Commit Graph

26353 Commits

Author SHA1 Message Date
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
Zuhayr
5159cdba56 Merge pull request #10844 from PsiOmegaDelta/150824-HaltSecurity
Fixes #10815.
2015-08-24 16:55:05 +09:30
PsiOmegaDelta
0b163b89ae Fixes #10815.
Now uses audible message. Added a message for deaf mobs.
2015-08-24 09:16:35 +02:00
Kelenius
d2ee97c6b7 You guys are hard to please 2015-08-24 09:59:57 +03:00
Zuhayr
ddcf7ec282 Merge pull request #10837 from mwerezak/brainloss-fix
Fixes adjustBrainLoss
2015-08-24 15:24:12 +09:30
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
75f19938b3 Fixes an apparent clonexadone typo 2015-08-24 00:04:03 -04:00
mwerezak
c8da3f0590 Fixes #10742 2015-08-23 22:28:29 -04:00
mwerezak
09f1c6054b Changed MSAY to show the ckey/character name like it does with asay 2015-08-23 20:27:56 -04:00
mwerezak
5bcede5801 Fixes adjustBrainLoss
adjustBrainLoss() was giving damage to the brain organ and then setting it back to brainloss, undoing the change.
2015-08-23 20:22:15 -04:00
mwerezak
c14cf40e48 Adds two spaceacillin syringes to the raider skipjack 2015-08-23 18:23:58 -04:00
mwerezak
7c96829ecd Fixes #10828
Adds a slick red emergency light to the engineering escape pod, updates other pods to match.
2015-08-23 18:19:22 -04:00
Chinsky
1a7b0e33a4 Merge pull request #10758 from FrickenChris101/patch-1
Flashlight Icon toggle fix
2015-08-24 00:40:26 +03:00
Chinsky
13257b52c4 Merge pull request #10824 from mwerezak/stump-desc-fix
Fixes limb stump examine text
2015-08-24 00:31:05 +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
PsiOmegaDelta
d44921d767 Merge pull request #10823 from Raptor1628/master
Reduces Detective slots.
2015-08-23 21:58:28 +02: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
3c86715474 Fixes limb stump examine text 2015-08-23 15:35:45 -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
mwerezak
7fa920902a Merge pull request #10821 from Raptor1628/master
Adds fourth Security Officer slot
2015-08-23 13:31:31 -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
GinjaNinja32
663aae9786 Merge pull request #10816 from PsiOmegaDelta/150818-RealFunny
Rig AI fixes.
2015-08-23 13:33:24 +01:00
GinjaNinja32
d4fd93410b Merge pull request #10818 from volas/ai-sanitize
Sanitize for AI emergency message
2015-08-23 13:31:36 +01:00
volas
d31203c70f Sanitize for AI emergency message 2015-08-23 15:24:52 +03:00
PsiOmega
c7bd20ceb6 Rig AI fixes.
Changes how the state for the NanoUI window is selected.
Fixes and optimizes the hardsuit module tab for rig AIs.
Corrects some qdel issues for ejected rig AIs.
2015-08-23 13:33:10 +02: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
PsiOmegaDelta
2fbe9ddb8f Merge pull request #10809 from Zuhayr/master
Species_restricted tweaks
2015-08-22 18:51:19 +02:00
GinjaNinja32
0edc18b9c7 Merge pull request #10778 from atlantiscze/stabilisedoutputv2
Corrects supermatter fluctuations v2
2015-08-22 17:46:19 +01:00
Zuhayr
ca4b56cc77 Reapplying some species_restricted cleanup that was merged over. Allows Vox to wear softsuits. 2015-08-23 01:24:49 +09:30
mwerezak
13c760c5bb Fixes #9453 and fixes #10614 2015-08-22 11:09:17 -04:00
mwerezak
70241d576f Merge pull request #10803 from GinjaNinja32/manifest
add manifest status command
2015-08-22 09:47:57 -04:00
mwerezak
de0a3c3c1d Merge pull request #10804 from PsiOmegaDelta/150822-HealthyAntags
Antags are now never eligible to be patient zero.
2015-08-22 09:44:53 -04:00
PsiOmega
f1323c35a9 Antags are now never eligible to be patient zero.
Includes on-station antags. Fixes #10798.
2015-08-22 14:38:08 +02:00
GinjaNinja32
aff57029e2 add manifest status command 2015-08-22 11:33:25 +01:00
PsiOmegaDelta
392eef3939 Merge pull request #10802 from mwerezak/traps
Removes bear traps from the custodial closet, adds autolathe recipe
2015-08-22 10:50:07 +02:00
mwerezak
cfa8ab3fd0 Removes bear traps from the custodial closet, adds autolathe recipe 2015-08-22 02:31:19 -04:00
GinjaNinja32
00362809b1 Merge pull request #10792 from Zuhayr/master
I am a fucking moron.
2015-08-21 19:47:40 +01:00
Zuhayr
8564db4643 I am a fucking moron. 2015-08-22 04:10:44 +09:30
PsiOmegaDelta
196add63ee Merge pull request #10788 from Zuhayr/voxtweaks
Vox Pariah tweaks
2015-08-21 19:33:19 +02:00
Zuhayr
f752813132 Changelog. 2015-08-22 02:57:13 +09:30
Zuhayr
eb0f48d412 Xenos use bodytype for species_restricted, Vox can wear softsuits.
Conflicts:
	code/modules/clothing/clothing.dm
2015-08-22 02:54:14 +09:30
Zuhayr
bb82f80885 Added get_bodytype() species proc as groundwork for subspecies.
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
2015-08-22 02:53:16 +09:30
Zuhayr
8701205783 Pariah nerfs.
Conflicts:
	code/modules/mob/living/carbon/human/species/outsider/vox.dm
	code/modules/organs/organ_alien.dm
2015-08-22 02:51:42 +09:30