Commit Graph

8705 Commits

Author SHA1 Message Date
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
Fox McCloud cc151278d5 Removes Unfinished VR (#12341) 2019-09-20 17:58:41 -07:00
Dave caffb8fd65 Adds Analyzer Examine Hint (#12336) 2019-09-20 17:58:03 -07:00
Fox McCloud 6711f92099 Merge pull request #12326 from Couls/missing-keyword-args
fixes some missing arguments and runtimes
2019-09-17 21:03:11 -04:00
Fox McCloud 5810d28571 Refactors Simple Mob Creation: Adjusts Which Mobs are Available (#12325) 2019-09-17 16:06:43 -07:00
Dave ed97b0f05b Crayon Fixes (#12327) 2019-09-17 14:43:18 -07:00
Fox McCloud aa49033844 nor-shall-our-souls-falter 2019-09-17 16:06:09 -04:00
Fox McCloud 6f637b6014 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-17 11:24:58 -04:00
Kyep dfd83d822a Depot Fixes & Tweaks (#11677)
* Depot Fixes & Tweaks
2019-09-16 22:55:54 -04:00
Coul d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
Dave e0ca504de0 OK, you caught me, I did use the web editor
But it was just to edit plaintext values, don't hurt me.
2019-09-16 12:48:27 -04:00
Dave eba05d3e91 Shield desc fix 2019-09-16 12:23:08 -04:00
Fox McCloud d015c0c2b2 even-still-though-time-itself-be-shattered 2019-09-16 01:35:25 -04:00
Fox McCloud 788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -04:00
Fox McCloud d9186a0c7b Fixes Double-Bonking Light Replacer 2019-09-15 11:11:07 -04:00
Fox McCloud af92373d33 though-this-world-may-be-broken 2019-09-15 05:53:43 -04:00
Fox McCloud 1bfb442d40 Merge remote-tracking branch 'upstream/master' into universal-damage 2019-09-14 21:15:31 -04:00
variableundefined 894ffab1ae Merge pull request #12277 from Fox-McCloud/removes-roman-armor
Removes Real Armor from Autodrobe
2019-09-13 08:15:46 -04:00
variableundefined 9c88e72cc3 Merge pull request #12271 from AzuleUtama/nukeOpsItemTweaks
Nuclear Operative Item Tweaks
2019-09-12 19:49:34 -04:00
Fox McCloud 94a2861039 Removes Real Armor from Autodrobe 2019-09-12 01:07:58 -04:00
Fox McCloud 6f516d0303 Merge remote-tracking branch 'upstream/master' into ash-drake-rework 2019-09-12 00:42:34 -04:00
variableundefined db211cfc54 Deconflict 2019-09-11 23:00:13 -04:00
AzuleUtama c6d846b6b6 Nuclear Operative Item Tweaks 2019-09-11 21:25:44 +01:00
Fox McCloud 59082ff21a space dragonnnn 2019-09-11 13:52:33 -04:00
variableundefined bcd64e99be Merge pull request #12255 from Fox-McCloud/shards-glass-lights
Refactors Shards, Improved Light Replacer, Adds Plasmaspear
2019-09-11 10:10:18 -04:00
variableundefined ee86b56d58 Merge pull request #12250 from Fox-McCloud/linda-upgrade-prep
Refactors Atmos Air Current Pushing
2019-09-11 01:28:55 -04:00
variableundefined 18b270cb7e Remove the structure/chair/wood/normal subtype, moving all properties to its parent. 2019-09-11 00:28:27 -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
Fox McCloud 7e0190b46a fix 2019-09-10 03:21:41 -04:00
Fox McCloud 40428e47d9 Refactors Shards, Improved Light Replacer, Adds Plasmaspear 2019-09-10 03:08:44 -04:00
variableundefined 69537dd60c Port TG hitby refactor and detonation of items by projectiles 2019-09-09 22:57:31 -04:00
Fox McCloud 42564c65f3 Refactors Atmos Air Current Pushing 2019-09-09 20:11:26 -04:00
Fox McCloud 177ac43f23 next-we-melt-the-memories-that-are 2019-09-09 16:20:04 -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 d19961378d first-we-burn-away-the-world-that-was 2019-09-09 14:48:29 -04:00
Fox McCloud b8f93f5151 fixes comment and sound 2019-09-08 11:27:32 -04:00
Fox McCloud fde5769225 other vending machines 2019-09-08 10:59:04 -04:00
Fox McCloud 607343424b Refactors Vending Machines and Fixes Restocking Exploit 2019-09-08 08:41:08 -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 0854f75f7b Fixes Pugs 2019-09-06 19:06:41 -04:00
variableundefined 854e5de97f Merge pull request #12206 from Fox-McCloud/refactors-corgis
Refactors Corgis and Other Doggos
2019-09-05 21:17:53 -04:00
Fox McCloud a54cac4887 foxes are canines 2019-09-05 19:18:24 -04:00
Fox McCloud b4863db46f further tweaks 2019-09-05 18:44:55 -04:00
Coul c6c1b1ce36 fix runtime 2019-09-04 22:20:28 -04:00