diff --git a/code/game/machinery/alarm.dm b/code/game/machinery/alarm.dm index fd37e02185..289c2e2719 100644 --- a/code/game/machinery/alarm.dm +++ b/code/game/machinery/alarm.dm @@ -567,12 +567,12 @@ Temperature: [environment.temperature] output += {" Scrubbers Control
Vents Control
-Set envirenomentals mode
-Sensor Control
+Set environmentals mode
+Sensor Settings
"} if (mode==AALARM_MODE_PANIC) - output += "PANIC SYPHON ACTIVE
turn syphoning off" + output += "PANIC SYPHON ACTIVE
Turn syphoning off" else output += "ACTIVATE PANIC SYPHON IN AREA" if (AALARM_SCREEN_VENT) @@ -581,12 +581,10 @@ Temperature: [environment.temperature] for(var/id_tag in alarm_area.air_vent_names) var/long_name = alarm_area.air_vent_names[id_tag] var/list/data = alarm_area.air_vent_info[id_tag] - var/state = "" if(!data) - state = " can not be found!" - data = list("external" = 0) //for "0" instead of empty string - else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time) - state = " not responding!" + continue; + var/state = "" + sensor_data += {" [long_name][state]
Operating: @@ -606,6 +604,7 @@ Temperature: [environment.temperature] + + + + (reset)
"} if (data["direction"] == "siphon") @@ -624,12 +623,9 @@ siphoning for(var/id_tag in alarm_area.air_scrub_names) var/long_name = alarm_area.air_scrub_names[id_tag] var/list/data = alarm_area.air_scrub_info[id_tag] - var/state = "" if(!data) - state = " can not be found!" - data = list("external" = 0) //for "0" instead of empty string - else if (data["timestamp"]+AALARM_REPORT_TIMEOUT < world.time) - state = " not responding!" + continue; + var/state = "" sensor_data += {" [long_name][state]
@@ -761,6 +757,7 @@ table tr:first-child th:first-child { border: none;} if( "power", "adjust_external_pressure", + "set_external_pressure", "checks", "co2_scrub", "tox_scrub", @@ -771,6 +768,7 @@ table tr:first-child th:first-child { border: none;} send_signal(device_id, list (href_list["command"] = text2num(href_list["val"]))) spawn(3) src.updateUsrDialog() + //if("adjust_threshold") //was a good idea but required very wide window if("set_threshold") var/env = href_list["env"] @@ -863,15 +861,15 @@ table tr:first-child th:first-child { border: none;} send_signal(device_id, list( "power"= 0 )) - if(AALARM_MODE_OFF) + /*if(AALARM_MODE_OFF) Commented out cause the "turn off panic" uses scrubbing mode now instead. for(var/device_id in alarm_area.air_scrub_names) send_signal(device_id, list( - "power"= 0 + "panic_siphon" = 0 )) for(var/device_id in alarm_area.air_vent_names) send_signal(device_id, list( - "power"= 0 - )) + "power"= 1 + ))*/ /obj/machinery/alarm/update_icon() if(wiresexposed) diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 80ea9a50cc..d4c8337853 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -445,7 +445,7 @@ if(!operation_allowed(user)) return user.machine = src - var/turf/exit = get_step(src,EAST) + var/turf/exit = get_step(src,SOUTH) if(exit.density) src.visible_message("\icon[src] [src] beeps, \"Error! Part outlet is obstructed\".") return diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm index 39d9620c64..aee7146a8d 100644 --- a/code/game/objects/items/weapons/AI_modules.dm +++ b/code/game/objects/items/weapons/AI_modules.dm @@ -87,7 +87,7 @@ AI MODULES desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not human and are a threat to humans.'" origin_tech = "programming=3;materials=4" -/obj/item/weapon/aiModule/safeguard/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/safeguard/attack_self(var/mob/user as mob) ..() var/targName = input(usr, "Please enter the name of the person to safeguard.", "Safeguard who?", user.name) targetName = sanitize(targName) @@ -110,7 +110,7 @@ AI MODULES desc = "A 'one human' AI module: 'Only is human.'" origin_tech = "programming=3;materials=6" //made with diamonds! -/obj/item/weapon/aiModule/oneHuman/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/oneHuman/attack_self(var/mob/user as mob) ..() var/targName = input(usr, "Please enter the name of the person who is the only human.", "Who?", user.real_name) targetName = sanitize(targName) @@ -135,7 +135,7 @@ AI MODULES desc = "A 'protect station' AI module: 'Protect the space station against damage. Anyone you see harming the station is to be no longer considered human, and is a threat to the station which must be neutralized.'" origin_tech = "programming=3;materials=4" //made of gold -/obj/item/weapon/aiModule/protectStation/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/protectStation/attack_self(var/mob/user as mob) ..() /obj/item/weapon/aiModule/protectStation/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -151,7 +151,7 @@ AI MODULES desc = "A 'prototype engine offline' AI module: 'Keep the prototype engine offline at all costs. This overrides rules 1-3 if necessary.'" origin_tech = "programming=3;materials=4" -/obj/item/weapon/aiModule/prototypeEngineOffline/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/prototypeEngineOffline/attack_self(var/mob/user as mob) ..() /obj/item/weapon/aiModule/prototypeEngineOffline/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -167,7 +167,7 @@ AI MODULES desc = "A 'teleporter offline' AI module: 'Keep the teleporter offline at all costs. Anything attempting to access or activate the teleporter is not human.'" origin_tech = "programming=3;materials=4" -/obj/item/weapon/aiModule/teleporterOffline/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/teleporterOffline/attack_self(var/mob/user as mob) ..() /obj/item/weapon/aiModule/teleporterOffline/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -183,7 +183,7 @@ AI MODULES desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, humans from leaving. It is impossible to harm a human while preventing them from leaving.'" origin_tech = "programming=3;biotech=2;materials=4" -/obj/item/weapon/aiModule/quarantine/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/quarantine/attack_self(var/mob/user as mob) ..() /obj/item/weapon/aiModule/quarantine/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -199,7 +199,7 @@ AI MODULES desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to humans, and must be purged from the station. Prevent, by any means necessary, anyone from exposing the station to this toxic gas. Extreme cold is the most effective method of healing the damage Oxygen does to a human.'" origin_tech = "programming=3;biotech=2;materials=4" -/obj/item/weapon/aiModule/oxygen/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/oxygen/attack_self(var/mob/user as mob) ..() /obj/item/weapon/aiModule/oxygen/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender) @@ -216,7 +216,7 @@ AI MODULES var/newFreeFormLaw = "freeform" desc = "A 'freeform' AI module: ''" -/obj/item/weapon/aiModule/freeform/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob) ..() var/eatShit = "Eat shit and die" var/targName = input(usr, "Please enter anything you want the AI to do. Anything. Serious.", "What?", eatShit) @@ -238,7 +238,7 @@ AI MODULES desc = "A 'freeform' AI module: ''" origin_tech = "programming=4;materials=4" -/obj/item/weapon/aiModule/freeform/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/freeform/attack_self(var/mob/user as mob) ..() lawpos = 0 while(lawpos < 15) @@ -367,7 +367,7 @@ AI MODULES desc = "A 'freeform' Core AI module: ''" origin_tech = "programming=3;materials=6" -/obj/item/weapon/aiModule/freeformcore/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/freeformcore/attack_self(var/mob/user as mob) ..() var/newlaw = "" var/targName = input(usr, "Please enter a new core law for the AI.", "Freeform Law Entry", newlaw) @@ -388,7 +388,7 @@ AI MODULES desc = "A hacked AI law module: ''" origin_tech = "programming=3;materials=6;syndicate=7" -/obj/item/weapon/aiModule/syndicate/attack_hand(var/mob/user as mob) +/obj/item/weapon/aiModule/syndicate/attack_self(var/mob/user as mob) ..() var/newlaw = "" var/targName = input(usr, "Please enter a new law for the AI.", "Freeform Law Entry", newlaw) diff --git a/code/modules/scripting/Implementations/_Logic.dm b/code/modules/scripting/Implementations/_Logic.dm index 54ebe6a7fb..ff17bae286 100644 --- a/code/modules/scripting/Implementations/_Logic.dm +++ b/code/modules/scripting/Implementations/_Logic.dm @@ -134,7 +134,7 @@ if(istext(string)) return uppertext(string) - +/* //Makes a list where all indicies in a string is a seperate index in the list // JUST A HELPER DON'T ADD TO NTSCRIPT proc/string_tolist(var/string) @@ -150,7 +150,6 @@ proc/string_explode(var/string, var/separator) if(istext(string)) if(istext(separator) && separator == "") return string_tolist(string) - var/i var/lasti = 1 var/list/L = new/list() @@ -164,6 +163,12 @@ proc/string_explode(var/string, var/separator) return L +Just found out there was already a string explode function, did some benchmarking, and that function were a bit faster, sticking to that. +*/ +proc/string_explode(var/string, var/separator) + if(istext(string)) + return dd_text2list(string, separator) + proc/n_repeat(var/string, var/amount) if(istext(string) && isnum(amount)) var/i @@ -178,7 +183,6 @@ proc/n_reverse(var/string) var/newstring = "" var/i for(i=lentext(string), i>0, i--) - world << copytext(string, i, i+1) newstring = newstring + copytext(string, i, i+1) return newstring diff --git a/html/changelog.html b/html/changelog.html index b0db5dfe68..67be0145d0 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -40,7 +40,7 @@ Credits:
- Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak
 + Coders: TLE, NEO, Errorage, muskets, veryinky, Skie, Noise, Numbers, Agouri, Noka, Urist McDorf, Uhangi, Darem, Mport, rastaf0, Doohl, Superxpdude, Rockdtben, ConstantA, Petethegoat, Kor, Polymorph, Carn, Nodrak, Donkie
 Spriters: Agouri, Cheridan, Cruazy Guest, Deeaych, Deuryn, Matty406, Microwave, ShiftyEyesShady, Skie, Uhangi, Veyveyr, Petethegoat, Kor, Ricotez, Ausops, TankNut
 Sounds: Skie, Lasty/Vinyl
 Thanks to: CDK Station devs, GoonStation devs, the original SpaceStation developers and Erikat for the title image @@ -91,13 +91,16 @@ Stuff which is in development and not yet visible to players or just code relate should be listed in the changelog upon commit tho. Thanks. --> -

28 March 2012

Carn updated:

  • Fixed turrets shooting people that leave the area and the telecomm turret controls.
+

Donkie updated:

+
    +
  • Updated air alarm's GUI.
    • +