cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 18:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,451 Commits 26 Branches 2 Tags
b5c322e00a2449b441ffb573f4c50135d0842e60
Commit Graph

19894 Commits

Author SHA1 Message Date
Mark van Alphen
b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +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
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
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04: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
TDSSS
93d6d7fd7b fixed typo 2019-05-02 05:32:05 +02:00
Arkatos1
1f2c3819bd Adds 4 new plushies 2019-05-01 21:43:32 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Aurorablade
ba22fe0d85 one size fits honk 2019-05-01 01:28:37 -04:00
variableundefined
ceec14b1ef Merge pull request #11419 from dovydas12345/Camera-spook 
Fixes cameras spooking non chaplains even when they don't see ghosts
 2019-05-01 09:14:07 +08:00
variableundefined
664c66b8da Merge pull request #11409 from farie82/borg-fixes 
Various borg fixes
 2019-05-01 08:51:55 +08:00
variableundefined
de69037fbd Merge pull request #11407 from Arkatos1/Coats 
Adds inhand sprites for winter coats
 2019-05-01 08:51:18 +08:00
variableundefined
9d32120975 Merge pull request #11413 from Arkatos1/carp 
Carp Expansion Pack
 2019-05-01 08:50:52 +08:00
Mark van Alphen
a03603775b Initialize fix 2019-05-01 02:35:26 +02:00
Mark van Alphen
0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02:00
Dovixx
e0015b69ba Proper fix (And yes i did forget about this PR) 2019-04-30 22:45:00 +03:00
Dovixx
9024108454 Merge branch 'master' into Camera-spook 2019-04-30 22:00:37 +03:00
Mark van Alphen
ad2238f496 Merge branch 'master' into lighting 2019-04-30 19:15:58 +02:00
variableundefined
c8d890ef8a Merge pull request #11365 from Kyep/id_card_tracking 
Upgrades ID Computer
 2019-04-30 13:28:03 +08:00
KasparoVy
66baa9e41b Adds Eyewear Adjustment: Wearing Over/Under Masks 
Adds a verb that'll let you adjust eyewear to be worn above or below a mask. Purely cosmetic.
 2019-04-30 01:00:24 -04:00
Twinmold93
726e0af91a rebase 2019-04-29 23:43:32 -05:00
variableundefined
32376093cb Merge pull request #11393 from Fox-McCloud/powernet-refactor 
TG Powernet Refactor
 2019-04-30 12:42:53 +08:00
Kyep
07b269264a restricts deletion of only your logs to centcom, deletion of all requires ID computer access 2019-04-29 20:47:45 -07:00
variableundefined
86d6ee8256 Merge pull request #11356 from 1fbff5f83b23d39d38b1dfcb4cac8d9b/patch-2 
[s]fixes a couple exploits
 2019-04-30 11:39:34 +08:00
variableundefined
3aab59f686 Merge pull request #11414 from Markolie/pai 
pAI admin message fix
 2019-04-30 11:33:18 +08:00
variableundefined
a1d349dd36 Merge pull request #11405 from Markolie/drone 
Remove an admin message when drones join
 2019-04-30 11:31:17 +08:00
variableundefined
5b98e861f0 Merge pull request #11299 from Kyep/ssd_auto_cryo_option 
Better SSD management
 2019-04-30 11:29:49 +08:00
Kyep
de29dbcc94 Ansari request #define SSD_WARNING_TIMER 2019-04-29 20:16:28 -07:00
Kyep
97e53916f6 job transfers now correctly update job slots 2019-04-29 20:10:06 -07:00
variableundefined
183862eafa Merge pull request #11395 from farie82/IRC-fix 
IRC's and the like now get checked to be revived when their vital organs are in
 2019-04-30 11:04:07 +08:00
variableundefined
739ae3fd03 Merge pull request #11396 from Arkatos1/Deadtelefix 
Small Ghost teleport verb refactor
 2019-04-30 11:03:44 +08:00
variableundefined
cb3ba0f5d0 Merge pull request #11334 from Arkatos1/BorgDeathSound 
Adds deathsound for Silicons
 2019-04-30 09:57:16 +08:00
Mark van Alphen
e54103d1eb pAI fix 2.0 2019-04-30 01:34:25 +02:00