Commit Graph

20137 Commits

Author SHA1 Message Date
Arkatos1 b2e7149f1d Adds new inhand sprites 2019-05-06 16:08:38 +02:00
variableundefined 00207f8d9d Merge pull request #11399 from Kyep/patreon_update
Patreon Upgrade
2019-05-06 18:52:50 +08:00
variableundefined af237fe05b Merge pull request #11427 from Arkatos1/color_examine
Species name now shows in a species theme color on examine
2019-05-06 18:43:26 +08:00
AffectedArc07 19d8efef68 Morgue Updating [Hooks P4] 2019-05-06 10:08:28 +01:00
Mark van Alphen 6c14ac302c Switch to material glasses 2019-05-06 05:47:49 +02:00
Mark van Alphen 88fd88e25b Add custom glasses for Reyblood 2019-05-06 05:29:04 +02:00
Mark van Alphen 79d761063a Rename ghost darkness images 2019-05-06 04:06:54 +02:00
Arkatos1 d8dcd762a8 Gold color 2019-05-06 00:09:27 +02:00
Fox McCloud f6801461af Merge pull request #11440 from farie82/xeno-devour-fix
Force move for regurgitate and devour now
2019-05-05 16:43:50 -04:00
Mark van Alphen 90f71f164a Remove unused species_fit and move chameleon file 2019-05-05 20:37:53 +02:00
Mark van Alphen 93b45d91c5 Species chameleon fixes 2019-05-05 20:14:34 +02:00
joep van der velden 7a55bca054 can't eat while buckled 2019-05-05 13:23:31 +02:00
AffectedArc07 96edeacec5 Removes unused hooks 2019-05-05 10:28:56 +01:00
Kyep 0c85b1790c fixes merge conflict in paradise.dme 2019-05-04 22:59:00 -07:00
Kyep 2555679050 is_connecting_from_localhost() 2019-05-04 22:47:04 -07:00
Mark van Alphen d5df7456b1 Reinforcement number fix 2019-05-05 01:26:08 +02:00
Arkatos1 6020d1d397 Merge https://github.com/ParadiseSS13/Paradise into LingIcons 2019-05-04 15:27:48 +02:00
Mark van Alphen 6d8ec82733 Fix dynamic lighting on shuttles 2019-05-04 05:51:13 +02:00
Fox McCloud 9b00e11628 Fixes Warning Spam for Mob Transitions and Roundstart Spawning 2019-05-03 23:08:36 -04:00
Mark van Alphen b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +02:00
Mark van Alphen d98eb14a39 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	code/__DEFINES/misc.dm
#	code/modules/mob/living/simple_animal/hostile/hostile.dm
#	code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
#	code/modules/shuttle/shuttle.dm
#	icons/mob/actions/actions.dmi
#	paradise.dme
2019-05-04 03:16:38 +02:00
Mark van Alphen f3fb39b339 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/__DEFINES/misc.dm
2019-05-04 03:07:36 +02:00
Mark van Alphen bbeb07abd2 More lighting fixes 2019-05-04 03:06:10 +02:00
variableundefined 3ba90f87df Merge pull request #11384 from Kyep/no_free_jobs
Adds error message when trying to join with no free job slots
2019-05-04 08:34:09 +08:00
variableundefined 5357e0e36f Merge pull request #11428 from Markolie/bundles
Chameleon overhaul
2019-05-04 08:23:40 +08:00
Mark van Alphen 9009cd443e Fix pipe layering 2019-05-04 00:47:16 +02:00
Mark van Alphen ea517f153d Fix the steel_rain runtime again 2019-05-03 20:50:03 +02:00
Mark van Alphen 4c99f3913b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	paradise.dme
2019-05-03 20:31:41 +02:00
Mark van Alphen ea76fd2136 Add onTransitZ 2019-05-03 19:32:53 +02:00
Fox McCloud 9d4928b37a Merge pull request #11450 from variableundefined/AIOptimization2
AI Optimization, SNPC Removal 2.0
2019-05-03 13:30:41 -04:00
Mark van Alphen 35b1cee88b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into turfs
# Conflicts:
#	icons/obj/toy.dmi
2019-05-03 18:31:45 +02:00
Mark van Alphen d646ab0934 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting
# Conflicts:
#	code/game/area/Space Station 13 areas.dm
2019-05-03 18:30:07 +02:00
variableundefined b9acfe067d Merge pull request #11434 from TDSSS/sst-typo
fixed typo in sst console
2019-05-03 22:43:35 +08:00
variableundefined 8a5c4350bc Merge pull request #11431 from Arkatos1/plushies
Adds 4 new plushies
2019-05-03 22:42:49 +08:00
variableundefined d45d8b5731 Merge pull request #11403 from Kyep/oxytank
Makes active internals visible in pockets
2019-05-03 22:41:02 +08:00
variableundefined c1129e44b9 Merge pull request #11415 from Twinmold93/server_time
Adds Server Time to MC Tab for Admins
2019-05-03 22:40:40 +08:00
variableundefined b1bbac3bd7 Merge pull request #11416 from KasparoVy/swippity-swappity
Adds Eyewear Adjustment: Wearing Over/Under Masks
2019-05-03 22:40:21 +08:00
variableundefined df4dd5660a Merge pull request #11422 from Markolie/reviver
Make the traitor reviver implant EMP-proof
2019-05-03 22:37:42 +08:00
variableundefined 2cc5e3a5f7 Merge pull request #11445 from Kyep/blob_runtime_fix
Fixes add_reagent runtimes for blobs
2019-05-03 22:14:40 +08:00
variableundefined 6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Kyep 2cf6f1aa79 fixes add_reagent runtimes for blobs 2019-05-02 19:54:11 -07:00
Kyep 63980ff522 switches from flags=f to flags=b, for <130ms response time 2019-05-02 17:41:23 -07:00
EvadableMoxie 5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
joep van der velden 86cdeb3fa1 Force move for regurgitate and devour now 2019-05-02 20:12:24 +02:00
Twinmold93 fe0c04534f Moved to MC Tab
Moves the time stamp to the MC Tab per Fox's request.
2019-05-02 12:59:05 -05:00
Arkatos1 b931c6669b Plasmamen addition 2019-05-02 18:50:28 +02:00
Arkatos1 8b50022858 Old code cleanup 2019-05-02 18:31:31 +02:00
Arkatos1 fedb9c1770 Added icons, fixes, special cases resolved 2019-05-02 18:28:39 +02:00
Eman b27f084eb8 Admin created cultists can now properly summon their Gods
Upon being made a cultist through admin means, the "summon spots" will now be generated, even if the game mode isn't cult. This allows admin created cultists to actually reach their goal of summoning their god, if it is what the admins told them to do.
2019-05-02 15:35:40 +02:00
TDSSS 93d6d7fd7b fixed typo 2019-05-02 05:32:05 +02:00