Hello there, proud operator of an NT-Sec Prisoner Rehabilitation Center. A solution to rising crime rates and falling productivity, these facilities are specifically designed for the safe, productive imprisonment of your most dangerous criminals.
To press a long-term prisoner into the service of the station, replace his equipment with prisoners' garb at one of the prison lockers, as per normal operating procedure. Before assigning a prisoner his ID, insert the ID into a prisoner management console and assign the prisoner a quota, based on the severity of his crime. A single sheet of most materials produces five points for the prisoner, and points can be expected to be produced at a rate of about 100 per minute, though punishments as severe as forced labor should be reserved for serious crimes of sentences not less than five minutes long. Once you have prepared the prisoner, place him in the secure northern half of the labor shuttle, and send him to the station. Once he meets his quota by feeding sheets to the stacker, he will be allowed to return to the station, and will be able to open the secure door to the prisoner release area.
Your station has been selected to carry out the Gateway Project.
The equipment will be shipped to you at the start of the next quarter. You are to prepare a secure location to house the equipment as outlined in the attached documents.
Your station has been selected to carry out the Gateway Project.
The equipment will be shipped to you at the start of the next quarter. You are to prepare a secure location to house the equipment as outlined in the attached documents.
Log 2: Really dumb of me, but I just waved at an engineer in the outpost, and he waved back. I hope to god he was too dumb or drunk to recognize the suit, because if he isn't, then we might have to pull out before they come looking for us.
Log 3: That huge reinforced tumor in their science section has been making a lot of noise lately. I've been hearing some banging and scratching from the other side and I'm kind of glad now that they reinforced this thing so much. I'll be sleeping with my gun under my pillow from now on."; name = "Personal Log"},/turf/simulated/floor/plasteel/airless{dir = 8; icon_state = "wood"; name = "floor"; tag = "icon-warningcorner (NORTH)"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
"dr" = (/obj/structure/closet/secure_closet{desc = "It's a secure locker for personnel. The first card swiped gains control."; icon_broken = "cabinetdetective_broken"; icon_closed = "cabinetdetective"; icon_locked = "cabinetdetective_locked"; icon_off = "cabinetdetective_broken"; icon_opened = "cabinetdetective_open"; icon_state = "cabinetdetective_locked"; locked = 1; name = "personal closet"; req_access_txt = "150"},/obj/item/ammo_box/magazine/m10mm,/obj/item/ammo_box/magazine/m10mm,/obj/item/suppressor,/turf/simulated/floor/plasteel/airless{dir = 8; icon_state = "wood"; name = "floor"; tag = "icon-warningcorner (NORTH)"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
"ds" = (/obj/structure/closet/secure_closet{desc = "It's a secure locker for personnel. The first card swiped gains control."; icon_broken = "cabinetdetective_broken"; icon_closed = "cabinetdetective"; icon_locked = "cabinetdetective_locked"; icon_off = "cabinetdetective_broken"; icon_opened = "cabinetdetective_open"; icon_state = "cabinetdetective"; locked = 0; name = "personal closet"; req_access_txt = "150"},/obj/item/stack/spacecash/c50,/turf/simulated/floor/wood,/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
@@ -181,7 +181,7 @@
"dy" = (/obj/structure/rack,/obj/item/clothing/suit/space/syndicate/orange,/obj/item/clothing/mask/gas,/obj/item/pickaxe/drill,/obj/item/clothing/head/helmet/space/syndicate/orange,/turf/simulated/floor/plating/airless{dir = 5; icon_state = "warnplate"; name = "plating"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
"dz" = (/obj/item/ore/iron{pixel_x = -3; pixel_y = 9},/turf/simulated/floor/plating/airless/asteroid,/area/awaycontent/a3{always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); has_gravity = 1; name = "Khonsu 19"; power_environ = 0; power_equip = 0; power_light = 0; poweralm = 0})
"dA" = (/turf/simulated/mineral,/area/awaycontent/a3{always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); has_gravity = 1; name = "Khonsu 19"; power_environ = 0; power_equip = 0; power_light = 0; poweralm = 0})
-"dB" = (/turf/simulated/floor/plating/airless{icon_state = "platingdmg1"; name = "plating"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
+"dB" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"dC" = (/obj/structure/sign/vacuum{desc = "A warning sign which reads 'HOSTILE ATMOSPHERE AHEAD'"; name = "\improper HOSTILE ATMOSPHERE AHEAD"; pixel_x = 0; pixel_y = -32},/obj/machinery/portable_atmospherics/canister/oxygen,/turf/simulated/floor/plating/airless{dir = 10; icon_state = "warnplate"; name = "plating"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
"dD" = (/obj/structure/rack,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plating/airless{dir = 6; icon_state = "warnplate"; name = "plating"},/area/awaycontent/a4{has_gravity = 1; name = "Syndicate Outpost"})
"dE" = (/obj/effect/decal/cleanable/blood/tracks{color = "red"; desc = "Your instincts say you shouldn't be following these."; dir = 4; icon = 'icons/effects/blood.dmi'; icon_state = "tracks"},/turf/simulated/floor/plating/airless/asteroid,/area/awaycontent/a3{always_unpowered = 1; ambientsounds = list('sound/ambience/ambimine.ogg'); has_gravity = 1; name = "Khonsu 19"; power_environ = 0; power_equip = 0; power_light = 0; poweralm = 0})
@@ -258,12 +258,12 @@
"eX" = (/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 10},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"eY" = (/obj/machinery/power/port_gen/pacman{desc = "A portable generator for emergency backup power."; name = "P.A.C.M.A.N.-type portable generator"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating,/area/awaycontent/a7)
"eZ" = (/obj/machinery/space_heater,/obj/machinery/light/small{dir = 1},/obj/structure/sign/poster/official/build{pixel_y = 32},/turf/simulated/floor/plating,/area/awaycontent/a7)
-"fa" = (/obj/machinery/power/port_gen/pacman/super{desc = "A portable generator for emergency backup power."; name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator"},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg2"; tag = "icon-platingdmg2"},/area/awaycontent/a7)
+"fa" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"fb" = (/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/power/smes{charge = 1.5e+006; input_level = 10000; inputting = 0; output_level = 200000; outputting = 0},/turf/simulated/floor/plating,/area/awaycontent/a7)
"fc" = (/obj/machinery/power/terminal{dir = 4},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/machinery/alarm/monitor{frequency = 1439; locked = 0; pixel_y = 23; req_access = null},/turf/simulated/floor/plating,/area/awaycontent/a7)
"fd" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/effect/decal/cleanable/blood/tracks{desc = "Your instincts say you shouldn't be following these."; dir = 5; icon_state = "ltrails_1"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"fe" = (/obj/structure/cable{d1 = 2; d2 = 4; icon_state = "2-4"; tag = ""},/turf/simulated/floor/plating,/area/awaycontent/a7)
-"ff" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg1"; tag = "icon-platingdmg1"},/area/awaycontent/a7)
+"ff" = (/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"fg" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/item/newspaper,/turf/simulated/floor/plating,/area/awaycontent/a7)
"fh" = (/obj/structure/table,/obj/machinery/reagentgrinder,/obj/structure/alien/weeds{icon_state = "weeds2"},/turf/simulated/floor/plasteel{dir = 8; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"fi" = (/obj/structure/closet/crate/freezer,/obj/structure/alien/weeds{icon_state = "weeds1"},/obj/item/clothing/mask/facehugger{icon_state = "facehugger_impregnated"; item_state = "facehugger_impregnated"; stat = 2},/obj/item/xenos_claw,/turf/simulated/floor/plasteel{dir = 8; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -296,7 +296,7 @@
"fJ" = (/obj/machinery/atmospherics/pipe/simple/visible{desc = "A one meter section of pipe. This one has been applied with an acid-proof coating."; dir = 4; name = "Acid-Proof Pipe"; unacidable = 1},/obj/structure/alien/weeds,/obj/structure/alien/resin/wall,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"fK" = (/obj/machinery/atmospherics/unary/outlet_injector{desc = "Has a valve and pump attached to it. This one has been applied with an acid-proof coating."; dir = 8; icon_state = "on"; name = "Acid-Proof Air Injector"; on = 1; unacidable = 1},/obj/structure/alien/weeds,/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"fL" = (/obj/machinery/light{active_power_usage = 0; dir = 4; icon_state = "tube-broken"; status = 2},/obj/structure/alien/weeds{icon_state = "weeds2"},/obj/machinery/camera{c_tag = "Xenobiology Containment East"; dir = 8; network = list("MO19X")},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"fM" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg1"; tag = "icon-platingdmg1"},/area/awaycontent/a7)
+"fM" = (/obj/structure/table,/obj/item/paper{info = "Ivan Volodin Stories:
Entry Won — 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too — 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree — 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore — 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv — 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."; name = "Personal Log — Ivan Volodin"},/obj/item/pickaxe,/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"fN" = (/obj/structure/cable{d1 = 1; d2 = 8; icon_state = "1-8"; tag = ""},/turf/simulated/floor/plating,/area/awaycontent/a7)
"fO" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/turf/simulated/floor/plating,/area/awaycontent/a7)
"fP" = (/turf/simulated/wall/r_wall/rust,/area/awaycontent/a7)
@@ -352,7 +352,7 @@
"gN" = (/obj/structure/disposalpipe/segment{desc = "An underfloor disposal pipe. This one has been applied with an acid-proof coating."; name = "Acid-Proof disposal pipe"; unacidable = 1},/obj/structure/alien/weeds{icon_state = "weeds1"},/turf/simulated/floor/engine,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"gO" = (/obj/structure/cable,/obj/machinery/door/poddoor/preopen{desc = "A heavy duty blast door that opens mechanically. This one has been applied with an acid-proof coating."; id_tag = "Awaylab"; name = "Acid-Proof containment chamber blast door"; unacidable = 1},/obj/structure/cable{icon_state = "0-2"; d2 = 2},/obj/structure/grille,/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"gP" = (/obj/effect/decal/cleanable/blood/oil{color = "black"},/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/machinery/power/apc/noalarm{cell_type = 15000; dir = 4; locked = 0; name = "Maintenance APC"; pixel_x = 25; req_access = null; start_charge = 100},/obj/structure/cable,/turf/simulated/floor/plating,/area/awaycontent/a7)
-"gQ" = (/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/awaycontent/a7)
+"gQ" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/item/stack/rods,/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"gR" = (/obj/structure/table,/obj/machinery/recharger{pixel_y = 4},/turf/simulated/floor/plasteel{dir = 4; icon_state = "red"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"gS" = (/obj/structure/chair/office/dark,/turf/simulated/floor/plasteel,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"gT" = (/turf/simulated/floor/plasteel{dir = 8; icon_state = "whitepurplecorner"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -373,7 +373,7 @@
"hi" = (/obj/structure/table,/obj/item/book/manual/security_space_law,/obj/machinery/computer/security/telescreen/entertainment{pixel_x = -32; pixel_y = 0},/turf/simulated/floor/plasteel{dir = 10; icon_state = "red"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"hj" = (/obj/structure/table,/obj/item/paper_bin{pixel_x = 1; pixel_y = 9},/obj/item/pen,/turf/simulated/floor/plasteel{dir = 6; icon_state = "red"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"hk" = (/obj/structure/table,/obj/item/folder/red,/turf/simulated/floor/plasteel{icon_state = "red"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"hl" = (/obj/structure/table,/obj/item/paper{info = "Ivan Volodin Stories:
Entry Won — 28/05/2554: Hello. I am Crazy Ivan. Boss say I must write. I do good job fixing outpost. Is very good job. Much better than mines. Many nice people. I cause no trouble.
Entry Too — 05/06/2554: I am finding problem with Booze-O-Mat. Is not problem. I solve very easy. Use yellow tool to make purple light go off. I am good engineer! Bartender will be very happy.
Entry Tree — 08/06/2554: Bartender is not happy. Security man is not happy. Cannot feel legs, is very cold in freezer. Is not good. Table is jammed into door, have no tools. Is very not good. But, on bright side, found meat! Shall chew to keep spirits up.
Entry Fore — 12/06/2554: Big nasty purple bug looked at me today. Make nervous. Blue wall wire can be broken, then bad thing happens. Very very bad thing. Man in orange spacesuit wave at me today too. He seem nice. Wonder who was?
Entry Fiv — 15/06/2554: I eat cornflakes today. Is good day. Sun shine for a while. Was nice. I also take ride on disposals chute. Was fun, but tiny. Get clog out of pipes, was vodka bottle. Is empty. This make many sads.
Entry Sex: 19/06/2554: Purple bugs jumpy today. When waved, get hiss. Maybe very bad. Maybe just ill. Do not know. Is science problem, is not engineer problem. I eat sandwich. Is glorious job. Wish to never end."; name = "Personal Log — Ivan Volodin"},/obj/item/pickaxe,/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/awaycontent/a7)
+"hl" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/effect/decal/cleanable/blood/oil{color = "black"},/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"hm" = (/obj/machinery/computer/monitor,/obj/structure/cable,/turf/simulated/floor/plating,/area/awaycontent/a7)
"hn" = (/obj/machinery/portable_atmospherics/canister/air,/turf/simulated/floor/plating,/area/awaycontent/a7)
"ho" = (/obj/structure/closet/crate/can,/obj/item/clothing/gloves/color/latex,/obj/item/trash/chips,/obj/effect/decal/cleanable/dirt,/obj/machinery/light/small{active_power_usage = 0; dir = 1; icon_state = "bulb-broken"; status = 2},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitehall"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -382,7 +382,7 @@
"hr" = (/obj/structure/table,/obj/item/retractor,/obj/item/hemostat,/obj/structure/alien/weeds,/obj/item/stack/cable_coil,/turf/simulated/floor/plasteel{icon_state = "white"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"hs" = (/obj/structure/table,/obj/item/cartridge/signal/toxins,/obj/item/cartridge/signal/toxins{pixel_x = -4; pixel_y = 2},/obj/machinery/firealarm{dir = 2; pixel_y = 24},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"ht" = (/obj/structure/filingcabinet/chestdrawer,/obj/machinery/light/small{active_power_usage = 0; dir = 1; icon_state = "bulb-broken"; status = 2},/obj/machinery/alarm/monitor{frequency = 1439; locked = 0; pixel_y = 23; req_access = null},/obj/item/paper{info = "Personal Log for Research Director Gerald Rosswell
Entry One — 17/05/2554: You know, I can't believe I took this position so suddenly. I saw that corporate needed a research director for one of its outposts and thought it would be a cakewalk; there isn't going to be a lot of research to be done on a tiny outpost. Mainly just running scans on the gas giant we are orbiting or some basic RnD. However, they conveniently forgot to tell me that I and my science staff would have to pull double duty as medical staff, and that there is no one higher up on the chain of command here, so I get to pull triple duty as acting captain as well! This shit is probably allowed in some 3pt. fine print buried underneath the literally thousands of pages of contracts. Well, at least the research will be easy work.
Entry Two — 25/05/2554: Well, we all expected it at the outpost: CentComm has decided to completely change what research we are doing. They've decided that we should be researching the species known as 'xenomorphs'. They announced this change 4 days ago, and along with it, sadly, the termination of our current science staff, barring me. Not to mention the constant noise made by the construction detail they sent, to staple on a xenobiology lab, ensuring no one has been able to sleep decently ever since they announced the shift. To make matters worse, our current security guard actually died of a heart attack today. Just goes to show, that 75 year old men shouldn't be security guards. Still can't believe that they decided to do this major change less than a month after the outpost was established.
Entry Three — 27/05/2554: The new security guard arrived today. Apparently transferred here from the research station that also is orbiting the gas giant. He seems to be rather angry about his transfer. Considering the rumors I've heard about the research station, he's probably caught off guard by the fact that Steve hasn't tried to force an IED down his throat.
Entry Four — 06/06/2554: My requests for additional security and containment measures for the 'xenomorph' has been denied. Does Central Command not notice how dangerous these creatures are? The only thing keeping them in is a force field: a minor problem with the power grid and the entire hive is loose. What would stop them then, the lone security guard with a dinky little taser? Kenneth can barely handle a short-tempered engineer. We are under-equipped and under-staffed, we are inevitably going to be destroyed, unless we get the equipment and staff we need.
Entry Five — 10/06/2554: Cunningham got a good look at the xenomorph in containment. He was frightened for the rest of the day, rather amusing if it wasn't for the fact that we are all trapped on this scrap heap, with naught but a force field keeping those xenomorphs in.
Entry Six — 17/06/2554: The reactions from the specimens today have shown that they possess strange mental properties. Mark hypothesizes that they possibly have a sort of hive mind; while nothing is certain, this would explain how xenomorphs seem to have vastly increased intellect when a 'queen' is present. Of course, testing this hypothesis would require many complicated procedures which we will not be able to undertake. Although we do not know the full extend of the xenomorph mind, it may or may not be able to find a way to circumvent our containment system. I will resubmit my request for additional security measures, along with this newfound information."; name = "Personal Log — Gerald Rosswell"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"hu" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/item/stack/rods,/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/awaycontent/a7)
+"hu" = (/obj/structure/closet/crate,/obj/item/storage/box/lights/mixed,/obj/item/poster/random_contraband,/obj/effect/landmark/damageturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"hv" = (/obj/machinery/door_control{id = "Awaybiohazard"; name = "Biohazard Shutter Control"; pixel_x = -25; pixel_y = 0; req_access_txt = "271"},/obj/machinery/light/small{dir = 8},/obj/machinery/computer/security{desc = "Used to access the various cameras on the outpost."; network = list("MO19R","MO19")},/turf/simulated/floor/plasteel{dir = 8; icon_state = "red"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"hw" = (/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplecorner"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"hx" = (/obj/structure/grille,/obj/machinery/door/poddoor{id_tag = "AwayRD"; name = "privacy shutter"},/obj/structure/window/full/reinforced,/turf/simulated/floor/plating,/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -451,7 +451,7 @@
"iI" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = -32},/obj/machinery/light/small{active_power_usage = 0; dir = 2; icon_state = "bulb-broken"; status = 2},/obj/machinery/camera{c_tag = "Research Director's Office"; dir = 1; network = list("MO19","MO19R")},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"iJ" = (/obj/machinery/newscaster{pixel_x = 0; pixel_y = -30},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"iK" = (/obj/structure/table,/obj/item/radio/off,/obj/item/laser_pointer,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"iL" = (/obj/structure/cable{d1 = 1; d2 = 2; icon_state = "1-2"; pixel_y = 0; tag = ""},/obj/effect/decal/cleanable/blood/oil{color = "black"},/turf/simulated/floor/plating{broken = 1; icon_state = "platingdmg3"; tag = "icon-platingdmg3"},/area/awaycontent/a7)
+"iL" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/obj/effect/landmark/burnturf,/turf/simulated/floor/plating,/area/awaycontent/a7)
"iM" = (/obj/structure/table,/obj/item/storage/secure/briefcase,/obj/item/taperecorder{pixel_x = -3},/turf/simulated/floor/plasteel{dir = 6; icon_state = "warnwhite"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"iN" = (/obj/machinery/light/small,/turf/simulated/floor/plasteel{dir = 2; icon_state = "warnwhite"; tag = "icon-warnwhite (NORTH)"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"iO" = (/obj/structure/sink{dir = 8; icon_state = "sink"; pixel_x = -12; pixel_y = 2},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 10; icon_state = "warnwhite"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -462,7 +462,7 @@
"iT" = (/obj/structure/chair{dir = 1},/obj/machinery/light/small{dir = 4},/turf/simulated/floor/plasteel{icon_state = "bar"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"iU" = (/obj/machinery/computer/security/telescreen/entertainment{pixel_x = 0; pixel_y = 0},/turf/simulated/wall/rust,/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"iV" = (/obj/machinery/vending/boozeomat{req_access_txt = "0"},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
-"iW" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched1"; tag = "icon-floorscorched1 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"iW" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/obj/effect/landmark/burnturf,/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched2"; tag = "icon-floorscorched2 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"iX" = (/obj/structure/table,/obj/machinery/microwave{pixel_x = -3; pixel_y = 6},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched2"; tag = "icon-floorscorched2 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"iY" = (/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"iZ" = (/obj/structure/table,/obj/machinery/reagentgrinder,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
@@ -484,12 +484,12 @@
"jp" = (/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/structure/table,/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jq" = (/obj/structure/table/reinforced,/obj/machinery/door/firedoor,/obj/item/reagent_containers/food/condiment/peppermill{pixel_x = 3},/obj/item/reagent_containers/food/condiment/saltshaker{pixel_x = -3; pixel_y = 0},/obj/machinery/door/poddoor/shutters{dir = 8; id_tag = "awaykitchen"; name = "Serving Hatch"},/turf/simulated/floor/carpet,/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jr" = (/obj/structure/closet/secure_closet{icon_broken = "rdsecurebroken"; icon_closed = "rdsecure"; icon_locked = "rdsecure1"; icon_off = "rdsecureoff"; icon_opened = "rdsecureopen"; icon_state = "rdsecure1"; locked = 1; name = "research director's locker"; req_access_txt = "271"},/obj/item/storage/backpack/satchel_tox,/obj/item/clothing/gloves/color/latex,/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"js" = (/obj/item/twohanded/required/kirbyplants{desc = "A plastic potted plant."; layer = 4.1; pixel_y = 3},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched1"; tag = "icon-floorscorched1 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"js" = (/obj/item/twohanded/required/kirbyplants{desc = "A plastic potted plant."; layer = 4.1; pixel_y = 3},/obj/effect/landmark/burnturf,/turf/simulated/floor/plasteel{dir = 8; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jt" = (/obj/structure/closet/crate/can,/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 6},/turf/simulated/floor/plasteel{tag = "icon-cafeteria (NORTHEAST)"; icon_state = "cafeteria"; dir = 5},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
"ju" = (/obj/machinery/vending/snack,/obj/structure/sign/poster/official/ue_no{pixel_y = 32},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched2"; tag = "icon-floorscorched2 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jv" = (/obj/structure/chair,/obj/effect/decal/cleanable/generic,/turf/simulated/floor/plasteel,/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jw" = (/obj/structure/chair,/turf/simulated/floor/plasteel,/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
-"jx" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched1"; tag = "icon-floorscorched1 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"jx" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/obj/effect/landmark/burnturf,/turf/simulated/floor/plasteel{dir = 8; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jy" = (/obj/structure/sign/science{pixel_x = 0; pixel_y = 32},/obj/effect/decal/cleanable/dirt,/turf/simulated/floor/plasteel{dir = 9; icon_state = "purple"; tag = "icon-purple (NORTHWEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jz" = (/turf/simulated/floor/plasteel{dir = 5; icon_state = "purple"; tag = "icon-purple (NORTHEAST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jA" = (/obj/machinery/atmospherics/pipe/simple/hidden/supply{dir = 4; level = 1},/turf/simulated/floor/plasteel{dir = 1; icon_state = "whitepurplecorner"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
@@ -502,7 +502,7 @@
"jH" = (/turf/simulated/floor/plasteel,/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jI" = (/obj/structure/extinguisher_cabinet{pixel_x = 0; pixel_y = 30},/turf/simulated/floor/plasteel{dir = 8; icon_state = "floorgrime"; tag = "icon-floorgrime (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
"jJ" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 8; on = 1},/turf/simulated/floor/plasteel{dir = 2; icon_state = "whitepurplecorner"},/area/awaycontent/a2{has_gravity = 1; name = "MO19 Research"})
-"jK" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper{info = "
I Can't Believe It's Not Pasta: Half off on Wednesdays
Burger night every Friday 6PM-10PM, free drinks with purchase of meal!
Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM
"; name = "Specials This Week"},/turf/simulated/floor/plasteel{burnt = 1; dir = 8; icon_state = "floorscorched1"; tag = "icon-floorscorched1 (WEST)"},/area/awaycontent/a1{has_gravity = 1; name = "MO19 Arrivals"})
+"jK" = (/obj/structure/noticeboard{pixel_y = 32},/obj/item/paper{info = "
I Can't Believe It's Not Pasta: Half off on Wednesdays
Burger night every Friday 6PM-10PM, free drinks with purchase of meal!
Premiering Tonight: The comedy stylings of Shoe Snatching Willy! 11AM-7PM
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
Equip yourself with a multi-tool
Use the multitool on each machine, that is the broadcaster, receiver and the relay.
Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
You have purchased the latest in listening equipment. The telecommunication setup we created is the best in listening to common and private radio fequencies. Here is a step by step guide to start listening in on those saucy radio channels:
Equip yourself with a multi-tool
Use the multitool on each machine, that is the broadcaster, receiver and the relay.
Turn all the machines on, it has already been configured for you to listen on.
Simple as that. Now to listen to the private channels, you'll have to configure the intercoms, located on the front desk. Here is a list of frequencies for you to listen on.
"
+
+ if(!T.adminAssigned)
+ dat += "No admin assigned to this ticket - Take Ticket "
+ else
+ dat += "[T.adminAssigned] is assigned to this Ticket. - Take Ticket "
+
+ if(T.lastAdminResponse)
+ dat += "Last Admin Response: [T.lastAdminResponse] at [T.lastResponseTime]"
+ else
+ dat +="No Admin Response"
+
+ dat += "
")
log_admin("Announce: [key_name(usr)] : [message]")
feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index dae563c7e19..d76b73ae10c 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -170,7 +170,6 @@ var/list/admin_verbs_debug = list(
/client/proc/admin_serialize,
/client/proc/jump_to_ruin,
/client/proc/toggle_medal_disable,
- /client/proc/startadmintickets,
)
var/list/admin_verbs_possess = list(
/proc/possess,
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index b03f35b6091..78b175b4656 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -407,11 +407,11 @@
dat += "Current Game Mode: [ticker.mode.name] "
dat += "Round Duration: [round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)] "
dat += "Emergency shuttle "
- if(shuttle_master.emergency.mode < SHUTTLE_CALL)
+ if(SSshuttle.emergency.mode < SHUTTLE_CALL)
dat += "Call Shuttle "
else
- var/timeleft = shuttle_master.emergency.timeLeft()
- if(shuttle_master.emergency.mode < SHUTTLE_DOCKED)
+ var/timeleft = SSshuttle.emergency.timeLeft()
+ if(SSshuttle.emergency.mode < SHUTTLE_DOCKED)
dat += "ETA: [(timeleft / 60) % 60]:[add_zero(num2text(timeleft % 60), 2)] "
dat += "Send Back "
else
diff --git a/code/modules/admin/tickets/admintickets.dm b/code/modules/admin/tickets/admintickets.dm
deleted file mode 100644
index ea5f7003870..00000000000
--- a/code/modules/admin/tickets/admintickets.dm
+++ /dev/null
@@ -1,185 +0,0 @@
-/*
-Admin ticket system by Birdtalon
-*/
-//Global holder
-
-var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
-
-//Defines
-//Deciseconds until ticket becomes stale if unanswered. Alerts admins.
-#define ADMIN_TICKET_TIMEOUT 6000 // 10 minutes
-//Decisecions before the user is allowed to open another ticket while their existing one is open.
-#define ADMIN_TICKET_DUPLICATE_COOLDOWN 3000 // 5 minutes
-
-//Status defines
-#define ADMIN_TICKET_OPEN 1
-#define ADMIN_TICKET_CLOSED 2
-#define ADMIN_TICKET_RESOLVED 3
-#define ADMIN_TICKET_STALE 4
-
-//Datum holding all tickets
-/datum/adminTicketHolder
- var/ticketCounter = 1 // Counts the tickets and used to assign the id number
- var/list/allTickets = list()
-
-//Return the current ticket number ready to be called off.
-/datum/adminTicketHolder/proc/getTicketCounter()
- return ticketCounter
-
-//Return the ticket counter and increment
-/datum/adminTicketHolder/proc/getTicketCounterAndInc()
- . = ticketCounter
- ticketCounter++
- return
-
-/datum/adminTicketHolder/proc/resolveAllOpenTickets() // Resolve all open tickets
- for(var/i in allTickets)
- var/datum/admin_ticket/T = i
- resolveTicket(T.ticketNum)
-
-//Open a new ticket and populate details then add to the list of open tickets
-/datum/adminTicketHolder/proc/newTicket(var/client/C, var/passedContent, var/title)
- if(!C || !passedContent)
- return
-
- //Check if the user has an open ticket already within the cooldown period, if so we don't create a new one and re-set the cooldown period
- var/datum/admin_ticket/existingTicket = checkForOpenTicket(C)
- if(existingTicket)
- existingTicket.setCooldownPeriod()
- to_chat(C, "Your ticket #[existingTicket.ticketNum] remains open! Visit \"My tickets\" under the Admin Tab to view it.")
- return
-
- if(!title)
- title = passedContent
-
- var/datum/admin_ticket/T = new /datum/admin_ticket
- T.clientName = C
- T.timeOpened = worldtime2text()
- T.title = title
- T.content += passedContent
- T.locationSent = C.mob.loc.loc.name
- T.mobControlled = C.mob
- T.ticketState = ADMIN_TICKET_OPEN
- T.timeUntilStale = world.time + ADMIN_TICKET_TIMEOUT
- T.setCooldownPeriod()
- T.ticketNum = getTicketCounterAndInc()
- allTickets += T
-
- //Inform the user that they have opened a ticket
- to_chat(C, "You have opened admin ticket number #[(globAdminTicketHolder.getTicketCounter() - 1)]! Please be patient and we will help you soon!")
-
- //Begin the stale count for this ticket.
- spawn(0)
- T.beginStaleCount()
-
-//Set ticket state with key N to open
-/datum/adminTicketHolder/proc/openTicket(var/N)
- var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
- if(T.ticketState != ADMIN_TICKET_OPEN)
- T.ticketState = ADMIN_TICKET_OPEN
- return TRUE
-
-//Set ticket state with key N to resolved
-/datum/adminTicketHolder/proc/resolveTicket(var/N)
- var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
- if(T.ticketState != ADMIN_TICKET_RESOLVED)
- T.ticketState = ADMIN_TICKET_RESOLVED
- return TRUE
-
-//Set ticket state with key N to closed
-/datum/adminTicketHolder/proc/closeTicket(var/N)
- var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
- if(T.ticketState != ADMIN_TICKET_CLOSED)
- T.ticketState = ADMIN_TICKET_CLOSED
- return TRUE
-
-//Check if the user already has a ticket open and within the cooldown period.
-/datum/adminTicketHolder/proc/checkForOpenTicket(var/client/C)
- for(var/datum/admin_ticket/T in allTickets)
- if(T.clientName == C && T.ticketState == ADMIN_TICKET_OPEN && (T.ticketCooldown > world.time))
- return T
- return FALSE
-
-//Check if the user has ANY ticket not resolved or closed.
-/datum/adminTicketHolder/proc/checkForTicket(var/client/C)
- var/list/tickets = list()
- for(var/datum/admin_ticket/T in allTickets)
- if(T.clientName == C && (T.ticketState == ADMIN_TICKET_OPEN || T.ticketState == ADMIN_TICKET_STALE))
- tickets += T
- if(tickets.len)
- return tickets
- return FALSE
-
-//return the client of a ticket number
-/datum/adminTicketHolder/proc/returnClient(var/N)
- var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
- return T.clientName
-
-/datum/adminTicketHolder/proc/assignAdminToTicket(var/client/C, var/N)
- var/datum/admin_ticket/T = globAdminTicketHolder.allTickets[N]
- T.assignAdmin(C)
- return TRUE
-
-//Single admin ticket
-
-/datum/admin_ticket
- var/ticketNum // Ticket number
- var/clientName // Client which opened the ticket
- var/timeOpened // Time the ticket was opened
- var/title //The initial message with links
- var/list/content = list() // content of the admin help
- var/lastAdminResponse // Last admin who responded
- var/lastResponseTime // When the admin last responded
- var/locationSent // Location the player was when they send the ticket
- var/mobControlled // Mob they were controlling
- var/ticketState // State of the ticket, open, closed, resolved etc
- var/timeUntilStale // When the ticket goes stale
- var/ticketCooldown // Cooldown before allowing the user to open another ticket.
- var/adminAssigned // Admin who has assigned themselves to this ticket
-
-//Ticker called when a ticket is created, checks for stale-ness.
-/datum/admin_ticket/proc/beginStaleCount()
- while(world.time < timeUntilStale || !lastAdminResponse || !adminAssigned) // While within the stale period OR no admin responded OR no admin assigned.
-
- if(!src)
- return
-
- sleep(200) // Check every 20 seconds.
- if(ticketState == ADMIN_TICKET_OPEN && world.time > timeUntilStale)
- message_adminTicket("Ticket #[ticketNum] has been open for [ADMIN_TICKET_TIMEOUT * 0.1] seconds. Changing status to stale.")
- ticketState = ADMIN_TICKET_STALE
- break
-
-//Set the cooldown period for the ticket. The time when it's created plus the defined cooldown time.
-/datum/admin_ticket/proc/setCooldownPeriod()
- ticketCooldown = world.time + ADMIN_TICKET_DUPLICATE_COOLDOWN
-
-//Set the last admin who responded as the client passed as an arguement.
-/datum/admin_ticket/proc/setLastAdminResponse(var/client/C)
- lastAdminResponse = C
- lastResponseTime = worldtime2text()
-
-//Return the ticket state as a colour coded text string.
-/datum/admin_ticket/proc/state2text()
- switch(ticketState)
- if(ADMIN_TICKET_OPEN)
- return "OPEN"
- if(ADMIN_TICKET_RESOLVED)
- return "RESOLVED"
- if(ADMIN_TICKET_CLOSED)
- return "CLOSED"
- if(ADMIN_TICKET_STALE)
- return "STALE"
-
-//Assign the client passed to var/adminAsssigned
-/datum/admin_ticket/proc/assignAdmin(var/client/C, var/N)
- if(!C)
- return
- adminAssigned = C
- return TRUE
-
-/datum/admin_ticket/proc/addResponse(var/client/C, var/M as text)
- if(C.holder)
- setLastAdminResponse(C)
- M = "[C]: [M]"
- content += M
\ No newline at end of file
diff --git a/code/modules/admin/tickets/adminticketsUI.dm b/code/modules/admin/tickets/adminticketsUI.dm
deleted file mode 100644
index b063c5cb673..00000000000
--- a/code/modules/admin/tickets/adminticketsUI.dm
+++ /dev/null
@@ -1,172 +0,0 @@
-/datum/adminTicketHolder/proc/returnUI(var/tab = ADMIN_TICKET_OPEN)
- set name = "Open Ticket Interface"
- set category = "Tickets"
-
-//dat
- var/trStyle = "border-top:2px solid; border-bottom:2px solid; padding-top: 5px; padding-bottom: 5px;"
- var/tdStyleleft = "border-top:2px solid; border-bottom:2px solid; width:150px; text-align:center;"
- var/tdStyle = "border-top:2px solid; border-bottom:2px solid;"
- var/datum/admin_ticket/ticket
- var/dat
- dat += "
"
-
- if(!T.adminAssigned)
- dat += "No admin assigned to this ticket - Take Ticket "
- else
- dat += "[T.adminAssigned] is assigned to this Ticket. - Take Ticket "
-
- if(T.lastAdminResponse)
- dat += "Last Admin Response: [T.lastAdminResponse] at [T.lastResponseTime]"
- else
- dat +="No Admin Response"
-
- dat += "
"
- for(var/datum/admin_ticket/T in tickets)
- dat += "
Ticket #[T.ticketNum]
"
- for(var/i = 1, i <= T.content.len, i++)
- dat += "
[T.content[i]]
"
- dat += "
"
-
- var/datum/browser/popup = new(user, "userticketsdetail", "Tickets", 1000, 600)
- popup.set_content(dat)
- popup.open()
-
-/datum/adminTicketHolder/Topic(href, href_list)
-
- if(href_list["refresh"])
- showUI(usr)
- return
-
- if(href_list["refreshdetail"])
- var/indexNum = text2num(href_list["refreshdetail"])
- showDetailUI(usr, indexNum)
- return
-
- if(href_list["showopen"])
- showUI(usr, ADMIN_TICKET_OPEN)
- return
- if(href_list["showresolved"])
- showUI(usr, ADMIN_TICKET_RESOLVED)
- return
- if(href_list["showclosed"])
- showUI(usr, ADMIN_TICKET_CLOSED)
- return
-
- if(href_list["details"])
- var/indexNum = text2num(href_list["details"])
- showDetailUI(usr, indexNum)
- return
-
- if(href_list["resolve"])
- var/indexNum = text2num(href_list["resolve"])
- if(globAdminTicketHolder.resolveTicket(indexNum))
- message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
- to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.")
- showUI(usr)
-
- if(href_list["detailresolve"])
- var/indexNum = text2num(href_list["detailresolve"])
- if(globAdminTicketHolder.resolveTicket(indexNum))
- message_adminTicket("[usr.client] / ([usr]) resolved admin ticket number [indexNum]")
- to_chat(returnClient(indexNum), "Your admin ticket has now been resolved.")
- showDetailUI(usr, indexNum)
-
- if(href_list["detailclose"])
- var/indexNum = text2num(href_list["detailclose"])
- if(alert("Are you sure? This will send a negative message.",,"Yes","No") != "Yes")
- return
- if(globAdminTicketHolder.closeTicket(indexNum))
- message_adminTicket("[usr.client] / ([usr]) closed admin ticket number [indexNum]")
- to_chat(returnClient(indexNum), "- AdminHelp Rejected! -")
- to_chat(returnClient(indexNum), "Please try to be calm, clear, and descriptive in admin helps, do not assume the admin has seen any related events, and clearly state the names of anybody you are reporting. If you asked a question, please ensure it was clear what you were asking.")
- to_chat(returnClient(indexNum), "Your ticket has now been closed.")
- showDetailUI(usr, indexNum)
-
- if(href_list["detailreopen"])
- var/indexNum = text2num(href_list["detailreopen"])
- if(globAdminTicketHolder.openTicket(indexNum))
- message_adminTicket("[usr.client] / ([usr]) re-opened admin ticket number [indexNum]")
- showDetailUI(usr, indexNum)
-
- if(href_list["assignadmin"])
- var/indexNum = text2num(href_list["assignadmin"])
- if(globAdminTicketHolder.assignAdminToTicket(usr.client, indexNum))
- message_adminTicket("[usr.client] / ([usr]) has taken ticket number [indexNum]")
- to_chat(returnClient(indexNum), "Your ticket is being handled by [usr.client].")
- showDetailUI(usr, indexNum)
diff --git a/code/modules/admin/tickets/adminticketsverbs.dm b/code/modules/admin/tickets/adminticketsverbs.dm
index 0cf22c5d24c..f203ef501e8 100644
--- a/code/modules/admin/tickets/adminticketsverbs.dm
+++ b/code/modules/admin/tickets/adminticketsverbs.dm
@@ -1,51 +1,33 @@
//Verbs
-/client/proc/startadmintickets()
- set name = "Restart Admin Ticket System"
- set category = "Debug"
-
- if(!holder && !check_rights(R_DEBUG))
- return
-
- if(!globAdminTicketHolder)
- var/global/datum/adminTicketHolder/globAdminTicketHolder = new /datum/adminTicketHolder
- else
- if(alert("Are you sure you want to reboot the admin ticket system?","Reboot Admin Tickets?","Yes","No") != "Yes")
- return
- message_admins("Restarting Admin Ticket System!")
- globAdminTicketHolder = new /datum/adminTicketHolder
- message_admins("Admin Ticket System Restarted!")
-
/client/proc/openTicketUI()
set name = "Open Ticket Interface"
set category = "Admin"
- if(!holder && !check_rights(R_ADMIN))
+ if(!holder || !check_rights(R_ADMIN))
return
- globAdminTicketHolder.showUI(usr)
+ SStickets.showUI(usr)
/client/proc/resolveAllTickets()
set name = "Resolve All Open Tickets"
set category = "Admin"
- if(!holder && !check_rights(R_ADMIN))
+ if(!holder || !check_rights(R_ADMIN))
return
if(alert("Are you sure you want to resolve ALL open tickets?","Resolve all open tickets?","Yes","No") != "Yes")
return
- globAdminTicketHolder.resolveAllOpenTickets()
-
-
+ SStickets.resolveAllOpenTickets()
/client/proc/openUserUI()
set name = "My Tickets"
set category = "Admin"
- if(!holder && !check_rights(R_ADMIN))
+ if(!holder || !check_rights(R_ADMIN))
return
- globAdminTicketHolder.userDetailUI(usr)
+ SStickets.userDetailUI(usr)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 194b1d49035..6a540e65096 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -30,7 +30,7 @@
if(!check_rights(R_ADMIN))
return
var/ticketID = text2num(href_list["openadminticket"])
- globAdminTicketHolder.showDetailUI(usr, ticketID)
+ SStickets.showDetailUI(usr, ticketID)
if(href_list["stickyban"])
stickyban(href_list["stickyban"],href_list)
@@ -274,22 +274,22 @@
switch(href_list["call_shuttle"])
if("1")
- if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+ if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
return
- shuttle_master.emergency.request()
+ SSshuttle.emergency.request()
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station")
if("2")
- if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+ if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
return
- switch(shuttle_master.emergency.mode)
+ switch(SSshuttle.emergency.mode)
if(SHUTTLE_CALL)
- shuttle_master.emergency.cancel()
+ SSshuttle.emergency.cancel()
log_admin("[key_name(usr)] sent the Emergency Shuttle back")
message_admins("[key_name_admin(usr)] sent the Emergency Shuttle back")
else
- shuttle_master.emergency.cancel()
+ SSshuttle.emergency.cancel()
log_admin("[key_name(usr)] called the Emergency Shuttle")
message_admins("[key_name_admin(usr)] called the Emergency Shuttle to the station")
@@ -299,10 +299,10 @@
else if(href_list["edit_shuttle_time"])
if(!check_rights(R_SERVER)) return
- var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", shuttle_master.emergency.timeLeft() ) as num
- shuttle_master.emergency.setTimer(timer*10)
+ var/timer = input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", SSshuttle.emergency.timeLeft() ) as num
+ SSshuttle.emergency.setTimer(timer*10)
log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds")
- minor_announcement.Announce("The emergency shuttle will reach its destination in [round(shuttle_master.emergency.timeLeft(600))] minutes.")
+ minor_announcement.Announce("The emergency shuttle will reach its destination in [round(SSshuttle.emergency.timeLeft(600))] minutes.")
message_admins("[key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [timer] seconds")
href_list["secrets"] = "check_antagonist"
@@ -2859,21 +2859,21 @@
if("moveminingshuttle")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShM")
- if(!shuttle_master.toggleShuttle("mining","mining_home","mining_away"))
+ if(!SSshuttle.toggleShuttle("mining","mining_home","mining_away"))
message_admins("[key_name_admin(usr)] moved mining shuttle")
log_admin("[key_name(usr)] moved the mining shuttle")
if("movelaborshuttle")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShL")
- if(!shuttle_master.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
+ if(!SSshuttle.toggleShuttle("laborcamp","laborcamp_home","laborcamp_away"))
message_admins("[key_name_admin(usr)] moved labor shuttle")
log_admin("[key_name(usr)] moved the labor shuttle")
if("moveferry")
feedback_inc("admin_secrets_fun_used",1)
feedback_add_details("admin_secrets_fun_used","ShF")
- if(!shuttle_master.toggleShuttle("ferry","ferry_home","ferry_away"))
+ if(!SSshuttle.toggleShuttle("ferry","ferry_home","ferry_away"))
message_admins("[key_name_admin(usr)] moved the centcom ferry")
log_admin("[key_name(usr)] moved the centcom ferry")
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index c38b42ad9b5..9d972598376 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -117,15 +117,15 @@ var/list/adminhelp_ignored_words = list("unknown","the","a","an","of","monkey","
if("Adminhelp")
var/ticketNum // Holder for the ticket number
var/prunedmsg ="[usr.client]: [msg]" // Message without links
- if(globAdminTicketHolder.checkForOpenTicket(usr.client)) // If user already has an open ticket
- var/datum/admin_ticket/T = globAdminTicketHolder.checkForOpenTicket(usr.client) // Make T equal to the ticket they have open
+ if(SStickets.checkForOpenTicket(usr)) // If user already has an open ticket
+ var/datum/admin_ticket/T = SStickets.checkForOpenTicket(usr) // Make T equal to the ticket they have open
ticketNum = T.ticketNum // ticketNum is the number of their ticket.
T.addResponse(usr.client, msg)
else
- ticketNum = globAdminTicketHolder.getTicketCounter() // ticketNum is the ticket ready to be assigned.
+ ticketNum = SStickets.getTicketCounter() // ticketNum is the ticket ready to be assigned.
msg = "[selected_type]: [key_name(src, TRUE, selected_type)] (?) (PP) (VV) (SM) ([admin_jump_link(mob)]) (CA) (TICKET) [ai_found ? " (CL)" : ""](TAKE) :[msg]"
//Open a new adminticket and inform the user.
- globAdminTicketHolder.newTicket(src, prunedmsg, msg)
+ SStickets.newTicket(src, prunedmsg, msg)
for(var/client/X in modholders + adminholders)
if(X.prefs.sound & SOUND_ADMINHELP)
X << 'sound/effects/adminhelp.ogg'
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 600a53d81eb..1287b96181a 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -187,15 +187,15 @@
return
//Check if the mob being PM'd has any open admin tickets.
var/tickets = list()
- tickets = globAdminTicketHolder.checkForTicket(C)
+ tickets = SStickets.checkForTicket(C)
if(tickets)
for(var/datum/admin_ticket/i in tickets)
i.addResponse(src, msg) // Add this response to their open tickets.
return
- tickets = globAdminTicketHolder.checkForTicket(src)
+ tickets = SStickets.checkForTicket(C)
if(check_rights(R_ADMIN|R_MOD, 0, C.mob)) //Is the person being pm'd an admin? If so we check if the pm'er has open tickets
- tickets = globAdminTicketHolder.checkForTicket(src)
+ tickets = SStickets.checkForTicket(C)
if(tickets)
for(var/datum/admin_ticket/i in tickets)
i.addResponse(src, msg)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 230fbb6555c..c3641766db0 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -32,7 +32,7 @@ client/proc/one_click_antag()
if(M.stat || !M.mind || M.mind.special_role)
return FALSE
if(temp)
- if(M.mind.assigned_role in temp.restricted_jobs || M.mind.assigned_role in temp.protected_jobs || M.client.prefs.species in temp.protected_species)
+ if((M.mind.assigned_role in temp.restricted_jobs) || (M.client.prefs.species in temp.protected_species))
return FALSE
if(role) // Don't even bother evaluating if there's no role
if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && (!jobban_isbanned(M, role)))
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index c5d6a50c418..013fd4b2e40 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -796,7 +796,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
set category = "Admin"
set name = "Call Shuttle"
- if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+ if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
return
if(!check_rights(R_ADMIN))
@@ -806,11 +806,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(confirm != "Yes") return
if(alert("Set Shuttle Recallable (Select Yes unless you know what this does)", "Recallable?", "Yes", "No") == "Yes")
- shuttle_master.emergency.canRecall = TRUE
+ SSshuttle.emergency.canRecall = TRUE
else
- shuttle_master.emergency.canRecall = FALSE
+ SSshuttle.emergency.canRecall = FALSE
- shuttle_master.emergency.request()
+ SSshuttle.emergency.request()
feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-called the emergency shuttle.")
@@ -825,20 +825,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
if(alert(src, "You sure?", "Confirm", "Yes", "No") != "Yes") return
- if(shuttle_master.emergency.mode >= SHUTTLE_DOCKED)
+ if(SSshuttle.emergency.mode >= SHUTTLE_DOCKED)
return
- if(shuttle_master.emergency.canRecall == FALSE)
+ if(SSshuttle.emergency.canRecall == FALSE)
if(alert("Shuttle is currently set to be nonrecallable. Recalling may break things. Respect Recall Status?", "Override Recall Status?", "Yes", "No") == "Yes")
return
else
var/keepStatus = alert("Maintain recall status on future shuttle calls?", "Maintain Status?", "Yes", "No") == "Yes" //Keeps or drops recallability
- shuttle_master.emergency.canRecall = TRUE // must be true for cancel proc to work
- shuttle_master.emergency.cancel()
+ SSshuttle.emergency.canRecall = TRUE // must be true for cancel proc to work
+ SSshuttle.emergency.cancel()
if(keepStatus)
- shuttle_master.emergency.canRecall = FALSE // restores original status
+ SSshuttle.emergency.canRecall = FALSE // restores original status
else
- shuttle_master.emergency.cancel()
+ SSshuttle.emergency.cancel()
feedback_add_details("admin_verb","CCSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] admin-recalled the emergency shuttle.")
@@ -855,11 +855,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
if(!check_rights(R_ADMIN))
return
- if(shuttle_master)
- shuttle_master.emergencyNoEscape = !shuttle_master.emergencyNoEscape
+ if(SSshuttle)
+ SSshuttle.emergencyNoEscape = !SSshuttle.emergencyNoEscape
- log_admin("[key_name(src)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
- message_admins("[key_name_admin(usr)] has [shuttle_master.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+ log_admin("[key_name(src)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
+ message_admins("[key_name_admin(usr)] has [SSshuttle.emergencyNoEscape ? "denied" : "allowed"] the shuttle to be called.")
/client/proc/cmd_admin_attack_log(mob/M as mob in mob_list)
set category = "Admin"
diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm
index 8b85d70fd1a..af8f3c6e921 100644
--- a/code/modules/arcade/claw_game.dm
+++ b/code/modules/arcade/claw_game.dm
@@ -9,7 +9,6 @@
window_name = "Claw Game"
var/machine_image = "_1"
var/bonus_prize_chance = 5 //chance to dispense a SECOND prize if you win, increased by matter bin rating
-
//This is to make sure the images are available
var/list/img_resources = list('icons/obj/arcade_images/backgroundsprite.png',
'icons/obj/arcade_images/clawpieces.png',
@@ -49,26 +48,25 @@
icon_state = "clawmachine[machine_image]_off"
else
icon_state = "clawmachine[machine_image]_on"
- return
/obj/machinery/arcade/claw/win()
icon_state = "clawmachine[machine_image]_win"
- visible_message("[src.name] beeps, \"WINNER!\"")
- if(prob(bonus_prize_chance))
- //double prize mania!
+ if(prob(bonus_prize_chance)) //double prize mania!
+ atom_say("DOUBLE PRIZE!")
new /obj/item/toy/prizeball(get_turf(src))
+ else
+ atom_say("WINNER!")
new /obj/item/toy/prizeball(get_turf(src))
playsound(src.loc, 'sound/arcade/Win.ogg', 50, 1, extrarange = -3, falloff = 10)
- spawn(10)
- update_icon()
+ addtimer(CALLBACK(src, .update_icon), 10)
/obj/machinery/arcade/claw/start_play(mob/user as mob)
..()
user << browse_rsc('page.css')
- for(var/i=1, i<=img_resources.len, i++)
+ for(var/i in 1 to img_resources.len)
user << browse_rsc(img_resources[i])
var/my_game_html = replacetext(claw_game_html, "/* ref src */", UID())
- user << browse(my_game_html, "window=[window_name];size=700x600")
+ user << browse(my_game_html, "window=[window_name];size=915x600;can_resize=0")
/obj/machinery/arcade/claw/Topic(href, list/href_list)
if(..())
diff --git a/code/modules/arcade/crane.html b/code/modules/arcade/crane.html
index 3cf0fc67ae3..5fef0d104dc 100644
--- a/code/modules/arcade/crane.html
+++ b/code/modules/arcade/crane.html
@@ -2,7 +2,7 @@
- Crane game
+ Claw Game
@@ -278,11 +268,14 @@
-
"
dat += ""
dat += ""
- if(ready && mob_hunt_server.battle_turn) //offer the surrender option if they are in a battle (ready), but don't have a card loaded
+ if(ready && SSmob_hunt.battle_turn) //offer the surrender option if they are in a battle (ready), but don't have a card loaded
dat += "
"
@@ -444,8 +425,8 @@
var/cat = text2num(last_viewed_group)
var/packs_list[0]
- for(var/set_name in shuttle_master.supply_packs)
- var/datum/supply_packs/pack = shuttle_master.supply_packs[set_name]
+ for(var/set_name in SSshuttle.supply_packs)
+ var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name]
if(!pack.contraband && !pack.hidden && !pack.special && pack.group == cat)
// 0/1 after the pack name (set_name) is a boolean for ordering multiple crates
packs_list.Add(list(list("name" = pack.name, "amount" = pack.amount, "cost" = pack.cost, "command1" = list("doorder" = "[set_name]0"), "command2" = list("doorder" = "[set_name]1"), "command3" = list("contents" = set_name))))
@@ -458,7 +439,7 @@
data["contents_access"] = content_pack.access ? get_access_desc(content_pack.access) : "None"
var/requests_list[0]
- for(var/set_name in shuttle_master.requestlist)
+ for(var/set_name in SSshuttle.requestlist)
var/datum/supply_order/SO = set_name
if(SO)
// Check if the user owns the request, so they can cancel requests
@@ -470,18 +451,18 @@
data["requests"] = requests_list
var/orders_list[0]
- for(var/set_name in shuttle_master.shoppinglist)
+ for(var/set_name in SSshuttle.shoppinglist)
var/datum/supply_order/SO = set_name
if(SO)
orders_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby)))
data["orders"] = orders_list
- data["points"] = round(shuttle_master.points)
+ data["points"] = round(SSshuttle.points)
data["send"] = list("send" = 1)
- data["moving"] = shuttle_master.supply.mode != SHUTTLE_IDLE
- data["at_station"] = shuttle_master.supply.getDockedId() == "supply_home"
- data["timeleft"] = shuttle_master.supply.timeLeft(600)
+ data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE
+ data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home"
+ data["timeleft"] = SSshuttle.supply.timeLeft(600)
return data
@@ -499,7 +480,7 @@
var/multi = text2num(copytext(href_list["doorder"], -1))
if(!isnum(multi))
return 1
- var/datum/supply_packs/P = shuttle_master.supply_packs[index]
+ var/datum/supply_packs/P = SSshuttle.supply_packs[index]
if(!istype(P))
return 1
var/crates = 1
@@ -528,7 +509,7 @@
//make our supply_order datums
for(var/i = 1; i <= crates; i++)
- var/datum/supply_order/O = shuttle_master.generateSupplyOrder(index, idname, idrank, reason, crates)
+ var/datum/supply_order/O = SSshuttle.generateSupplyOrder(index, idname, idrank, reason, crates)
if(!O) return
if(i == 1)
O.generateRequisition(loc)
@@ -536,10 +517,10 @@
else if(href_list["rreq"])
var/ordernum = text2num(href_list["rreq"])
var/obj/item/card/id/I = usr.get_id_card()
- for(var/i=1, i<=shuttle_master.requestlist.len, i++)
- var/datum/supply_order/SO = shuttle_master.requestlist[i]
+ for(var/i=1, i<=SSshuttle.requestlist.len, i++)
+ var/datum/supply_order/SO = SSshuttle.requestlist[i]
if(SO.ordernum == ordernum && (I && SO.orderedby == I.registered_name))
- shuttle_master.requestlist.Cut(i,i+1)
+ SSshuttle.requestlist.Cut(i,i+1)
break
else if(href_list["last_viewed_group"])
@@ -551,7 +532,7 @@
if(topic == 1)
content_pack = null
else
- var/datum/supply_packs/P = shuttle_master.supply_packs[topic]
+ var/datum/supply_packs/P = SSshuttle.supply_packs[topic]
content_pack = P
add_fingerprint(usr)
@@ -593,8 +574,8 @@
var/cat = text2num(last_viewed_group)
var/packs_list[0]
- for(var/set_name in shuttle_master.supply_packs)
- var/datum/supply_packs/pack = shuttle_master.supply_packs[set_name]
+ for(var/set_name in SSshuttle.supply_packs)
+ var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name]
if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special))
if(pack.group == cat)
// 0/1 after the pack name (set_name) is a boolean for ordering multiple crates
@@ -608,7 +589,7 @@
data["contents_access"] = content_pack.access ? get_access_desc(content_pack.access) : "None"
var/requests_list[0]
- for(var/set_name in shuttle_master.requestlist)
+ for(var/set_name in SSshuttle.requestlist)
var/datum/supply_order/SO = set_name
if(SO)
if(!SO.comment)
@@ -617,21 +598,21 @@
data["requests"] = requests_list
var/orders_list[0]
- for(var/set_name in shuttle_master.shoppinglist)
+ for(var/set_name in SSshuttle.shoppinglist)
var/datum/supply_order/SO = set_name
if(SO)
orders_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment)))
data["orders"] = orders_list
- data["canapprove"] = (shuttle_master.supply.getDockedId() == "supply_away") && !(shuttle_master.supply.mode != SHUTTLE_IDLE)
- data["points"] = round(shuttle_master.points)
+ data["canapprove"] = (SSshuttle.supply.getDockedId() == "supply_away") && !(SSshuttle.supply.mode != SHUTTLE_IDLE)
+ data["points"] = round(SSshuttle.points)
data["send"] = list("send" = 1)
- data["message"] = shuttle_master.centcom_message ? shuttle_master.centcom_message : "Remember to stamp and send back the supply manifests."
+ data["message"] = SSshuttle.centcom_message ? SSshuttle.centcom_message : "Remember to stamp and send back the supply manifests."
- data["moving"] = shuttle_master.supply.mode != SHUTTLE_IDLE
- data["at_station"] = shuttle_master.supply.getDockedId() == "supply_home"
- data["timeleft"] = shuttle_master.supply.timeLeft(600)
- data["can_launch"] = !shuttle_master.supply.canMove()
+ data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE
+ data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home"
+ data["timeleft"] = SSshuttle.supply.timeLeft(600)
+ data["can_launch"] = !SSshuttle.supply.canMove()
return data
/obj/machinery/computer/supplycomp/proc/is_authorized(mob/user)
@@ -650,24 +631,24 @@
if(!is_authorized(usr))
return 1
- if(!shuttle_master)
- log_runtime(EXCEPTION("The shuttle_master controller datum is missing somehow."), src)
+ if(!SSshuttle)
+ log_runtime(EXCEPTION("The SSshuttle controller datum is missing somehow."), src)
return 1
if(href_list["send"])
- if(shuttle_master.supply.canMove())
+ if(SSshuttle.supply.canMove())
to_chat(usr, "For safety reasons the automated supply shuttle cannot transport live organisms, classified nuclear weaponry or homing beacons.")
- else if(shuttle_master.supply.getDockedId() == "supply_home")
- shuttle_master.toggleShuttle("supply", "supply_home", "supply_away", 1)
- investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [shuttle_master.points]. Shuttle contents: [shuttle_master.sold_atoms]", "cargo")
- else if(!shuttle_master.supply.request(shuttle_master.getDock("supply_home")))
+ else if(SSshuttle.supply.getDockedId() == "supply_home")
+ SSshuttle.toggleShuttle("supply", "supply_home", "supply_away", 1)
+ investigate_log("[key_name(usr)] has sent the supply shuttle away. Remaining points: [SSshuttle.points]. Shuttle contents: [SSshuttle.sold_atoms]", "cargo")
+ else if(!SSshuttle.supply.request(SSshuttle.getDock("supply_home")))
post_signal("supply")
- if(LAZYLEN(shuttle_master.shoppinglist) && prob(10))
+ if(LAZYLEN(SSshuttle.shoppinglist) && prob(10))
var/datum/supply_order/O = new /datum/supply_order()
- O.ordernum = shuttle_master.ordernum
- O.object = shuttle_master.supply_packs[pick(shuttle_master.supply_packs)]
+ O.ordernum = SSshuttle.ordernum
+ O.object = SSshuttle.supply_packs[pick(SSshuttle.supply_packs)]
O.orderedby = random_name(pick(MALE,FEMALE), species = "Human")
- shuttle_master.shoppinglist += O
+ SSshuttle.shoppinglist += O
investigate_log("Random [O.object] crate added to supply shuttle")
else if(href_list["doorder"])
@@ -680,7 +661,7 @@
var/multi = text2num(copytext(href_list["doorder"], -1))
if(!isnum(multi))
return 1
- var/datum/supply_packs/P = shuttle_master.supply_packs[index]
+ var/datum/supply_packs/P = SSshuttle.supply_packs[index]
if(!istype(P))
return 1
var/crates = 1
@@ -708,37 +689,37 @@
//make our supply_order datums
for(var/i = 1; i <= crates; i++)
- var/datum/supply_order/O = shuttle_master.generateSupplyOrder(index, idname, idrank, reason, crates)
+ var/datum/supply_order/O = SSshuttle.generateSupplyOrder(index, idname, idrank, reason, crates)
if(!O) return 1
if(i == 1)
O.generateRequisition(loc)
else if(href_list["confirmorder"])
- if(shuttle_master.supply.getDockedId() != "supply_away" || shuttle_master.supply.mode != SHUTTLE_IDLE)
+ if(SSshuttle.supply.getDockedId() != "supply_away" || SSshuttle.supply.mode != SHUTTLE_IDLE)
return 1
var/ordernum = text2num(href_list["confirmorder"])
var/datum/supply_order/O
var/datum/supply_packs/P
- for(var/i=1, i<=shuttle_master.requestlist.len, i++)
- var/datum/supply_order/SO = shuttle_master.requestlist[i]
+ for(var/i=1, i<=SSshuttle.requestlist.len, i++)
+ var/datum/supply_order/SO = SSshuttle.requestlist[i]
if(SO.ordernum == ordernum)
O = SO
P = O.object
- if(shuttle_master.points >= P.cost)
- shuttle_master.requestlist.Cut(i,i+1)
- shuttle_master.points -= P.cost
- shuttle_master.shoppinglist += O
- investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [shuttle_master.points].", "cargo")
+ if(SSshuttle.points >= P.cost)
+ SSshuttle.requestlist.Cut(i,i+1)
+ SSshuttle.points -= P.cost
+ SSshuttle.shoppinglist += O
+ investigate_log("[key_name(usr)] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", "cargo")
else
to_chat(usr, "There are insufficient supply points for this request.")
break
else if(href_list["rreq"])
var/ordernum = text2num(href_list["rreq"])
- for(var/i=1, i<=shuttle_master.requestlist.len, i++)
- var/datum/supply_order/SO = shuttle_master.requestlist[i]
+ for(var/i=1, i<=SSshuttle.requestlist.len, i++)
+ var/datum/supply_order/SO = SSshuttle.requestlist[i]
if(SO.ordernum == ordernum)
- shuttle_master.requestlist.Cut(i,i+1)
+ SSshuttle.requestlist.Cut(i,i+1)
break
else if(href_list["last_viewed_group"])
@@ -750,7 +731,7 @@
if(topic == 1)
content_pack = null
else
- var/datum/supply_packs/P = shuttle_master.supply_packs[topic]
+ var/datum/supply_packs/P = SSshuttle.supply_packs[topic]
content_pack = P
add_fingerprint(usr)
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index c58f4efb300..0783aed0a5c 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -15,7 +15,7 @@
/datum/station_goal/bluespace_cannon/on_report()
//Unlock BSA parts
- var/datum/supply_packs/misc/bsa/P = shuttle_master.supply_packs["[/datum/supply_packs/misc/bsa]"]
+ var/datum/supply_packs/misc/bsa/P = SSshuttle.supply_packs["[/datum/supply_packs/misc/bsa]"]
P.special_enabled = TRUE
/datum/station_goal/bluespace_cannon/check_completion()
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index 46f5920f3d3..c84742445ed 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -42,10 +42,10 @@
The base vault parts should be available for shipping by your cargo shuttle."}
/datum/station_goal/dna_vault/on_report()
- var/datum/supply_packs/P = shuttle_master.supply_packs["[/datum/supply_packs/misc/dna_vault]"]
+ var/datum/supply_packs/P = SSshuttle.supply_packs["[/datum/supply_packs/misc/dna_vault]"]
P.special_enabled = TRUE
- P = shuttle_master.supply_packs["[/datum/supply_packs/misc/dna_probes]"]
+ P = SSshuttle.supply_packs["[/datum/supply_packs/misc/dna_probes]"]
P.special_enabled = TRUE
/datum/station_goal/dna_vault/check_completion()
@@ -87,10 +87,10 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
to_chat(user, "Plants needs to be ready to harvest to perform full data scan.") //Because space dna is actually magic
return
if(plants[H.myseed.type])
- to_chat(user, "Plant data already present in local storage.")
+ to_chat(user, "Plant data already present in local storage.")
return
plants[H.myseed.type] = 1
- to_chat(user, "Plant data added to local storage.")
+ to_chat(user, "Plant data added to local storage.")
//animals
if(isanimal(target) || is_type_in_typecache(target, non_simple_animals))
@@ -100,19 +100,19 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
to_chat(user, "No compatible DNA detected")
return
if(animals[target.type])
- to_chat(user, "Animal data already present in local storage.")
+ to_chat(user, "Animal data already present in local storage.")
return
animals[target.type] = 1
- to_chat(user, "Animal data added to local storage.")
+ to_chat(user, "Animal data added to local storage.")
//humans
if(ishuman(target))
var/mob/living/carbon/human/H = target
if(dna[H.dna.uni_identity])
- to_chat(user, "Humanoid data already present in local storage.")
+ to_chat(user, "Humanoid data already present in local storage.")
return
dna[H.dna.uni_identity] = 1
- to_chat(user, "Humanoid data added to local storage.")
+ to_chat(user, "Humanoid data added to local storage.")
/obj/item/circuitboard/machine/dna_vault
@@ -301,4 +301,4 @@ var/list/non_simple_animals = typecacheof(list(/mob/living/carbon/human/monkey,/
/obj/machinery/dna_vault/proc/grant_power(mob/living/carbon/human/H, block, power)
H.dna.SetSEState(block, 1, 1)
H.mutations |= power
- genemutcheck(H, block, null, MUTCHK_FORCED)
\ No newline at end of file
+ genemutcheck(H, block, null, MUTCHK_FORCED)
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 3307bd61b13..26c4838897c 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -13,10 +13,10 @@
/datum/station_goal/station_shield/on_report()
//Unlock
- var/datum/supply_packs/P = shuttle_master.supply_packs["[/datum/supply_packs/misc/shield_sat]"]
+ var/datum/supply_packs/P = SSshuttle.supply_packs["[/datum/supply_packs/misc/shield_sat]"]
P.special_enabled = TRUE
- P = shuttle_master.supply_packs["[/datum/supply_packs/misc/shield_sat_control]"]
+ P = SSshuttle.supply_packs["[/datum/supply_packs/misc/shield_sat_control]"]
P.special_enabled = TRUE
/datum/station_goal/station_shield/check_completion()
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 72bf70c7e81..8d201f32897 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -86,8 +86,6 @@
if(target_zone == surgery.location)
initiate(user, target, target_zone, tool, surgery)
return 1//returns 1 so we don't stab the guy in the dick or wherever.
- if(isrobot(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
- return 1
return 0
/datum/surgery_step/proc/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm
index 78b1da7f2a9..2c955920122 100644
--- a/code/modules/telesci/bscrystal.dm
+++ b/code/modules/telesci/bscrystal.dm
@@ -26,7 +26,7 @@
/obj/item/ore/bluespace_crystal/proc/blink_mob(var/mob/living/L)
if(!is_teleport_allowed(L.z))
- src.visible_message("[src]'s fragments begin rapidly vibrating and blink out of existence.")
+ src.visible_message("[src]'s fragments begin rapidly vibrating and blink out of existence.")
qdel(src)
return
do_teleport(L, get_turf(L), blink_range, asoundin = 'sound/effects/phasein.ogg')
@@ -55,7 +55,7 @@
// Polycrystals, aka stacks
-var/global/list/datum/stack_recipe/bluespace_crystal_recipes = list(new/datum/stack_recipe("Breakdown into bluespace crystal", /obj/item/ore/bluespace_crystal/refined, 1, one_per_turf = 0, on_floor = 1))
+var/global/list/datum/stack_recipe/bluespace_crystal_recipes = list(new/datum/stack_recipe("Breakdown into bluespace crystal", /obj/item/ore/bluespace_crystal/refined, 1))
/obj/item/stack/sheet/bluespace_crystal
name = "bluespace polycrystal"
diff --git a/config/example/config.txt b/config/example/config.txt
index c8bdc8cffc9..08792117b1f 100644
--- a/config/example/config.txt
+++ b/config/example/config.txt
@@ -183,6 +183,9 @@ CHECK_RANDOMIZER
## GitHub address
# GITHUBURL http://example.org
+## Discord address
+# DISCORDURL http://example.org
+
## Donations address
# DONATIONSURL http://example.org
diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js
index 0632bad9688..7f775879fcd 100644
--- a/goon/browserassets/js/browserOutput.js
+++ b/goon/browserassets/js/browserOutput.js
@@ -103,6 +103,27 @@ function linkify(text) {
});
}
+function byondDecode(message) {
+ // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8.
+ // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
+ // Marvelous.
+ message = message.replace(/\+/g, "%20");
+ try {
+ // This is a workaround for the above not always working when BYOND's shitty url encoding breaks.
+ // Basically, sometimes BYOND's double encoding trick just arbitrarily produces something that makes decodeURIComponent
+ // throw an "Invalid Encoding URI" URIError... the simplest way to work around this is to just ignore it and use unescape instead
+ // which just fails to decode shit instead of throwing errors
+ if (decodeURIComponent) {
+ message = decodeURIComponent(message);
+ } else {
+ throw new Error("Easiest way to trigger the fallback")
+ }
+ } catch (err) {
+ message = unescape(message);
+ }
+ return message;
+}
+
function emojiparse(el) {
if ((typeof UNICODE_9_EMOJI === 'undefined') || (typeof twemoji === 'undefined')) {
@@ -159,11 +180,7 @@ function output(message, flag) {
if (flag !== 'internal')
opts.lastPang = Date.now();
- // Basically we url_encode twice server side so we can manually read the encoded version and actually do UTF-8.
- // The replace for + is because FOR SOME REASON, BYOND replaces spaces with a + instead of %20, and a plus with %2b.
- // Marvelous.
- message = message.replace(/\+/g, "%20");
- message = decoder(message);
+ message = byondDecode(message).trim();
//The behemoth of filter-code (for Admin message filters)
//Note: This is proooobably hella inefficient
diff --git a/html/changelog.html b/html/changelog.html
index 90b3d607925..46323ab2934 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -56,15 +56,215 @@
-->
+
06 October 2018
+
Alonefromhell updated:
+
+
META - Cryogenics now has a Cellcharger.
+
+
Purpose updated:
+
+
Delta - Adds a Paramedic's Office.
+
Latejoining autotraitors should now have their uplinks again.
+
+
Squirgenheimer updated:
+
+
Victims of changeling swap forms and wizard mindswap can now re-enter their corpses
+
+
+
04 October 2018
+
Alonefromhell updated:
+
+
Sensory Restoration should now work with Ocular Restoration.
+
+
Farie82 updated:
+
+
borgs can now heal their patients while there is a surgery going on.
+
+
Purpose updated:
+
+
Boxstation: Fixed a number of turf/decal/overlay issues
+
Boxstation: The poster in medbay maintenance now displays properly...
+
Boxstation: Xenobio slime cameras should no longer be able to see into maintenance.
+
Boxstation: Adds missing firelock to vacant office.
+
Boxstation: Moves Medbay AIR Alarms around to more functional locations.
+
Boxstation: Fixes 'fake grass' in the kitchen area.
+
Boxstation: Fixed several issues were Radiation Storm events could bleed into maintanence.
+
Boxstation: ALL catwalks should now be able to see space through the holes.
+
Delta - Adds fuel depo to the hanger.
+
Delta - Adds the Nullrod & Shard to the Chaplain's back office.
+
Delta - Fixes the invisible wardrobe in the dorms.
+
Delta - Adds a few art vendors across the station.
+
Delta - Adds the buttons to the Perma Airlock.
+
Delta - Doctors now have access to the patients rooms. Oops.
+
Delta - Adds the Coroner's spawn point in the morgue.
+
Delta - Increases blood packs in medbay, by random blood spawners.
+
Delta - Fixes the exit button of Medbay.
+
Delta - Increases the size of the atmos space loop.
+
Delta - No longer can maintenance fire lasers at the Supermatter....
+
Delta - Added some wiring to make it easier to emitter the SM.
+
Delta - Extends the wiring out of solars airlocks in atmos solars.
+
Delta - Atmos now have access to Atmos solars.
+
Delta - Adds an additional atmos void suit.
+
Delta - Adds two additional engineering void suits, but into secure storage.
+
Delta - Fixes the missing airlock cycling on an atmos airlock.
+
Delta - Adds the missing multi-tool to atmospherics.
+
Delta - Fixed Mixed Air & Gas Mix computers access to the tanks & sensors.
+
Delta - Can now cross parts of the transit tube.
+
Delta - Garbage disposal is now functional.
+
Delta - Disposals no longer fires trash into the atmos office.
+
Delta - Atmos techs now have access to the jetpacks in EVA.
+
Damaged plating when fixed, now loses the aesthetic damage too.
+
Yellow closets now use the correct icons.
+
+
+
03 October 2018
+
Farie82 updated:
+
+
Your hands won't become the surgeons hands anymore in surgery
+
+
Fethas updated:
+
+
Cryostorage ghost role spawners for ruin/mapping/adminbus. Also refactors corpse landmark code.
+
+
FreeStylaLT updated:
+
+
Remapped Medbay Lobby.
+
Moved the cell charger from Cryo to the break room.
+
Added a cell to Medbay's break room.
+
+
+
02 October 2018
+
Birdtalon updated:
+
+
Small formatting fix in soulstone.dm
+
+
Kurgis updated:
+
+
The chief engineer jumpsuit no longer appears as a green suit when held in-hand.
+
Added a new in-hand sprite for the chief engineer jumpsuit from Polaris.
+
+
Purpose updated:
+
+
Delta Station, codenamed Kerberos has been acquired by Nanotrasen.
+
Wizard Academy now uses decals
+
Wizard Academy misplaced wires fixed
+
+
Tails2091 updated:
+
+
Claw Game is now a bit easier to use. Slower speeds, still receive prize when interrupted, and auto-close.
+
Claw Game has correct window size, centered buttons, general code cleanup.
+
+
name here updated:
+
+
Remove canvas and easel from Deltastation
+
+
tigercat2000 updated:
+
+
Chat no longer horribly breaks at the first high-ascii character.
+
+
+
01 October 2018
+
Aurorablade updated:
+
+
adjusts to Arachno-Man suit fluff.
+
+
Birdtalon updated:
+
+
Admin ticket subsystem - migrates existing global datum.
+
+
Dapocalypse updated:
+
+
Added a grille cooldown to prevent alt-click spam someone on a grille to instantly husk people.
+
+
Farie82 updated:
+
+
Not being able to place chutes over tiles with multiple pipes.
+
+
Purpose updated:
+
+
CPU Performance in get_area proc
+
Excavates a few relics from area code.
+
Metastation - Escape Shuttle windows are now breakable again.
+
Metastation - Medbay camera no longer floating in mid-air.
+
Metastation - Adds the missing component analyzer to Robotics.
+
Metastation - Fixes the wiring issues in Medbay.
+
Metastation - Fixes the wiring issues in Virology.
+
Metastation - Fixes the lack of fungus on the map, placing it near water sources in maintenance.
+
Metastation - Fixes area definition, so that admins can now send people to cryo.
+
Metastation - Fixes bizarre map corruption from the Arcade PR which turned Coroners into a bit of an arcade....
+
Metastation - Law office's shutters now grant privacy properly.
+
Metastation - Fixes the lack of inflatables & pipe painter in Atmospherics
+
Metastation - Adds a second atmos locker, as one is lower than number of atmos slots available....
+
Metastation - Properly marks airless tiles by the hanger as airless.
+
Metastation - Hooks up Security's Camera Computer to the station's cameras...
+
Metastation - Fixes the floating fire alarm in Security.
+
Metastation - Fixes the detective's lack of Evidence Storage access...
+
Metastation - Captain, IAA and NT Rep's fax machines are hooked up properly. Bloody IT department...
+
Metastation - Security cannister attachment is now attached to the pipe grid.
+
Metastation - Bots now correctly patrol the station again.
+
Metastation - Updates the turfs & decals to use the correct decals.
+
+
Purpose & AndrewMontagne updated:
+
+
Tiles now retain the styling when damaged.
+
Tile damage now uses decals, and can be mapped easier.
+
+
TDSSS updated:
+
+
RnD server control console's data management now works, allowing for deletion of research levels and known techs.
+
fixed minor typos.
+
bluespace polycrystals can now correctly be broken down while floating in space.
+
+
variableundefined updated:
+
+
Nano Mob Hunter ported to StonedMC. Report unexpected issues.
+
Shuttle has been ported over to the StonedMC Subsystem.
+
+
+
30 September 2018
+
Crazylemon updated:
+
+
Corrects a comment in the code regarding IPC damage.
+
+
Purpose updated:
+
+
Fixes various message format overflows.
+
+
Shazbot updated:
+
+
You can now remove KA mods from borgs.
+
+
TDSSS updated:
+
+
Plasma statues and walls are no longer ignited by laser tag guns or practice lasers.
+
Crowbars can no longer make pool water invisible.
+
+
datlo updated:
+
+
Made the poison pen available to traitor librarians
+
+
variableundefined updated:
+
+
One click antagonist giving antag to people in restricted job.
+
+
29 September 2018
Dapocalypse updated:
Removes extra penlight given to plasmemes.
+
DarkPyrolord updated:
+
+
Pyro's fluff item
+
Kyep updated:
Fixed several bugs with blob, including lateround blobs not generating biohazard alerts, blobs missing out on early resources they should have, and a bug with blob storage being broken that prevented blobs getting any resources.
+
NoWolfie updated:
+
+
New Pyr'kus cult floor and wall sprite.
+
Triiodine updated:
Nukies spawning with cybernetic organs/limbs
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 8d3d64e6faa..5e1513d194e 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7106,10 +7106,14 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
2018-09-29:
Dapocalypse:
- bugfix: Removes extra penlight given to plasmemes.
+ DarkPyrolord:
+ - rscadd: Pyro's fluff item
Kyep:
- bugfix: Fixed several bugs with blob, including lateround blobs not generating
biohazard alerts, blobs missing out on early resources they should have, and
a bug with blob storage being broken that prevented blobs getting any resources.
+ NoWolfie:
+ - rscadd: New Pyr'kus cult floor and wall sprite.
Triiodine:
- bugfix: Nukies spawning with cybernetic organs/limbs
Ty-Omaha:
@@ -7119,3 +7123,148 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- bugfix: refactored the airlock code.
- bugfix: Using multitools and such on a door with a note now doesn't remove the
note. Only grabbing with an empty hand now.
+2018-09-30:
+ Crazylemon:
+ - tweak: Corrects a comment in the code regarding IPC damage.
+ Purpose:
+ - bugfix: Fixes various message format overflows.
+ Shazbot:
+ - bugfix: You can now remove KA mods from borgs.
+ TDSSS:
+ - bugfix: Plasma statues and walls are no longer ignited by laser tag guns or practice
+ lasers.
+ - bugfix: Crowbars can no longer make pool water invisible.
+ datlo:
+ - tweak: Made the poison pen available to traitor librarians
+ variableundefined:
+ - bugfix: One click antagonist giving antag to people in restricted job.
+2018-10-01:
+ Aurorablade:
+ - tweak: adjusts to Arachno-Man suit fluff.
+ Birdtalon:
+ - rscadd: Admin ticket subsystem - migrates existing global datum.
+ Dapocalypse:
+ - bugfix: Added a grille cooldown to prevent alt-click spam someone on a grille
+ to instantly husk people.
+ Farie82:
+ - bugfix: Not being able to place chutes over tiles with multiple pipes.
+ Purpose:
+ - tweak: CPU Performance in get_area proc
+ - tweak: Excavates a few relics from area code.
+ - bugfix: Metastation - Escape Shuttle windows are now breakable again.
+ - bugfix: Metastation - Medbay camera no longer floating in mid-air.
+ - bugfix: Metastation - Adds the missing component analyzer to Robotics.
+ - bugfix: Metastation - Fixes the wiring issues in Medbay.
+ - bugfix: Metastation - Fixes the wiring issues in Virology.
+ - bugfix: Metastation - Fixes the lack of fungus on the map, placing it near water
+ sources in maintenance.
+ - bugfix: Metastation - Fixes area definition, so that admins can now send people
+ to cryo.
+ - bugfix: Metastation - Fixes bizarre map corruption from the Arcade PR which turned
+ Coroners into a bit of an arcade....
+ - bugfix: Metastation - Law office's shutters now grant privacy properly.
+ - bugfix: Metastation - Fixes the lack of inflatables & pipe painter in Atmospherics
+ - bugfix: Metastation - Adds a second atmos locker, as one is lower than number
+ of atmos slots available....
+ - bugfix: Metastation - Properly marks airless tiles by the hanger as airless.
+ - bugfix: Metastation - Hooks up Security's Camera Computer to the station's cameras...
+ - bugfix: Metastation - Fixes the floating fire alarm in Security.
+ - bugfix: Metastation - Fixes the detective's lack of Evidence Storage access...
+ - bugfix: Metastation - Captain, IAA and NT Rep's fax machines are hooked up properly.
+ Bloody IT department...
+ - bugfix: Metastation - Security cannister attachment is now attached to the pipe
+ grid.
+ - bugfix: Metastation - Bots now correctly patrol the station again.
+ - tweak: Metastation - Updates the turfs & decals to use the correct decals.
+ Purpose & AndrewMontagne:
+ - rscadd: Tiles now retain the styling when damaged.
+ - rscadd: Tile damage now uses decals, and can be mapped easier.
+ TDSSS:
+ - bugfix: RnD server control console's data management now works, allowing for deletion
+ of research levels and known techs.
+ - bugfix: fixed minor typos.
+ - bugfix: bluespace polycrystals can now correctly be broken down while floating
+ in space.
+ variableundefined:
+ - bugfix: Nano Mob Hunter ported to StonedMC. Report unexpected issues.
+ - tweak: Shuttle has been ported over to the StonedMC Subsystem.
+2018-10-02:
+ Birdtalon:
+ - bugfix: Small formatting fix in soulstone.dm
+ Kurgis:
+ - bugfix: The chief engineer jumpsuit no longer appears as a green suit when held
+ in-hand.
+ - imageadd: Added a new in-hand sprite for the chief engineer jumpsuit from Polaris.
+ Purpose:
+ - rscadd: Delta Station, codenamed Kerberos has been acquired by Nanotrasen.
+ - tweak: Wizard Academy now uses decals
+ - bugfix: Wizard Academy misplaced wires fixed
+ Tails2091:
+ - bugfix: Claw Game is now a bit easier to use. Slower speeds, still receive prize
+ when interrupted, and auto-close.
+ - bugfix: Claw Game has correct window size, centered buttons, general code cleanup.
+ name here:
+ - rscdel: Remove canvas and easel from Deltastation
+ tigercat2000:
+ - bugfix: Chat no longer horribly breaks at the first high-ascii character.
+2018-10-03:
+ Farie82:
+ - bugfix: Your hands won't become the surgeons hands anymore in surgery
+ Fethas:
+ - rscadd: Cryostorage ghost role spawners for ruin/mapping/adminbus. Also refactors
+ corpse landmark code.
+ FreeStylaLT:
+ - tweak: Remapped Medbay Lobby.
+ - tweak: Moved the cell charger from Cryo to the break room.
+ - rscadd: Added a cell to Medbay's break room.
+2018-10-04:
+ Alonefromhell:
+ - bugfix: Sensory Restoration should now work with Ocular Restoration.
+ Farie82:
+ - bugfix: borgs can now heal their patients while there is a surgery going on.
+ Purpose:
+ - bugfix: 'Boxstation: Fixed a number of turf/decal/overlay issues'
+ - bugfix: 'Boxstation: The poster in medbay maintenance now displays properly...'
+ - bugfix: 'Boxstation: Xenobio slime cameras should no longer be able to see into
+ maintenance.'
+ - bugfix: 'Boxstation: Adds missing firelock to vacant office.'
+ - bugfix: 'Boxstation: Moves Medbay AIR Alarms around to more functional locations.'
+ - bugfix: 'Boxstation: Fixes ''fake grass'' in the kitchen area.'
+ - bugfix: 'Boxstation: Fixed several issues were Radiation Storm events could bleed
+ into maintanence.'
+ - bugfix: 'Boxstation: ALL catwalks should now be able to see space through the
+ holes.'
+ - bugfix: Delta - Adds fuel depo to the hanger.
+ - bugfix: Delta - Adds the Nullrod & Shard to the Chaplain's back office.
+ - bugfix: Delta - Fixes the invisible wardrobe in the dorms.
+ - bugfix: Delta - Adds a few art vendors across the station.
+ - bugfix: Delta - Adds the buttons to the Perma Airlock.
+ - bugfix: Delta - Doctors now have access to the patients rooms. Oops.
+ - bugfix: Delta - Adds the Coroner's spawn point in the morgue.
+ - bugfix: Delta - Increases blood packs in medbay, by random blood spawners.
+ - bugfix: Delta - Fixes the exit button of Medbay.
+ - bugfix: Delta - Increases the size of the atmos space loop.
+ - bugfix: Delta - No longer can maintenance fire lasers at the Supermatter....
+ - bugfix: Delta - Added some wiring to make it easier to emitter the SM.
+ - bugfix: Delta - Extends the wiring out of solars airlocks in atmos solars.
+ - bugfix: Delta - Atmos now have access to Atmos solars.
+ - bugfix: Delta - Adds an additional atmos void suit.
+ - bugfix: Delta - Adds two additional engineering void suits, but into secure storage.
+ - bugfix: Delta - Fixes the missing airlock cycling on an atmos airlock.
+ - bugfix: Delta - Adds the missing multi-tool to atmospherics.
+ - bugfix: Delta - Fixed Mixed Air & Gas Mix computers access to the tanks & sensors.
+ - bugfix: Delta - Can now cross parts of the transit tube.
+ - bugfix: Delta - Garbage disposal is now functional.
+ - bugfix: Delta - Disposals no longer fires trash into the atmos office.
+ - bugfix: Delta - Atmos techs now have access to the jetpacks in EVA.
+ - bugfix: Damaged plating when fixed, now loses the aesthetic damage too.
+ - bugfix: Yellow closets now use the correct icons.
+2018-10-06:
+ Alonefromhell:
+ - rscadd: META - Cryogenics now has a Cellcharger.
+ Purpose:
+ - rscadd: Delta - Adds a Paramedic's Office.
+ - bugfix: Latejoining autotraitors should now have their uplinks again.
+ Squirgenheimer:
+ - bugfix: Victims of changeling swap forms and wizard mindswap can now re-enter
+ their corpses
diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi
index b1a26763fbd..0ba92e7705c 100644
Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 6ee9b9d5b3f..7bc8088aa86 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index c8a031431f8..b40ca75991e 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 7388f41ac60..cd2ed068568 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/screen_gen.dmi b/icons/mob/screen_gen.dmi
index 4110876e272..88b592236f5 100644
Binary files a/icons/mob/screen_gen.dmi and b/icons/mob/screen_gen.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index ac347ad02f2..c12484b28e4 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 3e129dca1d2..bef18a0ddcc 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/mob/uniform_fat.dmi b/icons/mob/uniform_fat.dmi
index 2b1d713a325..19bce2646a0 100644
Binary files a/icons/mob/uniform_fat.dmi and b/icons/mob/uniform_fat.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index 1ec9229ca6e..8aaf2291abd 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 151b7444519..0ec60d09409 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/walls/cult_wall.dmi b/icons/turf/walls/cult_wall.dmi
index 47a76ee5cb3..b097321e714 100644
Binary files a/icons/turf/walls/cult_wall.dmi and b/icons/turf/walls/cult_wall.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index eb99b7dd0fd..0aa6636b335 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -78,6 +78,18 @@
to_chat(src, "The GitHub URL is not set in the server configuration.")
return
+/client/verb/discord()
+ set name = "Discord"
+ set desc = "Join our Discord server."
+ set hidden = 1
+ if(config.discordurl)
+ if(alert("This will invite you to our Discord server. Are you sure?",,"Yes","No")=="No")
+ return
+ src << link(config.discordurl)
+ else
+ to_chat(src, "The Discord URL is not set in the server configuration.")
+ return
+
/client/verb/donate()
set name = "Donate"
set desc = "Donate to help with hosting costs."
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 6e78de1f629..e7dec18eba4 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -1697,18 +1697,29 @@ window "rpane"
size = 67x16
text = "Changelog"
command = "Changelog"
- elem "karma"
+ elem "discordb"
type = BUTTON
pos = 487,0
- size = 67x16
+ size = 60x16
+ background-color = #7289DA
+ text-color = #FFFFFF
+ font-style = bold
+ text = "Discord"
+ command = "discord"
+ elem "karma"
+ type = BUTTON
+ pos = 552,0
+ size = 77x16
background-color = #ff8040
+ font-style = bold
text = "Karma Shop"
command = "karmashop"
elem "donate"
type = BUTTON
- pos = 559,0
+ pos = 634,0
size = 60x16
- background-color = #8080ff
+ background-color = #008000
+ font-style = bold
text = "Donate"
command = "Donate"
elem "browseb"
diff --git a/nano/images/Delta_nanomap_z1.png b/nano/images/Delta_nanomap_z1.png
new file mode 100644
index 00000000000..42499592f85
Binary files /dev/null and b/nano/images/Delta_nanomap_z1.png differ
diff --git a/paradise.dme b/paradise.dme
index 8722d8ae565..de38b9a410d 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -194,11 +194,9 @@
#include "code\controllers\Processes\event.dm"
#include "code\controllers\Processes\fast_process.dm"
#include "code\controllers\Processes\lighting.dm"
-#include "code\controllers\Processes\nano_mob_hunter.dm"
#include "code\controllers\Processes\npcai.dm"
#include "code\controllers\Processes\npcpool.dm"
#include "code\controllers\Processes\obj.dm"
-#include "code\controllers\Processes\shuttles.dm"
#include "code\controllers\Processes\ticker.dm"
#include "code\controllers\ProcessScheduler\core\process.dm"
#include "code\controllers\ProcessScheduler\core\processScheduler.dm"
@@ -208,11 +206,14 @@
#include "code\controllers\subsystem\garbage.dm"
#include "code\controllers\subsystem\machinery.dm"
#include "code\controllers\subsystem\mobs.dm"
+#include "code\controllers\subsystem\nano_mob_hunter.dm"
#include "code\controllers\subsystem\nanoui.dm"
#include "code\controllers\subsystem\nightshift.dm"
+#include "code\controllers\subsystem\shuttles.dm"
#include "code\controllers\subsystem\spacedrift.dm"
#include "code\controllers\subsystem\sun.dm"
#include "code\controllers\subsystem\throwing.dm"
+#include "code\controllers\subsystem\tickets.dm"
#include "code\controllers\subsystem\timer.dm"
#include "code\controllers\subsystem\weather.dm"
#include "code\controllers\subsystem\processing\processing.dm"
@@ -1092,8 +1093,6 @@
#include "code\modules\admin\watchlist.dm"
#include "code\modules\admin\DB ban\functions.dm"
#include "code\modules\admin\permissionverbs\permissionedit.dm"
-#include "code\modules\admin\tickets\admintickets.dm"
-#include "code\modules\admin\tickets\adminticketsUI.dm"
#include "code\modules\admin\tickets\adminticketsverbs.dm"
#include "code\modules\admin\verbs\adminhelp.dm"
#include "code\modules\admin\verbs\adminjump.dm"
@@ -1519,6 +1518,7 @@
#include "code\modules\logic\logic_base.dm"
#include "code\modules\logic\mono_input.dm"
#include "code\modules\map_fluff\cyberiad.dm"
+#include "code\modules\map_fluff\delta.dm"
#include "code\modules\map_fluff\maps.dm"
#include "code\modules\map_fluff\metastation.dm"
#include "code\modules\martial_arts\adminfu.dm"