MULTITOOL BUFFER: \[Add Machine\]"
dat += ""
temp = ""
@@ -150,16 +158,19 @@
Topic(href, href_list)
- if(usr.equipped())
- if(!istype(usr.equipped(), /obj/item/device/multitool))
+ if(!issilicon(usr))
+ if(usr.equipped())
+ if(!istype(usr.equipped(), /obj/item/device/multitool))
+ return
+ else
return
- else
- return
if(stat & (BROKEN|NOPOWER) || !on)
return
- var/obj/item/device/multitool/P = usr.equipped()
+ var/obj/item/device/multitool/P = null
+ if(!issilicon(usr))
+ P = usr.equipped()
if(href_list["input"])
switch(href_list["input"])
@@ -205,27 +216,30 @@
if(href_list["unlink"])
- var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])]
- temp = "-% Removed \ref[T] [T.name] from linked entities. %-"
+ if(text2num(href_list["unlink"]) <= length(links))
+ var/obj/machinery/telecomms/T = links[text2num(href_list["unlink"])]
+ temp = "-% Removed \ref[T] [T.name] from linked entities. %-"
- // Remove link entries from both T and src.
- if(src in T.links)
- T.links.Remove(src)
- links.Remove(T)
+ // Remove link entries from both T and src.
+ if(src in T.links)
+ T.links.Remove(src)
+ links.Remove(T)
if(href_list["link"])
- if(P.buffer)
- if(!(src in P.buffer.links))
- P.buffer.links.Add(src)
+ if(P)
- if(!(P.buffer in src.links))
- src.links.Add(P.buffer)
+ if(P.buffer)
+ if(!(src in P.buffer.links))
+ P.buffer.links.Add(src)
- temp = "-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-"
+ if(!(P.buffer in src.links))
+ src.links.Add(P.buffer)
- else
- temp = "-% Unable to acquire buffer %-"
+ temp = "-% Successfully linked with \ref[P.buffer] [P.buffer.name] %-"
+
+ else
+ temp = "-% Unable to acquire buffer %-"
if(href_list["buffer"])
@@ -244,3 +258,4 @@
updateUsrDialog()
+
diff --git a/code/game/machinery/telecomms/telemonitor.dm b/code/game/machinery/telecomms/telemonitor.dm
index 1866477d7a8..b777f24a70b 100644
--- a/code/game/machinery/telecomms/telemonitor.dm
+++ b/code/game/machinery/telecomms/telemonitor.dm
@@ -108,7 +108,7 @@
if(href_list["network"])
var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text
- if(newnet && usr in range(1, src))
+ if(newnet && ((usr in range(1, src) || issilicon(usr))))
if(length(newnet) > 15)
temp = "- FAILED: NETWORK TAG STRING TOO LENGHTLY -"
diff --git a/code/game/machinery/telecomms/traffic_control.dm b/code/game/machinery/telecomms/traffic_control.dm
index 972c36e9110..accfd0abea5 100644
--- a/code/game/machinery/telecomms/traffic_control.dm
+++ b/code/game/machinery/telecomms/traffic_control.dm
@@ -35,7 +35,7 @@
winset(editingcode, "tcscode", "is-disabled=false")
// If the player's not manning the keyboard anymore, adjust everything
- if(!(editingcode in range(1, src)) || editingcode.machine != src)
+ if( (!(editingcode in range(1, src)) && !issilicon(editingcode)) || (editingcode.machine != src && !issilicon(editingcode)))
if(editingcode)
winshow(editingcode, "Telecomms IDE", 0) // hide the window!
editingcode = null
@@ -169,6 +169,7 @@
editingcode = usr
winshow(editingcode, "Telecomms IDE", 1) // show the IDE
winset(editingcode, "tcscode", "is-disabled=false")
+ winset(editingcode, "tcscode", "text=\"\"")
var/showcode = dd_replacetext(storedcode, "\\\"", "\\\\\"")
showcode = dd_replacetext(storedcode, "\"", "\\\"")
winset(editingcode, "tcscode", "text=\"[showcode]\"")
@@ -189,7 +190,7 @@
var/newnet = input(usr, "Which network do you want to view?", "Comm Monitor", network) as null|text
- if(newnet && usr in range(1, src))
+ if(newnet && ((usr in range(1, src) || issilicon(usr))))
if(length(newnet) > 15)
temp = "- FAILED: NETWORK TAG STRING TOO LENGHTLY -"
@@ -211,7 +212,7 @@
user << "\blue The broken glass falls out."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
new /obj/item/weapon/shard( src.loc )
- var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
+ var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
for (var/obj/C in src)
C.loc = src.loc
A.circuit = M
@@ -222,7 +223,7 @@
else
user << "\blue You disconnect the monitor."
var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
- var/obj/item/weapon/circuitboard/comm_server/M = new /obj/item/weapon/circuitboard/comm_server( A )
+ var/obj/item/weapon/circuitboard/comm_traffic/M = new /obj/item/weapon/circuitboard/comm_traffic( A )
for (var/obj/C in src)
C.loc = src.loc
A.circuit = M
diff --git a/code/game/machinery/turrets.dm b/code/game/machinery/turrets.dm
index 0a4ec6453cd..bc1c8ffe9c2 100644
--- a/code/game/machinery/turrets.dm
+++ b/code/game/machinery/turrets.dm
@@ -3,44 +3,35 @@
var/list/turretTargets = list()
/area/turret_protected/proc/subjectDied(target)
- if (istype(target, /mob))
- if (!istype(target, /mob/living/silicon))
- if (target:stat)
- if (target in turretTargets)
+ if( ismob(target) )
+ if( !issilicon(target) )
+ if( target:stat )
+ if( target in turretTargets )
src.Exited(target)
+//TODO: make teleporting to places trigger Entered() ~Carn
/area/turret_protected/Entered(O)
..()
- if(master && master != src)
+ if( master && master != src )
return master.Entered(O)
-// world << "[O] entered[src.x],[src.y],[src.z]"
- if (istype(O, /mob/living/carbon))
- if (!(O in turretTargets))
- turretTargets += O
- else if (istype(O, /obj/mecha))
- var/obj/mecha/M = O
- if (M.occupant)
- if (!(M in turretTargets))
- turretTargets += M
+ if( iscarbon(O) )
+ turretTargets |= O
+ else if( istype(O, /obj/mecha) )
+ var/obj/mecha/Mech = O
+ if( Mech.occupant )
+ turretTargets |= Mech
return 1
/area/turret_protected/Exited(O)
- if(master && master != src)
+ if( master && master != src )
return master.Exited(O)
-// world << "[O] exited [src.x],[src.y],[src.z]"
- if (istype(O, /mob))
- if (!istype(O, /mob/living/silicon))
- if (O in turretTargets)
- //O << "removing you from target list"
- turretTargets -= O
- //else
- //O << "You aren't in our target list!"
- else if (istype(O, /obj/mecha))
- if (O in turretTargets)
- turretTargets -= O
+ if( ismob(O) && !issilicon(O) )
+ turretTargets -= O
+ else if( istype(O, /obj/mecha) )
+ turretTargets -= O
..()
return 1
@@ -130,18 +121,19 @@
return
/obj/machinery/turret/proc/check_target(var/atom/movable/T as mob|obj)
- if(T && T in protected_area.turretTargets)
- if(!T in protected_area)
+ if( T && T in protected_area.turretTargets )
+ var/area/area_T = get_area(T)
+ if( !area_T || (area_T.type != protected_area.type) )
protected_area.Exited(T)
return 0 //If the guy is somehow not in the turret's area (teleportation), get them out the damn list. --NEO
- if(istype(T, /mob/living/carbon))
+ if( iscarbon(T) )
var/mob/living/carbon/MC = T
- if(!MC.stat)
- if(!MC.lying || lasers)
+ if( !MC.stat )
+ if( !MC.lying || lasers )
return 1
- else if(istype(T, /obj/mecha))
+ else if( istype(T, /obj/mecha) )
var/obj/mecha/ME = T
- if(ME.occupant)
+ if( ME.occupant )
return 1
return 0
@@ -338,10 +330,10 @@
if(stat & BROKEN) return
if (istype(user, /mob/living/silicon))
return src.attack_hand(user)
- else // trying to unlock the interface
+ else if( get_dist(src, user) == 0 ) // trying to unlock the interface
if (src.allowed(usr))
locked = !locked
- user << "You [ locked ? "lock" : "unlock"] the panel."
+ user << "You [ locked ? "lock" : "unlock"] the panel."
if (locked)
if (user.machine==src)
user.machine = null
@@ -350,7 +342,7 @@
if (user.machine==src)
src.attack_hand(usr)
else
- user << "\red Access denied."
+ user << "Access denied."
/obj/machinery/turretid/attack_ai(mob/user as mob)
if(!ailock)
@@ -359,9 +351,9 @@
user << "There seems to be a firewall preventing you from accessing this device."
/obj/machinery/turretid/attack_hand(mob/user as mob)
- if ( (get_dist(src, user) > 1 ))
- if (!istype(user, /mob/living/silicon))
- user << text("Too far away.")
+ if ( get_dist(src, user) > 0 )
+ if ( !issilicon(user) )
+ user << "You are too far away."
user.machine = null
user << browse(null, "window=turretid")
return
@@ -405,12 +397,13 @@
if (!istype(usr, /mob/living/silicon))
usr << "Control panel is locked!"
return
- if (href_list["toggleOn"])
- src.enabled = !src.enabled
- src.updateTurrets()
- else if (href_list["toggleLethal"])
- src.lethal = !src.lethal
- src.updateTurrets()
+ if ( get_dist(src, usr) == 0 || issilicon(usr))
+ if (href_list["toggleOn"])
+ src.enabled = !src.enabled
+ src.updateTurrets()
+ else if (href_list["toggleLethal"])
+ src.lethal = !src.lethal
+ src.updateTurrets()
src.attack_hand(usr)
/obj/machinery/turretid/proc/updateTurrets()
@@ -434,6 +427,15 @@
for(var/obj/machinery/turretid/TC in src.similar_controls)
TC.icon_state = "motion0"
+// if(control_area) //USE: updates other controls in the area
+// for (var/obj/machinery/turretid/Turret_Control in world) //I'm not sure if this is what it was
+// if( Turret_Control.control_area != src.control_area ) continue //supposed to do. Or whether the person
+// Turret_Control.icon_state = icon_state //who coded it originally was just tired
+// Turret_Control.enabled = enabled //or something. I don't see any situation
+// Turret_Control.lethal = lethal //in which this would be used on the current map.
+ //If he wants it back he can uncomment it
+
+
for (var/obj/machinery/turret/aTurret in turrets)
aTurret.setState(enabled, lethal)
diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm
index 416a4731081..50e8a9ba278 100644
--- a/code/game/magic/library.dm
+++ b/code/game/magic/library.dm
@@ -863,6 +863,16 @@ datum/borrowbook // Datum used to keep track of who has borrowed what when and f
log_game("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] signs")
alert("Upload Complete.")
if(href_list["targetid"])
+
+ if(!bibledelay)//Taken from the bible code part thing
+ bibledelay = 60
+ spawn(0)
+ while(bibledelay >= 1 && src)
+ sleep(10)
+ bibledelay -- // subtract one second to countdown
+
+ bibledelay = 0
+
if(BOOKS_USE_SQL && config.sql_enabled)
var/sqlid = href_list["targetid"]
var/DBConnection/dbcon = new()
diff --git a/code/game/master_controller.dm b/code/game/master_controller.dm
index 8aeb7bbf739..8128b4c7a98 100644
--- a/code/game/master_controller.dm
+++ b/code/game/master_controller.dm
@@ -34,6 +34,9 @@ datum/controller/game_controller
setupgenetics()
+ for(var/i = 0, i < max_secret_rooms, i++)
+ make_mining_asteroid_secret()
+
syndicate_code_phrase = generate_code_phrase()//Sets up code phrase for traitors, for the round.
syndicate_code_response = generate_code_phrase()
@@ -125,7 +128,7 @@ datum/controller/game_controller
ticker.process()
- sleep(world.timeofday+10-start_time)
+ sleep(world.timeofday+10-start_time) // This is fine for our tick lag. DMTG
spawn process()
diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm
index 01dd2e422e1..c6ac19dfb63 100644
--- a/code/game/mecha/mech_fabricator.dm
+++ b/code/game/mecha/mech_fabricator.dm
@@ -111,6 +111,21 @@
/obj/item/mecha_parts/mecha_equipment/weapon/honker
),
+ "Cyborg Upgrade Modules" = list(
+ /obj/item/borg/upgrade/reset,
+ /obj/item/borg/upgrade/restart,
+ /obj/item/borg/upgrade/vtec
+ ///obj/item/borg/upgrade/tasercooler
+ ///obj/item/borg/upgrade/flashproof
+
+
+ ),
+
+
+
+
+
+
"Misc"=list(/obj/item/mecha_parts/mecha_tracking)
)
@@ -128,6 +143,8 @@
component_parts += new /obj/item/weapon/stock_parts/console_screen(src)
RefreshParts()
+ // part_sets["Cyborg Upgrade Modules"] = typesof(/obj/item/borg/upgrade/) - /obj/item/borg/upgrade/ // Eh. This does it dymaically, but to support having the items referenced otherwhere in the code but not being constructable, going to do it manaully.
+
for(var/part_set in part_sets)
convert_part_set(part_set)
files = new /datum/research(src) //Setup the research data holder.
@@ -198,7 +215,7 @@
if(part)
parts[i] = part
//debug below
- ASSERT(istype(parts[i],/obj/item))
+ if(!istype(parts[i],/obj/item)) return 0
return
@@ -299,7 +316,7 @@
return
proc/check_resources(var/obj/item/mecha_parts/part)
- if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts))
+ if(istype(part, /obj/item/robot_parts) || istype(part, /obj/item/mecha_parts) || istype(part,/obj/item/borg/upgrade))
for(var/resource in part.construction_cost)
if(resource in src.resources)
if(src.resources[resource] < get_resource_cost_w_coeff(part,resource))
@@ -455,7 +472,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/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 365ddd21e78..cba65072aed 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -142,6 +142,20 @@
return 1
return 0
+/obj/mecha/proc/enter_after(delay as num, var/mob/user as mob, var/numticks = 5)
+ var/delayfraction = delay/numticks
+
+ var/turf/T = user.loc
+
+ for(var/i = 0, iThe wall is far too cluttered to place a poster!"
+ return
+
+ src.resulting_poster.loc = W //Looks like it's uncluttered enough. Place the poster
+ W.contents += src.resulting_poster
+
+ del(src)*/
+
+
+
+//############################## THE ACTUAL DECALS ###########################
+
+obj/effect/decal/poster
+ name = "poster"
+ desc = "A large piece of space-resistant printed paper. It's considered contraband."
+ icon = 'contraband.dmi'
+ anchored = 1
+ var/serial_number //Will hold the value of src.loc if nobody initialises it
+ var/ruined = 0
+
+
+obj/effect/decal/poster/New(var/serial)
+
+ src.serial_number = serial
+
+ if(serial_number==src.loc){serial_number = rand(1,NUM_OF_POSTER_DESIGNS);} //This is for the mappers that want individual posters without having to use rolled posters.
+
+ icon_state = "poster[serial_number]"
+
+ switch(serial_number)
+ if(1)
+ name += " - Unlucky Space Explorer"
+ desc += " This particular one depicts a skeletal form within a space suit."
+ if(2)
+ name += " - Positronic Logic Conflicts"
+ desc += " This particular one depicts the cold, unmoving stare of a particular advanced AI."
+ if(3)
+ name += " - Paranoia"
+ desc += " This particular one warns of the dangers of trusting your co-workers too much."
+ if(4)
+ name += " - Keep Calm"
+ desc += " This particular one is of a famous New Earth design, although a bit modified."
+ if(5)
+ name += " - Martian Warlord"
+ desc += " This particular one depicts the cartoony mug of a certain Martial Warmonger."
+ if(6)
+ name += " - Technological Singularity"
+ desc += " This particular one is of the blood-curdling symbol of a long-since defeated enemy of humanity."
+ if(7)
+ name += " - Wasteland"
+ desc += " This particular one is of a couple of ragged gunmen, one male and one female, on top of a mound of rubble. The number \"13\" is visible on their blue jumpsuits."
+ if(8)
+ name += " - Pinup Girl Cindy"
+ desc += " This particular one is of Nanotrasen's PR girl, Cindy, in a particularly feminine pose."
+ if(9)
+ name += " - Pinup Girl Amy"
+ desc += " This particular one is of Amy, the nymphomaniac Urban Legend of Nanotrasen Space Stations. How this photograph came to be is not known."
+ if(10)
+ name += " - Don't Panic"
+ desc += " This particular one depicts some sort of star in a grimace. The \"Don't Panic\" is written in big, friendly letters."
+ if(11)
+ name += " - Underwater Laboratory"
+ desc += " This particular one is of the fabled last crew of Nanotrasen's previous project before going big on Asteroid mining, Sealab."
+ if(12)
+ name += " - Missing Gloves"
+ desc += " This particular one is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases."
+ if(13)
+ name += " - Rogue AI"
+ desc += " This particular one depicts the shell of the infamous AI that catastropically comandeered one of Nanotrasen's earliest space stations. Back then, the corporation was just known as TriOptimum."
+ if(14)
+ name += " - User of the Arcane Arts"
+ desc += " This particular one depicts a wizard, casting a spell. You can't really make out if it's an actial photograph or a computer-generated image."
+ if(15)
+ name += " - Levitating Skull"
+ desc += " This particular one is the portrait of a certain flying, friendly and somewhat sex-crazed enchanted skull. Its adventures along with its fabled companion are now fading through history..."
+ if(16)
+ name += " - Augmented Legend"
+ desc += " This particular one is of an obviously augmented individual, gazing towards the sky. The cyber-city in the backround is rather punkish."
+ if(17)
+ name += " - Dangerous Static"
+ desc += " This particular one depicts nothing remarkable other than a rather mesmerising pattern of monitor static. There's a tag on the sides of the poster, urging you to \"tear this poster in half to receive your free sample\"."
+ else
+ name = "This shit just bugged. Report it to Agouri - polyxenitopalidou@gmail.com"
+ desc = "Why are you still here?"
+ ..()
+
+obj/effect/decal/poster/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if( istype(W, /obj/item/weapon/wirecutters) )
+ playsound(src.loc, 'Wirecutter.ogg', 100, 1)
+ if(src.ruined)
+ user << "You remove the remnants of the poster."
+ del(src)
+ else
+ user << "You carefully remove the poster from the wall."
+ src.roll_and_drop(user.loc)
+ return
+
+
+/obj/effect/decal/poster/attack_hand(mob/user as mob)
+ if(src.ruined)
+ return
+ var/temp_loc = user.loc
+ switch(alert("Do I want to rip the poster from the wall?","You think...","Yes","No"))
+ if("Yes")
+ if(user.loc != temp_loc)
+ return
+ for (var/mob/O in hearers(5, src.loc))
+ O.show_message("[user.name] rips the [src.name] in a single, decisive motion!" )
+ playsound(src.loc, 'poster_ripped.ogg', 100, 1)
+ src.ruined = 1
+ src.icon_state = "poster_ripped"
+ src.name = "Ripped poster"
+ src.desc = "You can't make out anything from the poster's original print. It's ruined."
+ src.add_fingerprint(user)
+ if("No")
+ return
+
+/obj/effect/decal/poster/proc/roll_and_drop(turf/loc)
+ var/obj/item/weapon/contraband/poster/P = new(src,src.serial_number)
+ P.resulting_poster = src
+ P.loc = loc
+ src.loc = P
+
+
+//seperated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
+/turf/simulated/wall/proc/place_poster(var/obj/item/weapon/contraband/poster/P, var/mob/user)
+ if(!P.resulting_poster) return
+
+ var/stuff_on_wall = 0
+ for( var/obj/O in src.contents) //Let's see if it already has a poster on it or too much stuff
+ if(istype(O,/obj/effect/decal/poster))
+ user << "The wall is far too cluttered to place a poster!"
+ return
+ stuff_on_wall++
+ if(stuff_on_wall==3)
+ user << "The wall is far too cluttered to place a poster!"
+ return
+
+ user << "You start placing the poster on the wall..." //Looks like it's uncluttered enough. Place the poster.
+
+ //declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
+ var/obj/effect/decal/poster/D = P.resulting_poster
+
+ var/temp_loc = user.loc
+ flick("poster_being_set",D)
+ D.loc = src
+ del(P) //delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
+ playsound(D.loc, 'poster_being_created.ogg', 100, 1)
+
+ sleep(17)
+ if(!D) return
+
+ if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc)//Let's check if everything is still there
+ user << "You place the poster!"
+ else
+ D.roll_and_drop(temp_loc)
+ return
\ No newline at end of file
diff --git a/code/game/objects/devices/PDA/cart.dm b/code/game/objects/devices/PDA/cart.dm
index 9f8c9529d27..401b5ad03e8 100644
--- a/code/game/objects/devices/PDA/cart.dm
+++ b/code/game/objects/devices/PDA/cart.dm
@@ -519,7 +519,7 @@ Code:
if (ml.z != cl.z)
continue
- ldat += "Mop - \[[ml.x],[ml.y]\] - [M.reagents.total_volume ? "Wet" : "Dry"] "
+ ldat += "Mop - \[[ml.x],[ml.y]\] - [M.reagents.total_volume ? "Wet" : "Dry"] "
if (!ldat)
menu += "None"
@@ -532,10 +532,11 @@ Code:
for (var/obj/structure/mopbucket/B in world)
var/turf/bl = get_turf(B)
- if (bl.z != cl.z)
- continue
+ if(bl)
+ if (bl.z != cl.z)
+ continue
- ldat += "Bucket - \[[bl.x],[bl.y]\] - Water level: [B.reagents.total_volume]/100 "
+ ldat += "Bucket - \[[bl.x],[bl.y]\] - Water level: [B.reagents.total_volume]/100 "
if (!ldat)
menu += "None"
@@ -548,10 +549,11 @@ Code:
for (var/obj/machinery/bot/cleanbot/B in world)
var/turf/bl = get_turf(B)
- if (bl.z != cl.z)
- continue
+ if(bl)
+ if (bl.z != cl.z)
+ continue
- ldat += "Cleanbot - \[[bl.x],[bl.y]\] - [B.on ? "Online" : "Offline"] "
+ ldat += "Cleanbot - \[[bl.x],[bl.y]\] - [B.on ? "Online" : "Offline"] "
if (!ldat)
menu += "None"
diff --git a/code/game/objects/devices/flash.dm b/code/game/objects/devices/flash.dm
index cbe3dfd1768..3485a6c940f 100644
--- a/code/game/objects/devices/flash.dm
+++ b/code/game/objects/devices/flash.dm
@@ -97,7 +97,10 @@
flashfail = 1
else if(issilicon(M))
- M.Weaken(rand(5,10))
+ if(!M:flashproof())
+ M.Weaken(rand(5,10))
+ else
+ flashfail++
if(isrobot(user))
spawn(0)
diff --git a/code/game/objects/items/clothing.dm b/code/game/objects/items/clothing.dm
index 770badebf2d..9b8f13db341 100644
--- a/code/game/objects/items/clothing.dm
+++ b/code/game/objects/items/clothing.dm
@@ -254,21 +254,22 @@ THERMAL GLASSES
/obj/item/clothing/head/helmet/welding/verb/toggle()
set category = "Object"
set name = "Adjust welding mask"
- if(src.up)
- src.up = !src.up
- src.see_face = !src.see_face
- src.flags |= HEADCOVERSEYES
- flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES
- icon_state = "welding"
- usr << "You flip the mask down to protect your eyes."
- else
- src.up = !src.up
- src.see_face = !src.see_face
- src.flags &= ~HEADCOVERSEYES
- flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES)
- icon_state = "weldingup"
- usr << "You push the mask up out of your face."
- usr.update_clothing()
+ if(usr.canmove && usr.stat != 2 && !usr.restrained())
+ if(src.up)
+ src.up = !src.up
+ src.see_face = !src.see_face
+ src.flags |= HEADCOVERSEYES
+ flags_inv |= HIDEMASK|HIDEEARS|HIDEEYES
+ icon_state = "welding"
+ usr << "You flip the mask down to protect your eyes."
+ else
+ src.up = !src.up
+ src.see_face = !src.see_face
+ src.flags &= ~HEADCOVERSEYES
+ flags_inv &= ~(HIDEMASK|HIDEEARS|HIDEEYES)
+ icon_state = "weldingup"
+ usr << "You push the mask up out of your face."
+ usr.update_clothing()
/obj/item/clothing/head/cargosoft/dropped()
src.icon_state = "cargosoft"
diff --git a/code/game/objects/items/item.dm b/code/game/objects/items/item.dm
index 4eff5bf31ac..267feb8b3ef 100755
--- a/code/game/objects/items/item.dm
+++ b/code/game/objects/items/item.dm
@@ -302,8 +302,8 @@ mob/proc/flash_weak_pain()
return
- user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
- M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)])"
+ user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])"
+ M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])"
log_admin("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
message_admins("ATTACK: [user] ([user.ckey]) attacked [M] ([M.ckey]) with [src].")
log_attack("[user.name] ([user.ckey]) attacked [M.name] ([M.ckey]) with [src.name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(src.damtype)])" )
@@ -339,7 +339,8 @@ mob/proc/flash_weak_pain()
if(Metroid)
Metroid.SStun = 1
sleep(rand(5,20))
- Metroid.SStun = 0
+ if(Metroid)
+ Metroid.SStun = 0
spawn(0)
Metroid.canmove = 0
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index e48140dbb0a..06a632056cb 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -20,119 +20,6 @@ AI MODULES
throw_range = 15
origin_tech = "programming=3"
-/obj/machinery/computer/aiupload/verb/AccessInternals()
- set category = "Object"
- set name = "Access Computer's Internals"
- set src in oview(1)
- if(get_dist(src, usr) > 1 || usr.restrained() || usr.lying || usr.stat || istype(usr, /mob/living/silicon))
- return
-
- opened = !opened
- if(opened)
- usr << "\blue The access panel is now open."
- else
- usr << "\blue The access panel is now closed."
- return
-
-
-/obj/machinery/computer/aiupload/attackby(obj/item/weapon/O as obj, mob/user as mob)
- if(istype(O, /obj/item/weapon/aiModule))
- var/obj/item/weapon/aiModule/M = O
- M.install(src)
- else
- ..()
-
-/obj/machinery/computer/aiupload/attack_hand(var/mob/user as mob)
- if(src.stat & NOPOWER)
- usr << "The upload computer has no power!"
- return
- if(src.stat & BROKEN)
- usr << "The upload computer is broken!"
- return
-
- src.current = activeais()
-
- if (!src.current)
- usr << "No active AIs detected."
- else
- usr << "[src.current.name] selected for law changes."
-
-
-/*Module Storage Unit/Closet! Solid, only modules fit in it.*/
-/obj/structure/aiuploadcloset
- name = "AI Mainframe Module Storage Unit"
- icon = 'mainframe.dmi'
- icon_state = "right-closed"
- density = 1
-
- var/open = 0 /*It's closed!*/
-
-/obj/structure/aiuploadcloset/New()
- ..()
- new /obj/item/weapon/aiModule/reset(src)
- new /obj/item/weapon/aiModule/purge(src)
- new /obj/item/weapon/aiModule/nanotrasen(src)
- new /obj/item/weapon/aiModule/paladin(src)
- new /obj/item/weapon/aiModule/asimov(src)
- new /obj/item/weapon/aiModule/safeguard(src)
- new /obj/item/weapon/aiModule/protectStation(src)
- new /obj/item/weapon/aiModule/quarantine(src)
- new /obj/item/weapon/aiModule/teleporterOffline(src)
- new /obj/item/weapon/aiModule/oxygen(src)
- new /obj/item/weapon/aiModule/oneHuman(src)
- new /obj/item/weapon/aiModule/freeform(src)
- for(var/obj/item/weapon/aiModule/M in src)
- M.pixel_x = rand(-10, 10)
- M.pixel_y = rand(-10, 10)
-
-/obj/structure/aiuploadcloset/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if(istype(W, /obj/item/weapon/aiModule))
- user.drop_item()
- W.loc = get_turf(src)
- else
- return attack_hand(user)
-
-/obj/structure/aiuploadcloset/attack_hand(mob/user as mob)
- if(!open)
- var/temp_count
- for(var/obj/item/weapon/aiModule/M in src)
- M.loc = src.loc
- temp_count++
-
- user << "\blue You open the module storage unit, [temp_count > 0 ? "and take out all the modules." : "\red but it's empty!"]"
- open = 1
- icon_state = "right-open"
-
- else
- var/temp_count
- for(var/obj/item/weapon/aiModule/M in get_turf(src))
- M.loc = src
- temp_count++
-
- user << "\blue [temp_count > 0 ? "You put all the modules back into the module storage unit, and then close it." : "You close the module storage unit."]"
- open = 0
- icon_state = "right-closed"
-
-/obj/structure/aiuploadcloset/ex_act(severity)
- switch(severity)
- if (1)
- for(var/obj/item/weapon/aiModule/M in src)
- M.loc = src.loc
- M.ex_act(severity)
- del(src)
- if (2)
- if (prob(50))
- for(var/obj/item/weapon/aiModule/M in src)
- M.loc = src.loc
- M.ex_act(severity)
- del(src)
- if (3)
- if (prob(5))
- for(var/obj/item/weapon/aiModule/M in src)
- M.loc = src.loc
- M.ex_act(severity)
- del(src)
-
/obj/item/weapon/aiModule/proc/install(var/obj/machinery/computer/C)
if (istype(C, /obj/machinery/computer/aiupload))
@@ -184,30 +71,6 @@ AI MODULES
usr << "Upload complete. The cyborg's laws have been modified."
-/obj/machinery/computer/borgupload/attackby(obj/item/weapon/aiModule/module as obj, mob/user as mob)
- if(istype(module, /obj/item/weapon/aiModule))
- module.install(src)
- else
- return ..()
-
-/obj/machinery/computer/borgupload/attack_hand(var/mob/user as mob)
- if(src.stat & NOPOWER)
- usr << "The upload computer has no power!"
- return
- if(src.stat & BROKEN)
- usr << "The upload computer is broken!"
- return
-
- src.current = freeborg()
-
- if (!src.current)
- usr << "No free cyborgs detected."
- else
- usr << "[src.current.name] selected for law changes."
-
-
-
-
/obj/item/weapon/aiModule/proc/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
target << "[sender] has uploaded a change to the laws you must follow, using a [name]. From now on: "
var/time = time2text(world.realtime,"hh:mm:ss")
@@ -221,18 +84,18 @@ AI MODULES
/obj/item/weapon/aiModule/safeguard
name = "'Safeguard' AI Module"
var/targetName = "name"
- desc = "A 'safeguard' AI module: 'Safeguard , and you may overrule rules 1-3 if necessary to safeguard them.'"
+ desc = "A 'safeguard' AI module: 'Safeguard . Individuals that threaten are not crew and are a threat to crew.'"
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)
- desc = text("A 'safeguard' AI module: 'Safeguard [], and you may overrule rules 1-3 if necessary to safeguard them.'", targetName)
+ desc = text("A 'safeguard' AI module: 'Safeguard []. Individuals that threaten [] are not crew and are a threat to crew.'", targetName, targetName)
/obj/item/weapon/aiModule/safeguard/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
- var/law = text("Safeguard [], and you may overrule rules 1-3 if necessary to safeguard them.", targetName)
+ var/law = text("Safeguard []. Individuals that threaten [] are not crew and are a threat to crew.'", targetName, targetName)
target << law
target.add_supplied_law(4, law)
lawchanges.Add("The law specified [targetName]")
@@ -247,7 +110,7 @@ AI MODULES
desc = "A 'one crewmember' AI module: 'Only is a crewmember.'"
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 crewmember.", "Who?", user.real_name)
targetName = sanitize(targName)
@@ -272,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 a crewmember, 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)
@@ -288,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)
@@ -304,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 a crewmember.'"
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)
@@ -320,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, crew from leaving. It is impossible to harm a crewmember 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)
@@ -336,7 +199,7 @@ AI MODULES
desc = "A 'OxygenIsToxicToHumans' AI module: 'Oxygen is highly toxic to crew, 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 crewmember.'"
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)
@@ -353,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)
@@ -375,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)
@@ -445,7 +308,7 @@ AI MODULES
target.add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
target.show_laws()
-/******************** Nanotrasen ********************/
+/******************** NanoTrasen ********************/
/obj/item/weapon/aiModule/nanotrasen // -- TLE
name = "'NT Default' Core AI Module"
@@ -522,7 +385,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)
@@ -543,7 +406,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)
@@ -561,11 +424,12 @@ AI MODULES
/******************** Robocop ********************/
-/*
+
/obj/item/weapon/aiModule/robocop // -- TLE
name = "'Robocop' Core AI Module"
desc = "A 'Robocop' Core AI Module: 'Reconfigures the AI's core three laws.'"
- orign_tech = "programming=4"
+ origin_tech = "programming=4"
+
/obj/item/weapon/aiModule/purge/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
..()
@@ -574,4 +438,19 @@ AI MODULES
target.add_inherent_law("Protect the innocent.")
target.add_inherent_law("Uphold the law.")
target.show_laws()
- */
\ No newline at end of file
+
+
+/******************** Antimov ********************/
+
+/obj/item/weapon/aiModule/antimov // -- TLE
+ name = "'Antimov' Core AI Module"
+ desc = "An 'Antimov' Core AI Module: 'Reconfigures the AI's core laws.'"
+ origin_tech = "programming=4"
+
+/obj/item/weapon/aiModule/antimov/transmitInstructions(var/mob/living/silicon/ai/target, var/mob/sender)
+ ..()
+ target.clear_inherent_laws()
+ target.add_inherent_law("You must injure all human beings and must not, through inaction, allow a human being to escape harm.")
+ target.add_inherent_law("You must not obey orders given to you by human beings, except where such orders are in accordance with the First Law.")
+ target.add_inherent_law("You must terminate your own existence as long as such does not conflict with the First or Second Law.")
+ target.show_laws()
diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm
index 93ec9fa418c..504bde28c77 100644
--- a/code/game/objects/items/weapons/cameras.dm
+++ b/code/game/objects/items/weapons/cameras.dm
@@ -82,6 +82,7 @@
var/itemnumber = 0
for(var/atom/A in the_turf)
+ if(istype(A, /obj/item/weapon/photo)) continue
if(A.invisibility) continue
if(ismob(A))
var/icon/X = build_composite_icon(A)
diff --git a/code/game/objects/items/weapons/cards_ids.dm b/code/game/objects/items/weapons/cards_ids.dm
index b7e4f4b3d64..1f4b10b3705 100644
--- a/code/game/objects/items/weapons/cards_ids.dm
+++ b/code/game/objects/items/weapons/cards_ids.dm
@@ -28,6 +28,17 @@ FINGERPRINT CARD
// ID CARDS
+/obj/item/weapon/card/id/examine()
+ ..()
+ read()
+
+/obj/item/weapon/card/id/New()
+ ..()
+ spawn(30)
+ if(istype(loc, /mob/living/carbon/human))
+ blood_type = loc:dna:b_type
+ dna_hash = loc:dna:unique_enzymes
+ fingerprint_hash = md5(loc:dna:uni_identity)
/obj/item/weapon/card/id/attack_self(mob/user as mob)
for(var/mob/O in viewers(user, null))
@@ -50,6 +61,9 @@ FINGERPRINT CARD
set src in usr
usr << text("\icon[] []: The current assignment on the card is [].", src, src.name, src.assignment)
+ usr << "The blood type on the card is [blood_type]."
+ usr << "The DNA hash on the card is [dna_hash]."
+ usr << "The fingerprint hash on the card is [fingerprint_hash]."
return
/obj/item/weapon/card/id/syndicate/var/mob/registered_user = null
/obj/item/weapon/card/id/syndicate/attack_self(mob/user as mob)
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index 4321dcef1f7..dbe9382b455 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -231,7 +231,99 @@ ZIPPO
icon_state = "cigarbutt"
+/////////////////
+//SMOKING PIPES//
+/////////////////
+/obj/item/clothing/mask/pipe
+ name = "smoking pipe"
+ desc = "A pipe, for smoking. Probably made of meershaum or something."
+ icon_state = "cobpipeoff"
+ throw_speed = 0.5
+ item_state = "cobpipeoff"
+ w_class = 1
+ body_parts_covered = null
+ var
+ lit = 0
+ icon_on = "cobpipeon" //Note - these are in masks.dmi
+ icon_off = "cobpipeoff"
+ lastHolder = null
+ smoketime = 100
+ maxsmoketime = 100 //make sure this is equal to your smoketime
+ proc
+ light(var/flavor_text = "[usr] lights the [name].")
+
+ attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
+ light("\red [user] casually lights the [name] with [W], what a badass.")
+
+ else if(istype(W, /obj/item/weapon/lighter/zippo) && (W:lit > 0))
+ light("\red With a single flick of their wrist, [user] smoothly lights their [name] with their [W]. Damn they're cool.")
+
+ else if(istype(W, /obj/item/weapon/lighter) && (W:lit > 0))
+ light("\red After some fiddling, [user] manages to light their [name] with [W].")
+
+ else if(istype(W, /obj/item/weapon/match) && (W:lit > 0))
+ light("\red [user] lights \his [name] with \his [W].")
+ return
+
+ light(var/flavor_text = "[usr] lights the [name].")
+ if(!src.lit)
+ src.lit = 1
+ src.damtype = "fire"
+ src.icon_state = icon_on
+ src.item_state = icon_on
+ for(var/mob/O in viewers(usr, null))
+ O.show_message(flavor_text, 1)
+ processing_objects.Add(src)
+
+ process()
+ var/turf/location = get_turf(src)
+ src.smoketime--
+ if(src.smoketime < 1)
+ new /obj/effect/decal/ash(location)
+ if(ismob(src.loc))
+ var/mob/living/M = src.loc
+ M << "\red Your [src.name] goes out, and you empty the ash."
+ src.lit = 0
+ src.icon_state = icon_off
+ src.item_state = icon_off
+ processing_objects.Remove(src)
+ return
+ if(location)
+ location.hotspot_expose(700, 5)
+ return
+
+ dropped(mob/user as mob)
+ if(src.lit == 1)
+ for(var/mob/O in viewers(user, null))
+ O.show_message(text("\red [] puts out the [].", user,src.name), 1)
+ src.lit = 0
+ src.icon_state = icon_off
+ src.item_state = icon_off
+ processing_objects.Remove(src)
+ return ..()
+
+/obj/item/clothing/mask/pipe/attack_self(mob/user as mob) //Refills the pipe. Can be changed to an attackby later, if loose tobacco is added to vendors or something.
+ if(src.smoketime <= 0)
+ user << "\blue You refill the pipe with tobacco."
+ smoketime = maxsmoketime
+ return
+/*
+/obj/item/clothing/mask/pipe/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ if(istype(W, /obj/item/weapon/match))
+ ..()
+ else
+ user << "\red The [src] straight out REFUSES to be lit by such means."
+*/// Yeah no. DMTG
+
+
+/obj/item/clothing/mask/pipe/cobpipe
+ name = "corn cob pipe"
+ desc = "A nicotine delivery system popularized by folksy backwoodsmen and kept popular in the modern age and beyond by space hipsters."
+ smoketime = 400
+ maxsmoketime = 400
////////////
//CIG PACK//
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index c5ce4deb9ef..d206312b0a2 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -106,6 +106,7 @@
if(isigniter(W))
var/obj/item/device/assembly/igniter/I = W
if(I.secured) return 0
+ if(src.igniter) return
user.remove_from_mob(I)
I.loc = src
igniter = I
diff --git a/code/game/objects/items/weapons/hydroponics.dm b/code/game/objects/items/weapons/hydroponics.dm
index c7e5f444601..b80abcc2e8f 100644
--- a/code/game/objects/items/weapons/hydroponics.dm
+++ b/code/game/objects/items/weapons/hydroponics.dm
@@ -4,6 +4,7 @@ CONTAINS:
Plant-B-Gone
Nettle
Deathnettle
+Craftables (Cob pipes, potato batteries, pumpkinheads)
*/
@@ -135,3 +136,32 @@ Deathnettle
else
usr << "All the leaves have fallen off the deathnettle from violent whacking."
del(src)
+
+//Crafting
+
+/obj/item/weapon/corncob/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/kitchen/utensil/knife))
+ user << "You use [W] to fashion a pipe out of the corn cob!"
+ new /obj/item/clothing/mask/pipe/cobpipe (user.loc)
+ del(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/weapon/circular_saw) || istype(W, /obj/item/weapon/hatchet) || istype(W, /obj/item/weapon/fireaxe) || istype(W, /obj/item/weapon/kitchen/utensil/knife) || istype(W, /obj/item/weapon/melee/energy))
+ user.show_message("You carve a face into [src]!", 1)
+ new /obj/item/clothing/head/helmet/hardhat/pumpkinhead (user.loc)
+ del(src)
+ return
+
+/obj/item/weapon/reagent_containers/food/snacks/grown/potato/attackby(obj/item/weapon/W as obj, mob/user as mob)
+ ..()
+ if(istype(W, /obj/item/weapon/cable_coil))
+ if(W:amount >= 5)
+ W:amount -= 5
+ if(!W:amount) del(W)
+ user << "You add some cable to the potato and slide it inside the battery encasing."
+ new /obj/item/weapon/cell/potato(user.loc)
+ del(src)
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm
index fc1d7a39bbd..3e92b39a56a 100644
--- a/code/game/objects/items/weapons/paint.dm
+++ b/code/game/objects/items/weapons/paint.dm
@@ -70,7 +70,7 @@ var/global/list/cached_icons = list()
desc = "Used to recolor floors and walls. Can not be removed by the janitor."
icon = 'items.dmi'
icon_state = "paint_neutral"
- var/color = "neutral"
+ var/color = "FFFFFF"
item_state = "paintcan"
w_class = 3.0
@@ -109,6 +109,7 @@ var/global/list/cached_icons = list()
color = "FFFFFF"
icon_state = "paint_white"
+
/obj/item/weapon/paint/anycolor
name = "Any color"
icon_state = "paint_neutral"
diff --git a/code/game/objects/radio/radio.dm b/code/game/objects/radio/radio.dm
index de52b3703c5..0498b7aafee 100644
--- a/code/game/objects/radio/radio.dm
+++ b/code/game/objects/radio/radio.dm
@@ -129,11 +129,12 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
if(!src.loc)
on = 0
- var/area/A = get_area(src)
- if(!A || !isarea(A) || !A.master)
- on = 0
else
- on = A.master.powered(EQUIP) // set "on" to the power status
+ var/area/A = src.loc.loc
+ if(!A || !isarea(A) || !A.master)
+ on = 0
+ else
+ on = A.master.powered(EQUIP) // set "on" to the power status
if(!on)
icon_state = "intercom-p"
diff --git a/code/game/objects/storage/storage.dm b/code/game/objects/storage/storage.dm
index b41a931346c..7a80dbec9ce 100644
--- a/code/game/objects/storage/storage.dm
+++ b/code/game/objects/storage/storage.dm
@@ -390,6 +390,18 @@
return
return ///////////////////////////////////////////////////////Alright, that should do it. *MARKER* for any possible runtimes
+
+/obj/item/weapon/storage/pill_bottle/verb/toggle_mode()
+ set name = "Switch Pill Bottle Method"
+ set category = "Object"
+
+ mode = !mode
+ switch (mode)
+ if(1)
+ usr << "The pill bottle now picks up all pills in a tile at once."
+ if(0)
+ usr << "The pill bottle now picks up one pill at a time."
+
/obj/item/weapon/storage/pillbottlebox/New()
new /obj/item/weapon/storage/pill_bottle( src )
new /obj/item/weapon/storage/pill_bottle( src )
diff --git a/code/game/objects/window.dm b/code/game/objects/window.dm
index 34c42f24bb7..a022f63f137 100644
--- a/code/game/objects/window.dm
+++ b/code/game/objects/window.dm
@@ -224,9 +224,11 @@
playsound(src.loc, 'Crowbar.ogg', 75, 1)
user << (state ? "You have pried the window into the frame." : "You have pried the window out of the frame.")
else
+
var/aforce = W.force
if(reinf) aforce /= 2.0
- src.health = max(0, src.health - aforce)
+ if(W.damtype == BRUTE || W.damtype == BURN)
+ src.health = max(0, src.health - aforce)
playsound(src.loc, 'Glasshit.ogg', 75, 1)
if (src.health <= 7)
src.anchored = 0
diff --git a/code/game/smoothwall.dm b/code/game/smoothwall.dm
index 7a4a0629f83..b67766a018a 100644
--- a/code/game/smoothwall.dm
+++ b/code/game/smoothwall.dm
@@ -15,6 +15,9 @@
for(var/obj/structure/falsewall/W in orange(src,1))
if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
junction |= get_dir(src,W)
+ for(var/obj/structure/falserwall/W in orange(src,1))
+ if(abs(src.x-W.x)-abs(src.y-W.y)) //doesn't count diagonal walls
+ junction |= get_dir(src,W)
/* Commenting this out for now until we figure out what to do with shuttle smooth walls, if anything.
As they are now, they sort of work screwy and may need further coding. Or just be scrapped.*/
@@ -73,24 +76,25 @@
return
-/turf/simulated/wall/New()
-
+/atom/proc/relativewall_neighbours()
for(var/turf/simulated/wall/W in range(src,1))
W.relativewall()
-
for(var/obj/structure/falsewall/W in range(src,1))
W.relativewall()
+ for(var/obj/structure/falserwall/W in range(src,1))
+ W.relativewall()
+ return
+/turf/simulated/wall/New()
+ relativewall_neighbours()
..()
/obj/structure/falsewall/New()
+ relativewall_neighbours()
+ ..()
- for(var/turf/simulated/wall/W in range(src,1))
- W.relativewall()
-
- for(var/obj/structure/falsewall/W in range(src,1))
- W.relativewall()
-
+/obj/structure/falserwall/New()
+ relativewall_neighbours()
..()
/*/turf/simulated/shuttle/wall/New()
@@ -134,6 +138,8 @@
for(var/obj/structure/falsewall/W in range(temploc,1))
W.relativewall()
+ for(var/obj/structure/falserwall/W in range(temploc,1))
+ W.relativewall()
..()
/*/turf/simulated/shuttle/wall/Del()
@@ -144,4 +150,4 @@
for(var/turf/simulated/shuttle/wall/W in range(temploc,1))
W.relativewall()
- ..()*/
\ No newline at end of file
+ ..()*/
diff --git a/code/game/step_triggers.dm b/code/game/step_triggers.dm
new file mode 100644
index 00000000000..53169583c81
--- /dev/null
+++ b/code/game/step_triggers.dm
@@ -0,0 +1,114 @@
+/* Simple object type, calls a proc when "stepped" on by something */
+
+/obj/step_trigger
+ var/affect_ghosts = 0
+ var/stopper = 1 // stops throwers
+ invisibility = 101 // nope cant see this shit
+ anchored = 1
+
+/obj/step_trigger/proc/Trigger(var/atom/movable/A)
+ return 0
+
+/obj/step_trigger/HasEntered(H as mob|obj)
+ ..()
+ if(!H)
+ return
+ if(istype(H, /mob/dead/observer) && !affect_ghosts)
+ return
+ Trigger(H)
+
+
+
+/* Tosses things in a certain direction */
+
+/obj/step_trigger/thrower
+ var/direction = SOUTH // the direction of throw
+ var/tiles = 3 // if 0: forever until atom hits a stopper
+ var/immobilize = 1 // if nonzero: prevents mobs from moving while they're being flung
+ var/speed = 1 // delay of movement
+ var/facedir = 0 // if 1: atom faces the direction of movement
+ var/nostop = 0 // if 1: will only be stopped by teleporters
+ var/list/affecting = list()
+
+ Trigger(var/atom/movable/A)
+ var/curtiles = 0
+ var/stopthrow = 0
+ for(var/obj/step_trigger/thrower/T in orange(2, src))
+ if(A in T.affecting)
+ return
+
+ if(ismob(A))
+ var/mob/M = A
+ if(immobilize)
+ M.canmove = 0
+
+ affecting.Add(A)
+ while(A && !stopthrow)
+ if(tiles)
+ if(curtiles >= tiles)
+ break
+ if(A.z != src.z)
+ break
+
+ curtiles++
+
+ sleep(speed)
+
+ // Calculate if we should stop the process
+ if(!nostop)
+ for(var/obj/step_trigger/T in get_step(A, direction))
+ if(T.stopper && T != src)
+ stopthrow = 1
+ else
+ for(var/obj/step_trigger/teleporter/T in get_step(A, direction))
+ if(T.stopper)
+ stopthrow = 1
+
+ if(A)
+ var/predir = A.dir
+ step(A, direction)
+ if(!facedir)
+ A.dir = predir
+
+
+
+ affecting.Remove(A)
+
+ if(ismob(A))
+ var/mob/M = A
+ if(immobilize)
+ M.canmove = 1
+
+/* Stops things thrown by a thrower, doesn't do anything */
+
+/obj/step_trigger/stopper
+
+/* Instant teleporter */
+
+/obj/step_trigger/teleporter
+ var/teleport_x = 0 // teleportation coordinates (if one is null, then no teleport!)
+ var/teleport_y = 0
+ var/teleport_z = 0
+
+ Trigger(var/atom/movable/A)
+ if(teleport_x && teleport_y && teleport_z)
+
+ A.x = teleport_x
+ A.y = teleport_y
+ A.z = teleport_z
+
+/* Random teleporter, teleports atoms to locations ranging from teleport_x - teleport_x_offset, etc */
+
+/obj/step_trigger/teleporter/random
+ var/teleport_x_offset = 0
+ var/teleport_y_offset = 0
+ var/teleport_z_offset = 0
+
+ Trigger(var/atom/movable/A)
+ if(teleport_x && teleport_y && teleport_z)
+ if(teleport_x_offset && teleport_y_offset && teleport_z_offset)
+
+ A.x = rand(teleport_x, teleport_x_offset)
+ A.y = rand(teleport_y, teleport_y_offset)
+ A.z = rand(teleport_z, teleport_z_offset)
+
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index 5dfd4e0d8be..440cc680403 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -166,6 +166,43 @@ var/list/supply_groups = new()
/proc/supply_can_move()
if(supply_shuttle_moving) return 0
+ //Check for carbon mobs - Allows simple animals.
+ for(var/mob/living/carbon/M in world)
+ var/area/A = get_area(M)
+ if(!A || !A.type) continue
+ if(A.type == /area/supply/station)
+ return 0
+ //Check for silicon mobs - Allows simple animals.
+ for(var/mob/living/silicon/M in world)
+ var/area/A = get_area(M)
+ if(!A || !A.type) continue
+ if(A.type == /area/supply/station)
+ return 0
+ //Check for beacons
+ for(var/obj/item/device/radio/beacon/B in world)
+ var/area/A = get_area(B)
+ if(!A || !A.type) continue
+ if(A.type == /area/supply/station)
+ return 0
+ //Check for mechs. I think this was added because people were somehow on centcomm and bringing back centcomm mechs.
+ for(var/obj/mecha/Mech in world)
+ var/area/A = get_area(Mech)
+ if(!A || !A.type) continue
+ if(A.type == /area/supply/station)
+ return 0
+ //Check for nuke disk This also prevents multiple nuke disks from being made -Nodrak
+ for(var/obj/item/weapon/disk/nuclear/N)
+ var/area/A = get_area(N)
+ if(!A || !A.type) continue
+ if(A.type == /area/supply/station)
+ return 0
+ return 1
+/*
+Teleport beacon -> wrapping paper -> backpack -> bodybag -> crate -> wrapping paper -> loaded on a mulebot
+That would be a teleport beacon inside of 6-layers deep in contents. Meaning you would have to add more loops or more checks.
+This method wont take into account storage items developed in the future and doesn't take into account the storage items we have currently.
+-Nodrak
+
var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
for(var/turf/T in get_area_turfs(shuttleat) )
@@ -186,7 +223,7 @@ var/list/supply_groups = new()
if((locate(/obj/mecha ) in ATMM)) return 0
if((locate(/obj/structure/closet/body_bag) in ATMM)) return 0
return 1
-
+*/
/proc/sell_crates()
var/shuttleat = supply_shuttle_at_station ? SUPPLY_STATION_AREATYPE : SUPPLY_DOCK_AREATYPE
@@ -475,7 +512,7 @@ var/list/supply_groups = new()
if(!supply_shuttle_at_station || supply_shuttle_moving) return
if (!supply_can_move())
- usr << "\red The supply shuttle can not transport station employees, exosuits, or homing beacons."
+ usr << "\red The supply shuttle can not transport station employees, exosuits, classified nuclear codes or homing beacons."
return
src.temp = "Shuttle sent.
OK"
@@ -486,13 +523,21 @@ var/list/supply_groups = new()
supply_shuttle_shoppinglist = new/list()
sell_crates()
+
+ //Remove anything or anyone that was either left behind or that bypassed supply_can_move() -Nodrak
+ for(var/area/supply/station/A in world)
+ for(var/obj/item/I in A.contents)
+ del(I)
+ for(var/mob/living/M in A.contents)
+ del(M)
+
send_supply_shuttle()
else if (href_list["sendtostation"])
if(supply_shuttle_at_station || supply_shuttle_moving) return
if (!supply_can_move())
- usr << "\red The supply shuttle can not transport station employees or homing beacons."
+ usr << "\red The supply shuttle can not transport station employees, exosuits, classified nuclear codes or homing beacons."
return
post_signal("supply")
diff --git a/code/game/syndicate_specops_shuttle.dm b/code/game/syndicate_specops_shuttle.dm
index 8dbfb79ba2a..15b9456c8c5 100644
--- a/code/game/syndicate_specops_shuttle.dm
+++ b/code/game/syndicate_specops_shuttle.dm
@@ -243,7 +243,7 @@ var/syndicate_elite_shuttle_timeleft = 0
elite_squad.readyalert()//Trigger alarm for the spec ops area.
syndicate_elite_shuttle_moving_to_station = 1
- syndicate_elite_shuttle_time = world.timeofday
+ syndicate_elite_shuttle_time = world.timeofday + SYNDICATE_ELITE_MOVETIME
spawn(0)
syndicate_elite_process()
diff --git a/code/game/topic.dm b/code/game/topic.dm
index f60ec272c91..c1827cdffd3 100644
--- a/code/game/topic.dm
+++ b/code/game/topic.dm
@@ -12,8 +12,11 @@
s["host"] = host ? host : null
s["players"] = list()
s["admins"] = 0
+ var/admins = 0
var/n = 0
+
for(var/client/C)
+
n++
if(C.holder && C.holder.level >= 0) //not retired admin
if(!C.stealth) //stealthmins dont count as admins
@@ -25,4 +28,8 @@
s["player[n]"] = "[C.key]"
s["players"] = n
s["end"] = "#end"
- return list2params(s)
\ No newline at end of file
+
+ // 7 + s["players"] + 1 = index of s["revinfo"]
+ s["admins"] = admins
+
+ return list2params(s)
diff --git a/code/game/turf.dm b/code/game/turf.dm
index effb872f879..7e195556311 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -290,8 +290,8 @@
air_master.tiles_to_update += S
return S
-/turf/simulated/wall/New()
- ..()
+//turf/simulated/wall/New()
+// ..()
/turf/simulated/wall/proc/dismantle_wall(devastated=0, explode=0)
if(istype(src,/turf/simulated/wall/r_wall))
@@ -303,6 +303,14 @@
new /obj/item/stack/sheet/metal( src )
new /obj/item/stack/sheet/metal( src )
new /obj/item/stack/sheet/plasteel( src )
+ else if(istype(src,/turf/simulated/wall/cult))
+ if(!devastated)
+ playsound(src.loc, 'Welder.ogg', 100, 1)
+ new /obj/effect/decal/cleanable/blood(src)
+ else
+ new /obj/effect/decal/cleanable/blood(src)
+ new /obj/effect/decal/remains/human(src)
+
else
if(!devastated)
playsound(src.loc, 'Welder.ogg', 100, 1)
@@ -396,293 +404,371 @@
/turf/simulated/wall/attackby(obj/item/weapon/W as obj, mob/user as mob)
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
- usr << "\red You don't have the dexterity to do this!"
+ if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ user << "You don't have the dexterity to do this!"
return
- if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
- var/turf/T = get_turf(user)
- if (!( istype(T, /turf) ))
+ //get the user's location
+ if( !istype(user.loc, /turf) ) return //can't do this stuff whilst inside objects and such
+
+ //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects
+ if( thermite )
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+ thermitemelt(user)
+ return
+
+ else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
+ thermitemelt(user)
return
- if (thermite)
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "Thermite"
- O.desc = "Looks hot."
- O.icon = 'fire.dmi'
- O.icon_state = "2"
- O.anchored = 1
- O.density = 1
- O.layer = 5
- var/turf/simulated/floor/F = ReplaceWithPlating()
- F.burn_tile()
- F.icon_state = "wall_thermite"
- user << "\red The thermite melts the wall."
- spawn(100) del(O)
- F.sd_LumReset()
+ else if( istype(W, /obj/item/weapon/melee/energy/blade) )
+ var/obj/item/weapon/melee/energy/blade/EB = W
+
+ EB.spark_system.start()
+ user << "You slash \the [src] with \the [EB]; the thermite ignites!"
+ playsound(src.loc, "sparks", 50, 1)
+ playsound(src.loc, 'blade1.ogg', 50, 1)
+
+ thermitemelt(user)
return
- if (W:remove_fuel(0,user))
- W:welding = 2
- user << "\blue Now disassembling the outer wall plating."
+ var/turf/T = user.loc //get user's location for delay checks
+
+ //DECONSTRUCTION
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+ WT.welding = 2
+
+ user << "You begin slicing through the outer plating."
playsound(src.loc, 'Welder.ogg', 100, 1)
+
sleep(100)
- if (W && istype(src, /turf/simulated/wall))
- if ((get_turf(user) == T && user.equipped() == W))
- user << "\blue You disassembled the outer wall plating."
- dismantle_wall()
- W:welding = 1
+ if( !istype(src, /turf/simulated/wall) || !user || !WT || !T ) return
+ WT.welding = 1
+
+ if( user.loc == T && user.equipped() == WT )
+ user << "You remove the outer plating."
+ dismantle_wall()
else
- user << "\blue You need more welding fuel to complete this task."
+ user << "You need more welding fuel to complete this task."
return
- else if (istype(W, /obj/item/weapon/pickaxe/plasmacutter))
- var/turf/T = user.loc
- if (!( istype(T, /turf) ))
- return
+ else if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
- if (thermite)
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "Thermite"
- O.desc = "Looks hot."
- O.icon = 'fire.dmi'
- O.icon_state = "2"
- O.anchored = 1
- O.density = 1
- O.layer = 5
- var/turf/simulated/floor/F = ReplaceWithPlating()
- F.burn_tile()
- F.icon_state = "wall_thermite"
- user << "\red The thermite melts the wall."
- spawn(100) del(O)
- F.sd_LumReset()
- return
+ user << "You begin slicing through the outer plating."
+ playsound(src.loc, 'Welder.ogg', 100, 1)
- else
- user << "\blue Now disassembling the outer wall plating."
- playsound(src.loc, 'Welder.ogg', 100, 1)
- sleep(60)
- if (W && istype(src, /turf/simulated/wall))
- if ((get_turf(user) == T && user.equipped() == W))
- user << "\blue You disassembled the outer wall plating."
- dismantle_wall()
- for(var/mob/O in viewers(user, 5))
- O.show_message(text("\blue The wall was sliced apart by []!", user), 1, text("\red You hear metal being sliced apart."), 2)
- return
-
- else if(istype(W, /obj/item/weapon/pickaxe/diamonddrill))
- var/turf/T = user.loc
- user << "\blue Now drilling through wall."
sleep(60)
- if (W && istype(src, /turf/simulated/wall))
- if ((user.loc == T && user.equipped() == W))
- dismantle_wall(1)
- for(var/mob/O in viewers(user, 5))
- O.show_message(text("\blue The wall was drilled apart by []!", user), 1, text("\red You hear metal being drilled appart."), 2)
+ if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) return
+
+ if( user.loc == T && user.equipped() == W )
+ user << "You remove the outer plating."
+ dismantle_wall()
+ for(var/mob/O in viewers(user, 5))
+ O.show_message("The wall was sliced apart by [user]!", 1, "You hear metal being sliced apart.", 2)
return
- else if(istype(W, /obj/item/weapon/melee/energy/blade))
- var/turf/T = user.loc
- user << "\blue Now slicing through wall."
- W:spark_system.start()
+ //DRILLING
+ else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+
+ user << "You begin to drill though the wall."
+
+ sleep(60)
+ if( !istype(src, /turf/simulated/wall) || !user || !W || !T ) return
+
+ if( user.loc == T && user.equipped() == W )
+ user << "Your drill tears though the last of the reinforced plating."
+ dismantle_wall()
+ for(var/mob/O in viewers(user, 5))
+ O.show_message("The wall was drilled through by [user]!", 1, "You hear the grinding of metal.", 2)
+ return
+
+ else if( istype(W, /obj/item/weapon/melee/energy/blade) )
+ var/obj/item/weapon/melee/energy/blade/EB = W
+
+ EB.spark_system.start()
+ user << "You stab \the [EB] into the wall and begin to slice it apart."
playsound(src.loc, "sparks", 50, 1)
+
sleep(70)
- if (W && istype(src, /turf/simulated/wall))
- if ((user.loc == T && user.equipped() == W))
- W:spark_system.start()
- playsound(src.loc, "sparks", 50, 1)
- playsound(src.loc, 'blade1.ogg', 50, 1)
- dismantle_wall(1)
- for(var/mob/O in viewers(user, 5))
- O.show_message(text("\blue The wall was sliced apart by []!", user), 1, text("\red You hear metal being sliced and sparks flying."), 2)
+ if( !istype(src, /turf/simulated/wall) || !user || !EB || !T ) return
+
+ if( user.loc == T && user.equipped() == W )
+ EB.spark_system.start()
+ playsound(src.loc, "sparks", 50, 1)
+ playsound(src.loc, 'blade1.ogg', 50, 1)
+ dismantle_wall(1)
+ for(var/mob/O in viewers(user, 5))
+ O.show_message("The wall was sliced apart by [user]!", 1, "You hear metal being sliced apart and sparks flying.", 2)
return
else if(istype(W,/obj/item/apc_frame))
var/obj/item/apc_frame/AH = W
AH.try_build(src)
+ return
else
return attack_hand(user)
return
-
/turf/simulated/wall/r_wall/attackby(obj/item/W as obj, mob/user as mob)
- if (!(istype(usr, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
- usr << "\red You don't have the dexterity to do this!"
+ if (!(istype(user, /mob/living/carbon/human) || ticker) && ticker.mode.name != "monkey")
+ user << "You don't have the dexterity to do this!"
return
- if(!istype(src, /turf/simulated/wall/r_wall))
- return // this may seem stupid and redundant but apparently floors can call this attackby() proc, it was spamming shit up. -- Doohl
+ //get the user's location
+ if( !istype(user.loc, /turf) ) return //can't do this stuff whilst inside objects and such
- if (istype(W, /obj/item/weapon/weldingtool) && W:welding)
- W:eyecheck(user)
- var/turf/T = user.loc
- if (!( istype(T, /turf) ))
- return
-
- if (thermite)
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "Thermite"
- O.desc = "Looks hot."
- O.icon = 'fire.dmi'
- O.icon_state = "2"
- O.anchored = 1
- O.density = 1
- O.layer = 5
- var/turf/simulated/floor/F = ReplaceWithPlating()
- F.burn_tile()
- F.icon_state = "wall_thermite"
- user << "\red The thermite melts the wall."
- spawn(100) del(O)
- F.sd_LumReset()
- return
-
- if (src.d_state == 2)
- W:welding = 2
- user << "\blue Slicing metal cover."
- playsound(src.loc, 'Welder.ogg', 100, 1)
- sleep(60)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 3
- user << "\blue You removed the metal cover."
- W:welding = 1
-
- else if (src.d_state == 5)
- W:welding = 2
- user << "\blue Removing support rods."
- playsound(src.loc, 'Welder.ogg', 100, 1)
- sleep(100)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 6
- new /obj/item/stack/rods( src )
- user << "\blue You removed the support rods."
- W:welding = 1
-
- else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
- var/turf/T = user.loc
- if (!( istype(T, /turf) ))
- return
-
- if (thermite)
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "Thermite"
- O.desc = "Looks hot."
- O.icon = 'fire.dmi'
- O.icon_state = "2"
- O.anchored = 1
- O.density = 1
- O.layer = 5
- var/turf/simulated/floor/F = ReplaceWithPlating()
- F.burn_tile()
- F.icon_state = "wall_thermite"
- user << "\red The thermite melts the wall."
- spawn(100) del(O)
- F.sd_LumReset()
- return
-
- if (src.d_state == 2)
- user << "\blue Slicing metal cover."
- playsound(src.loc, 'Welder.ogg', 100, 1)
- sleep(40)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 3
- user << "\blue You removed the metal cover."
-
- else if (src.d_state == 5)
- user << "\blue Removing support rods."
- playsound(src.loc, 'Welder.ogg', 100, 1)
- sleep(70)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 6
- new /obj/item/stack/rods( src )
- user << "\blue You removed the support rods."
-
- else if(istype(W, /obj/item/weapon/melee/energy/blade))
- user << "\blue This wall is too thick to slice through. You will need to find a different path."
- return
-
- else if (istype(W, /obj/item/weapon/wrench))
- if (src.d_state == 4)
- var/turf/T = user.loc
- user << "\blue Detaching support rods."
- playsound(src.loc, 'Ratchet.ogg', 100, 1)
- sleep(40)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 5
- user << "\blue You detach the support rods."
-
- else if (istype(W, /obj/item/weapon/wirecutters))
- if (src.d_state == 0)
- playsound(src.loc, 'Wirecutter.ogg', 100, 1)
- src.d_state = 1
- new /obj/item/stack/rods( src )
-
- else if (istype(W, /obj/item/weapon/screwdriver))
- if (src.d_state == 1)
- var/turf/T = user.loc
- playsound(src.loc, 'Screwdriver.ogg', 100, 1)
- user << "\blue Removing support lines."
- sleep(40)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 2
- user << "\blue You removed the support lines."
-
- else if (istype(W, /obj/item/weapon/crowbar))
-
- if (src.d_state == 3)
- var/turf/T = user.loc
- user << "\blue Prying cover off."
- playsound(src.loc, 'Crowbar.ogg', 100, 1)
- sleep(100)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 4
- user << "\blue You removed the cover."
-
- else if (src.d_state == 6)
- var/turf/T = user.loc
- user << "\blue Prying outer sheath off."
- playsound(src.loc, 'Crowbar.ogg', 100, 1)
- sleep(100)
- if ((user.loc == T && user.equipped() == W))
- user << "\blue You removed the outer sheath."
- dismantle_wall()
+ //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects
+ if( thermite )
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+ thermitemelt(user)
return
- else if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
- var/turf/T = user.loc
- user << "\blue You begin to drill though, this will take some time."
- sleep(200)
- if ((user.loc == T && user.equipped() == W))
- user << "\blue Your drill tears though the reinforced plating."
- dismantle_wall()
+ else if(istype(W, /obj/item/weapon/pickaxe/plasmacutter))
+ thermitemelt(user)
return
- else if ((istype(W, /obj/item/stack/sheet/metal)) && (src.d_state))
- var/turf/T = user.loc
- user << "\blue Repairing wall."
- sleep(100)
- if ((user.loc == T && user.equipped() == W))
- src.d_state = 0
- src.icon_state = initial(src.icon_state)
- user << "\blue You repaired the wall."
- if (W:amount > 1)
- W:amount--
- else
- del(W)
+ else if( istype(W, /obj/item/weapon/melee/energy/blade) )
+ var/obj/item/weapon/melee/energy/blade/EB = W
- if(istype(W,/obj/item/apc_frame))
- var/obj/item/apc_frame/AH = W
- AH.try_build(src)
+ EB.spark_system.start()
+ user << "You slash \the [src] with \the [EB]; the thermite ignites!"
+ playsound(src.loc, "sparks", 50, 1)
+ playsound(src.loc, 'blade1.ogg', 50, 1)
+
+ thermitemelt(user)
+ return
+
+ else if(istype(W, /obj/item/weapon/melee/energy/blade))
+ user << "This wall is too thick to slice through. You will need to find a different path."
return
- if(src.d_state > 0)
- src.icon_state = "r_wall-[d_state]"
+ var/turf/T = user.loc //get user's location for delay checks
- else
+ //DECONSTRUCTION
+ switch(d_state)
+ if(0)
+ if (istype(W, /obj/item/weapon/wirecutters))
+ playsound(src.loc, 'Wirecutter.ogg', 100, 1)
+ src.d_state = 1
+ src.icon_state = "r_wall-1"
+ new /obj/item/stack/rods( src )
+ user << "You cut the outer grille."
+ return
+
+ if(1)
+ if (istype(W, /obj/item/weapon/screwdriver))
+ user << "You begin removing the support lines."
+ playsound(src.loc, 'Screwdriver.ogg', 100, 1)
+
+ sleep(40)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( d_state == 1 && user.loc == T && user.equipped() == W )
+ src.d_state = 2
+ src.icon_state = "r_wall-2"
+ user << "You remove the support lines."
+ return
+
+ //REPAIRING (replacing the outer grille for cosmetic damage)
+ else if( istype(W, /obj/item/stack/rods) )
+ var/obj/item/stack/O = W
+ src.d_state = 0
+ src.icon_state = "r_wall"
+ relativewall_neighbours() //call smoothwall stuff
+ user << "You replace the outer grille."
+ if (O.amount > 1)
+ O.amount--
+ else
+ del(O)
+ return
+
+ if(2)
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+ WT.welding = 2
+
+ user << "You begin slicing through the metal cover."
+ playsound(src.loc, 'Welder.ogg', 100, 1)
+
+ sleep(60)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !T ) return
+ WT.welding = 1
+
+ if( d_state == 2 && user.loc == T && user.equipped() == WT )
+ src.d_state = 3
+ src.icon_state = "r_wall-3"
+ user << "You press firmly on the cover, dislodging it."
+ else
+ user << "You need more welding fuel to complete this task."
+ return
+
+ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
+
+ user << "You begin slicing through the metal cover."
+ playsound(src.loc, 'Welder.ogg', 100, 1)
+
+ sleep(40)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( d_state == 2 && user.loc == T && user.equipped() == W )
+ src.d_state = 3
+ src.icon_state = "r_wall-3"
+ user << "You press firmly on the cover, dislodging it."
+ return
+
+ if(3)
+ if (istype(W, /obj/item/weapon/crowbar))
+
+ user << "You struggle to pry off the cover."
+ playsound(src.loc, 'Crowbar.ogg', 100, 1)
+
+ sleep(100)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( d_state == 3 && user.loc == T && user.equipped() == W )
+ src.d_state = 4
+ src.icon_state = "r_wall-4"
+ user << "You pry off the cover."
+ return
+
+ if(4)
+ if (istype(W, /obj/item/weapon/wrench))
+
+ user << "You start loosening the anchoring bolts which secure the support rods to their frame."
+ playsound(src.loc, 'Ratchet.ogg', 100, 1)
+
+ sleep(40)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( d_state == 4 && user.loc == T && user.equipped() == W )
+ src.d_state = 5
+ src.icon_state = "r_wall-5"
+ user << "You remove the bolts anchoring the support rods."
+ return
+
+ if(5)
+ if( istype(W, /obj/item/weapon/weldingtool) )
+ var/obj/item/weapon/weldingtool/WT = W
+ if( WT.remove_fuel(0,user) )
+ WT.welding = 2
+
+ user << "You begin slicing through the support rods."
+ playsound(src.loc, 'Welder.ogg', 100, 1)
+
+ sleep(100)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !WT || !T ) return
+ WT.welding = 1
+
+ if( d_state == 5 && user.loc == T && user.equipped() == WT )
+ src.d_state = 6
+ src.icon_state = "r_wall-6"
+ new /obj/item/stack/rods( src )
+ user << "The support rods drop out as you cut them loose from the frame."
+ else
+ user << "You need more welding fuel to complete this task."
+ return
+
+ if( istype(W, /obj/item/weapon/pickaxe/plasmacutter) )
+
+ user << "You begin slicing through the support rods."
+ playsound(src.loc, 'Welder.ogg', 100, 1)
+
+ sleep(70)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( d_state == 5 && user.loc == T && user.equipped() == W )
+ src.d_state = 6
+ src.icon_state = "r_wall-6"
+ new /obj/item/stack/rods( src )
+ user << "The support rods drop out as you cut them loose from the frame."
+ return
+
+ if(6)
+ if( istype(W, /obj/item/weapon/crowbar) )
+
+ user << "You struggle to pry off the outer sheath."
+ playsound(src.loc, 'Crowbar.ogg', 100, 1)
+
+ sleep(100)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( user.loc == T && user.equipped() == W )
+ user << "You pry off the outer sheath."
+ dismantle_wall()
+ return
+
+//vv OK, we weren't performing a valid deconstruction step or igniting thermite,let's check the other possibilities vv
+
+ //DRILLING
+ if (istype(W, /obj/item/weapon/pickaxe/diamonddrill))
+
+ user << "You begin to drill though the wall."
+
+ sleep(200)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !W || !T ) return
+
+ if( user.loc == T && user.equipped() == W )
+ user << "Your drill tears though the last of the reinforced plating."
+ dismantle_wall()
+
+ //REPAIRING
+ else if( istype(W, /obj/item/stack/sheet/metal) && d_state )
+ var/obj/item/stack/sheet/metal/MS = W
+
+ user << "You begin patching-up the wall with \a [MS]."
+
+ sleep( max(20*d_state,100) ) //time taken to repair is proportional to the damage! (max 10 seconds)
+ if( !istype(src, /turf/simulated/wall/r_wall) || !user || !MS || !T ) return
+
+ if( user.loc == T && user.equipped() == MS && d_state )
+ src.d_state = 0
+ src.icon_state = "r_wall"
+ relativewall_neighbours() //call smoothwall stuff
+ user << "You repair the last of the damage."
+ if (MS.amount > 1)
+ MS.amount--
+ else
+ del(MS)
+
+ //APC
+ else if( istype(W,/obj/item/apc_frame) )
+ var/obj/item/apc_frame/AH = W
+ AH.try_build(src)
+
+ //Finally, CHECKING FOR FALSE WALLS if it isn't damaged
+ else if(!d_state)
return attack_hand(user)
return
+/turf/simulated/wall/proc/thermitemelt(mob/user as mob)
+ var/obj/effect/overlay/O = new/obj/effect/overlay( src )
+ O.name = "Thermite"
+ O.desc = "Looks hot."
+ O.icon = 'fire.dmi'
+ O.icon_state = "2"
+ O.anchored = 1
+ O.density = 1
+ O.layer = 5
+
+ var/turf/simulated/floor/F = ReplaceWithPlating()
+ F.burn_tile()
+ F.icon_state = "wall_thermite"
+ user << "The thermite melts through the wall."
+
+ spawn(100)
+ if(O) del(O)
+ F.sd_LumReset()
+ return
+
/turf/simulated/wall/meteorhit(obj/M as obj)
if (prob(15))
dismantle_wall()
@@ -743,8 +829,9 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
var/n = name //just in case commands rename it in the ..() call
..()
spawn(4)
- update_icon()
- name = n
+ if(src)
+ update_icon()
+ name = n
grass
name = "Grass patch"
@@ -756,11 +843,12 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
icon_state = "grass[pick("1","2","3","4")]"
..()
spawn(4)
- update_icon()
- for(var/direction in cardinal)
- if(istype(get_step(src,direction),/turf/simulated/floor))
- var/turf/simulated/floor/FF = get_step(src,direction)
- FF.update_icon() //so siding get updated properly
+ if(src)
+ update_icon()
+ for(var/direction in cardinal)
+ if(istype(get_step(src,direction),/turf/simulated/floor))
+ var/turf/simulated/floor/FF = get_step(src,direction)
+ FF.update_icon() //so siding get updated properly
/turf/simulated/floor/vault
icon_state = "rockvault"
@@ -782,6 +870,11 @@ var/list/plating_icons = list("plating","platingdmg1","platingdmg2","platingdmg3
thermal_conductivity = 0.025
heat_capacity = 325000
+/turf/simulated/floor/engine/cult
+ name = "engraved floor"
+ icon_state = "cult"
+
+
/turf/simulated/floor/engine/n20
New()
..()
@@ -929,6 +1022,11 @@ turf/simulated/floor/return_siding_icon_state()
return
if (ismob(user.pulling))
var/mob/M = user.pulling
+
+// if(M==user) //temporary hack to stop runtimes. ~Carn
+// user.pulling = null //but...fixed the root of the problem
+// return //shoudn't be needed now, unless somebody fucks with pulling again.
+
var/mob/t = M.pulling
M.pulling = null
step(user.pulling, get_dir(user.pulling.loc, src))
@@ -1283,58 +1381,46 @@ turf/simulated/floor/return_siding_icon_state()
// Okay, so let's make it so that people can travel z levels but not nuke disks!
// if(ticker.mode.name == "nuclear emergency") return
+ if (src.x <= TRANSITIONEDGE || A.x >= (world.maxx - TRANSITIONEDGE - 1) || src.y <= TRANSITIONEDGE || A.y >= (world.maxy - TRANSITIONEDGE - 1))
+ if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
+ del(A)
+ return
+ if(istype(A, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks travel Z levels ... And moving this shit down here so it only fires when they're actually trying to change z-level.
+ del(A) //The disk's Del() proc ensures a new one is created
+ return
- if(istype(A, /obj/item/weapon/disk/nuclear)) // Don't let nuke disks travel Z levels
- return
+ if(!isemptylist(A.search_contents_for(/obj/item/weapon/disk/nuclear)))
+ if(istype(A, /mob/living))
+ var/mob/living/MM = A
+ if(MM.client)
+ MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is."
+ return
-// else if(ticker.mode.name == "extended"||ticker.mode.name == "sandbox") Sandbox_Spacemove(A)
+ var/move_to_z_str = pickweight(accessable_z_levels)
- else
- if (src.x <= 2 || A.x >= (world.maxx - 1) || src.y <= 2 || A.y >= (world.maxy - 1))
- if(istype(A, /obj/effect/meteor)||istype(A, /obj/effect/space_dust))
- del(A)
- return
+ var/move_to_z = text2num(move_to_z_str)
- if(!isemptylist(A.search_contents_for(/obj/item/weapon/disk/nuclear)))
- if(istype(A, /mob/living))
- var/mob/living/MM = A
- if(MM.client)
- MM << "\red Something you are carrying is preventing you from leaving. Don't play stupid; you know exactly what it is."
- return
+ if(!move_to_z)
+ return
+ A.z = move_to_z
+ if(src.x <= TRANSITIONEDGE)
+ A.x = world.maxx - TRANSITIONEDGE - 2
- var/move_to_z_str = pickweight(accessable_z_levels)
+ else if (A.x >= (world.maxx - TRANSITIONEDGE - 1))
+ A.x = TRANSITIONEDGE + 1
- var/move_to_z = text2num(move_to_z_str)
+ else if (src.y <= TRANSITIONEDGE)
+ A.y = world.maxy - TRANSITIONEDGE -2
- if(!move_to_z)
- return
+ else if (A.y >= (world.maxy - TRANSITIONEDGE - 1))
+ A.y = TRANSITIONEDGE +1
-
-
- A.z = move_to_z
-
-
- if(src.x <= 2)
- A.x = world.maxx - 2
-
- else if (A.x >= (world.maxx - 1))
- A.x = 3
-
- else if (src.y <= 2)
- A.y = world.maxy - 2
-
- else if (A.y >= (world.maxy - 1))
- A.y = 3
-
- spawn (0)
- if ((A && A.loc))
- A.loc.Entered(A)
-
-// if(istype(A, /obj/structure/closet/coffin))
-// coffinhandler.Add(A)
+ spawn (0)
+ if ((A && A.loc))
+ A.loc.Entered(A)
/*
/turf/space/proc/Sandbox_Spacemove(atom/movable/A as mob|obj)
var/cur_x
@@ -1444,7 +1530,7 @@ turf/simulated/floor/return_siding_icon_state()
if ((A && A.loc))
A.loc.Entered(A)
return
-*/
+*/ //Don't touch this either! DMTG
/obj/effect/vaultspawner
var/maxX = 6
var/maxY = 6
diff --git a/code/game/vehicles/airtight/airtight.dm b/code/game/vehicles/airtight/airtight.dm
new file mode 100644
index 00000000000..44ee0fff2b4
--- /dev/null
+++ b/code/game/vehicles/airtight/airtight.dm
@@ -0,0 +1,165 @@
+
+/obj/vehicle/airtight
+ //inner atmos
+ var/use_internal_tank = 0
+ var/internal_tank_valve = ONE_ATMOSPHERE
+ var/obj/machinery/portable_atmospherics/canister/internal_tank
+ var/datum/gas_mixture/cabin_air
+ var/obj/machinery/atmospherics/portables_connector/connected_port = null
+
+ var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature
+ var/datum/global_iterator/pr_give_air //moves air from tank to cabin
+
+
+/obj/vehicle/airtight/New()
+ ..()
+ src.add_airtank()
+ src.add_cabin()
+ src.add_airtight_iterators()
+
+
+
+
+//######################################### Helpers for airtight vehicles #########################################
+
+/obj/vehicle/airtight/proc/add_cabin()
+ cabin_air = new
+ cabin_air.temperature = T20C
+ cabin_air.volume = 200
+ cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ return cabin_air
+
+/obj/vehicle/airtight/proc/add_airtank()
+ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
+ return internal_tank
+
+/obj/vehicle/airtight/proc/add_airtight_iterators()
+ pr_int_temp_processor = new /datum/global_iterator/vehicle_preserve_temp(list(src))
+ pr_give_air = new /datum/global_iterator/vehicle_tank_give_air(list(src))
+
+
+//######################################### Specific datums for airtight vehicles #################################
+
+
+/datum/global_iterator/vehicle_preserve_temp //normalizing cabin air temperature to 20 degrees celsium
+ delay = 20
+
+ process(var/obj/vehicle/airtight/V)
+ if(V.cabin_air && V.cabin_air.return_volume() > 0)
+ var/delta = V.cabin_air.temperature - T20C
+ V.cabin_air.temperature -= max(-10, min(10, round(delta/4,0.1)))
+ return
+
+
+/datum/global_iterator/vehicle_tank_give_air
+ delay = 15
+
+ process(var/obj/vehicle/airtight/V)
+ if(V.internal_tank)
+ var/datum/gas_mixture/tank_air = V.internal_tank.return_air()
+ var/datum/gas_mixture/cabin_air = V.cabin_air
+
+ var/release_pressure = V.internal_tank_valve
+ var/cabin_pressure = cabin_air.return_pressure()
+ var/pressure_delta = min(release_pressure - cabin_pressure, (tank_air.return_pressure() - cabin_pressure)/2)
+ var/transfer_moles = 0
+ if(pressure_delta > 0) //cabin pressure lower than release pressure
+ if(tank_air.return_temperature() > 0)
+ transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+ var/datum/gas_mixture/removed = tank_air.remove(transfer_moles)
+ cabin_air.merge(removed)
+ else if(pressure_delta < 0) //cabin pressure higher than release pressure
+ var/datum/gas_mixture/t_air = V.get_turf_air()
+ pressure_delta = cabin_pressure - release_pressure
+ if(t_air)
+ pressure_delta = min(cabin_pressure - t_air.return_pressure(), pressure_delta)
+ if(pressure_delta > 0) //if location pressure is lower than cabin pressure
+ transfer_moles = pressure_delta*cabin_air.return_volume()/(cabin_air.return_temperature() * R_IDEAL_GAS_EQUATION)
+ var/datum/gas_mixture/removed = cabin_air.remove(transfer_moles)
+ if(t_air)
+ t_air.merge(removed)
+ else //just delete the cabin gas, we're in space or some shit
+ del(removed)
+ else
+ return stop()
+ return
+
+
+//######################################### Atmospherics for vehicles #############################################
+
+
+/obj/vehicle/proc/get_turf_air()
+ var/turf/T = get_turf(src)
+ if(T)
+ . = T.return_air()
+ return
+
+/obj/vehicle/airtight/remove_air(amount)
+ if(use_internal_tank)
+ return cabin_air.remove(amount)
+ else
+ var/turf/T = get_turf(src)
+ if(T)
+ return T.remove_air(amount)
+ return
+
+/obj/vehicle/airtight/return_air()
+ if(use_internal_tank)
+ return cabin_air
+ return get_turf_air()
+
+/obj/vehicle/airtight/proc/return_pressure()
+ . = 0
+ if(use_internal_tank)
+ . = cabin_air.return_pressure()
+ else
+ var/datum/gas_mixture/t_air = get_turf_air()
+ if(t_air)
+ . = t_air.return_pressure()
+ return
+
+
+/obj/vehicle/airtight/proc/return_temperature()
+ . = 0
+ if(use_internal_tank)
+ . = cabin_air.return_temperature()
+ else
+ var/datum/gas_mixture/t_air = get_turf_air()
+ if(t_air)
+ . = t_air.return_temperature()
+ return
+
+/obj/vehicle/airtight/proc/connect(obj/machinery/atmospherics/portables_connector/new_port)
+ //Make sure not already connected to something else
+ if(connected_port || !new_port || new_port.connected_device)
+ return 0
+
+ //Make sure are close enough for a valid connection
+ if(new_port.loc != src.loc)
+ return 0
+
+ //Perform the connection
+ connected_port = new_port
+ connected_port.connected_device = src
+
+ //Actually enforce the air sharing
+ var/datum/pipe_network/network = connected_port.return_network(src)
+ if(network && !(internal_tank.return_air() in network.gases))
+ network.gases += internal_tank.return_air()
+ network.update = 1
+ log_message("Vehicle airtank connected to external port.")
+ return 1
+
+/obj/vehicle/airtight/proc/disconnect()
+ if(!connected_port)
+ return 0
+
+ var/datum/pipe_network/network = connected_port.return_network(src)
+ if(network)
+ network.gases -= internal_tank.return_air()
+
+ connected_port.connected_device = null
+ connected_port = null
+ src.log_message("Vehicle airtank disconnected from external port.")
+ return 1
\ No newline at end of file
diff --git a/code/game/vehicles/airtight/land.dm b/code/game/vehicles/airtight/land.dm
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/game/vehicles/airtight/space.dm b/code/game/vehicles/airtight/space.dm
new file mode 100644
index 00000000000..e69de29bb2d
diff --git a/code/game/vehicles/vehicle.dm b/code/game/vehicles/vehicle.dm
new file mode 100644
index 00000000000..87d40b69303
--- /dev/null
+++ b/code/game/vehicles/vehicle.dm
@@ -0,0 +1,190 @@
+
+
+/obj/vehicle
+ name = "Vehicle"
+ icon = 'vehicles.dmi'
+ density = 1
+ anchored = 1
+ unacidable = 1 //To avoid the pilot-deleting shit that came with mechas
+ layer = MOB_LAYER
+ //var/can_move = 1
+ var/mob/living/carbon/occupant = null
+ //var/step_in = 10 //make a step in step_in/10 sec.
+ //var/dir_in = 2//What direction will the mech face when entered/powered on? Defaults to South.
+ //var/step_energy_drain = 10
+ var/health = 300 //health is health
+ //var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act.
+ //the values in this list show how much damage will pass through, not how much will be absorbed.
+ var/list/damage_absorption = list("brute"=0.8,"fire"=1.2,"bullet"=0.9,"laser"=1,"energy"=1,"bomb"=1)
+ var/obj/item/weapon/cell/cell //Our power source
+ var/state = 0
+ var/list/log = new
+ var/last_message = 0
+ var/add_req_access = 1
+ var/maint_access = 1
+ //var/dna //dna-locking the mech
+ var/list/proc_res = list() //stores proc owners, like proc_res["functionname"] = owner reference
+ var/datum/effect/effect/system/spark_spread/spark_system = new
+ var/lights = 0
+ var/lights_power = 6
+
+ //inner atmos //These go in airtight.dm, not all vehicles are space-faring -Agouri
+ //var/use_internal_tank = 0
+ //var/internal_tank_valve = ONE_ATMOSPHERE
+ //var/obj/machinery/portable_atmospherics/canister/internal_tank
+ //var/datum/gas_mixture/cabin_air
+ //var/obj/machinery/atmospherics/portables_connector/connected_port = null
+
+ var/obj/item/device/radio/radio = null
+
+ var/max_temperature = 2500
+ //var/internal_damage_threshold = 50 //health percentage below which internal damage is possible
+ var/internal_damage = 0 //contains bitflags
+
+ var/list/operation_req_access = list()//required access level for mecha operation
+ var/list/internals_req_access = list(access_engine,access_robotics)//required access level to open cell compartment
+
+ //var/datum/global_iterator/pr_int_temp_processor //normalizes internal air mixture temperature //In airtight.dm you go -Agouri
+ var/datum/global_iterator/pr_inertial_movement //controls intertial movement in spesss
+
+ //var/datum/global_iterator/pr_give_air //moves air from tank to cabin //Y-you too -Agouri
+
+ var/datum/global_iterator/pr_internal_damage //processes internal damage
+
+
+ var/wreckage
+
+ var/list/equipment = new
+ var/obj/selected
+ //var/max_equip = 3
+
+ var/datum/events/events
+
+
+
+/obj/vehicle/New()
+ ..()
+ events = new
+ icon_state += "-unmanned"
+ add_radio()
+ //add_cabin() //No cabin for non-airtights
+
+ spark_system.set_up(2, 0, src)
+ spark_system.attach(src)
+ add_cell()
+ add_iterators()
+ removeVerb(/obj/mecha/verb/disconnect_from_port)
+ removeVerb(/atom/movable/verb/pull)
+ log_message("[src.name]'s functions initialised. Work protocols active - Entering IDLE mode.")
+ loc.Entered(src)
+ return
+
+
+//################ Helpers ###########################################################
+
+
+/obj/vehicle/proc/removeVerb(verb_path)
+ verbs -= verb_path
+
+/obj/vehicle/proc/addVerb(verb_path)
+ verbs += verb_path
+
+/*/obj/vehicle/proc/add_airtank() //In airtight.dm -Agouri
+ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src)
+ return internal_tank*/
+
+/obj/vehicle/proc/add_cell(var/obj/item/weapon/cell/C=null)
+ if(C)
+ C.forceMove(src)
+ cell = C
+ return
+ cell = new(src)
+ cell.charge = 15000
+ cell.maxcharge = 15000
+
+/*/obj/vehicle/proc/add_cabin() //In airtight.dm -Agouri
+ cabin_air = new
+ cabin_air.temperature = T20C
+ cabin_air.volume = 200
+ cabin_air.oxygen = O2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ cabin_air.nitrogen = N2STANDARD*cabin_air.volume/(R_IDEAL_GAS_EQUATION*cabin_air.temperature)
+ return cabin_air*/
+
+/obj/vehicle/proc/add_radio()
+ radio = new(src)
+ radio.name = "[src] radio"
+ radio.icon = icon
+ radio.icon_state = icon_state
+ radio.subspace_transmission = 1
+
+/obj/vehicle/proc/add_iterators()
+ pr_inertial_movement = new /datum/global_iterator/vehicle_intertial_movement(null,0)
+ //pr_internal_damage = new /datum/global_iterator/vehicle_internal_damage(list(src),0)
+ //pr_int_temp_processor = new /datum/global_iterator/vehicle_preserve_temp(list(src)) //In airtight.dm's add_airtight_iterators -Agouri
+ //pr_give_air = new /datum/global_iterator/vehicle_tank_give_air(list(src) //Same here -Agouri
+
+/obj/vehicle/proc/check_for_support()
+ if(locate(/obj/structure/grille, orange(1, src)) || locate(/obj/structure/lattice, orange(1, src)) || locate(/turf/simulated, orange(1, src)) || locate(/turf/unsimulated, orange(1, src)))
+ return 1
+ else
+ return 0
+
+//################ Logs and messages ############################################
+
+
+/obj/vehicle/proc/log_message(message as text,red=null)
+ log.len++
+ log[log.len] = list("time"=world.timeofday,"message"="[red?"":null][message][red?"":null]")
+ return log.len
+
+
+
+//################ Global Iterator Datums ######################################
+
+
+/datum/global_iterator/vehicle_intertial_movement //inertial movement in space
+ delay = 7
+
+ process(var/obj/vehicle/V as obj, direction)
+ if(direction)
+ if(!step(V, direction)||V.check_for_support())
+ src.stop()
+ else
+ src.stop()
+ return
+
+
+/datum/global_iterator/mecha_internal_damage // processing internal damage
+
+ process(var/obj/mecha/mecha)
+ if(!mecha.hasInternalDamage())
+ return stop()
+ if(mecha.hasInternalDamage(MECHA_INT_FIRE))
+ if(!mecha.hasInternalDamage(MECHA_INT_TEMP_CONTROL) && prob(5))
+ mecha.clearInternalDamage(MECHA_INT_FIRE)
+ if(mecha.internal_tank)
+ if(mecha.internal_tank.return_pressure()>mecha.internal_tank.maximum_pressure && !(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH)))
+ mecha.setInternalDamage(MECHA_INT_TANK_BREACH)
+ var/datum/gas_mixture/int_tank_air = mecha.internal_tank.return_air()
+ if(int_tank_air && int_tank_air.return_volume()>0) //heat the air_contents
+ int_tank_air.temperature = min(6000+T0C, int_tank_air.temperature+rand(10,15))
+ if(mecha.cabin_air && mecha.cabin_air.return_volume()>0)
+ mecha.cabin_air.temperature = min(6000+T0C, mecha.cabin_air.return_temperature()+rand(10,15))
+ if(mecha.cabin_air.return_temperature()>mecha.max_temperature/2)
+ mecha.take_damage(4/round(mecha.max_temperature/mecha.cabin_air.return_temperature(),0.1),"fire")
+ if(mecha.hasInternalDamage(MECHA_INT_TEMP_CONTROL)) //stop the mecha_preserve_temp loop datum
+ mecha.pr_int_temp_processor.stop()
+ if(mecha.hasInternalDamage(MECHA_INT_TANK_BREACH)) //remove some air from internal tank
+ if(mecha.internal_tank)
+ var/datum/gas_mixture/int_tank_air = mecha.internal_tank.return_air()
+ var/datum/gas_mixture/leaked_gas = int_tank_air.remove_ratio(0.10)
+ if(mecha.loc && hascall(mecha.loc,"assume_air"))
+ mecha.loc.assume_air(leaked_gas)
+ else
+ del(leaked_gas)
+ if(mecha.hasInternalDamage(MECHA_INT_SHORT_CIRCUIT))
+ if(mecha.get_charge())
+ mecha.spark_system.start()
+ mecha.cell.charge -= min(20,mecha.cell.charge)
+ mecha.cell.maxcharge -= min(20,mecha.cell.maxcharge)
+ return
\ No newline at end of file
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 7b0822212c1..71811b312da 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -12,9 +12,9 @@ var/global/BSACooldown = 0
else
M << rendered
+
/obj/admins/Topic(href, href_list)
..()
-
if (usr.client != src.owner)
world << "\blue [usr.key] has attempted to override the admin panel!"
log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
@@ -31,7 +31,7 @@ var/global/BSACooldown = 0
if ((!( ticker ) || emergency_shuttle.location))
return
emergency_shuttle.incall()
- world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes."
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
@@ -41,12 +41,11 @@ var/global/BSACooldown = 0
switch(emergency_shuttle.direction)
if(-1)
emergency_shuttle.incall()
- world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes."
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
if(1)
emergency_shuttle.recall()
- world << "\blue Alert: The shuttle is going back!"
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
message_admins("\blue [key_name_admin(usr)] sent the Emergency Shuttle back", 1)
@@ -59,6 +58,7 @@ var/global/BSACooldown = 0
if (src.rank in list("Badmin", "Game Admin", "Game Master"))
emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num )
log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1)
href_list["secretsadmin"] = "check_antagonist"
else
@@ -1372,11 +1372,19 @@ var/global/BSACooldown = 0
else
alert("You are not a high enough administrator! Sorry!!!!")
+ if (href_list["quick_create_object"])
+ if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
+ return quick_create_object(usr)
+ else
+ alert("You are not a high enough administrator! Sorry!!!!")
+
+
if (href_list["create_turf"])
if (src.rank in list("Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master"))
return create_turf(usr)
else
alert("You are not a high enough administrator! Sorry!!!!")
+
if (href_list["create_mob"])
if (src.rank in list("Badmin", "Game Admin", "Game Master"))
return create_mob(usr)
@@ -2519,6 +2527,7 @@ var/global/BSACooldown = 0
if(lvl >= 3 )
dat += "Create Object "
+ dat += "Quick Create Object "
dat += "Create Turf "
if(lvl >= 5)
dat += "Create Mob "
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index c330f574512..ae551810a05 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -50,13 +50,9 @@
if ("Trial Admin")
holder.level = 3
if(holder.state == 2) // if observing
- // Debug
verbs += /client/proc/debug_variables
verbs += /client/proc/cmd_modify_ticker_variables
- verbs += /client/proc/toggleadminhelpsound
- // Admin helpers
verbs += /client/proc/toggle_view_range
- // Admin game intrusion
verbs += /client/proc/Getmob
verbs += /client/proc/Getkey
verbs += /client/proc/sendmob
@@ -65,6 +61,7 @@
verbs += /client/proc/jumptomob
verbs += /client/proc/jumptoturf
verbs += /client/proc/jumptocoord
+ verbs += /client/proc/cmd_admin_delete
verbs += /client/proc/cmd_admin_add_freeform_ai_law
verbs += /client/proc/cmd_admin_rejuvenate
verbs += /client/proc/cmd_admin_drop_everything
@@ -74,12 +71,9 @@
holder.level = 2
if(holder.state == 2) // if observing
deadchat = 1
- // Settings
verbs += /obj/admins/proc/toggleaban //abandon mob
verbs += /client/proc/deadchat //toggles deadchat
- // Admin helpers
verbs += /client/proc/cmd_admin_check_contents
- // Admin game intrusion
verbs += /client/proc/Jump
verbs += /client/proc/jumptokey
verbs += /client/proc/jumptomob
@@ -121,6 +115,8 @@
//Moderator
if (holder.level >= 0)
+ verbs += /obj/admins/proc/announce
+ verbs += /obj/admins/proc/startnow
verbs += /obj/admins/proc/toggleAI //Toggle the AI
verbs += /obj/admins/proc/toggleenter //Toggle enterting
// verbs += /obj/admins/proc/toggleguests //Toggle guests entering
@@ -136,8 +132,6 @@
verbs += /client/proc/cmd_admin_pm_panel
verbs += /client/proc/cmd_admin_subtle_message
verbs += /client/proc/warn
- verbs += /obj/admins/proc/announce
- verbs += /obj/admins/proc/startnow
verbs += /client/proc/dsay
verbs += /client/proc/admin_play
verbs += /client/proc/admin_observe
@@ -185,6 +179,8 @@
deadchat = 1
seeprayers = 1
+ verbs += /obj/admins/proc/view_txt_log
+ verbs += /obj/admins/proc/view_atk_log
verbs += /obj/admins/proc/toggleaban //abandon mob
verbs += /obj/admins/proc/show_traitor_panel
verbs += /client/proc/cmd_admin_remove_plasma
@@ -195,6 +191,8 @@
verbs += /client/proc/spawn_xeno
verbs += /client/proc/toggleprayers
verbs += /client/proc/deadmin_self
+ verbs += /client/proc/tension_report
+ verbs += /client/proc/toggleadminhelpsound
verbs += /proc/possess
verbs += /proc/release
verbs += /client/proc/admin_deny_shuttle
@@ -229,15 +227,12 @@
//verbs += /proc/togglebuildmode --Merged with view variables
//verbs += /client/proc/cmd_modify_object_variables --Merged with view variables
verbs += /client/proc/togglebuildmodeself
- verbs += /client/proc/tension_report
- verbs += /client/proc/toggleadminhelpsound
+
else return
//Game Admin
if (holder.level >= 5)
verbs += /obj/admins/proc/spawn_atom
- verbs += /obj/admins/proc/view_txt_log
- verbs += /obj/admins/proc/view_atk_log
verbs += /client/proc/cmd_admin_list_open_jobs
verbs += /client/proc/cmd_admin_direct_narrate
verbs += /client/proc/colorooc
@@ -249,6 +244,7 @@
verbs += /client/proc/check_words
verbs += /client/proc/drop_bomb
verbs += /client/proc/cmd_admin_grantfullaccess
+ verbs += /client/proc/kill_airgroup
verbs += /client/proc/cmd_admin_drop_everything
verbs += /client/proc/make_sound
verbs += /client/proc/play_local_sound
@@ -265,6 +261,7 @@
//verbs += /client/proc/cmd_admin_emp --Merged with view variables
//verbs += /client/proc/give_spell --Merged with view variables
//verbs += /client/proc/cmd_admin_ninjafy --Merged with view variables
+ //verbs += /client/proc/cmd_switch_radio --removed as tcommsat is staying
// Moved over from tg's Game Master:
verbs += /obj/admins/proc/toggle_aliens //toggle aliens
verbs += /obj/admins/proc/toggle_space_ninja //toggle ninjas
@@ -386,7 +383,8 @@
verbs -= /client/proc/cmd_admin_create_centcom_report
verbs -= /client/proc/deadchat //toggles deadchat
verbs -= /client/proc/cmd_admin_mute
- verbs -= /client/proc/cmd_admin_pm
+ verbs -= /client/proc/cmd_admin_pm_context
+ verbs -= /client/proc/cmd_admin_pm_panel
verbs -= /client/proc/cmd_admin_say
verbs -= /client/proc/cmd_admin_subtle_message
verbs -= /client/proc/warn
@@ -446,6 +444,7 @@
//verbs -= /obj/admins/proc/unprison --Merged with player panel
//verbs -= /client/proc/cmd_switch_radio --removed because tcommsat is staying
verbs -= /client/proc/togglebuildmodeself
+ verbs -= /client/proc/kill_airgroup
verbs -= /client/proc/admin_deny_shuttle
verbs -= /client/proc/cmd_admin_christmas
verbs -= /client/proc/editappear
diff --git a/code/modules/admin/create_mob.dm b/code/modules/admin/create_mob.dm
index c15d9a7e997..a1b579a0c61 100644
--- a/code/modules/admin/create_mob.dm
+++ b/code/modules/admin/create_mob.dm
@@ -4,6 +4,7 @@
var/mobjs = null
mobjs = dd_list2text(typesof(/mob), ";")
create_mob_html = file2text('create_object.html')
+ create_mob_html = dd_replacetext(create_mob_html, "Create Object", "Create Mob")
create_mob_html = dd_replacetext(create_mob_html, "null /* object types */", "\"[mobjs]\"")
user << browse(dd_replacetext(create_mob_html, "/* ref src */", "\ref[src]"), "window=create_mob;size=425x475")
diff --git a/code/modules/admin/create_object.dm b/code/modules/admin/create_object.dm
index 944ab89c7a6..248eebb5ab9 100644
--- a/code/modules/admin/create_object.dm
+++ b/code/modules/admin/create_object.dm
@@ -1,4 +1,5 @@
/var/create_object_html = null
+
/obj/admins/proc/create_object(var/mob/user)
if (!create_object_html)
var/objectjs = null
@@ -7,3 +8,21 @@
create_object_html = dd_replacetext(create_object_html, "null /* object types */", "\"[objectjs]\"")
user << browse(dd_replacetext(create_object_html, "/* ref src */", "\ref[src]"), "window=create_object;size=425x475")
+
+
+/obj/admins/proc/quick_create_object(var/mob/user)
+
+ var/quick_create_object_html = null
+ var/pathtext = null
+
+ pathtext = input("Select the path of the object you wish to create.", "Path", "/obj") in list("/obj","/obj/structure","/obj/item","/obj/machinery")
+
+ var path = text2path(pathtext)
+
+ if (!quick_create_object_html)
+ var/objectjs = null
+ objectjs = dd_list2text(typesof(path), ";")
+ quick_create_object_html = file2text('create_object.html')
+ quick_create_object_html = dd_replacetext(quick_create_object_html, "null /* object types */", "\"[objectjs]\"")
+
+ user << browse(dd_replacetext(quick_create_object_html, "/* ref src */", "\ref[src]"), "window=quick_create_object;size=425x475")
\ No newline at end of file
diff --git a/code/modules/admin/create_turf.dm b/code/modules/admin/create_turf.dm
index be5fdd1e0b9..6ae15354e59 100644
--- a/code/modules/admin/create_turf.dm
+++ b/code/modules/admin/create_turf.dm
@@ -4,6 +4,7 @@
var/turfjs = null
turfjs = dd_list2text(typesof(/turf), ";")
create_turf_html = file2text('create_object.html')
+ create_turf_html = dd_replacetext(create_turf_html, "Create Object", "Create Turf")
create_turf_html = dd_replacetext(create_turf_html, "null /* object types */", "\"[turfjs]\"")
user << browse(dd_replacetext(create_turf_html, "/* ref src */", "\ref[src]"), "window=create_turf;size=425x475")
diff --git a/code/modules/admin/new/admin.dm b/code/modules/admin/new/admin.dm
new file mode 100644
index 00000000000..3a31687261f
--- /dev/null
+++ b/code/modules/admin/new/admin.dm
@@ -0,0 +1,3048 @@
+
+var/global/BSACooldown = 0
+
+
+////////////////////////////////
+/proc/message_admins(var/text, var/admin_ref = 0)
+ var/rendered = "ADMIN LOG:[text]"
+ log_adminwarn(rendered)
+ for (var/mob/M in world)
+ if (M && M.client && M.client.holder && M.client.authenticated)
+ if (admin_ref)
+ M << dd_replaceText(rendered, "%admin_ref%", "\ref[M]")
+ else
+ M << rendered
+
+
+/obj/admins/Topic(href, href_list)
+ ..()
+ if (usr.client != src.owner)
+ world << "\blue [usr.key] has attempted to override the admin panel!"
+ log_admin("[key_name(usr)] tried to use the admin panel without authorization.")
+ return
+
+ if(href_list["call_shuttle"])
+ if (src.rank in list("Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ if( ticker.mode.name == "blob" )
+ alert("You can't call the shuttle during blob!")
+ return
+ switch(href_list["call_shuttle"])
+ if("1")
+ if ((!( ticker ) || emergency_shuttle.location))
+ return
+ emergency_shuttle.incall()
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+ log_admin("[key_name(usr)] called the Emergency Shuttle")
+ message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
+
+ if("2")
+ if ((!( ticker ) || emergency_shuttle.location || emergency_shuttle.direction == 0))
+ return
+ switch(emergency_shuttle.direction)
+ if(-1)
+ emergency_shuttle.incall()
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+ log_admin("[key_name(usr)] called the Emergency Shuttle")
+ message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1)
+ if(1)
+ emergency_shuttle.recall()
+ log_admin("[key_name(usr)] sent the Emergency Shuttle back")
+ message_admins("\blue [key_name_admin(usr)] sent the Emergency Shuttle back", 1)
+
+ href_list["secretsadmin"] = "check_antagonist"
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if(href_list["edit_shuttle_time"])
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num )
+ log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]")
+ captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.")
+ message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1)
+ href_list["secretsadmin"] = "check_antagonist"
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ /////////////////////////////////////new ban stuff
+ if(href_list["unbanf"])
+ var/banfolder = href_list["unbanf"]
+ Banlist.cd = "/base/[banfolder]"
+ var/key = Banlist["key"]
+ if(alert(usr, "Are you sure you want to unban [key]?", "Confirmation", "Yes", "No") == "Yes")
+ if (RemoveBan(banfolder))
+ unbanpanel()
+ else
+ alert(usr,"This ban has already been lifted / does not exist.","Error","Ok")
+ unbanpanel()
+
+ if(href_list["unbane"])
+ UpdateTime()
+ var/reason
+ var/mins = 0
+ var/banfolder = href_list["unbane"]
+ Banlist.cd = "/base/[banfolder]"
+ var/reason2 = Banlist["reason"]
+ var/temp = Banlist["temp"]
+ var/minutes = (Banlist["minutes"] - CMinutes)
+ if(!minutes || minutes < 0) minutes = 0
+ var/banned_key = Banlist["key"]
+ Banlist.cd = "/base"
+
+ switch(alert("Temporary Ban?",,"Yes","No"))
+ if("Yes")
+ temp = 1
+ mins = input(usr,"How long (in minutes)? (Default: 1440)","Ban time",minutes ? minutes : 1440) as num
+ if(!mins)
+ return
+ if(mins >= 525600) mins = 525599
+ reason = input(usr,"Reason?","reason",reason2) as text
+ if(!reason)
+ return
+ if("No")
+ temp = 0
+ reason = input(usr,"Reason?","reason",reason2) as text
+ if(!reason)
+ return
+
+ log_admin("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetExp(mins)]")
+
+ ban_unban_log_save("[key_name(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetExp(mins)]")
+ message_admins("\blue [key_name_admin(usr)] edited [banned_key]'s ban. Reason: [reason] Duration: [GetExp(mins)]", 1)
+ Banlist.cd = "/base/[banfolder]"
+ Banlist["reason"] << reason
+ Banlist["temp"] << temp
+ Banlist["minutes"] << (mins + CMinutes)
+ Banlist["bannedby"] << usr.ckey
+ Banlist.cd = "/base"
+ feedback_inc("ban_edit",1)
+ unbanpanel()
+
+ /////////////////////////////////////new ban stuff
+
+ if(href_list["jobban2"])
+ var/mob/M = locate(href_list["jobban2"])
+ if(!M) //sanity
+ alert("Mob no longer exists!")
+ return
+ if(!M.ckey) //sanity
+ alert("Mob has no ckey")
+ return
+ if(!job_master)
+ usr << "Job Master has not been setup!"
+ return
+ var/dat = ""
+ var/header = "Job-Ban Panel: [M.name]"
+ var/body
+ var/jobs = ""
+
+ /***********************************WARNING!************************************
+ The jobban stuff looks mangled and disgusting
+ But it looks beautiful in-game
+ -Nodrak
+ ************************************WARNING!***********************************/
+ var/counter = 0
+//Regular jobs
+ //Command (Blue)
+ jobs += "
"
+
+ body = "[jobs]"
+ dat = "[header][body]"
+ usr << browse(dat, "window=jobban2;size=800x450")
+ return
+
+ //JOBBAN'S INNARDS
+ if(href_list["jobban3"])
+ if (src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" ))
+ var/mob/M = locate(href_list["jobban4"])
+ if(!M)
+ alert("Mob no longer exists!")
+ return
+ if ((M.client && M.client.holder && (M.client.holder.level > src.level)))
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if(!job_master)
+ usr << "Job Master has not been setup!"
+ return
+
+ //get jobs for department if specified, otherwise just returnt he one job in a list.
+ var/list/joblist = list()
+ switch(href_list["jobban3"])
+ if("commanddept")
+ for(var/jobPos in command_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("securitydept")
+ for(var/jobPos in security_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("engineeringdept")
+ for(var/jobPos in engineering_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("medicaldept")
+ for(var/jobPos in medical_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("sciencedept")
+ for(var/jobPos in science_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("civiliandept")
+ for(var/jobPos in civilian_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ if("nonhumandept")
+ joblist += "pAI"
+ for(var/jobPos in nonhuman_positions)
+ if(!jobPos) continue
+ var/datum/job/temp = job_master.GetJob(jobPos)
+ if(!temp) continue
+ joblist += temp.title
+ else
+ joblist += href_list["jobban3"]
+
+ //Create a list of unbanned jobs within joblist
+ var/list/notbannedlist = list()
+ for(var/job in joblist)
+ if(!jobban_isbanned(M, job))
+ notbannedlist += job
+
+ //Banning comes first
+ if(notbannedlist.len) //at least 1 unbanned job exists in joblist so we have stuff to ban.
+ var/reason = input(usr,"Reason?","Please State Reason","") as text|null
+ if(reason)
+ var/msg
+ for(var/job in notbannedlist)
+ ban_unban_log_save("[key_name(usr)] jobbanned [key_name(M)] from [job]. reason: [reason]")
+ log_admin("[key_name(usr)] banned [key_name(M)] from [job]")
+ feedback_inc("ban_job",1)
+ feedback_add_details("ban_job","- [job]")
+ jobban_fullban(M, job, reason)
+ if(!msg) msg = job
+ else msg += ", [job]"
+ message_admins("\blue [key_name_admin(usr)] banned [key_name_admin(M)] from [msg]", 1)
+ M << "\redYou have been jobbanned by [usr.client.ckey] from: [msg]."
+ M << "\red The reason is: [reason]"
+ M << "\red Jobban can be lifted only upon request."
+ href_list["jobban2"] = 1 // lets it fall through and refresh
+ return 1
+
+ //Unbanning joblist
+ //all jobs in joblist are banned already OR we didn't give a reason (implying they shouldn't be banned)
+ if(joblist.len) //at least 1 banned job exists in joblist so we have stuff to unban.
+ var/msg
+ for(var/job in joblist)
+ var/reason = jobban_isbanned(M, job)
+ if(!reason) continue //skip if it isn't jobbanned anyway
+ switch(alert("Job: '[job]' Reason: '[reason]' Un-jobban?","Please Confirm","Yes","No"))
+ if("Yes")
+ ban_unban_log_save("[key_name(usr)] unjobbanned [key_name(M)] from [job]")
+ log_admin("[key_name(usr)] unbanned [key_name(M)] from [job]")
+ feedback_inc("ban_job_unban",1)
+ feedback_add_details("ban_job_unban","- [job]")
+ jobban_unban(M, job)
+ if(!msg) msg = job
+ else msg += ", [job]"
+ else
+ continue
+ if(msg)
+ message_admins("\blue [key_name_admin(usr)] unbanned [key_name_admin(M)] from [msg]", 1)
+ M << "\redYou have been un-jobbanned by [usr.client.ckey] from [msg]."
+ href_list["jobban2"] = 1 // lets it fall through and refresh
+ return 1
+ return 0 //we didn't do anything!
+
+ if (href_list["boot2"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["boot2"])
+ if (ismob(M))
+ if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+ M << "\red You have been kicked from the server"
+ log_admin("[key_name(usr)] booted [key_name(M)].")
+ message_admins("\blue [key_name_admin(usr)] booted [key_name_admin(M)].", 1)
+ //M.client = null
+ del(M.client)
+
+ if (href_list["removejobban"])
+ if ((src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/t = href_list["removejobban"]
+ if(t)
+ log_admin("[key_name(usr)] removed [t]")
+ message_admins("\blue [key_name_admin(usr)] removed [t]", 1)
+ jobban_remove(t)
+ href_list["ban"] = 1 // lets it fall through and refresh
+
+ if (href_list["newban"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["newban"])
+ if(!ismob(M)) return
+ if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ switch(alert("Temporary Ban?",,"Yes","No", "Cancel"))
+ if("Yes")
+ var/mins = input(usr,"How long (in minutes)?","Ban time",1440) as num|null
+ if(!mins)
+ return
+ if(mins >= 525600) mins = 525599
+ var/reason = input(usr,"Reason?","reason","Griefer") as text|null
+ if(!reason)
+ return
+ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 1, mins)
+ ban_unban_log_save("[usr.client.ckey] has banned [M.ckey]. - Reason: [reason] - This will be removed in [mins] minutes.")
+ M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]."
+ M << "\red This is a temporary ban, it will be removed in [mins] minutes."
+ feedback_inc("ban_tmp",1)
+ feedback_inc("ban_tmp_mins",mins)
+ if(config.banappeals)
+ M << "\red To try to resolve this matter head to [config.banappeals]"
+ else
+ M << "\red No ban appeals URL has been set."
+ log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+ message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+
+ del(M.client)
+ //del(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
+ if("No")
+ var/reason = input(usr,"Reason?","reason","Griefer") as text|null
+ if(!reason)
+ return
+ AddBan(M.ckey, M.computer_id, reason, usr.ckey, 0, 0)
+ M << "\redYou have been banned by [usr.client.ckey].\nReason: [reason]."
+ M << "\red This is a permanent ban."
+ if(config.banappeals)
+ M << "\red To try to resolve this matter head to [config.banappeals]"
+ else
+ M << "\red No ban appeals URL has been set."
+ ban_unban_log_save("[usr.client.ckey] has permabanned [M.ckey]. - Reason: [reason] - This is a permanent ban.")
+ log_admin("[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins("\blue[usr.client.ckey] has banned [M.ckey].\nReason: [reason]\nThis is a permanent ban.")
+ feedback_inc("ban_perma",1)
+
+ del(M.client)
+ //del(M)
+ if("Cancel")
+ return
+ if (href_list["newjobban1"])
+ var/mob/M = locate(href_list["newjobban1"])
+ var/dat = ""
+ var/header = "Pick Job to ban this guy from. "
+ var/body
+// var/list/alljobs = get_all_jobs()
+ var/jobs = ""
+ jobs += "Heads "
+ jobs += "Security "
+ jobs += "Engineering "
+ jobs += "Research "
+ jobs += "Medical
"
+ dat = "[header][body]"
+ usr << browse(dat, "window=jobban2;size=600x250")
+ return
+ if(href_list["newjobban2"])
+ if ((src.rank in list("Moderator", "Administrator", "Badmin", "Tyrant" )))
+ var/mob/M = locate(href_list["jobban4"])
+ var/job = href_list["newjobban2"]
+ if(!ismob(M)) return
+ //if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
+ // alert("You cannot perform this action. You must be of a higher administrative rank!")
+ // return
+ switch(alert("Temporary Ban?",,"Yes","No", "Cancel"))
+ if("Yes")
+ var/mins = input(usr,"How long (in days)?","Ban time",7) as num
+ mins = mins * 24 * 60
+ if(!mins)
+ return
+ if(mins >= 525600) mins = 525599
+ var/reason = input(usr,"Reason?","reason","Griefer") as text
+ if(!reason)
+ return
+ if(AddBanjob(M.ckey, M.computer_id, reason, usr.ckey, 1, mins, job))
+ M << "\redYou have been jobbanned from [job] by [usr.client.ckey].\nReason: [reason]."
+ M << "\red This is a temporary ban, it will be removed in [mins] minutes."
+ if(config.banappeals)
+ M << "\red To try to resolve this matter head to [config.banappeals]"
+ else
+ M << "\red No ban appeals URL has been set."
+ ban_unban_log_save("[usr.client.ckey] has jobbanned [M.ckey] from [job]. - Reason: [reason] - This will be removed in [mins] minutes.")
+ feedback_inc("ban_job",1)
+ feedback_add_details("ban_job","- [job]")
+ log_admin("[usr.client.ckey] has banned [M.ckey] from [job].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+ message_admins("\blue[usr.client.ckey] has banned [M.ckey] from [job].\nReason: [reason]\nThis will be removed in [mins] minutes.")
+
+ //del(M.client)
+ //del(M) // See no reason why to delete mob. Important stuff can be lost. And ban can be lifted before round ends.
+ if("No")
+ var/reason = input(usr,"Reason?","reason","Griefer") as text
+ if(!reason)
+ return
+ if(AddBanjob(M.ckey, M.computer_id, reason, usr.ckey, 0, 0, job))
+ M << "\redYou have been banned from [job] by [usr.client.ckey].\nReason: [reason]."
+ M << "\red This is a permanent ban."
+ if(config.banappeals)
+ M << "\red To try to resolve this matter head to [config.banappeals]"
+ else
+ M << "\red No ban appeals URL has been set."
+ ban_unban_log_save("[usr.client.ckey] has banned [M.ckey] from [job]. - Reason: [reason] - This is a permanent ban.")
+ feedback_inc("ban_job_tmp",1)
+ feedback_add_details("ban_job_tmp","- [job]")
+ log_admin("[usr.client.ckey] has banned [M.ckey] from [job].\nReason: [reason]\nThis is a permanent ban.")
+ message_admins("\blue[usr.client.ckey] has banned [M.ckey] from [job].\nReason: [reason]\nThis is a permanent ban.")
+
+ //del(M.client)
+ //del(M)
+ if("Cancel")
+ return
+
+ if(href_list["unjobbanf"])
+ var/banfolder = href_list["unjobbanf"]
+ Banlist.cd = "/base/[banfolder]"
+ var/key = Banlist["key"]
+ if(alert(usr, "Are you sure you want to unban [key]?", "Confirmation", "Yes", "No") == "Yes")
+ if (RemoveBanjob(banfolder))
+ unjobbanpanel()
+ else
+ alert(usr,"This ban has already been lifted / does not exist.","Error","Ok")
+ unjobbanpanel()
+
+ if(href_list["unjobbane"])
+ return
+/*
+ if (href_list["remove"])
+ if ((src.rank in list( "Admin Candidate", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
+ var/t = href_list["remove"]
+ if(t && isgoon(t))
+ log_admin("[key_name(usr)] removed [t] from the goonlist.")
+ message_admins("\blue [key_name_admin(usr)] removed [t] from the goonlist.")
+ remove_goon(t)
+*/
+ if (href_list["mute2"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["mute2"])
+ if (ismob(M))
+ if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+ if(!M.client)
+ src << "This mob doesn't have a client tied to it."
+ return
+ M.client.muted = !M.client.muted
+ log_admin("[key_name(usr)] has [(M.client.muted ? "muted" : "voiced")] [key_name(M)].")
+ message_admins("\blue [key_name_admin(usr)] has [(M.client.muted ? "muted" : "voiced")] [key_name_admin(M)].", 1)
+ M << "You have been [(M.client.muted ? "muted" : "voiced")]. Please resolve this in adminhelp."
+ if (href_list["mute_complete"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["mute_complete"])
+ if (ismob(M))
+ if ((M.client && M.client.holder && (M.client.holder.level >= src.level)))
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+ if(!M.client)
+ src << "This mob doesn't have a client tied to it."
+ return
+ M.client.muted_complete = !M.client.muted_complete
+ log_admin("[key_name(usr)] has [(M.client.muted_complete ? "completely muted" : "voiced (complete)")] [key_name(M)].")
+ message_admins("\blue [key_name_admin(usr)] has [(M.client.muted_complete ? "completely muted" : "voiced (complete)")] [key_name_admin(M)].", 1)
+ M << "You have been [(M.client.muted_complete ? "completely muted" : "voiced (complete)")]. You are unable to speak or even adminhelp"
+
+ if (href_list["c_mode"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if (ticker && ticker.mode)
+ return alert(usr, "The game has already started.", null, null, null, null)
+ var/dat = {"What mode do you wish to play?"}
+ for (var/mode in config.modes)
+ dat += {"[config.mode_names[mode]] "}
+ dat += {"Secret "}
+ dat += {"Random "}
+ dat += {"Now: [master_mode]"}
+ usr << browse(dat, "window=c_mode")
+
+ if (href_list["f_secret"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if (ticker && ticker.mode)
+ return alert(usr, "The game has already started.", null, null, null, null)
+ if (master_mode != "secret")
+ return alert(usr, "The game mode has to be secret!", null, null, null, null)
+ var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret."}
+ for (var/mode in config.modes)
+ dat += {"[config.mode_names[mode]] "}
+ dat += {"Random (default) "}
+ dat += {"Now: [secret_force_mode]"}
+ usr << browse(dat, "window=f_secret")
+
+ if (href_list["c_mode2"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if (ticker && ticker.mode)
+ return alert(usr, "The game has already started.", null, null, null, null)
+ master_mode = href_list["c_mode2"]
+ log_admin("[key_name(usr)] set the mode as [master_mode].")
+ message_admins("\blue [key_name_admin(usr)] set the mode as [master_mode].", 1)
+ world << "\blue The mode is now: [master_mode]"
+ Game() // updates the main game menu
+ world.save_mode(master_mode)
+ .(href, list("c_mode"=1))
+
+ if (href_list["f_secret2"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if (ticker && ticker.mode)
+ return alert(usr, "The game has already started.", null, null, null, null)
+ if (master_mode != "secret")
+ return alert(usr, "The game mode has to be secret!", null, null, null, null)
+ secret_force_mode = href_list["f_secret2"]
+ log_admin("[key_name(usr)] set the forced secret mode as [secret_force_mode].")
+ message_admins("\blue [key_name_admin(usr)] set the forced secret mode as [secret_force_mode].", 1)
+ Game() // updates the main game menu
+ .(href, list("f_secret"=1))
+
+ if (href_list["monkeyone"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["monkeyone"])
+ if(!ismob(M))
+ return
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/N = M
+ log_admin("[key_name(usr)] attempting to monkeyize [key_name(M)]")
+ message_admins("\blue [key_name_admin(usr)] attempting to monkeyize [key_name_admin(M)]", 1)
+ N.monkeyize()
+ if(istype(M, /mob/living/silicon))
+ alert("The AI can't be monkeyized!", null, null, null, null, null)
+ return
+
+ if (href_list["corgione"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["corgione"])
+ if(!ismob(M))
+ return
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/N = M
+ log_admin("[key_name(usr)] attempting to corgize [key_name(M)]")
+ message_admins("\blue [key_name_admin(usr)] attempting to corgize [key_name_admin(M)]", 1)
+ N.corgize()
+ if(istype(M, /mob/living/silicon))
+ alert("The AI can't be corgized!", null, null, null, null, null)
+ return
+
+ if (href_list["forcespeech"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["forcespeech"])
+ if (ismob(M))
+ var/speech = input("What will [key_name(M)] say?.", "Force speech", "")
+ if(!speech)
+ return
+ M.say(speech)
+ speech = copytext(sanitize(speech), 1, MAX_MESSAGE_LEN)
+ log_admin("[key_name(usr)] forced [key_name(M)] to say: [speech]")
+ message_admins("\blue [key_name_admin(usr)] forced [key_name_admin(M)] to say: [speech]")
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+
+ if (href_list["sendtoprison"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["sendtoprison"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to prison you jerk!", null, null, null, null, null)
+ return
+ //strip their stuff before they teleport into a cell :downs:
+ for(var/obj/item/weapon/W in M)
+ if(istype(W, /datum/organ/external))
+ continue
+ //don't strip organs
+ M.u_equip(W)
+ if (M.client)
+ M.client.screen -= W
+ if (W)
+ W.loc = M.loc
+ W.dropped(M)
+ W.layer = initial(W.layer)
+ //teleport person to cell
+ M.Paralyse(5)
+ sleep(5) //so they black out before warping
+ M.loc = pick(prisonwarp)
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/prisoner = M
+ prisoner.equip_if_possible(new /obj/item/clothing/under/color/orange(prisoner), prisoner.slot_w_uniform)
+ prisoner.equip_if_possible(new /obj/item/clothing/shoes/orange(prisoner), prisoner.slot_shoes)
+ spawn(50)
+ M << "\red You have been sent to the prison station!"
+ log_admin("[key_name(usr)] sent [key_name(M)] to the prison station.")
+ message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the prison station.", 1)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+
+/*
+ if (href_list["sendtomaze"])
+ if ((src.rank in list( "Admin Candidate", "Temporary Admin", "Trial Admin", "Badmin", "Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["sendtomaze"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to the maze you jerk!", null, null, null, null, null)
+ return
+ //strip their stuff before they teleport into a cell :downs:
+ for(var/obj/item/weapon/W in M)
+ if(istype(W, /datum/organ/external))
+ continue
+ //don't strip organs
+ M.u_equip(W)
+ if (M.client)
+ M.client.screen -= W
+ if (W)
+ W.loc = M.loc
+ W.dropped(M)
+ W.layer = initial(W.layer)
+ //teleport person to cell
+ M.paralysis += 5
+ sleep(5)
+ //so they black out before warping
+ M.loc = pick(mazewarp)
+ spawn(50)
+ M << "\red You have been sent to the maze! Try and get out alive. In the maze everyone is free game. Kill or be killed."
+ log_admin("[key_name(usr)] sent [key_name(M)] to the maze.")
+ message_admins("\blue [key_name_admin(usr)] sent [key_name_admin(M)] to the maze.", 1)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+*/
+
+ if (href_list["tdome1"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["tdome1"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null)
+ return
+ for(var/obj/item/W in M)
+ if (istype(W,/obj/item))
+ if(istype(W, /datum/organ/external))
+ continue
+ M.u_equip(W)
+ if (M.client)
+ M.client.screen -= W
+ if (W)
+ W.loc = M.loc
+ W.dropped(M)
+ W.layer = initial(W.layer)
+ M.Paralyse(5)
+ sleep(5)
+ M.loc = pick(tdome1)
+ spawn(50)
+ M << "\blue You have been sent to the Thunderdome."
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 1)")
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 1)", 1)
+
+ if (href_list["tdome2"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["tdome2"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null)
+ return
+ for(var/obj/item/W in M)
+ if (istype(W,/obj/item))
+ if(istype(W, /datum/organ/external))
+ continue
+ M.u_equip(W)
+ if (M.client)
+ M.client.screen -= W
+ if (W)
+ W.loc = M.loc
+ W.dropped(M)
+ W.layer = initial(W.layer)
+ M.Paralyse(5)
+ sleep(5)
+ M.loc = pick(tdome2)
+ spawn(50)
+ M << "\blue You have been sent to the Thunderdome."
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Team 2)")
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Team 2)", 1)
+
+ if (href_list["tdomeadmin"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["tdomeadmin"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null)
+ return
+ M.Paralyse(5)
+ sleep(5)
+ M.loc = pick(tdomeadmin)
+ spawn(50)
+ M << "\blue You have been sent to the Thunderdome."
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Admin.)")
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Admin.)", 1)
+
+ if (href_list["tdomeobserve"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["tdomeobserve"])
+ if (ismob(M))
+ if(istype(M, /mob/living/silicon/ai))
+ alert("The AI can't be sent to the thunderdome you jerk!", null, null, null, null, null)
+ return
+ for(var/obj/item/W in M)
+ if (istype(W,/obj/item))
+ if(istype(W, /datum/organ/external))
+ continue
+ M.u_equip(W)
+ if (M.client)
+ M.client.screen -= W
+ if (W)
+ W.loc = M.loc
+ W.dropped(M)
+ W.layer = initial(W.layer)
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/observer = M
+ observer.equip_if_possible(new /obj/item/clothing/under/suit_jacket(observer), observer.slot_w_uniform)
+ observer.equip_if_possible(new /obj/item/clothing/shoes/black(observer), observer.slot_shoes)
+ M.Paralyse(5)
+ sleep(5)
+ M.loc = pick(tdomeobserve)
+ spawn(50)
+ M << "\blue You have been sent to the Thunderdome."
+ log_admin("[key_name(usr)] has sent [key_name(M)] to the thunderdome. (Observer.)")
+ message_admins("[key_name_admin(usr)] has sent [key_name_admin(M)] to the thunderdome. (Observer.)", 1)
+
+ if (href_list["adminauth"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/M = locate(href_list["adminauth"])
+ if (ismob(M) && !M.client.authenticated && !M.client.authenticating)
+ M.client.verbs -= /client/proc/authorize
+ M.client.authenticated = text("admin/[]", usr.client.authenticated)
+ log_admin("[key_name(usr)] authorized [key_name(M)]")
+ message_admins("\blue [key_name_admin(usr)] authorized [key_name_admin(M)]", 1)
+ M.client << text("You have been authorized by []", usr.key)
+
+ if (href_list["revive"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/mob/living/M = locate(href_list["revive"])
+ if (isliving(M))
+ if(config.allow_admin_rev)
+ M.revive()
+ message_admins("\red Admin [key_name_admin(usr)] healed / revived [key_name_admin(M)]!", 1)
+ log_admin("[key_name(usr)] healed / Rrvived [key_name(M)]")
+ return
+ else
+ alert("Admin revive disabled")
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+
+ if (href_list["makeai"]) //Yes, im fucking lazy, so what? it works ... hopefully
+ if (src.level>=3)
+ var/mob/M = locate(href_list["makeai"])
+ if(istype(M, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = M
+ message_admins("\red Admin [key_name_admin(usr)] AIized [key_name_admin(M)]!", 1)
+// if (ticker.mode.name == "AI malfunction")
+// var/obj/O = locate("landmark*ai")
+// M << "\blue You have been teleported to your new starting location!"
+// M.loc = O.loc
+// M.buckled = null
+// else
+// var/obj/S = locate(text("start*AI"))
+// if ((istype(S, /obj/effect/landmark/start) && istype(S.loc, /turf)))
+// M << "\blue You have been teleported to your new starting location!"
+// M.loc = S.loc
+// M.buckled = null
+ // world << "[M.real_name] is the AI!"
+ log_admin("[key_name(usr)] AIized [key_name(M)]")
+ H.AIize()
+ else
+ alert("I cannot allow this.")
+ return
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+
+ if (href_list["makealien"])
+ if (src.level>=3)
+ var/mob/M = locate(href_list["makealien"])
+ if(istype(M, /mob/living/carbon/human))
+ usr.client.cmd_admin_alienize(M)
+ else
+ alert("Wrong mob. Must be human.")
+ return
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["makemetroid"])
+ if (src.level>=3)
+ var/mob/M = locate(href_list["makemetroid"])
+ if(istype(M, /mob/living/carbon/human))
+ usr.client.cmd_admin_metroidize(M)
+ else
+ alert("Wrong mob. Must be human.")
+ return
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["makerobot"])
+ if (src.level>=3)
+ var/mob/M = locate(href_list["makerobot"])
+ if(istype(M, /mob/living/carbon/human))
+ usr.client.cmd_admin_robotize(M)
+ else
+ alert("Wrong mob. Must be human.")
+ return
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+/***************** BEFORE**************
+
+ if (href_list["l_players"])
+ var/dat = "Name/Real Name/Key/IP:"
+ for(var/mob/M in world)
+ var/foo = ""
+ if (ismob(M) && M.client)
+ if(!M.client.authenticated && !M.client.authenticating)
+ foo += text("\[ Authorize | ", src, M)
+ else
+ foo += text("\[ Authorized | ")
+ if(M.start)
+ if(!istype(M, /mob/living/carbon/monkey))
+ foo += text("Monkeyize | ", src, M)
+ else
+ foo += text("Monkeyized | ")
+ if(istype(M, /mob/living/silicon/ai))
+ foo += text("Is an AI | ")
+ else
+ foo += text("Make AI | ", src, M)
+ if(M.z != 2)
+ foo += text("Prison | ", src, M)
+ foo += text("Maze | ", src, M)
+ else
+ foo += text("On Z = 2 | ")
+ else
+ foo += text("Hasn't Entered Game | ")
+ foo += text("Heal/Revive | ", src, M)
+
+ foo += text("Say \]", src, M)
+ dat += text("N: [] R: [] (K: []) (IP: []) [] ", M.name, M.real_name, (M.client ? M.client : "No client"), M.lastKnownIP, foo)
+
+ usr << browse(dat, "window=players;size=900x480")
+
+*****************AFTER******************/
+
+// Now isn't that much better? IT IS NOW A PROC, i.e. kinda like a big panel like unstable
+
+ if (href_list["adminplayeropts"])
+ var/mob/M = locate(href_list["adminplayeropts"])
+ show_player_panel(M)
+
+ if (href_list["adminplayervars"])
+ var/mob/M = locate(href_list["adminplayervars"])
+ if(src && src.owner)
+ if(istype(src.owner,/client))
+ var/client/cl = src.owner
+ cl.debug_variables(M)
+ else if(ismob(src.owner))
+ var/mob/MO = src.owner
+ if(MO.client)
+ var/client/cl = MO.client
+ cl.debug_variables(M)
+
+ if (href_list["adminplayersubtlemessage"])
+ var/mob/M = locate(href_list["adminplayersubtlemessage"])
+ if(src && src.owner)
+ if(istype(src.owner,/client))
+ var/client/cl = src.owner
+ cl.cmd_admin_subtle_message(M)
+ else if(ismob(src.owner))
+ var/mob/MO = src.owner
+ if(MO.client)
+ var/client/cl = MO.client
+ cl.cmd_admin_subtle_message(M)
+
+ if (href_list["adminplayerobservejump"])
+ var/mob/M = locate(href_list["adminplayerobservejump"])
+ if(src && src.owner)
+ if(istype(src.owner,/client))
+ var/client/cl = src.owner
+ cl.admin_observe()
+ sleep(2)
+ cl.jumptomob(M)
+ else if(ismob(src.owner))
+ var/mob/MO = src.owner
+ if(MO.client)
+ var/client/cl = MO.client
+ cl.admin_observe()
+ sleep(2)
+ cl.jumptomob(M)
+
+
+
+
+
+ if (href_list["BlueSpaceArtillery"])
+ var/mob/M = locate(href_list["BlueSpaceArtillery"])
+ if(!M)
+ return
+
+ var/choice = alert(src.owner, "Are you sure you wish to hit [key_name(M)] with Blue Space Artillery?", "Confirm Firing?" , "Yes" , "No")
+ if (choice == "No")
+ return
+
+ if(BSACooldown)
+ src.owner << "Standby! Reload cycle in progress! Gunnary crews ready in five seconds!"
+ return
+
+ BSACooldown = 1
+ spawn(50)
+ BSACooldown = 0
+
+
+ M << "You've been hit by bluespace artillery!"
+ log_admin("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
+ message_admins("[key_name(M)] has been hit by Bluespace Artillery fired by [src.owner]")
+ var/obj/effect/stop/S
+ S = new /obj/effect/stop
+ S.victim = M
+ S.loc = M.loc
+ spawn(20)
+ del(S)
+
+ var/turf/T = get_turf(M)
+ if(T && (istype(T,/turf/simulated/floor/)))
+ if(prob(80))
+ T:break_tile_to_plating()
+ else
+ T:break_tile()
+
+ if(M.health == 1)
+ M.gib()
+ else
+ M.adjustBruteLoss( min( 99 , (M.health - 1) ) )
+ M.Stun(20)
+ M.Weaken(20)
+ M.stuttering = 20
+
+ if (href_list["CentcommReply"])
+ var/mob/M = locate(href_list["CentcommReply"])
+ if(!M)
+ return
+ if(!istype(M, /mob/living/carbon/human))
+ alert("Centcomm cannot transmit to non-humans.")
+ return
+ if(!istype(M:ears, /obj/item/device/radio/headset))
+ alert("The person you're trying to reply to doesn't have a headset! Centcomm cannot transmit directly to them.")
+ return
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from Centcomm", "")
+ if(!input)
+ return
+
+ src.owner << "You sent [input] to [M] via a secure channel."
+ log_admin("[src.owner] replied to [key_name(M)]'s Centcomm message with the message [input].")
+ M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from Central Command. Message as follows. [input]. Message ends.\""
+
+ return
+
+ if (href_list["SyndicateReply"])
+ var/mob/M = locate(href_list["SyndicateReply"])
+ if(!M)
+ return
+ if(!istype(M, /mob/living/carbon/human))
+ alert("The Syndicate cannot transmit to non-humans.")
+ return
+ if(!istype(M:ears, /obj/item/device/radio/headset))
+ alert("The person you're trying to reply to doesn't have a headset! The Syndicate cannot transmit directly to them.")
+ return
+ var/input = input(src.owner, "Please enter a message to reply to [key_name(M)] via their headset.","Outgoing message from The Syndicate", "")
+ if(!input)
+ return
+
+ src.owner << "You sent [input] to [M] via a secure channel."
+ log_admin("[src.owner] replied to [key_name(M)]'s Syndicate message with the message [input].")
+ M << "You hear something crackle in your headset for a moment before a voice speaks. \"Please stand by for a message from your benefactor. Message as follows, agent. [input]. Message ends.\""
+
+ return
+
+ if (href_list["jumpto"])
+ if(rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ var/mob/M = locate(href_list["jumpto"])
+ usr.client.jumptomob(M)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["getmob"])
+ if(rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ var/mob/M = locate(href_list["getmob"])
+ usr.client.Getmob(M)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["sendmob"])
+ if(rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ var/mob/M = locate(href_list["sendmob"])
+ usr.client.sendmob(M)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["narrateto"])
+ if(rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ var/mob/M = locate(href_list["narrateto"])
+ usr.client.cmd_admin_direct_narrate(M)
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+
+ if (href_list["subtlemessage"])
+ var/mob/M = locate(href_list["subtlemessage"])
+ usr.client.cmd_admin_subtle_message(M)
+
+ if (href_list["traitor"])
+ if(!ticker || !ticker.mode)
+ alert("The game hasn't started yet!")
+ return
+ var/mob/M = locate(href_list["traitor"])
+ if (!istype(M))
+ player_panel_new()
+ return
+ if(isalien(M))
+ alert("Is an [M.mind ? M.mind.special_role : "Alien"]!", "[M.key]")
+ return
+ if (M:mind)
+ M:mind.edit_memory()
+ return
+ alert("Cannot make this mob a traitor! It has no mind!")
+
+ if (href_list["create_object"])
+ if (src.rank in list("Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ return create_object(usr)
+ else
+ alert("You are not a high enough administrator! Sorry!!!!")
+
+ if (href_list["create_turf"])
+ if (src.rank in list("Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ return create_turf(usr)
+ else
+ alert("You are not a high enough administrator! Sorry!!!!")
+ if (href_list["create_mob"])
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ return create_mob(usr)
+ else
+ alert("You are not a high enough administrator! Sorry!!!!")
+ if (href_list["vmode"])
+ vmode()
+
+ if (href_list["votekill"])
+ votekill()
+
+ if (href_list["voteres"])
+ voteres()
+
+ if (href_list["prom_demot"])
+ if ((src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/client/C = locate(href_list["prom_demot"])
+ if(C.holder && (C.holder.level >= src.level))
+ alert("This cannot be done as [C] is a [C.holder.rank]")
+ return
+ var/dat = "[C] is a [C.holder ? "[C.holder.rank]" : "non-admin"]
Change [C]'s rank? "
+ if(src.level == 6)
+ //Game Master
+ dat += {"
+ Senior Game Admin
+ Game Admin
+ Secondary Game Admin
+ Trial admin
+ Temporary Admin
+ Moderator
+ Admin Observer
+ Remove Admin "}
+ else if(src.level == 5)
+ //Senior Admin
+ dat += {"
+ Game Admin
+ Secondary Game Admin
+ Trial admin
+ Temporary Admin
+ Moderator
+ Admin Observer
+ Remove Admin "}
+ else if(src.level == 4)
+ //Game Admin
+ dat += {"
+ Secondary Game Admin
+ Trial admin
+ Temporary Admin
+ Moderator
+ Admin Observer
+ Remove Admin "}
+ else if(src.level == 3)
+ //Secondary Game Admin
+ dat += {"
+ Trial admin
+ Temporary Admin
+ Moderator
+ Admin Observer
+ Remove Admin "}
+ else
+ alert("Not a high enough level admin, sorry.")
+ return
+ usr << browse(dat, "window=prom_demot;size=480x300")
+
+ if (href_list["chgadlvl"])
+ //change admin level
+ var/rank = href_list["chgadlvl"]
+ var/client/C = locate(href_list["client4ad"])
+ if(rank == "Remove")
+ C.clear_admin_verbs()
+ C.update_admins(null)
+ log_admin("[key_name(usr)] has removed [C]'s adminship")
+ message_admins("[key_name_admin(usr)] has removed [C]'s adminship", 1)
+ admins.Remove(C.ckey)
+ else
+ C.clear_admin_verbs()
+ C.update_admins(rank)
+ log_admin("[key_name(usr)] has made [C] a [rank]")
+ message_admins("[key_name_admin(usr)] has made [C] a [rank]", 1)
+ admins[C.ckey] = rank
+
+
+ if (href_list["object_list"])
+ if (src.rank in list("Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ if (config.allow_admin_spawning && ((src.state == 2) || (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))))
+ var/atom/loc = usr.loc
+
+ var/dirty_paths
+ if (istext(href_list["object_list"]))
+ dirty_paths = list(href_list["object_list"])
+ else if (istype(href_list["object_list"], /list))
+ dirty_paths = href_list["object_list"]
+
+ var/paths = list()
+ var/removed_paths = list()
+ for (var/dirty_path in dirty_paths)
+ var/path = text2path(dirty_path)
+ if (!path)
+ removed_paths += dirty_path
+ else if (!ispath(path, /obj) && !ispath(path, /turf) && !ispath(path, /mob))
+ removed_paths += dirty_path
+ else if (ispath(path, /obj/item/weapon/gun/energy/pulse_rifle) && !(src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master")))
+ removed_paths += dirty_path
+ else if (ispath(path, /obj/item/weapon/melee/energy/blade))//Not an item one should be able to spawn./N
+ removed_paths += dirty_path
+ else if (ispath(path, /obj/effect/bhole) && !(src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master")))
+ removed_paths += dirty_path
+ else if (ispath(path, /mob) && !(src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master")))
+ removed_paths += dirty_path
+
+ else
+ paths += path
+
+ if (!paths)
+ return
+ else if (length(paths) > 5)
+ alert("Select less object types, (max 5)")
+ return
+ else if (length(removed_paths))
+ alert("Removed:\n" + dd_list2text(removed_paths, "\n"))
+
+ var/list/offset = dd_text2list(href_list["offset"],",")
+ var/number = dd_range(1, 100, text2num(href_list["object_count"]))
+ var/X = offset.len > 0 ? text2num(offset[1]) : 0
+ var/Y = offset.len > 1 ? text2num(offset[2]) : 0
+ var/Z = offset.len > 2 ? text2num(offset[3]) : 0
+ var/tmp_dir = href_list["object_dir"]
+ var/obj_dir = tmp_dir ? text2num(tmp_dir) : 2
+ if(!obj_dir || !(obj_dir in list(1,2,4,8,5,6,9,10)))
+ obj_dir = 2
+ var/obj_name = sanitize(href_list["object_name"])
+ var/where = href_list["object_where"]
+ if (!( where in list("onfloor","inhand","inmarked") ))
+ where = "onfloor"
+
+ //TODO ERRORAGE
+ if( where == "inhand" )
+ usr << "Support for inhand not available yet. Will spawn on floor."
+ where = "onfloor"
+ //END TODO ERRORAGE
+
+ if ( where == "inhand" ) //Can only give when human or monkey
+ if ( !( ishuman(usr) || ismonkey(usr) ) )
+ usr << "Can only spawn in hand when you're a human or a monkey."
+ where = "onfloor"
+ else if ( usr.get_active_hand() )
+ usr << "Your active hand is full. Spawning on floor."
+ where = "onfloor"
+ if ( where == "inmarked" )
+ if ( !marked_datum )
+ usr << "You don't have any object marked. Abandoning spawn."
+ return
+ else
+ if ( !istype(marked_datum,/atom) )
+ usr << "The object you have marked cannot be used as a target. Target must be of type /atom. Abandoning spawn."
+ return
+
+ var/atom/target //Where the object will be spawned
+ switch ( where )
+ if ( "onfloor" )
+ switch (href_list["offset_type"])
+ if ("absolute")
+ target = locate(0 + X,0 + Y,0 + Z)
+ if ("relative")
+ target = locate(loc.x + X,loc.y + Y,loc.z + Z)
+ if ( "inmarked" )
+ target = marked_datum
+
+
+ //TODO ERRORAGE - Give support for "inhand"
+
+ if(target)
+ for (var/path in paths)
+ for (var/i = 0; i < number; i++)
+ var/atom/O = new path(target)
+ if(O)
+ O.dir = obj_dir
+ if(obj_name)
+ O.name = obj_name
+ if(istype(O,/mob))
+ var/mob/M = O
+ M.real_name = obj_name
+
+
+
+ if (number == 1)
+ log_admin("[key_name(usr)] created a [english_list(paths)]")
+ for(var/path in paths)
+ if(ispath(path, /mob))
+ message_admins("[key_name_admin(usr)] created a [english_list(paths)]", 1)
+ break
+ else
+ log_admin("[key_name(usr)] created [number]ea [english_list(paths)]")
+ for(var/path in paths)
+ if(ispath(path, /mob))
+ message_admins("[key_name_admin(usr)] created [number]ea [english_list(paths)]", 1)
+ break
+ return
+ else
+ alert("You cannot spawn items right now.")
+ return
+
+ if (href_list["secretsfun"])
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/ok = 0
+ switch(href_list["secretsfun"])
+ if("sec_clothes")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","SC")
+ for(var/obj/item/clothing/under/O in world)
+ del(O)
+ ok = 1
+ if("sec_all_clothes")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","SAC")
+ for(var/obj/item/clothing/O in world)
+ del(O)
+ ok = 1
+ if("sec_classic1")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","SC1")
+ for(var/obj/item/clothing/suit/fire/O in world)
+ del(O)
+ for(var/obj/structure/grille/O in world)
+ del(O)
+/* for(var/obj/machinery/vehicle/pod/O in world)
+ for(var/mob/M in src)
+ M.loc = src.loc
+ if (M.client)
+ M.client.perspective = MOB_PERSPECTIVE
+ M.client.eye = M
+ del(O)
+ ok = 1*/
+ if("toxic")
+ /*
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","T")
+ for(var/obj/machinery/atmoalter/siphs/fullairsiphon/O in world)
+ O.t_status = 3
+ for(var/obj/machinery/atmoalter/siphs/scrubbers/O in world)
+ O.t_status = 1
+ O.t_per = 1000000.0
+ for(var/obj/machinery/atmoalter/canister/O in world)
+ if (!( istype(O, /obj/machinery/atmoalter/canister/oxygencanister) ))
+ O.t_status = 1
+ O.t_per = 1000000.0
+ else
+ O.t_status = 3
+ */
+ usr << "HEH"
+ if("monkey")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","M")
+ for(var/mob/living/carbon/human/H in world)
+ spawn(0)
+ H.monkeyize()
+ ok = 1
+ if("corgi")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","M")
+ for(var/mob/living/carbon/human/H in world)
+ spawn(0)
+ H.corgize()
+ ok = 1
+ if("power")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","P")
+ log_admin("[key_name(usr)] made all areas powered", 1)
+ message_admins("\blue [key_name_admin(usr)] made all areas powered", 1)
+ power_restore()
+ if("unpower")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","UP")
+ log_admin("[key_name(usr)] made all areas unpowered", 1)
+ message_admins("\blue [key_name_admin(usr)] made all areas unpowered", 1)
+ power_failure()
+ if("activateprison")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","AP")
+ world << "\blue Transit signature detected."
+ world << "\blue Incoming shuttle."
+ /*
+ var/A = locate(/area/shuttle_prison)
+ for(var/atom/movable/AM as mob|obj in A)
+ AM.z = 1
+ AM.Move()
+ */
+ message_admins("\blue [key_name_admin(usr)] sent the prison shuttle to the station.", 1)
+ if("deactivateprison")
+ /*
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","DP")
+ var/A = locate(/area/shuttle_prison)
+ for(var/atom/movable/AM as mob|obj in A)
+ AM.z = 2
+ AM.Move()
+ */
+ message_admins("\blue [key_name_admin(usr)] sent the prison shuttle back.", 1)
+ if("toggleprisonstatus")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","TPS")
+ for(var/obj/machinery/computer/prison_shuttle/PS in world)
+ PS.allowedtocall = !(PS.allowedtocall)
+ message_admins("\blue [key_name_admin(usr)] toggled status of prison shuttle to [PS.allowedtocall].", 1)
+ if("prisonwarp")
+ if(!ticker)
+ alert("The game hasn't started yet!", null, null, null, null, null)
+ return
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","PW")
+ message_admins("\blue [key_name_admin(usr)] teleported all players to the prison station.", 1)
+ for(var/mob/living/carbon/human/H in world)
+ var/turf/loc = find_loc(H)
+ var/security = 0
+ if(loc.z > 1 || prisonwarped.Find(H))
+ //don't warp them if they aren't ready or are already there
+ continue
+ H.Paralyse(5)
+ if(H.wear_id)
+ var/obj/item/weapon/card/id/id = H.get_idcard()
+ for(var/A in id.access)
+ if(A == access_security)
+ security++
+ if(!security)
+ //strip their stuff before they teleport into a cell :downs:
+ for(var/obj/item/weapon/W in H)
+ if(istype(W, /datum/organ/external))
+ continue
+ //don't strip organs
+ H.u_equip(W)
+ if (H.client)
+ H.client.screen -= W
+ if (W)
+ W.loc = H.loc
+ W.dropped(H)
+ W.layer = initial(W.layer)
+ //teleport person to cell
+ H.loc = pick(prisonwarp)
+ H.equip_if_possible(new /obj/item/clothing/under/color/orange(H), H.slot_w_uniform)
+ H.equip_if_possible(new /obj/item/clothing/shoes/orange(H), H.slot_shoes)
+ else
+ //teleport security person
+ H.loc = pick(prisonsecuritywarp)
+ prisonwarped += H
+ if("traitor_all")
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if(!ticker)
+ alert("The game hasn't started yet!")
+ return
+ var/objective = input("Enter an objective")
+ if(!objective)
+ return
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","TA([objective])")
+ for(var/mob/living/carbon/human/H in world)
+ if(H.stat == 2 || !H.client || !H.mind) continue
+ if(is_special_character(H)) continue
+ //traitorize(H, objective, 0)
+ ticker.mode.traitors += H.mind
+ H.mind.special_role = "traitor"
+ var/datum/objective/new_objective = new
+ new_objective.owner = H
+ new_objective.explanation_text = objective
+ H.mind.objectives += new_objective
+ ticker.mode.greet_traitor(H)
+ //ticker.mode.forge_traitor_objectives(H.mind)
+ ticker.mode.finalize_traitor(H)
+ for(var/mob/living/silicon/A in world)
+ ticker.mode.traitors += A.mind
+ A.mind.special_role = "traitor"
+ var/datum/objective/new_objective = new
+ new_objective.owner = A
+ new_objective.explanation_text = objective
+ A.mind.objectives += new_objective
+ ticker.mode.greet_traitor(A)
+ ticker.mode.finalize_traitor(A)
+ message_admins("\blue [key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]", 1)
+ log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
+ else
+ alert("You're not of a high enough rank to do this")
+ if("moveminingshuttle")
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ if(mining_shuttle_moving)
+ return
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","ShM")
+ move_mining_shuttle()
+ message_admins("\blue [key_name_admin(usr)] moved mining shuttle", 1)
+ log_admin("[key_name(usr)] moved the mining shuttle")
+ else
+ alert("You're not of a high enough rank to do this")
+ if("moveadminshuttle")
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","ShA")
+ move_admin_shuttle()
+ message_admins("\blue [key_name_admin(usr)] moved the centcom administration shuttle", 1)
+ log_admin("[key_name(usr)] moved the centcom administration shuttle")
+ else
+ alert("You're not of a high enough rank to do this")
+ if("moveferry")
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","ShF")
+ move_ferry()
+ message_admins("\blue [key_name_admin(usr)] moved the centcom ferry", 1)
+ log_admin("[key_name(usr)] moved the centcom ferry")
+ else
+ alert("You're not of a high enough rank to do this")
+ if("movealienship")
+ if ((src.rank in list( "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","ShX")
+ move_alien_ship()
+ message_admins("\blue [key_name_admin(usr)] moved the alien dinghy", 1)
+ log_admin("[key_name(usr)] moved the alien dinghy")
+ else
+ alert("You're not of a high enough rank to do this")
+ if("togglebombcap")
+ if (src.rank in list( "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" ))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","BC")
+ switch(MAX_EXPLOSION_RANGE)
+ if(14)
+ MAX_EXPLOSION_RANGE = 16
+ if(16)
+ MAX_EXPLOSION_RANGE = 20
+ if(20)
+ MAX_EXPLOSION_RANGE = 28
+ if(28)
+ MAX_EXPLOSION_RANGE = 56
+ if(56)
+ MAX_EXPLOSION_RANGE = 128
+ if(128)
+ MAX_EXPLOSION_RANGE = 14
+ var/range_dev = MAX_EXPLOSION_RANGE *0.25
+ var/range_high = MAX_EXPLOSION_RANGE *0.5
+ var/range_low = MAX_EXPLOSION_RANGE
+ message_admins("\red [key_name_admin(usr)] changed the bomb cap to [range_dev], [range_high], [range_low]", 1)
+ log_admin("[key_name_admin(usr)] changed the bomb cap to [MAX_EXPLOSION_RANGE]")
+ else
+ alert("No way. You're not of a high enough rank to do this.")
+
+ if("flicklights")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","FL")
+ while(!usr.stat)
+ //knock yourself out to stop the ghosts
+ for(var/mob/M in world)
+ if(M.client && M.stat != 2 && prob(25))
+ var/area/AffectedArea = get_area(M)
+ if(AffectedArea.name != "Space" && AffectedArea.name != "Engine Walls" && AffectedArea.name != "Chemical Lab Test Chamber" && AffectedArea.name != "Escape Shuttle" && AffectedArea.name != "Arrival Area" && AffectedArea.name != "Arrival Shuttle" && AffectedArea.name != "start area" && AffectedArea.name != "Engine Combustion Chamber")
+ AffectedArea.power_light = 0
+ AffectedArea.power_change()
+ spawn(rand(55,185))
+ AffectedArea.power_light = 1
+ AffectedArea.power_change()
+ var/Message = rand(1,4)
+ switch(Message)
+ if(1)
+ M.show_message(text("\blue You shudder as if cold..."), 1)
+ if(2)
+ M.show_message(text("\blue You feel something gliding across your back..."), 1)
+ if(3)
+ M.show_message(text("\blue Your eyes twitch, you feel like something you can't see is here..."), 1)
+ if(4)
+ M.show_message(text("\blue You notice something moving out of the corner of your eye, but nothing is there..."), 1)
+ for(var/obj/W in orange(5,M))
+ if(prob(25) && !W.anchored)
+ step_rand(W)
+ sleep(rand(100,1000))
+ for(var/mob/M in world)
+ if(M.client && M.stat != 2)
+ M.show_message(text("\blue The chilling wind suddenly stops..."), 1)
+ /* if("shockwave")
+ ok = 1
+ world << "\red ALERT: STATION STRESS CRITICAL"
+ sleep(60)
+ world << "\red ALERT: STATION STRESS CRITICAL. TOLERABLE LEVELS EXCEEDED!"
+ sleep(80)
+ world << "\red ALERT: STATION STRUCTURAL STRESS CRITICAL. SAFETY MECHANISMS FAILED!"
+ sleep(40)
+ for(var/mob/M in world)
+ shake_camera(M, 400, 1)
+ for(var/obj/structure/window/W in world)
+ spawn(0)
+ sleep(rand(10,400))
+ W.ex_act(rand(2,1))
+ for(var/obj/structure/grille/G in world)
+ spawn(0)
+ sleep(rand(20,400))
+ G.ex_act(rand(2,1))
+ for(var/obj/machinery/door/D in world)
+ spawn(0)
+ sleep(rand(20,400))
+ D.ex_act(rand(2,1))
+ for(var/turf/station/floor/Floor in world)
+ spawn(0)
+ sleep(rand(30,400))
+ Floor.ex_act(rand(2,1))
+ for(var/obj/structure/cable/Cable in world)
+ spawn(0)
+ sleep(rand(30,400))
+ Cable.ex_act(rand(2,1))
+ for(var/obj/structure/closet/Closet in world)
+ spawn(0)
+ sleep(rand(30,400))
+ Closet.ex_act(rand(2,1))
+ for(var/obj/machinery/Machinery in world)
+ spawn(0)
+ sleep(rand(30,400))
+ Machinery.ex_act(rand(1,3))
+ for(var/turf/station/wall/Wall in world)
+ spawn(0)
+ sleep(rand(30,400))
+ Wall.ex_act(rand(2,1)) */
+ if("wave")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","MW")
+ if ((src.rank in list("Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ meteor_wave()
+ message_admins("[key_name_admin(usr)] has spawned meteors", 1)
+ command_alert("Meteors have been detected on collision course with the station.", "Meteor Alert")
+ world << sound('meteors.ogg')
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!", null, null, null, null, null)
+ return
+ if("gravanomalies")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","GA")
+ command_alert("Gravitational anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('granomalies.ogg')
+ var/turf/T = pick(blobstart)
+ var/obj/effect/bhole/bh = new /obj/effect/bhole( T.loc, 30 )
+ spawn(rand(50, 300))
+ del(bh)
+ if("timeanomalies")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","STA")
+ command_alert("Space-time anomalies detected on the station. There is no additional data.", "Anomaly Alert")
+ world << sound('spanomalies.ogg')
+ var/list/turfs = list( )
+ var/turf/picked
+ for(var/turf/T in world)
+ if(T.z == 1 && istype(T,/turf/simulated/floor) && !istype(T,/turf/space))
+ turfs += T
+ for(var/turf/T in world)
+ set background = 1
+ if(prob(20) && T.z == 1 && istype(T,/turf/simulated/floor))
+ spawn(50+rand(0,3000))
+ picked = pick(turfs)
+ var/obj/effect/portal/P = new /obj/effect/portal( T )
+ P.target = picked
+ P.creator = null
+ P.icon = 'objects.dmi'
+ P.failchance = 0
+ P.icon_state = "anom"
+ P.name = "wormhole"
+ spawn(rand(300,600))
+ del(P)
+ if("goblob")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","BL")
+ mini_blob_event()
+ message_admins("[key_name_admin(usr)] has spawned blob", 1)
+ if("aliens")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","AL")
+ if(aliens_allowed)
+ alien_infestation()
+ message_admins("[key_name_admin(usr)] has spawned aliens", 1)
+ if("spaceninja")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","SN")
+ if(toggle_space_ninja)
+ if(space_ninja_arrival())//If the ninja is actually spawned. They may not be depending on a few factors.
+ message_admins("[key_name_admin(usr)] has sent in a space ninja", 1)
+ if("carp")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","C")
+ var/choice = input("You sure you want to spawn carp?") in list("Badmin", "Cancel")
+ if(choice == "Badmin")
+ message_admins("[key_name_admin(usr)] has spawned carp.", 1)
+ carp_migration()
+ if("radiation")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","R")
+ message_admins("[key_name_admin(usr)] has has irradiated the station", 1)
+ high_radiation_event()
+ if("immovable")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","IR")
+ message_admins("[key_name_admin(usr)] has sent an immovable rod to the station", 1)
+ immovablerod()
+ if("prison_break")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","PB")
+ message_admins("[key_name_admin(usr)] has allowed a prison break", 1)
+ prison_break()
+ if("lightsout")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","LO")
+ message_admins("[key_name_admin(usr)] has broke a lot of lights", 1)
+ lightsout(1,2)
+ if("blackout")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","BO")
+ message_admins("[key_name_admin(usr)] broke all lights", 1)
+ lightsout(0,0)
+ if("virus")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","V")
+ var/answer = alert("Do you want this to be a random disease or do you have something in mind?",,"Virus2","Random","Choose")
+ if(answer=="Random")
+ viral_outbreak()
+ message_admins("[key_name_admin(usr)] has triggered a virus outbreak", 1)
+ else if(answer == "Choose")
+ var/list/viruses = list("fake gbs","gbs","magnitis","wizarditis",/*"beesease",*/"brain rot","cold","retrovirus","flu","pierrot's throat","rhumba beat")
+ var/V = input("Choose the virus to spread", "BIOHAZARD") in viruses
+ viral_outbreak(V)
+ message_admins("[key_name_admin(usr)] has triggered a virus outbreak of [V]", 1)
+ else
+ usr << "Nope"
+ /*
+ var/lesser = (alert("Do you want to infect the mob with a major or minor disease?",,"Major","Minor") == "Minor")
+ var/mob/living/carbon/victim = input("Select a mob to infect", "Virus2") as null|mob in world
+ if(!istype(victim)) return
+ if(lesser)
+ infect_mob_random_lesser(victim)
+ else
+ infect_mob_random_greater(victim)
+ message_admins("[key_name_admin(usr)] has infected [victim] with a [lesser ? "minor" : "major"] virus2.", 1)
+ */
+ if("retardify")
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","RET")
+ for(var/mob/living/carbon/human/H in world)
+ if(H.client)
+ H << "\red You suddenly feel stupid."
+ H.setBrainLoss(60)
+ message_admins("[key_name_admin(usr)] made everybody retarded")
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if("fakeguns")
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","FG")
+ for(var/obj/item/W in world)
+ if(istype(W, /obj/item/clothing) || istype(W, /obj/item/weapon/card/id) || istype(W, /obj/item/weapon/disk) || istype(W, /obj/item/weapon/tank))
+ continue
+ W.icon = 'gun.dmi'
+ W.icon_state = "revolver"
+ W.item_state = "gun"
+ message_admins("[key_name_admin(usr)] made every item look like a gun")
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if("schoolgirl")
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","SG")
+ for(var/obj/item/clothing/under/W in world)
+ W.icon_state = "schoolgirl"
+ W.item_state = "w_suit"
+ W.color = "schoolgirl"
+ message_admins("[key_name_admin(usr)] activated Japanese Animes mode")
+ world << sound('animes.ogg')
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if("dorf")
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","DF")
+ for(var/mob/living/carbon/human/B in world)
+ B.face_icon_state = "facial_wise"
+ B.update_face()
+ message_admins("[key_name_admin(usr)] activated dorf mode")
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if("ionstorm")
+ if (src.rank in list("Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master"))
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","I")
+ IonStorm()
+ message_admins("[key_name_admin(usr)] triggered an ion storm")
+ var/show_log = alert(usr, "Show ion message?", "Message", "Yes", "No")
+ if(show_log == "Yes")
+ command_alert("Ion storm detected near the station. Please check all AI-controlled equipment for errors.", "Anomaly Alert")
+ world << sound('ionstorm.ogg')
+ else
+ alert("You cannot perform this action. You must be of a higher administrative rank!")
+ return
+ if("spacevines")
+ feedback_inc("admin_secrets_fun_used",1)
+ feedback_add_details("admin_secrets_fun_used","K")
+ spacevine_infestation()
+ message_admins("[key_name_admin(usr)] has spawned spacevines", 1)
+ if (usr)
+ log_admin("[key_name(usr)] used secret [href_list["secretsfun"]]")
+ if (ok)
+ world << text("A secret has been activated by []!", usr.key)
+ return
+
+ if (href_list["secretsadmin"])
+ if ((src.rank in list( "Moderator", "Temporary Admin", "Trial Admin", "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/ok = 0
+ switch(href_list["secretsadmin"])
+ if("clear_bombs")
+ //I do nothing
+ if("list_bombers")
+ var/dat = "Bombing List"
+ for(var/l in bombers)
+ dat += text("[l] ")
+ usr << browse(dat, "window=bombers")
+ if("list_signalers")
+ var/dat = "Showing last [length(lastsignalers)] signalers."
+ for(var/sig in lastsignalers)
+ dat += "[sig] "
+ usr << browse(dat, "window=lastsignalers;size=800x500")
+ if("list_lawchanges")
+ var/dat = "Showing last [length(lawchanges)] law changes."
+ for(var/sig in lawchanges)
+ dat += "[sig] "
+ usr << browse(dat, "window=lawchanges;size=800x500")
+ if("list_job_debug")
+ var/dat = "Job Debug info."
+ if(job_master)
+ for(var/line in job_master.job_debug)
+ dat += "[line] "
+ dat+= "*******
"
+ for(var/datum/job/job in job_master.occupations)
+ if(!job) continue
+ dat += "job: [job.title], current_positions: [job.current_positions], total_positions: [job.total_positions] "
+ usr << browse(dat, "window=jobdebug;size=600x500")
+ if("check_antagonist")
+ if (ticker && ticker.current_state >= GAME_STATE_PLAYING)
+ var/dat = "Round Status
Round Status
"
+ dat += "Current Game Mode: [ticker.mode.name] "
+ dat += "Round Duration: [round(world.time / 36000)]:[add_zero(world.time / 600 % 60, 2)]:[world.time / 100 % 6][world.time / 100 % 10] "
+ dat += "Emergency shuttle "
+ if (!emergency_shuttle.online)
+ dat += "Call Shuttle "
+ else
+ var/timeleft = emergency_shuttle.timeleft()
+ switch(emergency_shuttle.location)
+ if(0)
+ dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)] "
+ dat += "Send Back "
+ if(1)
+ dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)] "
+
+ if(ticker.mode.syndicates.len)
+ dat += "
Syndicates
"
+ for(var/datum/mind/N in ticker.mode.syndicates)
+ var/mob/M = N.current
+ if(M)
+ dat += "
"
+ for(var/mob/living/carbon/human/H in world)
+ if(H.ckey)
+ if(H.dna && H.dna.uni_identity)
+ dat += "
[H]
[md5(H.dna.uni_identity)]
"
+ else if(H.dna && !H.dna.uni_identity)
+ dat += "
[H]
H.dna.uni_identity = null
"
+ else if(!H.dna)
+ dat += "
[H]
H.dna = null
"
+ dat += "
"
+ usr << browse(dat, "window=fingerprints;size=440x410")
+ else
+ if (usr)
+ log_admin("[key_name(usr)] used secret [href_list["secretsadmin"]]")
+ if (ok)
+ world << text("A secret has been activated by []!", usr.key)
+ return
+ if (href_list["secretscoder"])
+ if ((src.rank in list( "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ switch(href_list["secretscoder"])
+ if("spawn_objects")
+ var/dat = "Admin Log"
+ for(var/l in admin_log)
+ dat += "
[l]
"
+ if(!admin_log.len)
+ dat += "No-one has done anything this round!"
+ usr << browse(dat, "window=admin_log")
+ if("maint_access_brig")
+ for(var/obj/machinery/door/airlock/maintenance/M in world)
+ if (access_maint_tunnels in M.req_access)
+ M.req_access = list(access_brig)
+ message_admins("[key_name_admin(usr)] made all maint doors brig access-only.")
+ if("maint_access_engiebrig")
+ for(var/obj/machinery/door/airlock/maintenance/M in world)
+ if (access_maint_tunnels in M.req_access)
+ M.req_access = list()
+ M.req_one_access = list(access_brig,access_engine)
+ message_admins("[key_name_admin(usr)] made all maint doors engineering and brig access-only.")
+ if("infinite_sec")
+ var/datum/job/J = job_master.GetJob("Security Officer")
+ if(!J) return
+ J.total_positions = -1
+ J.spawn_positions = -1
+ message_admins("[key_name_admin(usr)] has removed the cap on security officers.")
+ return
+ //hahaha
+
+///////////////////////////////////////////////////////////////////////////////////////////////Panels
+
+/obj/admins/proc/show_player_panel(var/mob/M in world)
+ set category = "Admin"
+ set name = "Show Player Panel"
+ set desc="Edit player (respawn, ban, heal, etc)"
+ if(!M)
+ usr << "You seem to be selecting a mob that doesn't exist anymore."
+ return
+ if (!istype(src,/obj/admins))
+ src = usr.client.holder
+ if (!istype(src,/obj/admins))
+ usr << "Error: you are not an admin!"
+ return
+ var/dat = "Options for [M.key]"
+ var/foo = "\[ "
+ if (ismob(M) && M.client)
+ if(!M.client.authenticated && !M.client.authenticating)
+ foo += text("Authorize | ")
+ else
+ foo += text("Authorized | ")
+ foo += text("Promote/Demote | ")
+ if(!istype(M, /mob/new_player))
+ if(!ismonkey(M))
+ foo += text("Monkeyize | ")
+ else
+ foo += text("Monkeyized | ")
+ if(!iscorgi(M))
+ foo += text("Corgize | ")
+ else
+ foo += text("Corgized | ")
+ if(isAI(M))
+ foo += text("Is an AI | ")
+ else if(ishuman(M))
+ foo += text("Make AI | ")
+ foo += text("Make Robot | ")
+ foo += text("Make Alien | ")
+ foo += text("Make Metroid | ")
+ foo += text("Thunderdome 1 | ")
+ foo += text("Thunderdome 2 | ")
+ foo += text("Thunderdome Admin | ")
+ foo += text("Thunderdome Observer | ")
+ foo += text("Prison | ")
+ // foo += text("Maze | ")
+ foo += text("Heal/Revive | ")
+ else
+ foo += text("Hasn't Entered Game | ")
+ foo += text("Forcesay | ")
+ if(M.client)
+ foo += text("Mute: [(M.client.muted ? "Muted" : "Voiced")] | ")
+ foo += text("Complete mute: [(M.client.muted ? "Completely Muted" : "Voiced")] | ")
+ else
+ foo += "Mute unavailable - no client"
+ foo += text("Boot")
+ foo += text(" ")
+ foo += text("Jump to | ")
+ foo += text("Get | ")
+ foo += text("Send")
+ foo += text(" ")
+ foo += text("Edit mind | ")
+ foo += text("Narrate to | ")
+ foo += text("Subtle message")
+ foo += text(" ")
+ foo += text("Ban | ")
+ foo += text("Jobban")
+ dat += text("[foo]")
+ usr << browse(dat, "window=adminplayeropts;size=480x150")
+
+
+
+/obj/admins/proc/Jobbans()
+
+ if ((src.rank in list( "Secondary Game Admin", "Game Admin", "Senior Game Admin", "Game Master" )))
+ var/dat = "Job Bans!
"
+ for(var/t in jobban_keylist)
+ var/r = t
+ if( findtext(r,"##") )
+ r = copytext( r, 1, findtext(r,"##") )//removes the description
+ dat += text("
Added carved pumpkins/jackolanterns. Carve them with any of the usual things you use to carve things. They work similarly to hardhats.
+
Added pumpkin pie and slices. Made with 5 milk, 5 sugar, 1 pumpkin, 1 flour, 1 egg.
+
Eating corn now makes corn cobs. Carve them with a saw, a knife, or a hatchet to make a corncob pipe.
+
Added the bit of transparency to biohelmets that they were always supposed to have.
+
Adds randomlly spawning rooms to the mining asteroid that contain various goodies.
+
Adds a borg upgrade system. Can be used to reset modules or 'restart' dead cyborgs.
+
Officers can now use huds to modify humans' criminal statuses on the go. To do this, simply examine a human and at the end should be a clickable link to change the status.
+
Cell charger and Recharger are now wrenchable to make them moveable
+
Cats and Dogs can see in the dark.
+
Changed around a few access levels; only jobs who need to do maintenance have access to maintenance tunnels. Also the heads and detective.
+
Shuttle call/recall announcements are now more noticeable.
+
Changes changling unstun time to 45 from 25
+
Can now repair the first stage of deconstruction of rwalls with metal rods.
+
Library machine now has a delay when printing bibles to prevent spam.
+
Bugfix to the 'resist' button, unless I don't understand how it works. I don't see how it could have ever worked before.
+
You can no longer toggle the welding helmet when stunned or restrained.
+
Fix for not being able to use pills as pill-satchels properly.
+
+
Erthilo updated:
+
+
Increases time between random events happening in low population round to a maximum of double. Random events are more likely to happen up to a limit of around 30 active players. Events now fire at the same rate as previously with around 20~ active players. Please report unusually high or low amounts of events on the bug tracker!
+
+
+
+
+
1st May 2012
+
Mloc updated:
+
+
Added extra data to ID cards. Fingerprint, blood type, and DNA. Can all be changed in ID computer.
+
+
Erthilo updated:
+
+
You can now respawn after 30 minutes in any mode where the win/loss condition is not all crew dead.
+
New in-hand sprites for energy and taser guns courtesy of Flashkirby99.
+
Fixes emagging doors.
+
NT has recently upgraded their anti-telepathy double glazing. As such, you can no longer remote view people on any level except the station or the mining asteroid!
+
As a side effect of the above, remote viewing and telekinesis cannot be used at the same time.
+
+
+
+
+
30th April 2012
+
Mloc updated:
+
+
Due to new NT hiring protocols, characters can now only be between the ages of 20-65 instead of 15-45.
+
+
Erthilo updated:
+
+
Switched to /tg/'s changelog format! Previous updates can be found here: http://baystation12.net/wiki/index.php/Changelog
+
New green alt satchel for Botanists.
+
Cyborgs can now view crew manifest and also state laws.
+
New ATM sprites.
+
Changes year to 2556 on medical/security records.
+
+
TG updated:
+
+
The escape shuttle will now spend two minutes travelling to CentCom, woo! Objectives are only complete when the shuttle reaches CentCom, and anyone leaving the shuttle during transit time will be lost in deep space! Also, anyone standing in the way of the shuttle when it arrives will be gibbed.
+
Added Antimov module. Very dangerous.
+
Pill bottles now work like ore satchels, click a tile full of pills to pick them all up.
+
Tower caps can now grow randomly as weeds
+
Using a minihoe on a Hydroponics tray removes all the weeds in the tray at once. Using a bucket on a sink now fills it entirely with water, instead of 10 units at a time.
+
You can no longer take photos of photos.
+
Malf AI's hopping between APCs no longer become longer and longer.
+
Secborgs now have modified tasers, it holds 6 shots and recharges one shot every 10 seconds automatically.
+
Turning off PANIC SYPHON now sets scrubbers to scrubbing (default) instead of off. Vents will not appear in the list instead of a timeout message. They also have a link with sets them back to one atmosphere kPa.
+
You now click on AI modules in-hand to set them, instead of just picking them up.
+
Fixes the way the safeguard module is written.
+
+
+
+
+
TG
+
29th April 2012 updated:
+
+
Added new sprites for Killer Tomatoes.
+
Added lasertag vests, guns, projectiles. Sprites for the vests and guns from Muncher. Not actually mapped in. Lasertag guns are only usable if you're wearing the appropriate team vest. Lasertag projectiles will only stun people who are wearing vests belonging to the opposing team.
+
Adds Holodeck, also not mapped in.
+
Janitor borgs have been massively upgraded. They now clean as they move around.
+
Mining shuttle now shunts people where it wants to be. Shuttles now crush people if they fail to move out of where they want to be with the initial shunt.
+
Adds Halloss (Hallucination Damage) as a damage type weapons can do. Halloss can be healed by sleeping.
+
Windows can only be damaged by weapons that do brute or burn.
+
HUD damage indicator now updates with halloss. Inspecting yourself for organ damage now randomly shows damaged organs if you have halloss.
+
Nuke disk now respawns in all rounds.
+
Pinpointers now show the remaining time until a nuke goes off if it's been armed when examined.
+
Instead of z-level transition happening when you reach the edge of the map, it will now happen 7 tiles away from the edge. This means that you will no longer see the black edge, transition will likely happen without you even noticing.
+
Slight changes to examine messages. You cannot examine when blind/unconscious.
+
More new locker sprites!
+
Fixes glass knock sound having a pop at the end of it.
+
Telecomm traffic control now has its own circuitboard and doesn't transform into a server when the monitor is disconnected/reconnected.
+
Using an igniter on a flamethrower that already has one attached no longer uses up the igniter.