PsiOmegaDelta
2f183e1cee
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
code/modules/nano/modules/human_appearance.dm
2015-09-08 07:58:25 +02:00
PsiOmega
0e2f44e3ac
Admin logs bought uplink items.
2015-09-07 20:02:43 +02:00
Zuhayr
412ee32d1c
Stops autotraitor grabbing minds from the lobby for antag roles.
2015-09-07 17:01:34 +09:30
GinjaNinja32
4b73518d49
Merge pull request #11036 from PsiOmegaDelta/150907-AlwaysDoItYourself
...
Re-adds recharge station checks.
2015-09-07 07:19:50 +01:00
PsiOmega
8e9705b6c7
Re-adds recharge station checks.
...
Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them.
2015-09-07 08:16:31 +02:00
PsiOmega
8dea4d40c0
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-07 08:01:15 +02:00
Zuhayr
211e426009
Tweak.
2015-09-07 14:43:20 +09:30
Zuhayr
c2908bfc50
Fixes #10951
2015-09-07 14:43:12 +09:30
Zuhayr
88b95e1207
Fixes #7951
2015-09-07 14:40:23 +09:30
Zuhayr
43a349ee2a
Fixes #11022
2015-09-07 14:25:45 +09:30
Zuhayr
dd81250b1b
Merge pull request #10784 from Kelenius/masterRuntimes
...
Fixes two runtimes
2015-09-07 14:01:24 +09:30
Zuhayr
b9c01bf2f2
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/objects/items/devices/uplink.dm
2015-09-07 11:17:06 +09:30
Zuhayr
9d5f14298d
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
code/game/gamemodes/traitor/traitor.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-09-07 11:03:41 +09:30
Chinsky
9533f2d154
Merge pull request #11026 from GinjaNinja32/announcement
...
Improve formatting of admin announcements
2015-09-07 01:02:36 +03:00
Chinsky
47f382b892
Merge pull request #11027 from Datraen/master
...
[BOTANY] Fixes plant nutrient storage unit check
2015-09-07 01:02:21 +03:00
Datraen
05a29f8f3a
[BOTANY] Fixes plant storage nutrient check
...
Reported only high, low or none with previous system.
2015-09-06 16:42:58 -04:00
GinjaNinja32
5a335c9140
Improve formatting of admin announcements
2015-09-06 20:41:06 +01:00
PsiOmega
cc960624b9
Fixes mercenary mode not listing bought items.
...
The mercenary leader now spawns with the uplink, as is set as its owner.
2015-09-06 10:43:09 +02:00
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
Samuel Novák
12a0bae5bd
Stop resting when pAI chassis collapses
2015-09-05 21:53:21 +02:00
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
GinjaNinja32
ef208a55aa
Merge pull request #10996 from PsiOmegaDelta/150804-CrawlThroughThoseVents
...
Vent crawling now explicitly checks for equipped items.
2015-09-05 16:59:33 +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
PsiOmega
8191ff658e
Compilation and code relocation.
2015-09-05 09:29:12 +02:00
PsiOmega
69fde6af03
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/antagonist/alien/borer.dm
code/game/gamemodes/game_mode.dm
code/game/gamemodes/nuclear/nuclear.dm
code/game/gamemodes/traitor/traitor.dm
code/game/objects/items/robot/robot_parts.dm
code/setup.dm
2015-09-05 09:24:30 +02:00
GinjaNinja32
8311e06d2b
Merge pull request #11003 from Zuhayr/secretfix
...
Fixes Secret.
2015-09-05 07:17:47 +01:00
Chinsky
34662a83b5
Merge pull request #10998 from Zuhayr/antagsystem
...
Antag system fixes.
2015-09-05 07:56:42 +03:00
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
Daranz
ddeec9c89a
Fix effects for clonexadone
2015-09-04 16:06:03 +02:00
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
PsiOmega
1f39768ce1
Vent crawling now explicitly checks for equipped items.
...
Fixes #10991 .
2015-09-04 08:09:05 +02:00
Chinsky
9728f28880
Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech
...
Relocates Cult/Occult languages to unused keys.
2015-09-03 20:37:16 +03:00
PsiOmega
d78db0231b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-02 14:42:27 +02:00
