Zuhayr
f8bf428e66
Merge pull request #10981 from comma/technoir
...
MrSnapwalk's Detective Uniform Resprite
2015-09-06 00:48:50 +09:30
Zuhayr
6dc3b22432
Death to flashrev (compile fix)
2015-09-06 00:45:13 +09:30
Zuhayr
808bbee90f
Added species vars for oxy/tox/rad/flash resistance.
2015-09-06 00:39:05 +09:30
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
3951b1d62c
Added a handful of new mixed-antagonist modes.
2015-09-05 18:05:39 +09:30
Zuhayr
89a7c9667b
Reverts a testing value.
2015-09-05 17:31:27 +09:30
PsiOmega
95b12da391
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/__defines/gamemode.dm
code/game/antagonist/outsider/ert.dm
code/game/gamemodes/ninja/ninja.dm
2015-09-05 09:35:02 +02:00
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
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
8c743329df
Merge pull request #10955 from SkyMarshal/multi-z
...
Overhauls Multi-Z
2015-09-05 11:36:59 +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
Sligneris
ccac79e024
Adds morgue access to Paramedic
2015-09-05 01:16:32 +02:00
Sligneris
2f69a83caf
Removes morgue access from Civilian department.
...
Removes morgue access from Chef, Gardener and Bartender.
Also - removes somewhat outdated commentary on Gardener access.
2015-09-05 01:10:54 +02:00
Neerti
b93595c19f
Merge branch 'master' into 9/4/2015_master_to_dev
...
Conflicts:
code/game/jobs/job/security.dm
code/modules/projectiles/guns/energy/nuclear.dm
code/modules/projectiles/guns/projectile/automatic.dm
maps/colony-1.dmm
maps/colony-5.dmm
2015-09-04 08:43:37 -04: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
93a8a3a13f
Observers can now view radio settings, admins can alter them.
2015-09-04 10:07:41 +02:00
Zuhayr
a41ce0bd93
Added the Resomi.
2015-09-04 08:57:03 +09:30
Chinsky
94f7538d01
Merge pull request #10934 from PsiOmegaDelta/150822-Intercoms
...
Removes radio free range option, adds out-of range options
2015-09-03 20:47:39 +03:00
PsiOmegaDelta
7bcf9aaea9
Merge pull request #10340 from comma/russian_roulette
...
Russian roulette and russian roulette accessories
2015-09-03 19:40:01 +02:00
Chinsky
72d768808a
Merge pull request #10110 from mwerezak/shields
...
Better shield handling
2015-09-03 20:38:48 +03:00
Chinsky
7d123549ed
Merge pull request #10845 from PsiOmegaDelta/150824-Cargonia
...
Cargo now sorts under their own department in manifests.
2015-09-03 20:38:00 +03:00
PsiOmega
e5aa095f09
Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys.
2015-09-03 09:38:15 +02:00
PsiOmega
52eae80d74
Makes the cyborg radio menu more consistent.
2015-09-03 08:41:02 +02:00
Chinsky
8590ebe13a
Merge pull request #10933 from caelaislinn/b12_bugfix
...
resolves issue with space and unsimulated turfs being odd and dark
2015-09-03 01:06:08 +03:00
PsiOmega
593922929b
Changelog entry.
2015-09-02 16:54:54 +02:00
PsiOmega
affff253bc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/modules/mob/living/living.dm
code/modules/mob/mob_grab.dm
2015-09-02 14:58:13 +02:00
PsiOmega
d78db0231b
Merge remote-tracking branch 'upstream/master' into dev-freeze
2015-09-02 14:42:27 +02:00
PsiOmega
13780eba09
Rotates and otherwise cleans up map intercom usage.
2015-09-02 14:26:59 +02:00
PsiOmega
1b23f794c5
Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms
2015-09-02 10:54:04 +02:00
PsiOmega
c730a67d79
Makes it possible to select department channels on intercoms.
2015-09-02 10:38:16 +02:00
Zuhayr
2a02f4890c
Merge pull request #10336 from atlantiscze/phoronwindowsv2
...
Borosilicate windows
2015-09-02 16:11:39 +09:30
Chinsky
0f76c59944
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir
...
Conflicts:
icons/mob/head.dmi
2015-09-02 04:50:00 +03:00
Chinsky
a3b3e52959
Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir
2015-09-02 04:38:26 +03:00
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
Chinsky
cf0a3f94d0
Merge pull request #10808 from Hubblenaut/dev
...
Bar drinks
2015-09-01 12:56:54 +03: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
Zuhayr
3f6f34c16f
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mob/holder.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
icons/mob/head.dmi
2015-09-01 11:22:10 +09:30
Zuhayr
7581717246
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
...
Conflicts:
maps/exodus-1.dmm
2015-09-01 10:55:19 +09:30
Atlantis
e0a70d24ba
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2
2015-09-01 03:22:08 +02:00
Atlantis
d12002c536
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes
2015-09-01 02:57:36 +02:00
