Commit Graph

774 Commits

Author SHA1 Message Date
XDTM 2261bab837 Fixes accelerator cannon resizing (#22943) 2017-01-12 15:05:27 -05:00
TehZombehz 8cc9e6de50 Adds regenerate_organs proc and adds it to relevant regeneration code (#22740)
* Adds regenerate_organs proc to carbon and adds it to relevant regeneration code

I simply took the bit from the admin heal and made it into a proc and
added it to the necessary regeneration-related bits of code.

* Adds regenerate organs back to fully heal

For some reason this didn't get included in the previous commit.

* moves regenerate_organs to organ_internal

As suggested. It fits better here, anyways.
2017-01-07 19:38:29 +13:00
Firecage 50bbf5aa50 Allows syringes and droppers to show their reagents when examined while wearing things such as Science Goggles. (#22618)
* Allows syringes and droppers to show their reagents when examined.

* rearranges my logic

* replaces SEMIOPENCONTAINER with TRANSPARENT

* Silly spelling error fix.

* Moves the defines from flags to container_type to avoid issues with conflicting flags

* changes it back to obj/item/O

* Moves the OPENCONTAINER and TRANSPARENT defines to the reagents.dm
2017-01-04 20:00:46 +13:00
Kyle Spier-Swenson bee4b132a3 [READY]Makes addtimer use callbacks (#22660)
* Makes addtimer use callbacks

* I broke the comment

* I fucked up the regex

* this was a silly idea.
2017-01-04 16:02:56 +13:00
Kyle Spier-Swenson 280dbe20c3 [Ready] SSthrowing + callbacks! (#22476)
* SSthrowing + callbacks!
Throwing is now a subsystem.
It's low priority, but is a ticker subsystem so is ran before most other subsystems.
To allow for shit to run after the throw finishes, throwing now supports a callback.
A callback datum system was created, conversion of addtimer is planned for another PR.
Throwing now has a limit of 2048 turfs (was 600)
Throwing now ticks every world.tick, and properly converts the speed arg from 1ds to what ever tick_lag is.
Throwing now properly accounts for missed ticks.
Throwing no longer uses sleep.
Throwing should no longer lag since it's not filling the sleep queue up

* Smoother tentacles

* Some improvements

* Missed a spot.

* Makes shit quicker.
Inlines the thrownthing.tick() proc.
Raises missed ticks value
Lowers max dist value
Inlines the two sister overrides for /atom/movable/Moved() because that just seemed like a waste

* >PRs open that use procs i'm removing.

* STOP THE PRESSES!

* throw_at now runs the first throw tick() immediately
This will help some with throwing while running.

* Item throwing now imparts the momentum of the user throwing.

(ie, running in the direction you are throwing makes you throw faster, running away from the direction you are throwing makes you throw the item slower)

* Moves throwing momentum from carbon/throw_item to movable/throw_at.
There are other things that cause a mob to "throw" an item, I figured we keep this universal since thrower is already an arg.

* Explosions throw shit faster.
This was stupid, "Hey, lets set the item's throw_speed to 4 so embedding works, but lets make it throw at the base 2 throw speed for no reason."

* Fixes explosion embedding.
This also acts as a nice example of how to override a callback in an override of throw_at properly.
2017-01-02 20:08:03 +11:00
Joan Lung 27896031f0 Fixes not being able to light thermite on clockwork walls with a welding tool 2016-12-28 22:35:37 -05:00
jughu afccd6787d Hhwhhe (#22463) 2016-12-26 11:48:45 -05:00
Cyberboss 74c7634fca Fixes a russian revolver runtime 2016-12-21 01:48:43 -05:00
oranges e5e4b7dcc6 Merge pull request #22259 from ChangelingRain/kineticbow
Ebows can no longer have KA mods installed
2016-12-18 19:58:01 +13:00
Mervill 1b353d3cc4 Fixes russian revolver ammo displaying incorrectly (#22253)
* clean up the russian revolver code

* woops
2016-12-18 19:57:26 +13:00
Joan Lung e4413b932a Ebows can no longer have KA mods installed 2016-12-16 15:57:21 -05:00
XDTM 7d1a67d0c8 Abductor tools and tool sound refactor. (#22125)
* Everything in the PR

* I'm taking that as a yes
2016-12-14 18:09:41 +13:00
Cheridan 2dd1a87345 Merge pull request #22083 from ChangelingRain/multiplierspeed
Refactors toolspeed to be a multiplier instead of a divisor
2016-12-10 19:22:44 -06:00
Joan Lung e6df49f3de Revert "Removes left inhand files, automatically mirrors inhands" (#22085) 2016-12-09 18:27:25 -05:00
Joan Lung 43ce2667f4 Merge branch 'master' of https://github.com/tgstation/tgstation into multiplierspeed 2016-12-09 18:03:43 -05:00
Joan Lung a3be7a9226 Refactors toolspeed to be a multiplier instead of a divisor 2016-12-09 16:55:51 -05:00
KorPhaeron ace673e829 Removes left inhand files, automatically mirrors inhands 2016-12-07 23:34:12 -06:00
Joan Lung 551ede6d35 Kills all remaining text pronoun macros (#21916)
* Kills all remaining text pronoun macros

* review your own code

* oh right one further

* more

* \
2016-12-04 21:32:31 +01:00
Mervill 0972f78800 a_intent now uses defines 2016-12-02 22:27:30 -08:00
Mervill c2e2440953 Merge branch 'master' into w_class
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2016-12-02 21:44:24 -08:00
Jordie ca6ffdba40 Merge pull request #21866 from Mervill/slashes_deux
Remove slash from end of type refs/defs
2016-12-03 15:56:10 +11:00
Mervill 09ea5ad2e5 w_class now uses defines 2016-12-01 21:33:14 -08:00
Mervill 01d4232570 Remove slash from end of type refs/defs 2016-11-30 19:23:15 -08:00
ExcessiveUseOfCobblestone b30d0a5782 Fixes Revolver not being able to be redescribed
/obj/item/weapon already cover this so not sure why the revolver had its own.
2016-11-30 21:25:23 -05:00
MrStonedOne 76e1c6916f VV refactor 2016-11-30 12:49:21 -08:00
Thunder12345 15fac9496d Changed name by order of Razharas 2016-11-30 13:54:25 +00:00
Thunder12345 d37e339876 Does the oranges and the Joan 2016-11-29 11:03:18 +00:00
Thunder12345 8959238828 Antitank Launcher 2016-11-28 16:46:30 +00:00
oranges 138e0500a4 Merge pull request #21554 from ChangelingRain/infinitygun
Fixes infinite cooldown KAs
2016-11-15 16:46:13 +13:00
Joan Lung 40448e731a Fixes infinite cooldown KAs 2016-11-14 11:34:18 -05:00
Lzimann 1f4a5434c8 Fixes conflicts and updates spell description. 2016-11-13 22:05:57 -02:00
KorPhaeron a643cb92f0 Dual (or more!) Wielding (#21397)
* Dual (or more!) Wielding

* Removes an extra line

* Shotguns can't be dual wielded
2016-11-14 12:02:00 +13:00
Lzimann ba0af67f47 Adds a way to disallow having certains spells together. Only added to lesser summon guns/arcane barrage for now. 2016-11-13 20:10:52 -02:00
Lzimann 97055c5172 Removes horrible type check 2016-11-13 17:58:44 -02:00
Lzimann dc1aebd403 Uncomment the throw/message after shooting with the regular enchanted mosin. 2016-11-13 17:44:30 -02:00
Lzimann 9d23e5ab3c Changes the Lesser Summon guns to Arcane barrage. 2016-11-13 17:30:42 -02:00
Cyberboss 6d1e30b062 Adds an exception for KAs 2016-11-09 16:07:39 -05:00
Mervill 9ea955b85f Lint (#21393)
* icon, icon_state defined twice

* desc defined twice

* desc defined twice

* desc, icon_state defined twice

* icon_state, name defined twice

* item_state defined twice

* gender defined twice

* stop_automated_movement_when_pulled defined twice

* attacktext defined twice

* speak_emote defined twice

* flying defined twice

* item_state defined twice

* speak_chance defined twice

* attack_sound defined twice (x2)

* icon_state, item_state defined twice

* icon_state defined twice

* Revert "desc defined twice"

This reverts commit 18d74f442441078a7d8e8cfaddbef1c4646b6bb9.

* desc defined twice

* Revert "desc defined twice"

This reverts commit e167c0812c94a96dfb3f6888c77cee868cc37c03.

* desc defined twice
2016-11-08 13:55:30 +13:00
swindly 6feff91f76 it's -> its 2016-11-02 19:26:04 -04:00
phil235 b7efc2cef4 Make energy guns able to use burst fire. (#21005)
* Make energy guns able to use burst fire.

* Changed obj/item/weapon/gun/projectile to /gun/ballistic and the name of the folder from "projectile" to "ballistic" to avoid confusion between actually projectiles and guns.

Syringe gun, energy guns and magic guns can now use burst fire.

* fixing merge conflict shit

* fixing map conflicts

* more map conflict fix

* two tiny fixes.

* tiny tweak

* fixing merge conflicts.
Moving the practice mini egun to the gun module.
Renamed nuclear.dm to energy_gun.dm

* map conflict fixes
2016-11-02 16:16:21 +13:00
kevinz000 7e364fd79a rip 2016-10-29 20:45:23 -07:00
kevinz000 5552a0ff02 fuck 2016-10-28 16:55:37 -07:00
Xhuis b22cc0543a [s] Adds new Halloween content (#21191)
* Adds new Halloween content

* Removes the delay

* Replaces archaic code

* Atomizes by removing unrelated tweaks

* Conflicts I

* Conflicts III, I think

* Unticks "halloween.dm"
2016-10-29 11:28:11 +13:00
kevinz000 7b3af25fbe Fixes hardlight bows (#21231)
Prevents them from infinite-hitting things by deleting them after they apply hit effects.
Also removes the secondary hit for a 30 brute primary hit instead of attempting to split damage as that's not working well.
2016-10-28 20:10:13 +13:00
kevinz000 bbeaffe9c5 Hardlight Bows (#20944)
Adds hardlight bows and hardlight quivers.
Does 12 brute and 18 burn on hit.
The quivers regenerate one arrow every few seconds and is worn on the back.
Arrows disintegrate on hit and are destroyed after 20 seconds if it is dropped to prevent spam.

ADDED TO UPLINK AT 7 TELECRYSTALS FOR A BOW AND QUIVER. Can be included in surplus crates.
🆑
2016-10-28 14:16:16 +13:00
AdamElTablawy 9c82aab253 Makes sniper rifle descriptions less shit 2016-10-22 16:04:05 -07:00
Cheridan 7f6f300587 Merge pull request #21036 from phil235/hugbox
Some nerfs to clothes & item damage
2016-10-19 12:15:35 -05:00
Joan Lung 4cddd81120 Suicide now uses the pronoun helpers (#20973)
* This doesn't actually matter, because you're dead forever once it happens...

* is this entire pr chaff for something else

* you'll do it? nah, fuck that I'll do it
2016-10-18 14:36:38 +13:00
phil235 30ca862473 Fixes hardsuit not having 300hp (I gave it to the helmet, but had forgotten about the suit itself)
All unique traitor steal objective item are now immune to all damage except severity=1 explosion.
Mobs on fire no longer get damage to their worn backpacks, belts, id, pocket stuff, and suit storage.
All backpacks are now nonflammable, and bag oh holding and engineer backpack are now fireproof.
Mob receiving melee attacks now only have its outer layer of clothes damaged, e.g. no damage to jumpsuit when wearing a suit.
Made all hyposprays (not just the CMO's) acid proof.
Made the singularity gen and tesla gen immune to fire.
2016-10-17 22:51:57 +02:00
unknown 7e3257448c Removed a sleep from kinetic_accelerator/dropped() 2016-10-14 11:40:53 -06:00