Commit Graph

32559 Commits

Author SHA1 Message Date
Couls d0eca96d74 Fix typo in scanner code 2019-05-21 17:19:39 -04:00
Arkatos1 ca708563e5 more fixes 2019-05-20 21:02:53 +02:00
Arkatos1 72abc2665e fixes for cling aug vision and general action buttons 2019-05-20 15:42:20 +02:00
variableundefined 8eddb60313 Merge pull request #11547 from AffectedArc07/prefs-fix
Re-alphabetises prefs
2019-05-20 16:00:05 +08:00
Fox McCloud c31dfee6b1 Merge pull request #11556 from AffectedArc07/var-move
Moves a global var around
2019-05-19 16:46:18 -04:00
Fox McCloud 9f9d13dbd0 Merge pull request #11555 from Arkatos1/hissfix
You can no longer hiss while muzzled
2019-05-19 16:45:55 -04:00
Fox McCloud 702a3081d4 Merge pull request #11554 from Arkatos1/swapfix
Changeling Swap Forms fix
2019-05-19 16:45:29 -04:00
Fox McCloud 53eca25401 Merge pull request #11551 from Arkatos1/ghostfix
Ghost vision lighting fix
2019-05-19 16:43:35 -04:00
AffectedArc07 513c926cb1 Come on you need friends 2019-05-19 20:36:58 +01:00
Arkatos1 69cb37bf22 fixed a case where you could hiss while muzzled 2019-05-19 21:26:47 +02:00
Ty-Omaha 94afabee9c fix2 2019-05-19 15:13:00 -04:00
Ty-Omaha 0a65713126 fix 2019-05-19 14:54:03 -04:00
Arkatos1 bb4ac3d14b swap forms fix 2019-05-19 20:46:27 +02:00
Ty-Omaha 0e3645a27d taketickets 2019-05-19 14:24:12 -04:00
Mark van Alphen 1b14f705e0 Add crisis check 2019-05-19 20:08:19 +02:00
Mark van Alphen 1a93d05275 Gamma borgs are now reset when security level is dropped below Gamma 2019-05-19 20:04:26 +02:00
Citinited d36cb324a0 Spells now charge using the fast processing subsystem 2019-05-19 18:52:01 +01:00
Arkatos1 d2f50269d7 fixed ghost vision 2019-05-19 19:47:46 +02:00
AffectedArc07 3221827576 Re-alphabetises prefs 2019-05-19 08:11:37 +01:00
Fox McCloud d61c34e537 Merge pull request #11546 from Shadeykins/Paper-Exploit
Fixes paper.dm issue
2019-05-18 16:26:57 -04:00
Fox McCloud cbe4fe9b2e Merge pull request #11533 from Markolie/lighting
Rotatium fix
2019-05-18 15:44:07 -04:00
Shadeykins 7249cd84b5 Word choice. 2019-05-18 13:24:35 -06:00
Shadeykins 69e50ae70b Fixes potential paper exploit. 2019-05-18 13:21:38 -06:00
Citinited da51a3315c Fix for infinite boo 2019-05-18 13:02:06 +01:00
tayyyyyyy e288355182 Avoid announcing admin jobs 2019-05-18 02:01:32 -07:00
Dovixx cb33ec04f8 Fix headpocket being recovered 2019-05-17 21:49:36 +03:00
Dovixx c2a81675e4 Add the path to cryopod preserve item list 2019-05-17 21:26:09 +03:00
Arkatos1 15299ce1d0 smartfridge now visually reflect their content 2019-05-17 20:24:11 +02:00
Mark van Alphen 2c5e216e82 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/actions/actions.dmi
#	icons/mob/inhands/items_lefthand.dmi
#	icons/mob/inhands/items_righthand.dmi
#	paradise.dme
2019-05-17 17:37:18 +02:00
variableundefined 19c8a8265e Merge pull request #11486 from Tayyyyyyy/better_ert_spawn
Non-blocking ERT selection/spawn
2019-05-17 23:07:30 +08:00
Arkatos1 a78cf680de grammar fixes 2019-05-17 14:02:38 +02:00
variableundefined 41b175f470 Merge pull request #11480 from Tayyyyyyy/messages_window
Make it easier to slide into DMs
2019-05-17 19:20:22 +08:00
variableundefined 909c1d4d71 Merge pull request #11479 from TDSSS/rejuv-change
Lets vamp and cling anti-stun powers remove sleep too
2019-05-17 19:18:35 +08:00
variableundefined 7076f2718b Merge pull request #11477 from Arkatos1/smartoutput
Smartfridge gets smarter
2019-05-17 19:18:01 +08:00
variableundefined 3338d8b907 Merge pull request #11476 from Arkatos1/inhand
New inhand sprites
2019-05-17 19:17:32 +08:00
variableundefined 16c352abd1 Merge pull request #11472 from Couls/code-phrase
Remove non-manifest names from the code phrases
2019-05-17 19:17:01 +08:00
variableundefined 719ffda09e Merge pull request #11438 from Emanthealmighty/AdminCultist-change
Admin created cultists can now properly summon their Gods.
2019-05-17 19:15:39 +08:00
variableundefined 1e62ac30ad Merge pull request #11439 from Arkatos1/LingIcons
Changeling Evolution - Action Buttons!
2019-05-17 19:15:16 +08:00
Mark van Alphen 4ccf04124c Rotatium fix 2019-05-16 18:50:18 +02:00
Fox McCloud 238780cae6 Merge pull request #11511 from Markolie/lighting
Make the lighting plane master respect client color and other lighting fixes
2019-05-15 20:42:44 -04:00
Mark van Alphen 330708a578 Fix mining bot mesons 2019-05-15 23:08:24 +02:00
Fox McCloud 68effd9d83 The End 2019-05-13 17:22:57 -04:00
Arkatos1 e985bb672e Merge https://github.com/ParadiseSS13/Paradise into WizardRevenge 2019-05-13 22:21:48 +02:00
Mark van Alphen 0f98a95666 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-13 22:14:38 +02:00
Mark van Alphen acbf627f8c Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into bundles
# Conflicts:
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/customitems/item_defines.dm
2019-05-13 22:08:49 +02:00
AffectedArc07 f35c87dc19 Merge branch 'master' into ss-ticker 2019-05-13 18:14:00 +01:00
Fox McCloud c2df74312e Prevents Future SSTicker from Runtiming 2019-05-13 03:18:34 -04:00
Arkatos1 8a1f3ced79 Fix for admin spawned blob cores 2019-05-12 13:55:16 +02:00
Arkatos1 115f191084 blob split fix 2019-05-12 13:19:52 +02:00
variableundefined 10c1d71d53 Merge pull request #11483 from datlo/golem-traitor-fix
Fix golem getting selected as auto traitors
2019-05-12 07:39:27 +08:00