Commit Graph

20682 Commits

Author SHA1 Message Date
PsiOmegaDelta
7c3adad15f Merge pull request #11002 from Sligneris/patch-1
Morgue access
2015-09-05 17:29:16 +02:00
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
d03d9eebca removing now unneeded limb define. 2015-09-06 00:42:54 +09:30
Zuhayr
34a0c2f080 Added Resomi blood/damage masks. 2015-09-06 00:42:02 +09:30
Zuhayr
3e015d7c71 Added three human subspecies. 2015-09-06 00:39:08 +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
2d91711fcc Tail icons now use tail_hair var for overlays. 2015-09-05 16:07:24 +09:30
GinjaNinja32
8311e06d2b Merge pull request #11003 from Zuhayr/secretfix
Fixes Secret.
2015-09-05 07:17:47 +01:00
Zuhayr
1c2cea708d Mousedrop runtime fix. 2015-09-05 14:45:57 +09:30
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
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
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
93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
PsiOmega
1f39768ce1 Vent crawling now explicitly checks for equipped items.
Fixes #10991.
2015-09-04 08:09:05 +02:00
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
Zuhayr
cae57f022e Added by-species hat light overlays. 2015-09-04 08:56:45 +09:30
Zuhayr
0a355c84a3 Added species checks for robolimb use. 2015-09-04 08:55:27 +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
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
Chinsky
431db2bdbb Merge pull request #10970 from Zuhayr/complexholder
Added a complex holder for human mobs + example icons
2015-09-03 20:36:17 +03:00
PsiOmegaDelta
ad2e922776 Merge pull request #10971 from Zuhayr/sight
Added short-sightedness and sight flags proc.
2015-09-03 17:21:05 +02: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
GinjaNinja32
00a05bbdaa Remove a world.log print, change '0' to 'AUTOHISS_OFF' for clarity 2015-09-02 19:39:50 +01:00
GinjaNinja32
9dca74f755 add list typing to maps and exemption list 2015-09-02 19:11:59 +01:00