Commit Graph

5516 Commits

Author SHA1 Message Date
moxian 6520b32e56 Fix a potential minor logic error.
If the stack has no items left, we drop it, it gets merged
with another stack on the ground, then we should still report
the stack as having zero items.

Otherwise there's a potential to accidentally use items on the ground
once you run out of items in hand, which is slightly surprising.
2019-10-31 03:42:04 +00:00
moxian 4fab6f14e6 Add comment on why (I think) the stack fix happens to work. 2019-10-28 10:34:47 +00:00
moxian a24013be5b Fix stacks being consumed by redspace.
Fixes #12606
2019-10-28 10:21:06 +00:00
Darkmight9 19a29319de Decorations galore part 1! (#12615) 2019-10-27 00:30:05 -04:00
Evankhell561 af8916732b Remove the snowflake power cells (#12637) 2019-10-27 00:28:29 -04:00
Fox McCloud 00f5e0613c Stamina Damage Rework (#12591) 2019-10-27 00:23:22 -04:00
Fox McCloud 393b248835 Removes Ancient Storage Codersprite (#12594) 2019-10-27 00:22:12 -04:00
TDSSS 76ab2c7700 Makes yellow documents destructible (#12540) 2019-10-27 00:19:40 -04:00
datlo 6368447f83 Add nodrop notification 2019-10-24 20:41:36 +02:00
datlo 902b270ab1 His grace action button now links the box 2019-10-24 20:31:54 +02:00
Fox McCloud d6a6debf94 Traits framework (#12548) 2019-10-15 20:12:46 -04:00
AzuleUtama 3586683ef7 Vampire shapeshift and DNA scrambler clear flavourtext on use (#12546) 2019-10-15 20:07:40 -04:00
Fox McCloud 39cc83501b Fixes Explosions (#12539) 2019-10-09 09:58:27 -04:00
Fox McCloud c8eebd1b4b Adds Leather to Biogenerator (#12514) 2019-10-08 21:12:09 -04:00
Fox McCloud 5194094d3a Refactors Zone Selection (#12523) 2019-10-08 21:11:09 -04:00
Fox McCloud affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud a4641cc0cf Removes Dirty Floors (#12519) 2019-10-08 20:58:05 -04:00
SteelSlayer e9d463576f Reaper cult sprite overhaul (#12513) 2019-10-08 20:55:16 -04:00
Fox McCloud f4451fcb3d Fixes Universal Damage Issues. Implements Proper Ricochets (#12532) 2019-10-08 20:41:40 -04:00
Fox McCloud 86f626c9fd Merge pull request #12498 from Darkmight9/Hand-held-defib-new-sprite
Gives the handheld defib a new sprite
2019-10-08 05:22:00 -04:00
Fox McCloud 93fa76bee0 Fixes Blood Types (#12520) 2019-10-07 23:15:54 -04:00
Fox McCloud bb6cadef7a Health Analyzer Refactor (#12511) 2019-10-07 23:15:09 -04:00
variableundefined 3ae71f7932 Merge pull request #12245 from Fox-McCloud/universal-damage
Universal Object Damage
2019-10-06 23:22:48 -04:00
Fox McCloud 67dc33ac3f for-the-strength-from-which-he-gives-is-unerring 2019-10-05 02:08:11 -04:00
Darkmight9 da2fdc0c03 handheld 2019-10-04 20:10:28 -04:00
Fox McCloud 5170f3fbae the-strength-of-this-world-fades 2019-10-04 19:34:08 -04:00
variableundefined 2a27aaa1ff Syringe Refactor. Overhauls Lethal Injection Syringe (#12467)
* Syringe Refactor. Overhauls Lethal Injection Syringe

* fixes
2019-10-04 14:48:35 -04:00
Fox McCloud 20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
SteelSlayer 0e3a484c42 Fixes a bunch of things related to mindslaves (#12491) 2019-10-03 14:08:54 -04:00
Fox McCloud 99a6ee7827 the-bleakest-void-of-memento-mori 2019-10-02 00:38:08 -04:00
Fox McCloud d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud a97d050f4b Syringe Refactor. Overhauls Lethal Injection Syringe 2019-09-30 18:25:36 -04:00
Fox McCloud 2224229fad Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-30 14:18:33 -04:00
variableundefined e02a76aa73 Fixes too many items in the conscription kit #12436 2019-09-29 19:41:07 -07:00
AzuleUtama 4bdfc4c32b Camera bug now lists cameras in alphabetical order (#12427) 2019-09-29 19:13:19 -07:00
Fox McCloud 9097dfcacf Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/game/machinery/machinery.dm
#	code/game/objects/items.dm
#	code/game/objects/structures.dm
#	code/game/objects/structures/inflatable.dm
#	code/game/objects/structures/mirror.dm
#	code/modules/clothing/spacesuits/hardsuit.dm
#	code/modules/clothing/suits/wiz_robe.dm
#	code/modules/mob/living/carbon/alien/alien_defense.dm
#	code/modules/mob/living/carbon/slime/slime.dm
#	code/modules/mob/living/simple_animal/friendly/slime.dm
2019-09-28 00:16:11 -04:00
Mars 8b87bd529c Slight refactor of conscription kit 2019-09-27 17:44:06 +02:00
farie82 0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Mark van Alphen 6bd0d0813a Revert "Revert "Datumizes traitors and mindslaves"" (#12378) 2019-09-25 19:47:16 -07:00
Fox McCloud cb8529cdb8 Makes Xenobiology Simpler. Removes Slimes (#12398) 2019-09-24 16:17:33 -07:00
Fox McCloud 86e6d85093 Nutrition Refactor (#12389) 2019-09-24 15:17:55 -07:00
AzuleUtama da0375028f Fixes incorrect description for Traitor's Meat Cleaver (#12397) 2019-09-23 15:25:53 -07:00
Fox McCloud 62226851d9 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-23 12:53:52 -04:00
Fox McCloud c87389a595 TG Buckle Update (#12375) 2019-09-22 18:22:57 -07:00
Dave 2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayer 94bb14bb29 Datumizes traitors and mindslaves (#11969) 2019-09-21 16:50:03 -07:00
Fox McCloud 238ea19d09 Merge remote-tracking branch 'upstream/master' into universal-damage
# Conflicts:
#	code/modules/clothing/suits/labcoat.dm
#	code/modules/clothing/under/miscellaneous.dm
#	code/modules/mob/living/carbon/human/species/golem.dm
#	code/modules/mob/living/simple_animal/bot/ed209bot.dm
2019-09-21 12:40:07 -04:00
Fox McCloud d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
TDSSS 840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
AzuleUtama 09b87516d4 Syndie and Binary keys now use their own sprites (#12347) 2019-09-20 17:59:22 -07:00