Commit Graph
4623 Commits
Author SHA1 Message Date
Daveandvariableundefined 2230fc3227 Revert "Datumizes traitors and mindslaves (#11969)" (#12376) 2019-09-21 19:32:52 -07:00
SteelSlayerandvariableundefined 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 McCloudandvariableundefined d5759a0db5 Rebalances Golems, Refactors Species Based Equipping (#12358) 2019-09-21 06:10:37 -07:00
TDSSSandvariableundefined 840559e9ae Buffs the uplink syringe gun, it now comes with some syringes (#12353) 2019-09-20 17:59:51 -07:00
Fox McCloudandGitHub 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 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
Coul d89d4dbc38 fixes some missing arguments and runtimes 2019-09-16 16:18:16 -04:00
DaveandGitHub 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 788f1926fb though-our-bodies-be-ravaged 2019-09-15 19:49:52 -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
variableundefinedandGitHub 894ffab1ae Merge pull request #12277 from Fox-McCloud/removes-roman-armor
Removes Real Armor from Autodrobe
2019-09-13 08:15:46 -04:00
variableundefinedandGitHub 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
variableundefinedandGitHub 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
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
variableundefinedandGitHub 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 0119d350b4 Lavaland Update Part 2: Mobs 2019-09-07 02:26:31 -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
Fox McCloud dca6d98f5f Refactors Corgis 2019-09-04 18:40:34 -04:00
variableundefinedandGitHub 271c62dbef Merge pull request #11535 from Couls/zombies
[Ready for review] Romerol Virus, Zombies!
2019-09-03 20:58:53 -04:00
Fox McCloud 91fffcc076 Updates/Refactors Personal Crafting 2019-09-03 17:58:33 -04:00
Coul 6b82bfe47d Merge remote-tracking branch 'upstream/master' into zombies 2019-09-03 15:52:43 -04:00
Fox McCloud 1197ed0738 less admin annoyance 2019-08-31 19:43:59 -04:00
Fox McCloud 7a61ecb637 The Most Important Refactor Ever 2019-08-29 23:12:59 -04:00
Fox McCloud 6b8140d9ff Fixes Baseball Bats Throwing Anchored Things 2019-08-29 20:58:53 -04:00
variableundefinedandGitHub e6a190ae72 Merge pull request #12093 from Fox-McCloud/sandbags-and-barricades
Adds Sandbags Reworks Security Barricades
2019-08-27 18:01:20 -04:00
variableundefinedandGitHub 722df75be4 Merge pull request #12090 from Fox-McCloud/jetpack-upgrade
Ports Jetpack Upgrades. Removes Jetpack Suit Storage
2019-08-27 17:39:19 -04:00
variableundefinedandGitHub 97654f5d52 Merge pull request #11762 from AzuleUtama/vgFalseBriefcaseAndCompactRifle
Ports VG's false briefcase
2019-08-26 08:53:14 -04:00
Fox McCloud 1befa092be Adds Sandbags Reworks Security Barricades 2019-08-26 03:21:45 -04:00
Fox McCloud 899eb9c948 Ports Jetpack Upgrades. Removes Jetpack Suit Storage 2019-08-26 00:11:42 -04:00
Fox McCloud 9a4834a565 Merge remote-tracking branch 'upstream/master' into hardsuit-helmet 2019-08-25 18:15:10 -04:00
Fox McCloud c95067217c Merge remote-tracking branch 'upstream/master' into plasmamen-rework 2019-08-25 17:43:34 -04:00
variableundefinedandGitHub 8269bc525e Merge pull request #11941 from farie82/examine-info
Adds tips to certain things + general fixes that for issues I across
2019-08-25 16:53:49 -04:00