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

32198 Commits

Author SHA1 Message Date
Mark van Alphen
b5c322e00a Starlight/shuttle lighting fix 2019-05-04 04:30:13 +02:00
Mark van Alphen
bdfb4af5c2 Starlight fixes 2019-05-04 03:38:21 +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
de2fd6e1c2 Update cryo plane 2019-05-04 00:27:15 +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
Mark van Alphen
bcc1bdc168 Remove jumpsuit from uplink 2019-05-03 18:27:57 +02:00
variableundefined
8928210da1 Merge pull request #11425 from Arkatos1/delay 
Examine tooltips tweaks
 2019-05-03 22:48:15 +08: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
44d9f853cb Merge pull request #11418 from Arkatos1/patchpack 
Craftable Patch Pack
 2019-05-03 22:39:26 +08:00
variableundefined
f8d53aed67 Merge pull request #11426 from Arkatos1/toolbelt 
Belt Update
 2019-05-03 22:39:04 +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
01127dc5e9 Merge pull request #11429 from Mitchs98/pigcrate 
Adds Pig Crate to Cargo
 2019-05-03 22:19:50 +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
b2c3c0c4f4 Merge pull request #11443 from Kyep/attackby_runtime 
Fixes item_attack runtime when punching windoor
 2019-05-03 22:14:18 +08:00
variableundefined
6e79364b65 Here we go again 2019-05-03 21:47:07 +08:00
Kyep
cddb0a8213 one level deeper 2019-05-02 21:32:30 -07:00
Kyep
2cf6f1aa79 fixes add_reagent runtimes for blobs 2019-05-02 19:54:11 -07:00
Kyep
bf1eeb211f Fixes item_attack runtime when punching windoor 2019-05-02 19:03:29 -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
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
f7a52dcec0 COMIC injector fix 2019-05-01 21:07:43 +02:00
Mark van Alphen
86b90bab2c And fix the uplink kits 2019-05-01 21:01:16 +02:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Arkatos1
24b0eb0c0c toolbelt update 2019-05-01 16:57:54 +02:00
Arkatos1
c6a91eafdd Tweaks 2019-05-01 16:04:07 +02:00
Arkatos1
791bebf51c Tweaks to Examine tooltips 2019-05-01 15:50:30 +02:00
Aurorablade
ba22fe0d85 one size fits honk 2019-05-01 01:28:37 -04:00
Kyep
29d20e6c4d Fixes runtime in job_exp.dm 2019-04-30 18:28:00 -07: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