Commit Graph

10254 Commits

Author SHA1 Message Date
Chinsky
d99c4ffaaa Merge pull request #11021 from Zuhayr/antagsystem
Forgot a couple of tweaks.
2015-09-06 08:06:48 +03:00
Zuhayr
eacc1e7da7 Tweaks. 2015-09-06 11:19:54 +09:30
GinjaNinja32
3bb0e2503a Merge pull request #11020 from Zuhayr/antagsystem
More antag fixes.
2015-09-06 02:47:12 +01:00
Zuhayr
111ff96312 Should fix antag candidate selection. 2015-09-06 10:59:59 +09:30
Zuhayr
efa995b372 Should fix antag scaling. 2015-09-06 10:53:32 +09:30
GinjaNinja32
8685ff42a4 Merge pull request #11008 from Zuhayr/antaghud
Refactored the antagHUD to work better with the new antagonist system.
2015-09-05 17:01:57 +01:00
GinjaNinja32
0ae3b1dd0c Merge pull request #11013 from PsiOmegaDelta/150905-ShieldCrush
Hull shields should no longer prevent the departure shuttle from leaving
2015-09-05 16:59:58 +01:00
GinjaNinja32
71b2213233 Merge pull request #11009 from PsiOmegaDelta/150905-JustGoAwayAlready
Status display alarms now clear properly on all mode changes.
2015-09-05 16:59:52 +01:00
PsiOmega
5ae74883d2 Hull shields should no longer prevent the departure shuttle from leaving.
If hull shields are left alone by the crew (due to being, for example, all dead) the departure shuttle is unable to leave.
This should destroy any shields faster than they can regenerate, thus ensuring a safe and pleasant departure.
2015-09-05 16:49:15 +02:00
PsiOmega
d77f0f3997 Status display alarms now clear properly on all mode changes.
Previously one had to first set the display mode to Clear before the overlays would go away.
This corrects situations where, for example, the emergency shuttle ETA could be covered by a NT logo.
2015-09-05 12:02:17 +02:00
Zuhayr
b09e836d95 Removed an unused file. 2015-09-05 18:51:39 +09:30
Zuhayr
90c9d31782 Refactored the antagHUD to work better with the new antagonist system. 2015-09-05 18:51:17 +09:30
Zuhayr
89a7c9667b Reverts a testing value. 2015-09-05 17:31:27 +09:30
Zuhayr
a0187f66e3 Fixes Secret. 2015-09-05 14:12:20 +09:30
Zuhayr
f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
Zuhayr
c121993a11 Changed some vars around to be more explicit/descriptive, added documentation to main antag datum. 2015-09-05 11:23:48 +09:30
Zuhayr
12a5c47413 Added a proper cooldown on latespawn, added loyalist role to char setup. 2015-09-05 10:46:23 +09:30
Zuhayr
553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr
09ee98717e Fixes cortical borer spawning. 2015-09-04 19:19:29 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
Cael Aislinn
0228ca4959 fix for runtime in skills computer
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-09-01 20:05:42 +10:00
Zuhayr
cc0f4f7e90 Merge pull request #10964 from caelaislinn/telecomms_fix
Fixes an obscure runtime in telecomms code
2015-09-01 13:56:41 +09:30
Cael Aislinn
8f05e2f63a fixes an obscure runtime in telecomms code
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 18:57:42 +10:00
Zuhayr
f86eba984c Merge pull request #10962 from caelaislinn/remote_emitter_fix
Fixes runtime in remote emitter activation button
2015-08-31 17:25:57 +09:30
Cael Aislinn
9f1407c196 fixes runtime in remote emitter activation button
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2015-08-31 17:45:20 +10:00
PsiOmega
22262507b9 Only living mobs now trigger shrapnel.
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
2015-08-29 10:03:58 +02:00
Zuhayr
a6604b2ca2 Merge pull request #10830 from mwerezak/lighting
Fixes #10465, escape pod lighting and raider spaceacillin
2015-08-26 05:50:37 +09:30
Zuhayr
9b3d21fe1c Merge pull request #10868 from comma/detrevert
Fixes inconsistency in Detective job datum
2015-08-25 18:27:30 +09:30
Chinsky
3ccbe22152 Fixes inconsistency in Detective job datum
There was only 1 slot, but you could spawn 2 during roundstart.
2015-08-25 03:27:54 +03:00
Zuhayr
bcca0d4aee Merge pull request #10842 from mwerezak/showers
Fixes cryogenic showers
2015-08-25 07:38:19 +09:30
HarpyEagle
e03585898d Cleans up flashlight fix
Moves icon state changes into update_icon(), less duplicated code. Also
makes glowing slime extracts less dumb.
2015-08-24 16:31:31 -04:00
Zuhayr
863d75076d Merge pull request #10759 from mwerezak/girders
Fixes reinforcing girders through windows, adds an SS13-like interface for reinforcing
2015-08-24 17:28:08 +09:30
Zuhayr
4a64862c52 Merge pull request #10839 from mwerezak/antag-fix
Fixes #10742
2015-08-24 17:27:47 +09:30
PsiOmegaDelta
0b163b89ae Fixes #10815.
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
mwerezak
286e16a0f3 Fixes cryogenic showers
Changes shower temperature settings to use more reasonable temperature values. A menu is now shown when adjusting shower temperature.
2015-08-24 00:11:40 -04:00
mwerezak
c8da3f0590 Fixes #10742 2015-08-23 22:28:29 -04:00
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
mwerezak
39feaf0870 Space areas no longer use dynamic lighting 2015-08-23 17:05:56 -04:00
Ccomp5950
517b685950 Merge pull request #10822 from mwerezak/antag-fix
Antag Fixes
2015-08-23 16:24:42 -04:00
Raptor1628
dfeb43c496 Reduces Detective slots.
One detective to compensate for Security Officer, requested by Virgil
after Officer PR.
2015-08-23 15:37:24 -04:00
mwerezak
c16d4aca9a Removes unncessary shuffle 2015-08-23 14:49:30 -04:00
mwerezak
161e5c14cd Fixes #10819 2015-08-23 14:34:58 -04:00
mwerezak
20eeb394cb Fixes #10793 2015-08-23 14:34:37 -04:00
Raptor1628
59c500d01b Adds fourth security officer slot.
Discussed among admins, decision was made to make this change to master
and not dev. Approval from Virgil.
2015-08-23 13:20:41 -04:00
Zuhayr
89f498e3e8 Merge pull request #10811 from mwerezak/qdel
Fixes
2015-08-23 07:41:10 +09:30
mwerezak
4afaf9f5fd Cable layer cleanup, cable qdel 2015-08-22 14:35:53 -04:00
mwerezak
d62ff87ec9 Fixes #10689
Also some refactoring of locker stuffing.
2015-08-22 14:32:15 -04:00
mwerezak
e693fae718 Fixes door repair qdel 2015-08-22 14:09:25 -04:00