Commit Graph

44204 Commits

Author SHA1 Message Date
Mark van Alphen
4705c4e2fe Limit genetics XRay again 2019-04-28 20:15:30 +02:00
Mark van Alphen
adf53ecbed Fix lights not turning off on delete 2019-04-27 16:48:32 +02:00
Mark van Alphen
97fbfb279a Fix default statue vision 2019-04-27 01:15:21 +02:00
Mark van Alphen
40c1a25eb5 Lighting fixes 2019-04-27 01:08:17 +02:00
Mark van Alphen
b410ee5a97 zvis fix 2019-04-26 23:13:13 +02: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
ParadiseSS13-Bot
0fb164d041 Automatic changelog generation for PR #11364 [ci skip] 2019-04-25 20:11:50 -04:00
variableundefined
4b9bac327e Merge pull request #11364 from Fox-McCloud/death-of-object-processing
Kills off Object and Fast Object Processes
2019-04-26 08:11:48 +08:00
ParadiseSS13-Bot
3716e7876c Automatic changelog generation for PR #11367 [ci skip] 2019-04-24 13:54:58 -04:00
Fox McCloud
ce0b2c5828 Merge pull request #11367 from farie82/juice-fix
fixed orange juice and doctordelight not working on ingestion
2019-04-24 13:54:56 -04:00
joep van der velden
b19d460909 fixed orange juice and doctordelight 2019-04-24 13:03:22 +02:00
Fox McCloud
5bdbb64da2 returning parent value 2019-04-24 01:11:42 -04:00
Fox McCloud
89883a7b28 fixes 2019-04-24 00:49:23 -04:00
Fox McCloud
0034e851a1 Kills off Object and Fast Object Processes 2019-04-23 23:53:40 -04:00
Mark van Alphen
c8277bd282 More darkness fixes 2019-04-24 02:35:53 +02:00
Mark van Alphen
20b9285fc4 Wisp/meson implant fixes 2019-04-24 01:36:56 +02:00
Mark van Alphen
9e9d72d2ae Darkness fixes 2019-04-24 00:47:55 +02:00
Fox McCloud
1544756ce6 Merge pull request #11363 from AffectedArc07/oops
This shouldnt be existing anymore
2019-04-23 17:55:46 -04:00
AffectedArc07
1c5a412227 This shouldnt be existing anymore 2019-04-23 22:44:58 +01:00
Mark van Alphen
44347029db Compile fix 2019-04-23 23:22:03 +02:00
Mark van Alphen
5387d0ee67 TOGGLES_TOTAL fix 2019-04-23 22:59:58 +02: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
ParadiseSS13-Bot
1ed563c6f1 Automatic changelog generation for PR #11361 [ci skip] 2019-04-23 15:56:22 -04:00
Fox McCloud
4431f2ef22 Merge pull request #11361 from AffectedArc07/ss-alarms
SSalarms
2019-04-23 15:56:20 -04:00
ParadiseSS13-Bot
5619dba2f2 Automatic changelog generation for PR #11362 [ci skip] 2019-04-23 15:52:02 -04:00
Fox McCloud
f6afbf98b1 Merge pull request #11362 from alex-gh/cult_lobby_fix
Players in the lobby no longer see cult speak.
2019-04-23 15:52:00 -04:00
AffectedArc07
fa6ba7343f Merge branch 'master' into ss-alarms 2019-04-23 20:37:42 +01:00
AffectedArc07
42624fe847 Spaces > Tabs 2019-04-23 20:31:26 +01:00
alex-gh
5e0817a478 Players in the lobby no longer see cult speak. 2019-04-23 21:21:31 +02:00
ParadiseSS13-Bot
89278aaa0e Automatic changelog generation for PR #11300 [ci skip] 2019-04-23 15:11:17 -04:00
Fox McCloud
ff1edb1080 Merge pull request #11300 from Arkatos1/Ghost_Hud
Adds Observer HUD buttons + Refactor of some ghost verbs
2019-04-23 15:11:15 -04:00
Mark van Alphen
9213b89179 Remove receive_signal from alarm 2019-04-23 20:27:12 +02:00
ParadiseSS13-Bot
dcf80fba2b Automatic changelog generation for PR #11360 [ci skip] 2019-04-23 14:25:58 -04:00
Fox McCloud
5bd258c560 Merge pull request #11360 from AffectedArc07/ss-events
SSevents & SSholiday
2019-04-23 14:25:56 -04:00
Mark van Alphen
429dd20ded Button plane fix 2019-04-23 20:08:04 +02:00
Mark van Alphen
1bb35a43ef SQL fix 2019-04-23 15:13:33 +02:00
ParadiseSS13-Bot
1b78dc8d5d Automatic changelog generation for PR #11284 [ci skip] 2019-04-23 09:02:13 -04:00
variableundefined
73f4c6ea99 Merge pull request #11284 from Arkatos1/Null_Charge
New Shadowling Ability - Null Charge! (replaces Drain Life)
2019-04-23 21:02:11 +08:00
ParadiseSS13-Bot
dcb1acb8b3 Automatic changelog generation for PR #11332 [ci skip] 2019-04-23 08:47:04 -04: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
ParadiseSS13-Bot
ecce2b62fc Automatic changelog generation for PR #11328 [ci skip] 2019-04-23 08:46:36 -04:00
variableundefined
905fc7607a Merge pull request #11328 from farie82/mhelp-rights-fix
Admins can now see the mhelp tickets
2019-04-23 20:46:34 +08:00
ParadiseSS13-Bot
7489cc51c3 Automatic changelog generation for PR #11329 [ci skip] 2019-04-23 08:46:11 -04:00
variableundefined
f917c36ff7 Merge pull request #11329 from farie82/glare-logging
Vampire glare is logged now
2019-04-23 20:46:08 +08:00
variableundefined
337aeca559 Merge pull request #11354 from Kyep/ert_alert_fix
Improves unspawnable ERT alert
2019-04-23 20:42:44 +08:00
ParadiseSS13-Bot
649396e47d Automatic changelog generation for PR #11355 [ci skip] 2019-04-23 08:42:12 -04:00
variableundefined
ce87d5208f Merge pull request #11355 from Kyep/href_hack_alert_fix
Fixes unnecessary pAI warning for admins
2019-04-23 20:42:10 +08:00
AffectedArc07
acee1dcb42 SSalarms 2019-04-23 12:45:35 +01:00
ParadiseSS13-Bot
36045ecfc8 Automatic changelog generation for PR #11292 [ci skip] 2019-04-23 07:45:04 -04:00