Commit Graph

31862 Commits

Author SHA1 Message Date
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update
The Nations Update Everyone Deserves!
2019-04-09 20:47:34 -07:00
Fox McCloud
a615e2bf3c forgot this hud. 2019-04-09 23:28:19 -04:00
variableundefined
c6b8daa9b1 Merge pull request #11227 from Fox-McCloud/sr-update
Minor Strange Reagent Tweaks
2019-04-10 10:47:40 +08:00
Fox McCloud
e11b15fe7f Merge pull request #11270 from TDSSS/nukie-hijack
Lets nukies buy plasmagrenades again (and other hijack gear)
2019-04-09 22:47:26 -04:00
variableundefined
1a5b5dabe4 Merge pull request #11230 from Fox-McCloud/tweaks-crit
Newcrit Death Tweak
2019-04-10 10:47:02 +08:00
Fox McCloud
8a4b1691c7 Merge pull request #11277 from Arkatos1/Blob_Fix
Shield Blobs automatically spawned around Blob Cores now give no refund
2019-04-09 22:46:29 -04:00
variableundefined
aee2f6772e Merge pull request #11217 from Fox-McCloud/reagent-bodytemp
Tweaks Reagent Bodytemp Interaction
2019-04-10 10:42:31 +08:00
Fox McCloud
879b50fa10 Merge pull request #11253 from Citinited/foamedmetal-fix
Foamed metal fixes
2019-04-09 22:38:37 -04:00
variableundefined
9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc
Fixes and Updates CQC
2019-04-10 10:36:44 +08:00
Fox McCloud
cf17d82c69 Merge pull request #11260 from Aurorablade/STOPBREAKINGTHISSPRITE
Fixes cult ghost  suit sprites
2019-04-09 22:33:38 -04:00
variableundefined
17030d02fe Merge pull request #11214 from Arkatos1/Sling_Chat
Shadowlings now have a slightly bigger colored text when speaking in the Shadowling Hivemind
2019-04-10 10:13:16 +08:00
Fox McCloud
1ad27bc030 more hit type verbs 2019-04-09 21:57:47 -04:00
Arkatos1
de61851512 Fixes refund with strong blob spawned near Core 2019-04-08 19:42:56 +02:00
Fox McCloud
6557082d43 changes 2019-04-07 22:21:17 -04:00
Fox McCloud
061278224b derp 2019-04-07 21:31:30 -04:00
Fox McCloud
03d894ecfc Merge remote-tracking branch 'upstream/master' into fix-cqc
# Conflicts:
#	code/game/objects/items.dm
2019-04-07 19:54:14 -04:00
TDSSS
106b242770 Let's fix that too 2019-04-07 23:19:11 +02:00
TDSSS
e12653306a Thought of a better way to do it (probably 2019-04-07 23:16:54 +02:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode
Fix Hotkey Toggle button
2019-04-07 14:16:06 -07:00
TDSSS
6079cb1839 allows nukies to buy hijack items 2019-04-07 23:12:15 +02:00
Mark van Alphen
721760c002 Remove debug 2019-04-07 18:43:45 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00
variableundefined
7416eebf7f Merge pull request #11265 from Fox-McCloud/fix-pill-bottles
Fixess Being Unable to Open Pill Bottles
2019-04-07 22:12:01 +08:00
Fox McCloud
c0ca397d8a Fixess Being Unable to Open Pill Bottles 2019-04-07 09:25:45 -04:00
variableundefined
8578b6fe46 Merge pull request #11221 from Arkatos1/Destroy_Engine_Rework
Shadowling Destroy Engines ability rework + changes to Shadowling End Round messages
2019-04-07 21:23:43 +08:00
variableundefined
ff8dc59367 Merge pull request #11229 from Fox-McCloud/reagent-tweaks
[Goonchem] Reagent tweaks
2019-04-07 21:22:18 +08:00
variableundefined
fc616d8a19 Merge pull request #11242 from Markolie/hotkeymode
Hotkey mode handling is now instantaneous
2019-04-07 21:21:21 +08:00
variableundefined
996f26508e Merge pull request #11240 from Arkatos1/Carp_Change
Changes Dehydrated Space Carp TC cost from 3 to 2
2019-04-07 21:20:39 +08:00
variableundefined
2ab55adfc2 Merge pull request #11244 from Arkatos1/Action_Tooltip
Descriptions now show with a mouse hover over action buttons
2019-04-07 21:20:20 +08:00
variableundefined
c33aecafb8 Merge pull request #11246 from TDSSS/upload
Small law upload console tweak
2019-04-07 21:20:03 +08:00
variableundefined
7da7902b29 Merge pull request #11249 from Fox-McCloud/updates-power-gloves
Updates and Buffs Power Gloves
2019-04-07 21:19:37 +08:00
variableundefined
34f7e3dc9f Merge pull request #11251 from Fox-McCloud/vending-machine-qol
Vending Machine QOL and Destruction
2019-04-07 21:18:43 +08:00
variableundefined
53d64d818d Merge pull request #11225 from TDSSS/box-revolver
Trick revolver comes in a box.
2019-04-07 21:14:51 +08:00
farie82
9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02:00
variableundefined
781bf73827 Merge pull request #11096 from Arkatos1/Holoparasite_Fixes
Guardian - Fixed and Improved
2019-04-07 20:42:45 +08:00
variableundefined
525b28014c Merge pull request #11026 from farie82/popup-limiting
Gives the option to limit the text popups to 1
2019-04-07 20:41:24 +08:00
variableundefined
1466ee0cca Merge pull request #11182 from Arkatos1/Shadowling_Glare_Change
Shadowling Glare ability rework [Second Version]
2019-04-07 20:33:15 +08:00
variableundefined
86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
Terror Spider tweaks
2019-04-07 20:30:48 +08:00
variableundefined
1aab5d561b Merge pull request #11264 from Fox-McCloud/fix-toy-revolver
Fixes Russian Revolver
2019-04-07 20:28:31 +08:00
Fox McCloud
8cf68e7cae Fixes Russian Revolver 2019-04-07 07:37:02 -04:00
variableundefined
4f8494e89e Merge pull request #10999 from Kyep/ghost_verb
Tweaks Ghost Verb
2019-04-07 15:27:56 +08:00
Fox McCloud
59bae1e02d electrocute_act is bugged 2019-04-06 22:51:42 -04:00
Arkatos1
16a1a6d19a Shadowling text bolded in the Shadowling Hivemind 2019-04-07 04:06:47 +02:00
Aurorablade
e3819c37a5 Fixes cult ghost suit sprites 2019-04-06 21:56:46 -04:00
Fox McCloud
8446632fbc The Nations Update Everyone Deserves! 2019-04-06 20:30:04 -04:00
Fox McCloud
8e0f0906a3 Merge remote-tracking branch 'upstream/master' into sr-update 2019-04-06 19:58:12 -04:00
Citinited
9f8099637a Foamed metal will no longer turn transit turfs into metal floors; fixes foamed metal floors not having a sprite 2019-04-06 20:48:00 +01:00
Fox McCloud
12a09d46f1 Merge pull request #11239 from farie82/sec-hud-fix
Perps no longer need glasses to be set
2019-04-06 13:17:07 -04:00
Fox McCloud
9bbe5b1887 Vending Machine QOL and Destruction 2019-04-06 06:08:04 -04:00
Crazy Lemon
f6227ab2f8 Merge pull request #11223 from Fox-McCloud/fix-teslium
Fixes Teslium Being Unmakeable
2019-04-06 00:25:56 -07:00