Commit Graph

20137 Commits

Author SHA1 Message Date
variableundefined 9ae231ee99 Merge pull request #10327 from Fox-McCloud/fix-cqc
Fixes and Updates CQC
2019-04-10 10:36:44 +08: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
Fox McCloud 42a6f4ef30 tweak 2019-04-09 11:32:21 -04:00
Fox McCloud 06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -04:00
Ionward ba7491fa49 cleaned up and made all mantles a child of the base mantle 2019-04-09 02:54:06 -07:00
Ionward a792d46085 adds mantles! 3 public access ones (in default clothes vendor,) and 6 command ones, each in their respective heads' lockers. 2019-04-09 01:06:19 -07:00
Arkatos1 da73c134db Ghosts now orbit their followed targets 2019-04-09 02:17:40 +02:00
Arkatos1 21d212767f Summon Ghosts spell 2019-04-08 21:45:09 +02:00
Mark van Alphen 2285754948 Make sure it actually works 2019-04-08 19:28:48 +02:00
Mark van Alphen c7b4179e46 Make reinforcements spawn with basic gear and 0 telecrystals 2019-04-08 19:10:10 +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
Crazy Lemon b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode
Fix Hotkey Toggle button
2019-04-07 14:16:06 -07:00
Mark van Alphen ddc3a02ab3 Fix thermal for saboteur, reinforcement bugfix, re-add C4 pack 2019-04-07 23:04:43 +02:00
Mark van Alphen 16dd2860f4 Remove debug and re-add spawning as a cyborg 2019-04-07 22:42:04 +02:00
Mark van Alphen f63b587f54 Nuke ops updates 2019-04-07 21:57:22 +02:00
Mark van Alphen 91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02: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 7da7902b29 Merge pull request #11249 from Fox-McCloud/updates-power-gloves
Updates and Buffs Power Gloves
2019-04-07 21:19:37 +08:00
farie82 9034f2a214 Merge branch 'master' into mhelp-ticket-system 2019-04-07 14:43:49 +02: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 86ea35c25b Merge pull request #11161 from Kyep/terrorspider_patch_post_newcrit
Terror Spider tweaks
2019-04-07 20:30:48 +08:00
variableundefined 4f8494e89e Merge pull request #10999 from Kyep/ghost_verb
Tweaks Ghost Verb
2019-04-07 15:27:56 +08:00
Arkatos1 16a1a6d19a Shadowling text bolded in the Shadowling Hivemind 2019-04-07 04:06:47 +02: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
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
Crazy Lemon f6227ab2f8 Merge pull request #11223 from Fox-McCloud/fix-teslium
Fixes Teslium Being Unmakeable
2019-04-06 00:25:56 -07:00
Crazy Lemon 773d048919 Merge pull request #11237 from Fox-McCloud/fixes-reagents
Fixes Reagents Not Updating
2019-04-06 00:23:09 -07:00
Fox McCloud afa4e751db Merge pull request #11195 from Twinmold93/tonerless_sending
Fixes Sending Faxes Using Toner
2019-04-06 03:15:53 -04:00
Fox McCloud 29002efd98 Updates and Buffs Power Gloves 2019-04-06 01:38:02 -04:00
Mark van Alphen 2ba56c33de Code review fix 2019-04-06 06:17:29 +02:00
Mark van Alphen aa58a88296 Switch to client-side hotkey toggling 2019-04-05 22:45:05 +02:00
CornMyCob de3d84124a plasma cutter changes 2019-04-05 18:56:20 +01:00
Arkatos1 5edc1378f8 New tips, renamed show tip verb, new Random Tip verb 2019-04-05 14:43:38 +02:00
joep van der velden 75d9852d33 Perps no longer need glasses to be set 2019-04-05 09:35:43 +02:00
Fox McCloud 7d5e09d97d Fixes Reagents Not Updating 2019-04-05 02:22:10 -04:00
Mark van Alphen 391d91132c Fix code review issues (planetary_atmos and Initialize()) 2019-04-04 23:23:30 +02:00
Arkatos1 773865961b Colored title for Shadowlings in the Shadowling Hivemind 2019-04-04 22:08:49 +02:00
Mark van Alphen a21ec0f30b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
2019-04-04 22:04:55 +02:00
Mark van Alphen 33d6017e28 Merge branch 'turfs' of https://github.com/Markolie/Paradise into turfs 2019-04-04 22:01:50 +02:00
Mark van Alphen 877cfc4d7d Refactor catwalks to not be floors, update chasms and fix Lavaboat 2019-04-04 22:01:25 +02:00
Mark van Alphen d077138c3d Merge pull request #4 from CornMyCob/turfs
blood drunk miner
2019-04-04 21:41:45 +02:00
CornMyCob e02087d474 blood drunk miner 2019-04-04 20:34:26 +01:00
Mark van Alphen 99c470531f Add Swarmer megafauna/ruin, refactor medals so it's a subsystem. The catwalk's not yet functional 2019-04-04 17:43:15 +02:00
Arkatos1 51c91337c2 Adds show tip admin verb and Tip of the round 2019-04-04 15:37:07 +02:00
Fox McCloud 503f8a7036 fix brains 2019-04-04 07:59:11 -04:00