Commit Graph

31 Commits

Author SHA1 Message Date
Fox McCloud
209379d22a Nerfs Glass Armor (#12544) 2019-10-27 00:19:13 -04:00
Fox McCloud
45bb5241f0 Training Wheels Come Off (#12587) 2019-10-15 19:22:42 -04:00
Fox McCloud
affa319fab Removes Console Screens (#12512) 2019-10-08 21:07:50 -04:00
Fox McCloud
20c4cf0a08 for-if-I-stand-I-stand-by-his-will-alone 2019-10-03 19:52:03 -04:00
Fox McCloud
d29be05f74 the-figment-that-was-is-now-gone 2019-10-01 19:08:15 -04:00
Fox McCloud
a469d0fcf2 for-God-has-redeemed-us-all 2019-09-30 16:49:15 -04: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
farie82
0e8ddb2afe Refactors the examine proc to return a list of strings (#12280) 2019-09-25 22:05:01 -07:00
Fox McCloud
6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Fox McCloud
1b1bd00c06 Updates Status Effects: Fixes Blood Drunk Status Effect, Buffs Regenerative Core (#12320) 2019-09-17 07:56:50 -04:00
Fox McCloud
af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
variableundefined
f6fe4a1520 Merge pull request #12291 from Fox-McCloud/hierophant-update
Hierophant Update
2019-09-14 22:31:38 -04:00
Fox McCloud
1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
Fox McCloud
bdcdfc04f0 Hierophant Update 2019-09-13 19:35:41 -04:00
Dave
454ea46587 Let's be honest, the miners are going to die either way 2019-09-13 01:08:55 -04:00
Fox McCloud
5943ad2902 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-10 07:09:30 -04:00
Fox McCloud
f998cb74ad then-we-shall-reforge-the-armor-from-what-remains 2019-09-10 07:03:05 -04:00
variableundefined
1270c56ef7 Merge pull request #12236 from Fox-McCloud/vending-machien-refactor-fix
Refactors Vending Machines and Fixes Restocking Exploit
2019-09-09 15:54:08 -04:00
Fox McCloud
fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud
4162226cb1 Merge remote-tracking branch 'upstream/master' into lavaland-udpate-split 2019-09-08 02:07:06 -04:00
Fox McCloud
8587f63982 Refactors Spawners/Tendrils 2019-09-07 20:02:53 -04:00
Fox McCloud
0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -04:00
Fox McCloud
d79f983732 Lavaland Update: Mechs and Scanners 2019-09-06 18:45:30 -04:00
Fox McCloud
86dfb4c823 Simple Mob Update 2019-08-30 20:32:08 -04:00
Fox McCloud
9c8905f9ca Refactors Lazarus Capsules 2019-08-29 23:34:19 -04:00
Fox McCloud
2bdb6f448f Fixes Blooddrunk Buff 2019-08-29 22:12:02 -04:00
Fox McCloud
9b9d5461ef Re-organizes Lavaland Files; Makes some Balacne tweaks 2019-08-24 03:58:05 -04:00
Fox McCloud
9699beee82 Ports Crusher Trophies 2019-08-17 21:57:40 -04:00
Mark van Alphen
22693b4a70 Survival pod storage wrench fix 2019-07-08 22:08:59 +02:00
Mark van Alphen
697bb8eee5 More Lavaland fixes:
- Air alarm computers will no longer display alarms that can't be remote controlled
- Survival capsules now have a NanoMed
- Fixed the disk compartmentalizer not having a sprite when something is put in
- Fixed the drying rack not having a sprite when something is put in
- Turned water bottles into glass containers so they have more functionality
- Hairless hide can now be made wet using water
- Reagents in glass containers can now be fed to others
2019-06-02 23:29:50 +02:00
Mark van Alphen
bf68f966b1 Add Ash Walkers, work on Syndicate base 2019-03-31 04:33:39 +02:00