cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 22:22:31 +00:00
Code Issues Packages Projects Releases Wiki Activity
44,538 Commits 26 Branches 2 Tags
bc0749c99d60b079f2f58ba07ee9ac76ecbb89ff
Commit Graph

2728 Commits

Author SHA1 Message Date
Fox McCloud
23c884e14c Merge pull request #11494 from Markolie/lighting 
Lighting fixes
 2019-05-09 00:09:16 -04:00
Mark van Alphen
458e59a191 Final weather fix 2019-05-09 05:53:53 +02:00
Mark van Alphen
b66ac0559e Add initial plane to weather 2019-05-09 05:23:14 +02:00
Mark van Alphen
502b8aebc5 Weather lighting fix 2019-05-09 05:09:54 +02:00
Fox McCloud
3d90ccbfb7 nevermind, just generic fixes 2019-05-08 20:15:24 -04:00
Fox McCloud
61b337578b Potentially Solves Disappearing Human Mob Issue? 2019-05-08 17:25:35 -04:00
Mark van Alphen
7fb7cdc57f Chair plane fix (and maybe fixes the disappearing humans, too) 2019-05-06 03:52:01 +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
variableundefined
5357e0e36f Merge pull request #11428 from Markolie/bundles 
Chameleon overhaul
 2019-05-04 08:23:40 +08: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
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
EvadableMoxie
5c2608330c Adds Nanotrasen Hospital ship, admin shuttle templates system. 2019-05-02 20:17:50 -04:00
Unknown
0d81c2da7c Adds Pig Crate 2019-05-01 14:19:43 -05:00
Mark van Alphen
e9d39b0d27 Chameleon overhaul 2019-05-01 20:59:41 +02:00
Mark van Alphen
0d73736be2 Make the traitor reviver implant EMP-proof 2019-05-01 02:34:16 +02: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
variableundefined
0fb9167060 Merge pull request #11312 from farie82/cure-text 
Makes the crit cure texts clearer
 2019-04-29 22:58:59 +08:00
Mark van Alphen
e4dd9110ee Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lighting 
# Conflicts:
#	paradise.dme
 2019-04-26 22:58:56 +02:00
Kyep
3ef424eb5c upgrades ID computer 2019-04-23 21:02:27 -07:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
045311ae84 Merge branch 'ambientocclusion' of https://github.com/Markolie/Paradise into lighting 2019-04-23 22:59:11 +02:00
Mark van Alphen
0d883a5b88 Darkness handling update 2019-04-23 22:59:00 +02:00
Mark van Alphen
429dd20ded Button plane fix 2019-04-23 20:08:04 +02:00
variableundefined
624699e6d9 Merge pull request #11332 from Arkatos1/VarArts 
Adds an option to grant Martial Arts via Var menu
 2019-04-23 20:47:03 +08:00
Fox McCloud
4761ded0d4 Merge pull request #11350 from AffectedArc07/ss-everything 
Gives the orphans a home
 2019-04-21 18:44:38 -04:00
AffectedArc07
ff78ff1a9c SScommunications 2019-04-21 20:12:14 +01:00
Arkatos1
cb8e492746 Code improvement 2019-04-19 17:41:25 +02:00
Arkatos1
b0182639b2 Adds an option to grant Martial Arts via Var menu 2019-04-19 16:54:59 +02:00
variableundefined
31a2779bae Merge pull request #11259 from Markolie/flukeops 
Nuke Ops updates and buffs
 2019-04-18 07:16:31 +08:00
joep van der velden
1c21b625af Makes the crit cure texts clearer 2019-04-17 10:49:31 +02:00
variableundefined
eb83a2dee7 Merge pull request #11285 from Fox-McCloud/elecrocution-refactor 
Refactors Electrocution
 2019-04-16 19:47:42 +08:00
Crazy Lemon
6c4eb66da8 Merge pull request #11282 from Fox-McCloud/atmos-defines 
Atmos Define Cleanup + Plasma Tweaks
 2019-04-10 22:18:52 -07:00
Fox McCloud
90c9f3f479 Refacors Electrocution 2019-04-10 18:09:14 -04:00
Crazy Lemon
1a57f440df Merge pull request #11257 from Fox-McCloud/nations-update 
The Nations Update Everyone Deserves!
 2019-04-09 20:47:34 -07:00
Fox McCloud
a615e2bf3c forgot this hud. 2019-04-09 23:28:19 -04:00
Fox McCloud
e11b15fe7f Merge pull request #11270 from TDSSS/nukie-hijack 
Lets nukies buy plasmagrenades again (and other hijack gear)
 2019-04-09 22:47:26 -04:00
Fox McCloud
06713d604f Atmos Define Cleanup + Plasma Tweaks 2019-04-09 11:22:01 -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
TDSSS
106b242770 Let's fix that too 2019-04-07 23:19:11 +02:00
TDSSS
e12653306a Thought of a better way to do it (probably 2019-04-07 23:16:54 +02:00
Crazy Lemon
b59a5d37b6 Merge pull request #11266 from Markolie/hotkeymode 
Fix Hotkey Toggle button
 2019-04-07 14:16:06 -07:00
TDSSS
6079cb1839 allows nukies to buy hijack items 2019-04-07 23:12:15 +02: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
721760c002 Remove debug 2019-04-07 18:43:45 +02:00
Mark van Alphen
91e6cb9347 Fix hotkey mode button 2019-04-07 18:42:08 +02:00