cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-07-18 19:39:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4496 from DJSnapshot/hotfix

Browse Source 
Lots of fixes
This commit is contained in:
Ccomp5950
2014-02-28 19:45:25 -06:00
parent d55687a9da 4492648491
commit 103c189ea1
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/stack.dm
+1 -1
View File
@@ -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)
code/modules/mob/living/carbon/human/human.dm
+4
View File
@@ -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)
code/modules/mob/living/carbon/species.dm
+1 -1
View File
@@ -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"
code/modules/power/antimatter/control.dm
+1 -1
View File
@@ -276,7 +276,7 @@
dat += "Status: [(active?"Injecting":"Standby")] <BR>"
dat += "<A href='?src=\ref[src];togglestatus=1'>Toggle Status</A><BR>"
dat += "Stability: [stability]%<BR>"
dat += "Instability: [stability]%<BR>"
dat += "Reactor parts: [linked_shielding.len]<BR>"//TODO: perhaps add some sort of stability check
dat += "Cores: [linked_cores.len]<BR><BR>"
dat += "-Current Efficiency: [reported_core_efficiency]<BR>"
code/modules/supermatter/supermatter.dm
+3 -3
View File
@@ -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