From acdbb3573a5a99c959d1cd65d3858b7f93cc4993 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 28 Feb 2014 15:28:11 -0800 Subject: [PATCH 1/4] Changed supermatter messages to reflect what they actually mean. --- code/modules/power/antimatter/control.dm | 2 +- code/modules/supermatter/supermatter.dm | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 61c6cabb92e..b6eb7915d24 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -276,7 +276,7 @@ dat += "Status: [(active?"Injecting":"Standby")]
" dat += "Toggle Status
" - dat += "Stability: [stability]%
" + dat += "Instability: [stability]%
" dat += "Reactor parts: [linked_shielding.len]
"//TODO: perhaps add some sort of stability check dat += "Cores: [linked_cores.len]

" dat += "-Current Efficiency: [reported_core_efficiency]
" diff --git a/code/modules/supermatter/supermatter.dm b/code/modules/supermatter/supermatter.dm index 4bdd2431cea..f1ca0acc799 100644 --- a/code/modules/supermatter/supermatter.dm +++ b/code/modules/supermatter/supermatter.dm @@ -99,14 +99,14 @@ if(damage > warning_point) // while the core is still damaged and it's still worth noting its status if((world.timeofday - lastwarning) / 10 >= WARNING_DELAY) var/stability = num2text(round((damage / explosion_point) * 100)) - + if(damage > emergency_point) - radio.autosay(addtext(emergency_alert, " Stability: ",stability,"%"), "Supermatter Monitor") + radio.autosay(addtext(emergency_alert, " Instability: ",stability,"%"), "Supermatter Monitor") lastwarning = world.timeofday else if(damage >= damage_archived) // The damage is still going up - radio.autosay(addtext(warning_alert," Stability: ",stability,"%"), "Supermatter Monitor") + radio.autosay(addtext(warning_alert," Instability: ",stability,"%"), "Supermatter Monitor") lastwarning = world.timeofday - 150 else // Phew, we're safe From 3b10ee3ad515b7b6eed29e655b188e26d1dd0dda Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 28 Feb 2014 17:32:29 -0800 Subject: [PATCH 2/4] Removing IPC whitelist requirement. --- code/modules/mob/living/carbon/species.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/species.dm b/code/modules/mob/living/carbon/species.dm index 349c5fd9015..b046cce9c95 100644 --- a/code/modules/mob/living/carbon/species.dm +++ b/code/modules/mob/living/carbon/species.dm @@ -233,7 +233,7 @@ heat_level_2 = 3000 heat_level_3 = 4000 - flags = IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC + flags = NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC blood_color = "#FFFFFF" flesh_color = "#AAAAAA" \ No newline at end of file From 1e186839c6aab8db52b25e8a32e5969cdf30867c Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 28 Feb 2014 17:36:50 -0800 Subject: [PATCH 3/4] added IPCs(machines) to list to make it easier on everyone. --- code/modules/mob/living/carbon/human/human.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index 886af5d1455..7dc0594a8fe 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -36,6 +36,10 @@ species = new /datum/species/diona(src) ..() +/mob/living/carbon/human/machine/New() + species = new /datum/species/machine(src) + h_style = "blue IPC screen" + /mob/living/carbon/human/New() if(!species) From 449264849135c8d0bff10188845a1a335e355078 Mon Sep 17 00:00:00 2001 From: DJSnapshot Date: Fri, 28 Feb 2014 17:38:58 -0800 Subject: [PATCH 4/4] server crash fix based off of https://github.com/tgstation/-tg-station/pull/2943/files --- code/game/objects/items/stacks/stack.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index 9304f3a3c14..77aa58a1a67 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -189,7 +189,7 @@ /obj/item/stack/attack_hand(mob/user as mob) if (user.get_inactive_hand() == src) - var/obj/item/stack/F = new src.type( user, amount=1) + var/obj/item/stack/F = new src.type( user, 1) F.copy_evidences(src) user.put_in_hands(F) src.add_fingerprint(user)