"
@@ -536,7 +537,7 @@
var/list/buffer_slot = buffer[buffer_num]
var/mob/living/carbon/viable_occupant = get_viable_occupant()
if(istype(buffer_slot))
- viable_occupant.radiation += rand(10/(connected.damage_coeff ** 2),25/(connected.damage_coeff ** 2))
+ viable_occupant.radiation += rand(100/(connected.damage_coeff ** 2),250/(connected.damage_coeff ** 2))
//15 and 40 are just magic numbers that were here before so i didnt touch them, they are initial boundaries of damage
//Each laser level reduces damage by lvl^2, so no effect on 1 lvl, 4 times less damage on 2 and 9 times less damage on 3
//Numbers are this high because other way upgrading laser is just not worth the hassle, and i cant think of anything better to inmrove
diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm
index b1d56f2b2e..3ea4c2f9b2 100644
--- a/code/game/machinery/computer/gulag_teleporter.dm
+++ b/code/game/machinery/computer/gulag_teleporter.dm
@@ -1,7 +1,7 @@
//computer that handle the points and teleports the prisoner
/obj/machinery/computer/gulag_teleporter_computer
name = "labor camp teleporter console"
- desc = "Used to send criminals to the Labor Camp"
+ desc = "Used to send criminals to the Labor Camp."
icon_screen = "explosive"
icon_keyboard = "security_key"
req_access = list(ACCESS_ARMORY)
diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm
index f13cfe8c00..41b41e536e 100644
--- a/code/game/machinery/computer/medical.dm
+++ b/code/game/machinery/computer/medical.dm
@@ -123,8 +123,7 @@
dat += "
"
@@ -338,6 +342,12 @@ GLOBAL_LIST_EMPTY(PDAs)
dat += cartridge.generate_menu()
dat += ""
+
+ if (underline_flag)
+ dat = replacetext(dat, "text-decoration:none", "text-decoration:underline")
+ if (!underline_flag)
+ dat = replacetext(dat, "text-decoration:underline", "text-decoration:none")
+
user << browse(dat, "window=pda;size=400x450;border=1;can_resize=1;can_minimize=0")
onclose(user, "pda", src)
@@ -355,7 +365,7 @@ GLOBAL_LIST_EMPTY(PDAs)
//BASIC FUNCTIONS===================================
if("Refresh")//Refresh, goes to the end of the proc.
-
+
if ("Toggle_Font")
//CODE REVISION 2
font_index = (font_index + 1) % 4
@@ -373,6 +383,9 @@ GLOBAL_LIST_EMPTY(PDAs)
var/new_color = input("Please enter a color name or hex value (Default is \'#808000\').")as color
background_color = new_color
+ if ("Toggle_Underline")
+ underline_flag = !underline_flag
+
if("Return")//Return
if(mode<=9)
mode = 0
@@ -604,7 +617,7 @@ GLOBAL_LIST_EMPTY(PDAs)
P.show_recieved_message(msg,src)
if(!multiple)
show_to_ghosts(user,msg)
- log_talk(user,"[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [key_name(P,null,TRUE)]",LOGPDA)
+ log_talk(user,"[key_name(user)] (PDA: [initial(name)]) sent \"[message]\" to [P.name]",LOGPDA)
else
if(!multiple)
to_chat(user, "ERROR: Server isn't responding.")
@@ -836,7 +849,8 @@ GLOBAL_LIST_EMPTY(PDAs)
user.show_message("No radiation detected.")
/obj/item/device/pda/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
switch(scanmode)
if(3)
@@ -886,7 +900,8 @@ GLOBAL_LIST_EMPTY(PDAs)
/obj/item/device/pda/proc/explode() //This needs tuning.
- if(!detonatable) return
+ if(!detonatable)
+ return
var/turf/T = get_turf(src)
if (ismob(loc))
@@ -998,5 +1013,6 @@ GLOBAL_LIST_EMPTY(PDAs)
. = list()
// Returns a list of PDAs which can be viewed from another PDA/message monitor.
for(var/obj/item/device/pda/P in GLOB.PDAs)
- if(!P.owner || P.toff || P.hidden) continue
+ if(!P.owner || P.toff || P.hidden)
+ continue
. += P
diff --git a/code/game/objects/items/devices/PDA/cart.dm b/code/game/objects/items/devices/PDA/cart.dm
index fe2acd6948..92acb36982 100644
--- a/code/game/objects/items/devices/PDA/cart.dm
+++ b/code/game/objects/items/devices/PDA/cart.dm
@@ -202,7 +202,8 @@
var/datum/radio_frequency/frequency = SSradio.return_frequency(1435)
- if(!frequency) return
+ if(!frequency)
+ return
var/datum/signal/status_signal = new
status_signal.source = src
diff --git a/code/game/objects/items/devices/PDA/virus_cart.dm b/code/game/objects/items/devices/PDA/virus_cart.dm
index 8c4a42a5aa..a514270618 100644
--- a/code/game/objects/items/devices/PDA/virus_cart.dm
+++ b/code/game/objects/items/devices/PDA/virus_cart.dm
@@ -20,7 +20,7 @@
/obj/item/cartridge/virus/clown
name = "\improper Honkworks 5.0 cartridge"
icon_state = "cart-clown"
- desc = "A data cartridge for portable microcomputers. It smells vaguely of banannas"
+ desc = "A data cartridge for portable microcomputers. It smells vaguely of bananas."
access = CART_CLOWN
/obj/item/cartridge/virus/clown/send_virus(obj/item/device/pda/target, mob/living/U)
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index 0b882c96d3..62b8c9ae4e 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -15,7 +15,7 @@
throw_speed = 4
throw_range = 20
origin_tech = "syndicate=1;engineering=3"
- flags_1 = NOBLUDGEON_1
+ flags_1 = NOBLUDGEON_1
var/obj/machinery/camera/current = null
@@ -124,7 +124,8 @@
// 15 second intervals ~ 1/4 minute
var/m = round(time_diff/4)
var/s = (time_diff - 4*m) * 15
- if(!s) s = "00"
+ if(!s)
+ s = "00"
html += "Last seen near [outstring] ([m]:[s] minute\s ago) "
if( C && (C.bug == src)) //Checks to see if the camera has a bug
html += "\[Disable\]"
@@ -218,7 +219,7 @@
var/list/cameras = flatten_list(bugged_cameras)
var/obj/machinery/camera/C = locate(href_list["emp"]) in cameras
if(C && istype(C) && C.bug == src)
- C.emp_act(EMP_HEAVY)
+ C.emp_act(EMP_HEAVY)
C.bug = null
bugged_cameras -= C.c_tag
interact()
diff --git a/code/game/objects/items/devices/chameleonproj.dm b/code/game/objects/items/devices/chameleonproj.dm
index a4f91724dd..65b584a878 100644
--- a/code/game/objects/items/devices/chameleonproj.dm
+++ b/code/game/objects/items/devices/chameleonproj.dm
@@ -32,7 +32,8 @@
toggle()
/obj/item/device/chameleon/afterattack(atom/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(!check_sprite(target))
return
if(!active_dummy)
@@ -51,7 +52,8 @@
return FALSE
/obj/item/device/chameleon/proc/toggle()
- if(!can_use || !saved_appearance) return
+ if(!can_use || !saved_appearance)
+ return
if(active_dummy)
eject_all()
playsound(get_turf(src), 'sound/effects/pop.ogg', 100, 1, -6)
@@ -65,6 +67,7 @@
C.activate(usr, saved_appearance, src)
to_chat(usr, "You activate \the [src].")
new /obj/effect/temp_visual/emp/pulse(get_turf(src))
+ usr.cancel_camera()
/obj/item/device/chameleon/proc/disrupt(delete_dummy = 1)
if(active_dummy)
diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm
index eab0f030cc..fd56c6283f 100644
--- a/code/game/objects/items/devices/flashlight.dm
+++ b/code/game/objects/items/devices/flashlight.dm
@@ -69,7 +69,7 @@
to_chat(user, "You're going to need to remove that [(M.head && M.head.flags_cover & HEADCOVERSEYES) ? "helmet" : (M.wear_mask && M.wear_mask.flags_cover & MASKCOVERSEYES) ? "mask": "glasses"] first.")
return
- var/obj/item/organ/eyes/E = M.getorganslot("eye_sight")
+ var/obj/item/organ/eyes/E = M.getorganslot(ORGAN_SLOT_EYES)
if(!E)
to_chat(user, "[M] doesn't have any eyes!")
return
@@ -210,6 +210,7 @@
item_state = "lamp"
lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
+ force = 10
brightness_on = 5
w_class = WEIGHT_CLASS_BULKY
flags_1 = CONDUCT_1
diff --git a/code/game/objects/items/devices/geiger_counter.dm b/code/game/objects/items/devices/geiger_counter.dm
index c9755727e7..03e4ff123a 100644
--- a/code/game/objects/items/devices/geiger_counter.dm
+++ b/code/game/objects/items/devices/geiger_counter.dm
@@ -1,8 +1,12 @@
-#define RAD_LEVEL_NORMAL 10
-#define RAD_LEVEL_MODERATE 30
-#define RAD_LEVEL_HIGH 75
-#define RAD_LEVEL_VERY_HIGH 125
-#define RAD_LEVEL_CRITICAL 200
+#define RAD_LEVEL_NORMAL 9
+#define RAD_LEVEL_MODERATE 100
+#define RAD_LEVEL_HIGH 400
+#define RAD_LEVEL_VERY_HIGH 800
+#define RAD_LEVEL_CRITICAL 1500
+
+#define RAD_MEASURE_SMOOTHING 5
+
+#define RAD_GRACE_PERIOD 2
/obj/item/device/geiger_counter //DISCLAIMER: I know nothing about how real-life Geiger counters work. This will not be realistic. ~Xhuis
name = "geiger counter"
@@ -14,25 +18,48 @@
w_class = WEIGHT_CLASS_SMALL
slot_flags = SLOT_BELT
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
- var/scanning = 0
- var/radiation_count = 0
-/obj/item/device/geiger_counter/New()
- ..()
+ var/grace = RAD_GRACE_PERIOD
+ var/datum/looping_sound/geiger/soundloop
+
+ var/scanning = FALSE
+ var/radiation_count = 0
+ var/current_tick_amount = 0
+ var/last_tick_amount = 0
+ var/fail_to_receive = 0
+ var/current_warning = 1
+
+/obj/item/device/geiger_counter/Initialize()
+ . = ..()
START_PROCESSING(SSobj, src)
+ soundloop = new(list(src), FALSE)
+
/obj/item/device/geiger_counter/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
/obj/item/device/geiger_counter/process()
- if(emagged)
- if(radiation_count < 20)
- radiation_count++
- return 0
- if(radiation_count > 0)
- radiation_count--
- update_icon()
+ update_icon()
+ update_sound()
+
+ if(!scanning)
+ current_tick_amount = 0
+ return
+
+ radiation_count -= radiation_count/RAD_MEASURE_SMOOTHING
+ radiation_count += current_tick_amount/RAD_MEASURE_SMOOTHING
+
+ if(current_tick_amount)
+ grace = RAD_GRACE_PERIOD
+ last_tick_amount = current_tick_amount
+
+ else if(!emagged)
+ grace--
+ if(grace <= 0)
+ radiation_count = 0
+
+ current_tick_amount = 0
/obj/item/device/geiger_counter/examine(mob/user)
..()
@@ -56,6 +83,8 @@
if(RAD_LEVEL_CRITICAL + 1 to INFINITY)
to_chat(user, "Ambient radiation levels above critical level!")
+ to_chat(user, "The last radiation amount detected was [last_tick_amount]")
+
/obj/item/device/geiger_counter/update_icon()
if(!scanning)
icon_state = "geiger_off"
@@ -78,20 +107,21 @@
icon_state = "geiger_on_5"
..()
+/obj/item/device/geiger_counter/proc/update_sound()
+ var/datum/looping_sound/geiger/loop = soundloop
+ if(!scanning)
+ loop.stop()
+ return
+ if(!radiation_count)
+ loop.stop()
+ return
+ loop.last_radiation = radiation_count
+ loop.start()
+
/obj/item/device/geiger_counter/rad_act(amount)
- if(!amount && scanning)
- return 0
- if(emagged)
- amount = Clamp(amount, 0, 25) //Emagged geiger counters can only accept 25 radiation at a time
- radiation_count += amount
- if(isliving(loc))
- var/mob/living/M = loc
- if(!emagged)
- to_chat(M, "[icon2html(src, M)] RADIATION PULSE DETECTED.")
- to_chat(M, "[icon2html(src, M)] Severity: [amount]")
- else
- to_chat(M, "[icon2html(src, M)] !@%$AT!(N P!LS! D/TEC?ED.")
- to_chat(M, "[icon2html(src, M)] &!F2rity: <=[amount]#1")
+ if(amount <= RAD_BACKGROUND_RADIATION || !scanning)
+ return
+ current_tick_amount += amount
update_icon()
/obj/item/device/geiger_counter/attack_self(mob/user)
@@ -103,12 +133,7 @@
if(user.a_intent == INTENT_HELP)
if(!emagged)
user.visible_message("[user] scans [M] with [src].", "You scan [M]'s radiation levels with [src]...")
- if(!M.radiation)
- to_chat(user, "[icon2html(src, user)] Radiation levels within normal boundaries.")
- return 1
- else
- to_chat(user, "[icon2html(src, user)] Subject is irradiated. Radiation levels: [M.radiation].")
- return 1
+ addtimer(CALLBACK(src, .proc/scan, M, user), 20, TIMER_UNIQUE) // Let's not have spamming GetAllContents
else
user.visible_message("[user] scans [M] with [src].", "You project [src]'s stored radiation into [M]'s body!")
M.rad_act(radiation_count)
@@ -116,6 +141,28 @@
return 1
..()
+/obj/item/device/geiger_counter/proc/scan(atom/A, mob/user)
+ var/rad_strength = 0
+ for(var/i in get_rad_contents(A)) // Yes it's intentional that you can't detect radioactive things under rad protection. Gives traitors a way to hide their glowing green rocks.
+ var/atom/thing = i
+ if(!thing)
+ continue
+ var/datum/component/radioactive/radiation = thing.GetComponent(/datum/component/radioactive)
+ if(radiation)
+ rad_strength += radiation.strength
+
+ if(isliving(A))
+ var/mob/living/M = A
+ if(!M.radiation)
+ to_chat(user, "[icon2html(src, user)] Radiation levels within normal boundaries.")
+ else
+ to_chat(user, "[icon2html(src, user)] Subject is irradiated. Radiation levels: [M.radiation].")
+
+ if(rad_strength)
+ to_chat(user, "[icon2html(src, user)] Subject has irradiated objects on them. Radioactive strength: [rad_strength]")
+ else
+ to_chat(user, "[icon2html(src, user)] Subject is free of radioactive contamination.")
+
/obj/item/device/geiger_counter/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/screwdriver) && emagged)
if(scanning)
diff --git a/code/game/objects/items/devices/gps.dm b/code/game/objects/items/devices/gps.dm
index 6ba8425392..23fc8a29ea 100644
--- a/code/game/objects/items/devices/gps.dm
+++ b/code/game/objects/items/devices/gps.dm
@@ -124,6 +124,8 @@ GLOBAL_LIST_EMPTY(GPS_list)
a = copytext(sanitize(a), 1, 20)
gpstag = a
. = TRUE
+ name = "global positioning system ([gpstag])"
+
if("power")
toggletracking(usr)
. = TRUE
@@ -134,15 +136,6 @@ GLOBAL_LIST_EMPTY(GPS_list)
global_mode = !global_mode
. = TRUE
-/obj/item/device/gps/Topic(href, href_list)
- ..()
- if(href_list["tag"] )
- var/a = input("Please enter desired tag.", name, gpstag) as text
- a = uppertext(copytext(sanitize(a), 1, 5))
- if(in_range(src, usr))
- gpstag = a
- name = "global positioning system ([gpstag])"
- attack_self(usr)
/obj/item/device/gps/science
icon_state = "gps-s"
diff --git a/code/game/objects/items/devices/instruments.dm b/code/game/objects/items/devices/instruments.dm
index 8418e61146..06e8898e15 100644
--- a/code/game/objects/items/devices/instruments.dm
+++ b/code/game/objects/items/devices/instruments.dm
@@ -2,6 +2,7 @@
/obj/item/device/instrument
name = "generic instrument"
resistance_flags = FLAMMABLE
+ force = 10
max_integrity = 100
icon = 'icons/obj/musician.dmi'
lefthand_file = 'icons/mob/inhands/equipment/instruments_lefthand.dmi'
@@ -49,7 +50,6 @@
desc = "A wooden musical instrument with four strings and a bow. \"The devil went down to space, he was looking for an assistant to grief.\""
icon_state = "violin"
item_state = "violin"
- force = 10
hitsound = "swing_hit"
instrumentId = "violin"
@@ -80,7 +80,6 @@
icon_state = "guitar"
item_state = "guitar"
instrumentExt = "ogg"
- force = 10
attack_verb = list("played metal on", "serenaded", "crashed", "smashed")
hitsound = 'sound/weapons/stringsmash.ogg'
instrumentId = "guitar"
@@ -110,6 +109,30 @@
item_state = "accordion"
instrumentId = "accordion"
+/obj/item/device/instrument/trumpet
+ name = "trumpet"
+ desc = "To announce the arrival of the king!"
+ icon_state = "trumpet"
+ item_state = "trombone"
+ instrumentId = "trombone"
+
+/obj/item/device/instrument/trumpet/spectral
+ name = "spectral trumpet"
+ desc = "Things are about to get spooky!"
+ icon_state = "trumpet"
+ item_state = "trombone"
+ force = 0
+ instrumentId = "trombone"
+ attack_verb = list("played","jazzed","trumpeted","mourned","dooted","spooked")
+
+/obj/item/device/instrument/trumpet/spectral/Initialize()
+ . = ..()
+ AddComponent(/datum/component/spooky)
+
+/obj/item/device/instrument/trumpet/spectral/attack(mob/living/carbon/C, mob/user)
+ playsound (loc, 'sound/instruments/trombone/En4.mid', 100,1,-1)
+ ..()
+
/obj/item/device/instrument/saxophone
name = "saxophone"
desc = "This soothing sound will be sure to leave your audience in tears."
@@ -117,6 +140,23 @@
item_state = "saxophone"
instrumentId = "saxophone"
+/obj/item/device/instrument/saxophone/spectral
+ name = "spectral saxophone"
+ desc = "This spooky sound will be sure to leave mortals in bones."
+ icon_state = "saxophone"
+ item_state = "saxophone"
+ instrumentId = "saxophone"
+ force = 0
+ attack_verb = list("played","jazzed","saxxed","mourned","dooted","spooked")
+
+/obj/item/device/instrument/saxophone/spectral/Initialize()
+ . = ..()
+ AddComponent(/datum/component/spooky)
+
+/obj/item/device/instrument/saxophone/spectral/attack(mob/living/carbon/C, mob/user)
+ playsound (loc, 'sound/instruments/saxophone/En4.mid', 100,1,-1)
+ ..()
+
/obj/item/device/instrument/trombone
name = "trombone"
desc = "How can any pool table ever hope to compete?"
@@ -124,9 +164,27 @@
item_state = "trombone"
instrumentId = "trombone"
+/obj/item/device/instrument/trombone/spectral
+ name = "spectral trombone"
+ desc = "A skeleton's favorite instrument. Apply directly on the mortals."
+ instrumentId = "trombone"
+ icon_state = "trombone"
+ item_state = "trombone"
+ force = 0
+ attack_verb = list("played","jazzed","tromboned","mourned","dooted","spooked")
+
+/obj/item/device/instrument/trombone/spectral/Initialize()
+ . = ..()
+ AddComponent(/datum/component/spooky)
+
+/obj/item/device/instrument/trombone/spectral/attack(mob/living/carbon/C, mob/user)
+ playsound (loc, 'sound/instruments/trombone/Cn4.mid', 100,1,-1)
+ ..()
+
/obj/item/device/instrument/recorder
name = "recorder"
desc = "Just like in school, playing ability and all."
+ force = 5
icon_state = "recorder"
item_state = "recorder"
instrumentId = "recorder"
@@ -163,4 +221,3 @@
throw_speed = 3
throw_range = 15
hitsound = 'sound/items/bikehorn.ogg'
-
diff --git a/code/game/objects/items/devices/lightreplacer.dm b/code/game/objects/items/devices/lightreplacer.dm
index 6bfbff9f3a..3821f6206b 100644
--- a/code/game/objects/items/devices/lightreplacer.dm
+++ b/code/game/objects/items/devices/lightreplacer.dm
@@ -52,6 +52,7 @@
flags_1 = CONDUCT_1
slot_flags = SLOT_BELT
origin_tech = "magnets=3;engineering=4"
+ force = 8
var/max_uses = 20
var/uses = 0
@@ -192,7 +193,8 @@
if(target.status != LIGHT_OK)
if(CanUse(U))
- if(!Use(U)) return
+ if(!Use(U))
+ return
to_chat(U, "You replace the [target.fitting] with \the [src].")
if(target.status != LIGHT_EMPTY)
diff --git a/code/game/objects/items/devices/multitool.dm b/code/game/objects/items/devices/multitool.dm
index 3cbaf7e98d..c72d6f1cca 100644
--- a/code/game/objects/items/devices/multitool.dm
+++ b/code/game/objects/items/devices/multitool.dm
@@ -12,8 +12,8 @@
name = "multitool"
desc = "Used for pulsing wires to test which to cut. Not recommended by doctors."
icon_state = "multitool"
- lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
force = 5
w_class = WEIGHT_CLASS_SMALL
throwforce = 0
@@ -74,7 +74,7 @@
break
/obj/item/device/multitool/ai_detect/admin
- desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'" //What else should I say for a meme item?
+ desc = "Used for pulsing wires to test which to cut. Not recommended by doctors. Has a strange tag that says 'Grief in Safety'." //What else should I say for a meme item?
track_delay = 5
/obj/item/device/multitool/ai_detect/admin/multitool_detect()
@@ -98,4 +98,4 @@
icon = 'icons/obj/abductor.dmi'
icon_state = "multitool"
toolspeed = 0.1
- origin_tech = "magnets=5;engineering=5;abductor=3"
\ No newline at end of file
+ origin_tech = "magnets=5;engineering=5;abductor=3"
diff --git a/code/game/objects/items/devices/paicard.dm b/code/game/objects/items/devices/paicard.dm
index a07b30a86d..67618787b2 100644
--- a/code/game/objects/items/devices/paicard.dm
+++ b/code/game/objects/items/devices/paicard.dm
@@ -128,16 +128,26 @@
if(pai)
src.cut_overlays()
switch(emotion)
- if(1) src.add_overlay("pai-happy")
- if(2) src.add_overlay("pai-cat")
- if(3) src.add_overlay("pai-extremely-happy")
- if(4) src.add_overlay("pai-face")
- if(5) src.add_overlay("pai-laugh")
- if(6) src.add_overlay("pai-off")
- if(7) src.add_overlay("pai-sad")
- if(8) src.add_overlay("pai-angry")
- if(9) src.add_overlay("pai-what")
- if(10) src.add_overlay("pai-null")
+ if(1)
+ src.add_overlay("pai-happy")
+ if(2)
+ src.add_overlay("pai-cat")
+ if(3)
+ src.add_overlay("pai-extremely-happy")
+ if(4)
+ src.add_overlay("pai-face")
+ if(5)
+ src.add_overlay("pai-laugh")
+ if(6)
+ src.add_overlay("pai-off")
+ if(7)
+ src.add_overlay("pai-sad")
+ if(8)
+ src.add_overlay("pai-angry")
+ if(9)
+ src.add_overlay("pai-what")
+ if(10)
+ src.add_overlay("pai-null")
/obj/item/device/paicard/proc/alertUpdate()
visible_message("[src] flashes a message across its screen, \"Additional personalities available for download.\"", "[src] bleeps electronically.")
diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm
index 2673869bc4..f6110dd428 100644
--- a/code/game/objects/items/devices/radio/encryptionkey.dm
+++ b/code/game/objects/items/devices/radio/encryptionkey.dm
@@ -122,11 +122,11 @@
channels = list("Service" = 1)
/obj/item/device/encryptionkey/headset_cent
- name = "centcom radio encryption key"
- desc = "An encryption key for a radio headset. To access the centcom channel, use :y."
+ name = "\improper CentCom radio encryption key"
+ desc = "An encryption key for a radio headset. To access the CentCom channel, use :y."
icon_state = "cent_cypherkey"
independent = TRUE
- channels = list("CentCom" = 1)
+ channels = list("CentCom" = 1)
/obj/item/device/encryptionkey/ai //ported from NT, this goes 'inside' the AI.
channels = list("Command" = 1, "Security" = 1, "Engineering" = 1, "Science" = 1, "Medical" = 1, "Supply" = 1, "Service" = 1, "AI Private" = 1)
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 9817614e24..ada7b613e4 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -47,11 +47,11 @@
/obj/item/device/radio/headset/syndicate/alt //undisguised bowman with flash protection
name = "syndicate headset"
- desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs. \nTo access the syndicate channel, use ; before speaking."
+ desc = "A syndicate headset that can be used to hear all radio frequencies. Protects ears from flashbangs.\nTo access the syndicate channel, use ; before speaking."
origin_tech = "syndicate=3"
icon_state = "syndie_headset"
item_state = "syndie_headset"
- flags_2 = BANG_PROTECT_2
+ flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
/obj/item/device/radio/headset/syndicate/alt/leader
name = "team leader headset"
@@ -71,50 +71,50 @@
/obj/item/device/radio/headset/headset_sec
name = "security radio headset"
- desc = "This is used by your elite security force. \nTo access the security channel, use :s."
+ desc = "This is used by your elite security force.\nTo access the security channel, use :s."
icon_state = "sec_headset"
keyslot = new /obj/item/device/encryptionkey/headset_sec
/obj/item/device/radio/headset/headset_sec/alt
name = "security bowman headset"
- desc = "This is used by your elite security force. Protects ears from flashbangs. \nTo access the security channel, use :s."
+ desc = "This is used by your elite security force. Protects ears from flashbangs.\nTo access the security channel, use :s."
icon_state = "sec_headset_alt"
item_state = "sec_headset_alt"
- flags_2 = BANG_PROTECT_2
+ flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
/obj/item/device/radio/headset/headset_eng
name = "engineering radio headset"
- desc = "When the engineers wish to chat like girls. \nTo access the engineering channel, use :e. "
+ desc = "When the engineers wish to chat like girls.\nTo access the engineering channel, use :e."
icon_state = "eng_headset"
keyslot = new /obj/item/device/encryptionkey/headset_eng
/obj/item/device/radio/headset/headset_rob
name = "robotics radio headset"
- desc = "Made specifically for the roboticists, who cannot decide between departments. \nTo access the engineering channel, use :e. For research, use :n."
+ desc = "Made specifically for the roboticists, who cannot decide between departments.\nTo access the engineering channel, use :e. For research, use :n."
icon_state = "rob_headset"
keyslot = new /obj/item/device/encryptionkey/headset_rob
/obj/item/device/radio/headset/headset_med
name = "medical radio headset"
- desc = "A headset for the trained staff of the medbay. \nTo access the medical channel, use :m."
+ desc = "A headset for the trained staff of the medbay.\nTo access the medical channel, use :m."
icon_state = "med_headset"
keyslot = new /obj/item/device/encryptionkey/headset_med
/obj/item/device/radio/headset/headset_sci
name = "science radio headset"
- desc = "A sciency headset. Like usual. \nTo access the science channel, use :n."
+ desc = "A sciency headset. Like usual.\nTo access the science channel, use :n."
icon_state = "sci_headset"
keyslot = new /obj/item/device/encryptionkey/headset_sci
/obj/item/device/radio/headset/headset_medsci
name = "medical research radio headset"
- desc = "A headset that is a result of the mating between medical and science. \nTo access the medical channel, use :m. For science, use :n."
+ desc = "A headset that is a result of the mating between medical and science.\nTo access the medical channel, use :m. For science, use :n."
icon_state = "medsci_headset"
keyslot = new /obj/item/device/encryptionkey/headset_medsci
/obj/item/device/radio/headset/headset_com
name = "command radio headset"
- desc = "A headset with a commanding channel. \nTo access the command channel, use :c."
+ desc = "A headset with a commanding channel.\nTo access the command channel, use :c."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/headset_com
@@ -123,75 +123,75 @@
/obj/item/device/radio/headset/heads/captain
name = "\proper the captain's headset"
- desc = "The headset of the king. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
+ desc = "The headset of the king.\nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/alt
name = "\proper the captain's bowman headset"
- desc = "The headset of the boss. Protects ears from flashbangs. \nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
+ desc = "The headset of the boss. Protects ears from flashbangs.\nChannels are as follows: :c - command, :s - security, :e - engineering, :u - supply, :v - service, :m - medical, :n - science."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
- flags_2 = BANG_PROTECT_2
+ flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
/obj/item/device/radio/headset/heads/rd
name = "\proper the research director's headset"
- desc = "Headset of the fellow who keeps society marching towards technological singularity. \nTo access the science channel, use :n. For command, use :c."
+ desc = "Headset of the fellow who keeps society marching towards technological singularity.\nTo access the science channel, use :n. For command, use :c."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/rd
/obj/item/device/radio/headset/heads/hos
name = "\proper the head of security's headset"
- desc = "The headset of the man in charge of keeping order and protecting the station. \nTo access the security channel, use :s. For command, use :c."
+ desc = "The headset of the man in charge of keeping order and protecting the station.\nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/hos
/obj/item/device/radio/headset/heads/hos/alt
name = "\proper the head of security's bowman headset"
- desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs. \nTo access the security channel, use :s. For command, use :c."
+ desc = "The headset of the man in charge of keeping order and protecting the station. Protects ears from flashbangs.\nTo access the security channel, use :s. For command, use :c."
icon_state = "com_headset_alt"
item_state = "com_headset_alt"
- flags_2 = BANG_PROTECT_2
+ flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
/obj/item/device/radio/headset/heads/ce
name = "\proper the chief engineer's headset"
- desc = "The headset of the guy in charge of keeping the station powered and undamaged. \nTo access the engineering channel, use :e. For command, use :c."
+ desc = "The headset of the guy in charge of keeping the station powered and undamaged.\nTo access the engineering channel, use :e. For command, use :c."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/ce
/obj/item/device/radio/headset/heads/cmo
name = "\proper the chief medical officer's headset"
- desc = "The headset of the highly trained medical chief. \nTo access the medical channel, use :m. For command, use :c."
+ desc = "The headset of the highly trained medical chief.\nTo access the medical channel, use :m. For command, use :c."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/cmo
/obj/item/device/radio/headset/heads/hop
name = "\proper the head of personnel's headset"
- desc = "The headset of the guy who will one day be captain. \nChannels are as follows: :u - supply, :v - service, :c - command."
+ desc = "The headset of the guy who will one day be captain.\nChannels are as follows: :u - supply, :v - service, :c - command."
icon_state = "com_headset"
keyslot = new /obj/item/device/encryptionkey/heads/hop
/obj/item/device/radio/headset/headset_cargo
name = "supply radio headset"
- desc = "A headset used by the QM and his slaves. \nTo access the supply channel, use :u."
+ desc = "A headset used by the QM and his slaves.\nTo access the supply channel, use :u."
icon_state = "cargo_headset"
keyslot = new /obj/item/device/encryptionkey/headset_cargo
/obj/item/device/radio/headset/headset_cargo/mining
name = "mining radio headset"
- desc = "Headset used by shaft miners. \nTo access the supply channel, use :u. For science, use :n."
+ desc = "Headset used by shaft miners.\nTo access the supply channel, use :u. For science, use :n."
icon_state = "mine_headset"
keyslot = new /obj/item/device/encryptionkey/headset_mining
/obj/item/device/radio/headset/headset_srv
name = "service radio headset"
- desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean. \nTo access the service channel, use :v."
+ desc = "Headset used by the service staff, tasked with keeping the station full, happy and clean.\nTo access the service channel, use :v."
icon_state = "srv_headset"
keyslot = new /obj/item/device/encryptionkey/headset_service
/obj/item/device/radio/headset/headset_cent
name = "\improper CentCom headset"
- desc = "A headset used by the upper echelons of Nanotrasen. \nTo access the centcom channel, use :y."
+ desc = "A headset used by the upper echelons of Nanotrasen.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset"
keyslot = new /obj/item/device/encryptionkey/headset_com
keyslot2 = new /obj/item/device/encryptionkey/headset_cent
@@ -201,11 +201,11 @@
/obj/item/device/radio/headset/headset_cent/alt
name = "\improper CentCom bowman headset"
- desc = "A headset especially for emergency response personnel. Protects ears from flashbangs. \nTo access the centcom channel, use :y."
+ desc = "A headset especially for emergency response personnel. Protects ears from flashbangs.\nTo access the CentCom channel, use :y."
icon_state = "cent_headset_alt"
item_state = "cent_headset_alt"
keyslot = null
- flags_2 = BANG_PROTECT_2
+ flags_2 = BANG_PROTECT_2 | NO_EMP_WIRES_2
/obj/item/device/radio/headset/ai
name = "\proper Integrated Subspace Transceiver "
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index ccf5e985c8..7675c09776 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -29,6 +29,7 @@
var/emped = 0 //Highjacked to track the number of consecutive EMPs on the radio, allowing consecutive EMP's to stack properly.
// "Example" = FREQ_LISTENING|FREQ_BROADCASTING
flags_1 = CONDUCT_1 | HEAR_1
+ flags_2 = NO_EMP_WIRES_2
slot_flags = SLOT_BELT
throw_speed = 3
throw_range = 7
@@ -195,9 +196,11 @@
return ITALICS | REDUCE_RANGE
/obj/item/device/radio/proc/talk_into_impl(atom/movable/M, message, channel, list/spans, datum/language/language)
- if(!on) return // the device has to be on
+ if(!on)
+ return // the device has to be on
// Fix for permacell radios, but kinda eh about actually fixing them.
- if(!M || !message) return
+ if(!M || !message)
+ return
if(wires.is_cut(WIRE_TX))
return
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index e55c728121..9865f0bfb3 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -106,8 +106,8 @@ MASS SPECTROMETER
// Used by the PDA medical scanner too
-/proc/healthscan(mob/living/user, mob/living/M, mode = 1, advanced = FALSE)
- if(user.incapacitated() || user.eye_blind)
+/proc/healthscan(mob/user, mob/living/M, mode = 1, advanced = FALSE)
+ if(isliving(user) && (user.incapacitated() || user.eye_blind))
return
//Damage specifics
var/oxy_loss = M.getOxyLoss()
@@ -171,7 +171,7 @@ MASS SPECTROMETER
if(advanced)
if(iscarbon(M))
var/mob/living/carbon/C = M
- var/obj/item/organ/ears/ears = C.getorganslot("ears")
+ var/obj/item/organ/ears/ears = C.getorganslot(ORGAN_SLOT_EARS)
to_chat(user, "\t==EAR STATUS==")
if(istype(ears))
var/healthy = TRUE
@@ -189,7 +189,7 @@ MASS SPECTROMETER
to_chat(user, "\tHealthy.")
else
to_chat(user, "\tSubject does not have ears.")
- var/obj/item/organ/eyes/eyes = C.getorganslot("eye_sight")
+ var/obj/item/organ/eyes/eyes = C.getorganslot(ORGAN_SLOT_EYES)
to_chat(user, "\t==EYE STATUS==")
if(istype(eyes))
var/healthy = TRUE
@@ -280,18 +280,17 @@ MASS SPECTROMETER
to_chat(user, "[cyberimp_detect]")
/proc/chemscan(mob/living/user, mob/living/M)
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H.reagents)
- if(H.reagents.reagent_list.len)
+ if(istype(M))
+ if(M.reagents)
+ if(M.reagents.reagent_list.len)
to_chat(user, "Subject contains the following reagents:")
- for(var/datum/reagent/R in H.reagents.reagent_list)
+ for(var/datum/reagent/R in M.reagents.reagent_list)
to_chat(user, "[R.volume] units of [R.name][R.overdosed == 1 ? " - OVERDOSING" : "."]")
else
to_chat(user, "Subject contains no reagents.")
- if(H.reagents.addiction_list.len)
+ if(M.reagents.addiction_list.len)
to_chat(user, "Subject is addicted to the following reagents:")
- for(var/datum/reagent/R in H.reagents.addiction_list)
+ for(var/datum/reagent/R in M.reagents.addiction_list)
to_chat(user, "[R.name]")
else
to_chat(user, "Subject is not addicted to any reagents.")
@@ -358,10 +357,10 @@ MASS SPECTROMETER
var/list/env_gases = environment.gases
environment.assert_gases(arglist(GLOB.hardcoded_gases))
- var/o2_concentration = env_gases["o2"][MOLES]/total_moles
- var/n2_concentration = env_gases["n2"][MOLES]/total_moles
- var/co2_concentration = env_gases["co2"][MOLES]/total_moles
- var/plasma_concentration = env_gases["plasma"][MOLES]/total_moles
+ var/o2_concentration = env_gases[/datum/gas/oxygen][MOLES]/total_moles
+ var/n2_concentration = env_gases[/datum/gas/nitrogen][MOLES]/total_moles
+ var/co2_concentration = env_gases[/datum/gas/carbon_dioxide][MOLES]/total_moles
+ var/plasma_concentration = env_gases[/datum/gas/plasma][MOLES]/total_moles
environment.garbage_collect()
if(abs(n2_concentration - N2STANDARD) < 20)
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 663eed0a8d..c97ad1271c 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -241,7 +241,7 @@ effective or pretty fucking useless.
var/range = 12
/obj/item/device/jammer/attack_self(mob/user)
- to_chat(user,"You [active ? "deactivate" : "activate"] the [src].")
+ to_chat(user,"You [active ? "deactivate" : "activate"] [src].")
active = !active
if(active)
GLOB.active_jammers |= src
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index a24f300b18..fe310db994 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -5,7 +5,7 @@
item_state = "ttv"
lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
- desc = "Regulates the transfer of air between two tanks"
+ desc = "Regulates the transfer of air between two tanks."
var/obj/item/tank/tank_one
var/obj/item/tank/tank_two
var/obj/item/device/assembly/attached_device
diff --git a/code/game/objects/items/dna_injector.dm b/code/game/objects/items/dna_injector.dm
index 18064f83de..d76bc6856a 100644
--- a/code/game/objects/items/dna_injector.dm
+++ b/code/game/objects/items/dna_injector.dm
@@ -171,7 +171,7 @@
/obj/item/dnainjector/stuttmut
name = "\improper DNA injector (Stutt.)"
- desc = "Makes you s-s-stuttterrr"
+ desc = "Makes you s-s-stuttterrr."
add_mutations_static = list(NERVOUS)
/obj/item/dnainjector/antistutt
diff --git a/code/game/objects/items/extinguisher.dm b/code/game/objects/items/extinguisher.dm
index c6c8dbe749..d334d12193 100644
--- a/code/game/objects/items/extinguisher.dm
+++ b/code/game/objects/items/extinguisher.dm
@@ -157,19 +157,24 @@
if(precision)
the_targets -= my_target
var/datum/reagents/R = new/datum/reagents(5)
- if(!W) return
+ if(!W)
+ return
W.reagents = R
R.my_atom = W
- if(!W || !src) return
+ if(!W || !src)
+ return
src.reagents.trans_to(W,1)
for(var/b=0, bYou remove the plasma tank from [src]!")
+ update_icon()
/obj/item/flamethrower/examine(mob/user)
..()
@@ -201,8 +202,8 @@
//TODO: DEFERRED Consider checking to make sure tank pressure is high enough before doing this...
//Transfer 5% of current tank air contents to turf
var/datum/gas_mixture/air_transfer = ptank.air_contents.remove_ratio(release_amount)
- if(air_transfer.gases["plasma"])
- air_transfer.gases["plasma"][MOLES] *= 5
+ if(air_transfer.gases[/datum/gas/plasma])
+ air_transfer.gases[/datum/gas/plasma][MOLES] *= 5
target.assume_air(air_transfer)
//Burn it based on transfered gas
target.hotspot_expose((ptank.air_contents.temperature*2) + 380,500)
diff --git a/code/game/objects/items/grenades/chem_grenade.dm b/code/game/objects/items/grenades/chem_grenade.dm
index 833d215180..35ffebfe6b 100644
--- a/code/game/objects/items/grenades/chem_grenade.dm
+++ b/code/game/objects/items/grenades/chem_grenade.dm
@@ -529,7 +529,7 @@
/obj/item/grenade/chem_grenade/bioterrorfoam
name = "Bio terror foam grenade"
- desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin"
+ desc = "Tiger Cooperative chemical foam grenade. Causes temporary irration, blindness, confusion, mutism, and mutations to carbon based life forms. Contains additional spore toxin."
stage = READY
/obj/item/grenade/chem_grenade/bioterrorfoam/Initialize()
diff --git a/code/game/objects/items/grenades/grenade.dm b/code/game/objects/items/grenades/grenade.dm
index bf2f6dd4bb..e444ecce25 100644
--- a/code/game/objects/items/grenades/grenade.dm
+++ b/code/game/objects/items/grenades/grenade.dm
@@ -1,50 +1,50 @@
-/obj/item/grenade
- name = "grenade"
- desc = "It has an adjustable timer."
- w_class = WEIGHT_CLASS_SMALL
- icon = 'icons/obj/grenade.dmi'
- icon_state = "grenade"
- item_state = "flashbang"
- lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
- throw_speed = 3
- throw_range = 7
- flags_1 = CONDUCT_1
- slot_flags = SLOT_BELT
- resistance_flags = FLAMMABLE
- max_integrity = 40
- var/active = 0
- var/det_time = 50
- var/display_timer = 1
-
-/obj/item/grenade/deconstruct(disassembled = TRUE)
- if(!disassembled)
- prime()
- if(!QDELETED(src))
- qdel(src)
-
-/obj/item/grenade/proc/clown_check(mob/living/carbon/human/user)
- if(user.disabilities & CLUMSY && prob(50))
- to_chat(user, "Huh? How does this thing work?")
+/obj/item/grenade
+ name = "grenade"
+ desc = "It has an adjustable timer."
+ w_class = WEIGHT_CLASS_SMALL
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "grenade"
+ item_state = "flashbang"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ throw_speed = 3
+ throw_range = 7
+ flags_1 = CONDUCT_1
+ slot_flags = SLOT_BELT
+ resistance_flags = FLAMMABLE
+ max_integrity = 40
+ var/active = 0
+ var/det_time = 50
+ var/display_timer = 1
+
+/obj/item/grenade/deconstruct(disassembled = TRUE)
+ if(!disassembled)
+ prime()
+ if(!QDELETED(src))
+ qdel(src)
+
+/obj/item/grenade/proc/clown_check(mob/living/carbon/human/user)
+ if(user.disabilities & CLUMSY && prob(50))
+ to_chat(user, "Huh? How does this thing work?")
preprime(user, 5, FALSE)
return FALSE
return TRUE
-
-
-/obj/item/grenade/examine(mob/user)
- ..()
- if(display_timer)
- if(det_time > 1)
- to_chat(user, "The timer is set to [det_time/10] second\s.")
- else
- to_chat(user, "\The [src] is set for instant detonation.")
-
-
-/obj/item/grenade/attack_self(mob/user)
- if(!active)
- if(clown_check(user))
- preprime(user)
-
+
+
+/obj/item/grenade/examine(mob/user)
+ ..()
+ if(display_timer)
+ if(det_time > 1)
+ to_chat(user, "The timer is set to [det_time/10] second\s.")
+ else
+ to_chat(user, "\The [src] is set for instant detonation.")
+
+
+/obj/item/grenade/attack_self(mob/user)
+ if(!active)
+ if(clown_check(user))
+ preprime(user)
+
/obj/item/grenade/proc/log_grenade(mob/user, turf/T)
var/area/A = get_area(T)
var/message = "[ADMIN_LOOKUPFLW(user)]) has primed \a [src] for detonation at [ADMIN_COORDJMP(T)]"
@@ -52,57 +52,58 @@
message_admins(message)
log_game("[key_name(user)] has primed \a [src] for detonation at [A.name] [COORD(T)].")
-/obj/item/grenade/proc/preprime(mob/user, delayoverride, msg = TRUE)
+/obj/item/grenade/proc/preprime(mob/user, delayoverride, msg = TRUE, volume = 60)
var/turf/T = get_turf(src)
- log_grenade(user, T)
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.throw_mode_on()
- if(msg)
- to_chat(user, "You prime \the [src]! [det_time/10] seconds!")
- playsound(loc, 'sound/weapons/armbomb.ogg', 60, 1)
- active = TRUE
- icon_state = initial(icon_state) + "_active"
- add_fingerprint(user)
+ log_grenade(user, T) //Inbuilt admin procs already handle null users
+ if(user)
+ add_fingerprint(user)
+ if(iscarbon(user))
+ var/mob/living/carbon/C = user
+ C.throw_mode_on()
+ if(msg)
+ to_chat(user, "You prime \the [src]! [det_time/10] seconds!")
+ playsound(src, 'sound/weapons/armbomb.ogg', volume, 1)
+ active = TRUE
+ icon_state = initial(icon_state) + "_active"
addtimer(CALLBACK(src, .proc/prime), isnull(delayoverride)? det_time : delayoverride)
-
-/obj/item/grenade/proc/prime()
-
-/obj/item/grenade/proc/update_mob()
- if(ismob(loc))
- var/mob/M = loc
- M.dropItemToGround(src)
-
-
-/obj/item/grenade/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/screwdriver))
- switch(det_time)
- if ("1")
- det_time = 10
- to_chat(user, "You set the [name] for 1 second detonation time.")
- if ("10")
- det_time = 30
- to_chat(user, "You set the [name] for 3 second detonation time.")
- if ("30")
- det_time = 50
- to_chat(user, "You set the [name] for 5 second detonation time.")
- if ("50")
- det_time = 1
- to_chat(user, "You set the [name] for instant detonation.")
- add_fingerprint(user)
- else
- return ..()
-
-/obj/item/grenade/attack_hand()
- walk(src, null, null)
- ..()
-
-/obj/item/grenade/attack_paw(mob/user)
- return attack_hand(user)
-
-/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- var/obj/item/projectile/P = hitby
- if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15))
- owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!")
- prime()
+
+/obj/item/grenade/proc/prime()
+
+/obj/item/grenade/proc/update_mob()
+ if(ismob(loc))
+ var/mob/M = loc
+ M.dropItemToGround(src)
+
+
+/obj/item/grenade/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/screwdriver))
+ switch(det_time)
+ if ("1")
+ det_time = 10
+ to_chat(user, "You set the [name] for 1 second detonation time.")
+ if ("10")
+ det_time = 30
+ to_chat(user, "You set the [name] for 3 second detonation time.")
+ if ("30")
+ det_time = 50
+ to_chat(user, "You set the [name] for 5 second detonation time.")
+ if ("50")
+ det_time = 1
+ to_chat(user, "You set the [name] for instant detonation.")
+ add_fingerprint(user)
+ else
+ return ..()
+
+/obj/item/grenade/attack_hand()
+ walk(src, null, null)
+ ..()
+
+/obj/item/grenade/attack_paw(mob/user)
+ return attack_hand(user)
+
+/obj/item/grenade/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
+ var/obj/item/projectile/P = hitby
+ if(damage && attack_type == PROJECTILE_ATTACK && P.damage_type != STAMINA && prob(15))
+ owner.visible_message("[attack_text] hits [owner]'s [src], setting it off! What a shot!")
+ prime()
return TRUE //It hit the grenade, not them
diff --git a/code/game/objects/items/grenades/plastic.dm b/code/game/objects/items/grenades/plastic.dm
index a0e7eb1b96..4b7c8985a6 100644
--- a/code/game/objects/items/grenades/plastic.dm
+++ b/code/game/objects/items/grenades/plastic.dm
@@ -2,11 +2,15 @@
name = "plastic explosive"
desc = "Used to put holes in specific areas without too much extra hole."
icon_state = "plastic-explosive0"
- item_state = "plasticx"
+ item_state = "plastic-explosive"
+ lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
flags_1 = NOBLUDGEON_1
flags_2 = NO_EMP_WIRES_2
det_time = 10
display_timer = 0
+ w_class = WEIGHT_CLASS_SMALL
+ origin_tech = "syndicate=1"
var/atom/target = null
var/mutable_appearance/plastic_overlay
var/obj/item/device/assembly_holder/nadeassembly = null
@@ -16,7 +20,7 @@
var/boom_sizes = list(0, 0, 3)
/obj/item/grenade/plastic/New()
- plastic_overlay = mutable_appearance(icon, "[item_state]2")
+ plastic_overlay = mutable_appearance(icon, "[item_state]2", HIGH_OBJ_LAYER)
..()
/obj/item/grenade/plastic/Destroy()
@@ -95,7 +99,7 @@
if(ismob(AM))
return
- to_chat(user, "You start planting the [src]. The timer is set to [det_time]...")
+ to_chat(user, "You start planting [src]. The timer is set to [det_time]...")
if(do_after(user, 30, target = AM))
if(!user.temporarilyRemoveItemFromInventory(src))
@@ -112,7 +116,7 @@
message_admins("[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse",0,1)
log_game("[key_name(user)] planted [name] on [target.name] at [COORD(src)] with [det_time] second fuse")
- target.add_overlay(plastic_overlay, 1)
+ target.add_overlay(plastic_overlay, TRUE)
if(!nadeassembly)
to_chat(user, "You plant the bomb. Timer counting down from [det_time].")
addtimer(CALLBACK(src, .proc/prime), det_time*10)
@@ -122,7 +126,7 @@
/obj/item/grenade/plastic/suicide_act(mob/user)
message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src] at [ADMIN_COORDJMP(user)]",0,1)
log_game("[key_name(user)] suicided with [src] at [COORD(user)]")
- user.visible_message("[user] activates the [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!")
+ user.visible_message("[user] activates [src] and holds it above [user.p_their()] head! It looks like [user.p_theyre()] going out with a bang!")
var/message_say = "FOR NO RAISIN!"
if(user.mind)
if(user.mind.special_role)
@@ -133,7 +137,7 @@
message_say = "FOR THE HIVE!"
else if(role == "cultist")
message_say = "FOR NAR-SIE!"
- else if(role == "revolutionary" || role == "head revolutionary")
+ else if(is_revolutionary(user))
message_say = "VIVA LA REVOLUTION!"
user.say(message_say)
explosion(user,0,2,0) //Cheap explosion imitation because putting prime() here causes runtimes
@@ -154,21 +158,12 @@
name = "C4"
desc = "Used to put holes in specific areas without too much extra hole. A saboteur's favorite."
gender = PLURAL
- icon = 'icons/obj/grenade.dmi'
- icon_state = "plastic-explosive0"
- item_state = "plasticx"
- lefthand_file = 'icons/mob/inhands/weapons/bombs_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/bombs_righthand.dmi'
- flags_1 = NOBLUDGEON_1
- w_class = WEIGHT_CLASS_SMALL
- origin_tech = "syndicate=1"
var/timer = 10
var/open_panel = 0
/obj/item/grenade/plastic/c4/New()
wires = new /datum/wires/explosive/c4(src)
..()
- plastic_overlay = mutable_appearance(icon, "plastic-explosive2")
/obj/item/grenade/plastic/c4/Destroy()
qdel(wires)
@@ -188,7 +183,7 @@
message_say = "FOR THE HIVE!"
else if(role == "cultist")
message_say = "FOR NAR-SIE!"
- else if(role == "revolutionary" || role == "head revolutionary")
+ else if(is_revolutionary(user))
message_say = "VIVA LA REVOLUTION!"
user.say(message_say)
target = user
@@ -234,14 +229,14 @@
if(!user.temporarilyRemoveItemFromInventory(src))
return
src.target = AM
- forceMove(null)
+ moveToNullspace()
var/message = "[ADMIN_LOOKUPFLW(user)] planted [name] on [target.name] at [ADMIN_COORDJMP(target)] with [timer] second fuse"
GLOB.bombers += message
message_admins(message,0,1)
log_game("[key_name(user)] planted [name] on [target.name] at [COORD(target)] with [timer] second fuse")
- target.add_overlay(plastic_overlay, 1)
+ target.add_overlay(plastic_overlay, TRUE)
to_chat(user, "You plant the bomb. Timer counting down from [timer].")
addtimer(CALLBACK(src, .proc/explode), timer * 10)
@@ -272,5 +267,6 @@
desc = "A shaped high-explosive breaching charge. Designed to ensure user safety and wall nonsafety."
icon_state = "plasticx40"
item_state = "plasticx4"
+ gender = PLURAL
directional = TRUE
boom_sizes = list(0, 2, 5)
diff --git a/code/game/objects/items/grenades/syndieminibomb.dm b/code/game/objects/items/grenades/syndieminibomb.dm
index 8c2c6d4980..9484135a09 100644
--- a/code/game/objects/items/grenades/syndieminibomb.dm
+++ b/code/game/objects/items/grenades/syndieminibomb.dm
@@ -1,53 +1,53 @@
-/obj/item/grenade/syndieminibomb
- desc = "A syndicate manufactured explosive used to sow destruction and chaos"
- name = "syndicate minibomb"
- icon = 'icons/obj/grenade.dmi'
- icon_state = "syndicate"
- item_state = "flashbang"
- origin_tech = "materials=3;magnets=4;syndicate=3"
-
-
-/obj/item/grenade/syndieminibomb/prime()
- update_mob()
- explosion(src.loc,1,2,4,flame_range = 2)
- qdel(src)
-
-/obj/item/grenade/syndieminibomb/concussion
- name = "HE Grenade"
- desc = "A compact shrapnel grenade meant to devestate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction."
- icon_state = "concussion"
- origin_tech = "materials=3;magnets=4;syndicate=2"
-
-/obj/item/grenade/syndieminibomb/concussion/prime()
- update_mob()
- explosion(src.loc,0,2,3,flame_range = 3)
- qdel(src)
-
-/obj/item/grenade/syndieminibomb/concussion/frag
- name = "frag grenade"
- desc = "Fire in the hole."
- icon_state = "frag"
-
-/obj/item/grenade/gluon
- desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also likely wet any nearby floors."
- name = "gluon frag grenade"
- icon = 'icons/obj/grenade.dmi'
- icon_state = "bluefrag"
- item_state = "flashbang"
- var/freeze_range = 4
- var/rad_damage = 35
- var/stamina_damage = 30
-
-/obj/item/grenade/gluon/prime()
- update_mob()
- playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
- radiation_pulse(loc,freeze_range,freeze_range+1,rad_damage)
- for(var/turf/T in view(freeze_range,loc))
- if(isfloorturf(T))
- var/turf/open/floor/F = T
- F.wet = TURF_WET_PERMAFROST
- addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry, TURF_WET_PERMAFROST), rand(3000, 3100))
- for(var/mob/living/carbon/L in T)
- L.adjustStaminaLoss(stamina_damage)
- L.bodytemperature -= 230
- qdel(src)
+/obj/item/grenade/syndieminibomb
+ desc = "A syndicate manufactured explosive used to sow destruction and chaos."
+ name = "syndicate minibomb"
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "syndicate"
+ item_state = "flashbang"
+ origin_tech = "materials=3;magnets=4;syndicate=3"
+
+
+/obj/item/grenade/syndieminibomb/prime()
+ update_mob()
+ explosion(src.loc,1,2,4,flame_range = 2)
+ qdel(src)
+
+/obj/item/grenade/syndieminibomb/concussion
+ name = "HE Grenade"
+ desc = "A compact shrapnel grenade meant to devestate nearby organisms and cause some damage in the process. Pull pin and throw opposite direction."
+ icon_state = "concussion"
+ origin_tech = "materials=3;magnets=4;syndicate=2"
+
+/obj/item/grenade/syndieminibomb/concussion/prime()
+ update_mob()
+ explosion(src.loc,0,2,3,flame_range = 3)
+ qdel(src)
+
+/obj/item/grenade/syndieminibomb/concussion/frag
+ name = "frag grenade"
+ desc = "Fire in the hole."
+ icon_state = "frag"
+
+/obj/item/grenade/gluon
+ desc = "An advanced grenade that releases a harmful stream of gluons inducing radiation in those nearby. These gluon streams will also make victims feel exhausted, and induce shivering. This extreme coldness will also likely wet any nearby floors."
+ name = "gluon frag grenade"
+ icon = 'icons/obj/grenade.dmi'
+ icon_state = "bluefrag"
+ item_state = "flashbang"
+ var/freeze_range = 4
+ var/rad_damage = 350
+ var/stamina_damage = 30
+
+/obj/item/grenade/gluon/prime()
+ update_mob()
+ playsound(loc, 'sound/effects/empulse.ogg', 50, 1)
+ radiation_pulse(src, rad_damage)
+ for(var/turf/T in view(freeze_range,loc))
+ if(isfloorturf(T))
+ var/turf/open/floor/F = T
+ F.wet = TURF_WET_PERMAFROST
+ addtimer(CALLBACK(F, /turf/open/floor.proc/MakeDry, TURF_WET_PERMAFROST), rand(3000, 3100))
+ for(var/mob/living/carbon/L in T)
+ L.adjustStaminaLoss(stamina_damage)
+ L.bodytemperature -= 230
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 6fb85e5ad5..8ebb7b6061 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -88,8 +88,10 @@
/obj/item/restraints/handcuffs/cable
name = "cable restraints"
desc = "Looks like some cables tied together. Could be used to tie something up."
- icon_state = "cuff_red"
- item_state = "coil_red"
+ icon_state = "cuff"
+ item_state = "coil"
+ item_color = "red"
+ color = "#ff0000"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
materials = list(MAT_METAL=150, MAT_GLASS=75)
@@ -98,6 +100,19 @@
cuffsound = 'sound/weapons/cablecuff.ogg'
var/datum/robot_energy_storage/wirestorage = null
+/obj/item/restraints/handcuffs/cable/Initialize(mapload, param_color)
+ . = ..()
+
+ var/list/cable_colors = GLOB.cable_colors
+ item_color = param_color || item_color || pick(cable_colors)
+ if(cable_colors[item_color])
+ item_color = cable_colors[item_color]
+ update_icon()
+
+/obj/item/restraints/handcuffs/cable/update_icon()
+ color = null
+ add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
+
/obj/item/restraints/handcuffs/cable/attack(mob/living/carbon/C, mob/living/carbon/human/user)
if(!istype(C))
return
@@ -116,36 +131,35 @@
return ..()
/obj/item/restraints/handcuffs/cable/red
- icon_state = "cuff_red"
- item_state = "coil_red"
+ item_color = "red"
+ color = "#ff0000"
/obj/item/restraints/handcuffs/cable/yellow
- icon_state = "cuff_yellow"
- item_state = "coil_yellow"
+ item_color = "yellow"
+ color = "#ffff00"
/obj/item/restraints/handcuffs/cable/blue
- icon_state = "cuff_blue"
- item_state = "coil_blue"
+ item_color = "blue"
+ color = "#1919c8"
/obj/item/restraints/handcuffs/cable/green
- icon_state = "cuff_green"
- item_state = "coil_green"
+ item_color = "green"
+ color = "#00aa00"
/obj/item/restraints/handcuffs/cable/pink
- icon_state = "cuff_pink"
- item_state = "coil_pink"
+ item_color = "pink"
+ color = "#ff3ccd"
/obj/item/restraints/handcuffs/cable/orange
- icon_state = "cuff_orange"
- item_state = "coil_orange"
+ item_color = "orange"
+ color = "#ff8000"
/obj/item/restraints/handcuffs/cable/cyan
- icon_state = "cuff_cyan"
- item_state = "coil_cyan"
+ item_color = "cyan"
+ color = "#00ffff"
/obj/item/restraints/handcuffs/cable/white
- icon_state = "cuff_white"
- item_state = "coil_white"
+ item_color = "white"
/obj/item/restraints/handcuffs/alien
icon_state = "handcuffAlien"
@@ -209,17 +223,18 @@
/obj/item/restraints/handcuffs/cable/zipties
name = "zipties"
desc = "Plastic, disposable zipties that can be used to restrain temporarily but are destroyed after use."
- icon_state = "cuff_white"
+ icon_state = "cuff"
lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
materials = list()
breakouttime = 450 //Deciseconds = 45s
trashtype = /obj/item/restraints/handcuffs/cable/zipties/used
+ item_color = "white"
/obj/item/restraints/handcuffs/cable/zipties/used
desc = "A pair of broken zipties."
- icon_state = "cuff_white_used"
- item_state = "cuff_white"
+ icon_state = "cuff_used"
+ item_state = "cuff"
/obj/item/restraints/handcuffs/cable/zipties/used/attack()
return
diff --git a/code/game/objects/items/holosign_creator.dm b/code/game/objects/items/holosign_creator.dm
index d8f8bbf591..04dc732039 100644
--- a/code/game/objects/items/holosign_creator.dm
+++ b/code/game/objects/items/holosign_creator.dm
@@ -86,7 +86,7 @@
/obj/item/holosign_creator/cyborg
name = "Energy Barrier Projector"
- desc = "A holographic projector that creates fragile energy fields"
+ desc = "A holographic projector that creates fragile energy fields."
creation_time = 15
max_signs = 9
holosign_type = /obj/structure/holosign/barrier/cyborg
diff --git a/code/game/objects/items/holy_weapons.dm b/code/game/objects/items/holy_weapons.dm
index 634fbee9d2..a59f655b46 100644
--- a/code/game/objects/items/holy_weapons.dm
+++ b/code/game/objects/items/holy_weapons.dm
@@ -52,6 +52,8 @@
/obj/item/nullrod/godhand
icon_state = "disintegrate"
item_state = "disintegrate"
+ lefthand_file = 'icons/mob/inhands/items_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/items_righthand.dmi'
name = "god hand"
desc = "This hand of yours glows with an awesome power!"
flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1
@@ -295,6 +297,26 @@
hitsound = 'sound/items/bikehorn.ogg'
sharpness = IS_SHARP
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+
+/obj/item/nullrod/pride_hammer
+ icon_state = "pride"
+ name = "Pride-struck Hammer"
+ desc = "It resonates an aura of Pride."
+ force = 16
+ throwforce = 15
+ w_class = 4
+ slot_flags = SLOT_BACK
+ attack_verb = list("attacked", "smashed", "crushed", "splattered", "cracked")
+ hitsound = 'sound/weapons/blade1.ogg'
+
+/obj/item/nullrod/pride_hammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
+ if(!proximity)
+ return
+ if(prob(30) && ishuman(A))
+ var/mob/living/carbon/human/H = A
+ user.reagents.trans_to(H, user.reagents.total_volume, 1, 1, 0)
+ to_chat(user, "Your pride reflects on [H].")
+ to_chat(H, "You feel insecure, taking on [user]'s burden.")
/obj/item/nullrod/whip
name = "holy whip"
diff --git a/code/game/objects/items/implants/implant_exile.dm b/code/game/objects/items/implants/implant_exile.dm
index 298adf2af3..f6848e7782 100644
--- a/code/game/objects/items/implants/implant_exile.dm
+++ b/code/game/objects/items/implants/implant_exile.dm
@@ -3,7 +3,7 @@
/obj/item/implant/exile
name = "exile implant"
- desc = "Prevents you from returning from away missions"
+ desc = "Prevents you from returning from away missions."
origin_tech = "materials=2;biotech=3;magnets=2;bluespace=3"
activated = 0
diff --git a/code/game/objects/items/implants/implant_loyality.dm b/code/game/objects/items/implants/implant_loyality.dm
index ffaebf5a63..1edc0dc93c 100644
--- a/code/game/objects/items/implants/implant_loyality.dm
+++ b/code/game/objects/items/implants/implant_loyality.dm
@@ -19,14 +19,18 @@
/obj/item/implant/mindshield/implant(mob/living/target, mob/user, silent = 0)
if(..())
- if((target.mind in (SSticker.mode.head_revolutionaries)) || target.mind.unconvertable)
+ if(!target.mind)
+ return TRUE
+ if(target.mind.has_antag_datum(/datum/antagonist/rev/head) || target.mind.unconvertable)
if(!silent)
target.visible_message("[target] seems to resist the implant!", "You feel something interfering with your mental conditioning, but you resist it!")
removed(target, 1)
qdel(src)
return FALSE
- if(target.mind in SSticker.mode.revolutionaries)
- SSticker.mode.remove_revolutionary(target.mind, FALSE, user)
+
+ var/datum/antagonist/rev/rev = target.mind.has_antag_datum(/datum/antagonist/rev)
+ if(rev)
+ rev.remove_revolutionary(FALSE, user)
if(!silent)
if(target.mind in SSticker.mode.cult)
to_chat(target, "You feel something interfering with your mental conditioning, but you resist it!")
diff --git a/code/game/objects/items/implants/implant_misc.dm b/code/game/objects/items/implants/implant_misc.dm
index a036872925..2e21a6fb82 100644
--- a/code/game/objects/items/implants/implant_misc.dm
+++ b/code/game/objects/items/implants/implant_misc.dm
@@ -1,6 +1,6 @@
/obj/item/implant/weapons_auth
name = "firearms authentication implant"
- desc = "Lets you shoot your guns"
+ desc = "Lets you shoot your guns."
icon_state = "auth"
origin_tech = "magnets=2;programming=7;biotech=5;syndicate=5"
activated = 0
diff --git a/code/game/objects/items/implants/implantchair.dm b/code/game/objects/items/implants/implantchair.dm
index 8d252cb5af..7dd14bda88 100644
--- a/code/game/objects/items/implants/implantchair.dm
+++ b/code/game/objects/items/implants/implantchair.dm
@@ -151,7 +151,7 @@
/obj/machinery/implantchair/genepurge
name = "Genetic purifier"
- desc = "Used to purge human genome of foreign influences"
+ desc = "Used to purge a human genome of foreign influences."
special = TRUE
special_name = "Purge genome"
injection_cooldown = 0
diff --git a/code/game/objects/items/inducer.dm b/code/game/objects/items/inducer.dm
index d6f789a1b7..5c494294c8 100644
--- a/code/game/objects/items/inducer.dm
+++ b/code/game/objects/items/inducer.dm
@@ -96,6 +96,8 @@
return ..()
/obj/item/inducer/proc/recharge(atom/movable/A, mob/user)
+ if(!isturf(A) && user.loc == A)
+ return FALSE
if(recharging)
return TRUE
else
diff --git a/code/game/objects/items/manuals.dm b/code/game/objects/items/manuals.dm
index c0298d8122..edaa4ce648 100644
--- a/code/game/objects/items/manuals.dm
+++ b/code/game/objects/items/manuals.dm
@@ -1,959 +1,955 @@
-/*********************MANUALS (BOOKS)***********************/
-
-//Oh god what the fuck I am not good at computer
-/obj/item/book/manual
- icon = 'icons/obj/library.dmi'
- due_date = 0 // Game time in 1/10th seconds
- unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
-
-/obj/item/book/manual/engineering_particle_accelerator
- name = "Particle Accelerator User's Guide"
- icon_state ="bookParticleAccelerator"
- author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Particle Accelerator User's Guide"
- dat = {"
-
-
-
-
-
-
Experienced user's guide
-
-
Setting up
-
-
-
Wrench all pieces to the floor
-
Add wires to all the pieces
-
Close all the panels with your screwdriver
-
-
-
Use
-
-
-
Open the control panel
-
Set the speed to 2
-
Start firing at the singularity generator
-
When the singularity reaches a large enough size so it starts moving on its own set the speed down to 0, but don't shut it off
-
Remember to wear a radiation suit when working with this machine... we did tell you that at the start, right?
-
-
-
- "}
-
-
-/obj/item/book/manual/engineering_singularity_safety
- name = "Singularity Safety in Special Circumstances"
- icon_state ="bookEngineeringSingularitySafety"
- author = "Engineering Encyclopedia" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Singularity Safety in Special Circumstances"
-//big pile of shit below.
-
- dat = {"
-
-
-
-
-
Singularity Safety in Special Circumstances
-
-
Power outage
-
- A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps:
-
- Step one:PANIC!
- Step two: Get your ass over to engineering! QUICKLY!!!
- Step three: Make sure the SMES is still powering the emitters, if not, setup the generator in secure storage and disconnect the emitters from the SMES.
- Step four: Next, head over to the APC and swipe it with your ID card - if it doesn't unlock, continue with step 15.
- Step five: Open the console and disengage the cover lock.
- Step six: Pry open the APC with a Crowbar.
- Step seven: Take out the empty power cell.
- Step eight: Put in the new, full power cell - if you don't have one, continue with step 15.
- Step nine: Quickly put on a Radiation suit.
- Step ten: Check if the singularity field generators withstood the down-time - if they didn't, continue with step 15.
- Step eleven: Since disaster was averted you now have to ensure it doesn't repeat. If it was a powersink which caused it and if the engineering apc is wired to the same powernet, which the powersink is on, you have to remove the piece of wire which links the apc to the powernet. If it wasn't a powersink which caused it, then skip to step 14.
- Step twelve: Grab your crowbar and pry away the tile closest to the APC.
- Step thirteen: Use the wirecutters to cut the wire which is conecting the grid to the terminal.
- Step fourteen: Go to the bar and tell the guys how you saved them all. Stop reading this guide here.
- Step fifteen:GET THE FUCK OUT OF THERE!!!
-
-
-
Shields get damaged
-
- Step one: GET THE FUCK OUT OF THERE!!! FORGET THE WOMEN AND CHILDREN, SAVE YOURSELF!!!
-
-
- "}
-
-/obj/item/book/manual/hydroponics_pod_people
- name = "The Human Harvest - From seed to market"
- icon_state ="bookHydroponicsPodPeople"
- author = "Farmer John"
- title = "The Human Harvest - From seed to market"
- dat = {"
-
-
-
-
-
Growing Humans
-
- Why would you want to grow humans? Well I'm expecting most readers to be in the slave trade, but a few might actually
- want to revive fallen comrades. Growing pod people is easy, but prone to disaster.
-
-
-
Find a dead person who is in need of cloning.
-
Take a blood sample with a syringe.
-
Inject a seed pack with the blood sample.
-
Plant the seeds.
-
Tend to the plants water and nutrition levels until it is time to harvest the cloned human.
-
-
- It really is that easy! Good luck!
-
-
-
- "}
-
-/obj/item/book/manual/medical_cloning
- name = "Cloning techniques of the 26th century"
- icon_state ="bookCloning"
- author = "Medical Journal, volume 3" // Who wrote the thing, can be changed by pen or PC. It is not automatically assigned
- title = "Cloning techniques of the 26th century"
-//big pile of shit below.
-
- dat = {"
-
-
-
-
-
-
How to Clone People
- So there’s 50 dead people lying on the floor, chairs are spinning like no tomorrow and you haven’t the foggiest idea of what to do? Not to worry! This guide is intended to teach you how to clone people and how to do it right, in a simple step-by-step process! If at any point of the guide you have a mental meltdown, genetics probably isn’t for you and you should get a job-change as soon as possible before you’re sued for malpractice.
-
-
-
Connect all hydraulic fittings and tighten them up with a wrench
-
Adjust the servohydraulics with a screwdriver
-
Wire the chassis. (Cable is not included.)
-
Use the wirecutters to remove the excess cable if needed.
-
Install the central control module (Not included. Use supplied datadisk to create one).
-
Secure the mainboard with a screwdriver.
-
Install the peripherals control module (Not included. Use supplied datadisk to create one).
-
Secure the peripherals control module with a screwdriver
-
Install the internal armor plating (Not included due to Nanotrasen regulations. Can be made using 5 metal sheets.)
-
Secure the internal armor plating with a wrench
-
Weld the internal armor plating to the chassis
-
Install the external reinforced armor plating (Not included due to Nanotrasen regulations. Can be made using 5 reinforced metal sheets.)
-
Secure the external reinforced armor plating with a wrench
-
Weld the external reinforced armor plating to the chassis
-
-
Additional Information:
-
The firefighting variation is made in a similar fashion.
-
A firesuit must be connected to the Firefighter chassis for heat shielding.
-
Internal armor is plasteel for additional strength.
-
External armor must be installed in 2 parts, totaling 10 sheets.
-
Completed mech is more resiliant against fire, and is a bit more durable overall
-
Nanotrasen is determined to the safety of its investments employees.
-
-
-
-
-
Operation
- Coming soon...
- "}
-
-/obj/item/book/manual/experimentor
- name = "Mentoring your Experiments"
- icon_state = "rdbook"
- author = "Dr. H.P. Kritz"
- title = "Mentoring your Experiments"
- dat = {"
-
-
-
-
-
THE E.X.P.E.R.I-MENTOR
- The Enhanced Xenobiological Period Extraction (and) Restoration Instructor is a machine designed to discover the secrets behind every item in existence.
- With advanced technology, it can process 99.95% of items, and discover their uses and secrets.
- The E.X.P.E.R.I-MENTOR is a Research apparatus that takes items, and through a process of elimination, it allows you to deduce new technological designs from them.
- Due to the volatile nature of the E.X.P.E.R.I-MENTOR, there is a slight chance for malfunction, potentially causing irreparable damage to you or your environment.
- However, upgrading the apparatus has proven to decrease the chances of undesirable, potentially life-threatening outcomes.
- Please note that the E.X.P.E.R.I-MENTOR uses a state-of-the-art random generator, which has a larger entropy than the observable universe,
- therefore it can generate wildly different results each day, therefore it is highly suggested to re-scan objects of interests frequently (e.g. each shift).
-
-
BASIC PROCESS
- The usage of the E.X.P.E.R.I-MENTOR is quite simple:
-
-
Find an item with a technological background
-
Insert the item into the E.X.P.E.R.I-MENTOR
-
Cycle through each processing method of the device.
-
Stand back, even in case of a successful experiment, as the machine might produce undesired behaviour.
-
-
-
ADVANCED USAGE
- The E.X.P.E.R.I-MENTOR has a variety of uses, beyond menial research work. The different results can be used to combat localised events, or even to get special items.
-
- The E.X.P.E.R.I-MENTOR's OBLITERATE function has the added use of transferring the destroyed item's material into a linked lathe.
-
- The IRRADIATE function can be used to transform items into other items, resulting in potential upgrades (or downgrades).
-
- Users should remember to always wear appropriate protection when using the machine, because malfunction can occur at any moment!
-
-
EVENTS
-
GLOBAL (happens at any time):
-
-
DETECTION MALFUNCTION - The machine's onboard sensors have malfunctioned, causing it to redefine the item's experiment type.
- Produces the message: The E.X.P.E.R.I-MENTOR's onboard detection system has malfunctioned!
-
-
IANIZATION - The machine's onboard corgi-filter has malfunctioned, causing it to produce a corgi from.. somewhere.
- Produces the message: The E.X.P.E.R.I-MENTOR melts the banana, ian-izing the air around it!
-
-
RUNTIME ERROR - The machine's onboard C4T-P processor has encountered a critical error, causing it to produce a cat from.. somewhere.
- Produces the message: The E.X.P.E.R.I-MENTOR encounters a run-time error!
-
-
B100DG0D.EXE - The machine has encountered an unknown subroutine, which has been injected into its runtime. It upgrades the held item!
- Produces the message: The E.X.P.E.R.I-MENTOR improves the banana, drawing the life essence of those nearby!
-
-
POWERSINK - The machine's PSU has tripped the charging mechanism! It consumes massive amounts of power!
- Produces the message: The E.X.P.E.R.I-MENTOR begins to smoke and hiss, shaking violently!
-
-
FAIL:
- This event is produced when the item mismatches the selected experiment.
- Produces a random message similar to: "the Banana rumbles, and shakes, the experiment was a failure!"
-
-
POKE:
-
-
WILD ARMS - The machine's gryoscopic processors malfunction, causing it to lash out at nearby people with its arms.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions and destroys the banana, lashing its arms out at nearby people!
-
-
MISTYPE - The machine's interface has been garbled, and it switches to OBLITERATE.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions!
-
-
THROW - The machine's spatial recognition device has shifted several meters across the room, causing it to try and repostion the item there.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, throwing the banana!
-
-
IRRADIATE:
-
-
RADIATION LEAK - The machine's shield has failed, resulting in a toxic radiation leak.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and leaking radiation!
-
-
RADIATION DUMP - The machine's recycling and containment functions have failed, resulting in a dump of toxic waste around it
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, spewing toxic waste!
-
-
MUTATION - The machine's radio-isotope level meter has malfunctioned, causing it over-irradiate the item, making it transform.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, transforming the banana!
-
-
GAS:
-
-
TOXIN LEAK - The machine's filtering and vent systems have failed, resulting in a cloud of toxic gas being expelled.
- Produces the message: The E.X.P.E.R.I-MENTOR destroys the banana, leaking dangerous gas!
-
-
GAS LEAK - The machine's vent systems have failed, resulting in a cloud of harmless, but obscuring gas.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, spewing harmless gas!
-
-
ELECTROMAGNETIC IONS - The machine's electrolytic scanners have failed, causing a dangerous Electromagnetic reaction.
- Produces the message: The E.X.P.E.R.I-MENTOR melts the banana, ionizing the air around it!
-
-
HEAT:
-
-
TOASTER - The machine's heating coils have come into contact with the machine's gas storage, causing a large, sudden blast of flame.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and releasing a burst of flame!
-
-
SAUNA - The machine's vent loop has sprung a leak, resulting in a large amount of superheated air being dumped around it.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, melting the banana and leaking hot air!
-
-
EMERGENCY VENT - The machine's temperature gauge has malfunctioned, resulting in it attempting to cool the area around it, but instead, dumping a cloud of steam.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, activating its emergency coolant systems!
-
-
COLD:
-
-
FREEZER - The machine's cooling loop has sprung a leak, resulting in a cloud of super-cooled liquid being blasted into the air.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, shattering the banana and releasing a dangerous cloud of coolant!
-
-
FRIDGE - The machine's cooling loop has been exposed to the outside air, resulting in a large decrease in temperature.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, shattering the banana and leaking cold air!
-
-
SNOWSTORM - The machine's cooling loop has come into contact with the heating coils, resulting in a sudden blast of cool air.
- Produces the message: The E.X.P.E.R.I-MENTOR malfunctions, releasing a flurry of chilly air as the banana pops out!
-
-
OBLITERATE:
-
-
IMPLOSION - The machine's pressure leveller has malfunctioned, causing it to pierce the space-time momentarily, making everything in the area fly towards it.
- Produces the message: The E.X.P.E.R.I-MENTOR's crusher goes way too many levels too high, crushing right through space-time!
-
-
DISTORTION - The machine's pressure leveller has completely disabled, resulting in a momentary space-time distortion, causing everything to fly around.
- Produces the message: The E.X.P.E.R.I-MENTOR's crusher goes one level too high, crushing right into space-time!
-
-
-
- "}
-
-/obj/item/book/manual/research_and_development
- name = "Research and Development 101"
- icon_state = "rdbook"
- author = "Dr. L. Ight"
- title = "Research and Development 101"
- dat = {"
-
-
-
-
-
-
Science For Dummies
- So you want to further SCIENCE? Good man/woman/thing! However, SCIENCE is a complicated process even though it's quite easy. For the most part, it's a three step process:
-
-
1) Deconstruct items in the Destructive Analyzer to advance technology or improve the design.
-
2) Build unlocked designs in the Protolathe and Circuit Imprinter
-
3) Repeat!
-
-
- Those are the basic steps to furthing science. What do you do science with, however? Well, you have four major tools: R&D Console, the Destructive Analyzer, the Protolathe, and the Circuit Imprinter.
-
-
The R&D Console
- The R&D console is the cornerstone of any research lab. It is the central system from which the Destructive Analyzer, Protolathe, and Circuit Imprinter (your R&D systems) are controled. More on those systems in their own sections. On its own, the R&D console acts as a database for all your technological gains and new devices you discover. So long as the R&D console remains intact, you'll retain all that SCIENCE you've discovered. Protect it though, because if it gets damaged, you'll lose your data! In addition to this important purpose, the R&D console has a disk menu that lets you transfer data from the database onto disk or from the disk into the database. It also has a settings menu that lets you re-sync with nearby R&D devices (if they've become disconnected), lock the console from the unworthy, upload the data to all other R&D consoles in the network (all R&D consoles are networked by default), connect/disconnect from the network, and purge all data from the database.
- NOTE: The technology list screen, circuit imprinter, and protolathe menus are accessible by non-scientists. This is intended to allow 'public' systems for the plebians to utilize some new devices.
-
-
Destructive Analyzer
- This is the source of all technology. Whenever you put a handheld object in it, it analyzes it and determines what sort of technological advancements you can discover from it. If the technology of the object is equal or higher then your current knowledge, you can destroy the object to further those sciences. Some devices (notably, some devices made from the protolathe and circuit imprinter) aren't 100% reliable when you first discover them. If these devices break down, you can put them into the Destructive Analyzer and improve their reliability rather then futher science. If their reliability is high enough ,it'll also advance their related technologies.
-
-
Circuit Imprinter
- This machine, along with the Protolathe, is used to actually produce new devices. The Circuit Imprinter takes glass and various chemicals (depends on the design) to produce new circuit boards to build new machines or computers. It can even be used to print AI modules.
-
-
Protolathe
- This machine is an advanced form of the Autolathe that produce non-circuit designs. Unlike the Autolathe, it can use processed metal, glass, solid plasma, silver, gold, and diamonds along with a variety of chemicals to produce devices. The downside is that, again, not all devices you make are 100% reliable when you first discover them.
-
-
Reliability and You
- As it has been stated, many devices when they're first discovered do not have a 100% reliablity when you first discover them. Instead, the reliablity of the device is dependent upon a base reliability value, whatever improvements to the design you've discovered through the Destructive Analyzer, and any advancements you've made with the device's source technologies. To be able to improve the reliability of a device, you have to use the device until it breaks beyond repair. Once that happens, you can analyze it in a Destructive Analyzer. Once the device reachs a certain minimum reliability, you'll gain tech advancements from it.
-
-
Building a Better Machine
- Many machines produces from circuit boards and inserted into a machine frame require a variety of parts to construct. These are parts like capacitors, batteries, matter bins, and so forth. As your knowledge of science improves, more advanced versions are unlocked. If you use these parts when constructing something, its attributes may be improved. For example, if you use an advanced matter bin when constructing an autolathe (rather then a regular one), it'll hold more materials. Experiment around with stock parts of various qualities to see how they affect the end results! Be warned, however: Tier 3 and higher stock parts don't have 100% reliability and their low reliability may affect the reliability of the end machine.
-
-
- "}
-
-
-/obj/item/book/manual/robotics_cyborgs
- name = "Cyborgs for Dummies"
- icon_state = "borgbook"
- author = "XISC"
- title = "Cyborgs for Dummies"
- dat = {"
-
-
-
-
-
-
- The Exosuit Fabricator is the most important piece of equipment related to cyborgs. It allows the construction of the core cyborg parts. Without these machines, cyborgs can not be built. It seems that they may also benefit from advanced research techniques.
-
-
Cyborg Recharging Station
- This useful piece of equipment will suck power out of the power systems to charge a cyborg's power cell back up to full charge.
-
-
Robotics Control Console
- This useful piece of equipment can be used to immobolize or destroy a cyborg. A word of warning: Cyborgs are expensive pieces of equipment, do not destroy them without good reason, or Nanotrasen may see to it that it never happens again.
-
-
-
- When a cyborg is created it picks out of an array of modules to designate its purpose. There are 6 different cyborg modules.
-
-
Standard Cyborg
- The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.
-
-
Engineering Cyborg
- The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.
-
-
Mining Cyborg
- The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.
-
-
Security Cyborg
- The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.
-
-
Janitor Cyborg
- The Janitor Cyborg module is equipped with various cleaning-facilitating devices.
-
-
Service Cyborg
- The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros"
-
-
- Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies. The required materials to make a cyborg are:
-
-
Metal
-
Two Flashes
-
One Power Cell (Preferrably rated to 15000w)
-
Some electrical wires
-
One Human Brain
-
One Man-Machine Interface
-
- Once you have acquired the materials, you can start on construction of your cyborg. To construct a cyborg, follow the steps below:
-
-
Start the Exosuit Fabricators constructing all of the cyborg parts
-
While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface
-
Once you have a Robot Head, place your two flashes inside the eye sockets
-
Once you have your Robot Chest, wire the Robot chest, then insert the power cell
-
Attach all of the Robot parts to the Robot frame
-
Insert the Man-Machine Interface (With the Brain inside) Into the Robot Body
- If you want to deconstruct a cyborg, say to remove its MMI without blowing the Cyborg to pieces, they come apart very quickly, and very safely, in a few simple steps.
-
-
Crowbar
-
Wrench
- Optional:
-
Screwdriver
-
Wirecutters
-
-
-
Begin by unlocking the Cyborg's access panel using your ID
-
Use your crowbar to open the Cyborg's access panel
-
Using your bare hands, remove the power cell from the Cyborg
-
Lockdown the Cyborg to disengage safety protocols
-
- Option 1: Robotics console
-
Use the Robotics console in the RD's office
-
Find the entry for your Cyborg
-
Press the Lockdown button on the Robotics console
-
-
- Option 2: Lockdown wire
-
Use your screwdriver to expose the Cyborg's wiring
-
Use your wirecutters to start cutting all of the wires until the lockdown light turns off, cutting all of the wires irregardless of the lockdown light works as well
-
-
Use your wrench to unfasten the Cyborg's bolts, the Cyborg will then fall apart onto the floor, the MMI will be there as well
- Occasionally Cyborgs may require maintenance of a couple types, this could include replacing a power cell with a charged one, or possibly maintaining the cyborg's internal wiring.
-
-
Replacing a Power Cell
- Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell. The steps to replace a cell are follows:
-
-
Unlock the Cyborg's Interface by swiping your ID on it
-
Open the Cyborg's outer panel using a crowbar
-
Remove the old power cell
-
Insert the new power cell
-
Close the Cyborg's outer panel using a crowbar
-
Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell
-
-
-
Exposing the Internal Wiring
- Exposing the internal wiring of a cyborg is fairly easy to do, and is mainly used for cyborg repairs. You can easily expose the internal wiring by following the steps below:
-
-
Follow Steps 1 - 3 of "Replacing a Cyborg's Power Cell"
-
Open the cyborg's internal wiring panel by using a screwdriver to unsecure the panel
-
- To re-seal the cyborg's internal wiring:
-
-
Use a screwdriver to secure the cyborg's internal panel
-
Follow steps 4 - 6 of "Replacing a Cyborg's Power Cell" to close up the cyborg
- Occasionally a Cyborg may become damaged. This could be in the form of impact damage from a heavy or fast-travelling object, or it could be heat damage from high temperatures, or even lasers or Electromagnetic Pulses (EMPs).
-
-
Dents
- If a cyborg becomes damaged due to impact from heavy or fast-moving objects, it will become dented. Sure, a dent may not seem like much, but it can compromise the structural integrity of the cyborg, possibly causing a critical failure.
- Dents in a cyborg's frame are rather easy to repair, all you need is to apply a welding tool to the dented area, and the high-tech cyborg frame will repair the dent under the heat of the welder.
-
-
Excessive Heat Damage
- If a cyborg becomes damaged due to excessive heat, it is likely that the internal wires will have been damaged. You must replace those wires to ensure that the cyborg remains functioning properly. To replace the internal wiring follow the steps below:
-
-
Unlock the Cyborg's Interface by swiping your ID
-
Open the Cyborg's External Panel using a crowbar
-
Remove the Cyborg's Power Cell
-
Using a screwdriver, expose the internal wiring or the Cyborg
-
Replace the damaged wires inside the cyborg
-
Secure the internal wiring cover using a screwdriver
-
Insert the Cyborg's Power Cell
-
Close the Cyborg's External Panel using a crowbar
-
Lock the Cyborg's Interface by swiping your ID
-
- These repair tasks may seem difficult, but are essential to keep your cyborgs running at peak efficiency.
-
-
- In case of emergency, there are a few steps you can take.
-
-
"Rogue" Cyborgs
- If the cyborgs seem to become "rogue", they may have non-standard laws. In this case, use extreme caution.
- To repair the situation, follow these steps:
-
-
Locate the nearest robotics console
-
Determine which cyborgs are "Rogue"
-
Press the lockdown button to immobolize the cyborg
-
Locate the cyborg
-
Expose the cyborg's internal wiring
-
Check to make sure the LawSync and AI Sync lights are lit
-
If they are not lit, pulse the LawSync wire using a multitool to enable the cyborg's Law Sync
-
Proceed to a cyborg upload console. Nanotrasen usually places these in the same location as AI uplaod consoles.
-
Use a "Reset" upload moduleto reset the cyborg's laws
-
Proceed to a Robotics Control console
-
Remove the lockdown on the cyborg
-
-
-
As a last resort
- If all else fails in a case of cyborg-related emergency. There may be only one option. Using a Robotics Control console, you may have to remotely detonate the cyborg.
-
WARNING:
Do not detonate a borg without an explicit reason for doing so. Cyborgs are expensive pieces of Nanotrasen equipment, and you may be punished for detonating them without reason.
-
-
-
- "}
-
-
-
-/obj/item/book/manual/chef_recipes
- name = "Chef Recipes"
- icon_state = "cooked_book"
- author = "Lord Frenrir Cageth"
- title = "Chef Recipes"
- dat = {"
-
-
-
-
-
-
Food for Dummies
- Here is a guide on basic food recipes and also how to not poison your customers accidentally.
-
-
-
Basic ingredients preparation:
-
- Dough: 10u water + 15u flour for simple dough.
- 15u egg yolk + 15u flour + 5u sugar for cake batter.
- Doughs can be transformed by using a knife and rolling pin.
- All doughs can be microwaved.
- Bowl: Add water to it for soup preparation.
- Meat: Microwave it, process it, slice it into microwavable cutlets with your knife, or use it raw.
- Cheese: Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.
- Rice: Mix 10u rice with 10u water in a bowl then microwave it.
-
-
Custom food:
- Add ingredients to a base item to prepare a custom meal.
- The bases are:
- - bun (burger)
- - breadslices(sandwich)
- - plain bread
- - plain pie
- - vanilla cake
- - empty bowl (salad)
- - bowl with 10u water (soup)
- - boiled spaghetti
- - pizza bread
- - metal rod (kebab)
-
-
Table Craft:
- Put ingredients on table, then click and drag the table onto yourself to see what recipes you can prepare.
-
-
Microwave:
- Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
- It can cook multiple items at once.
-
-
Processor:
- Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...)
-
-
Gibber:
- Stuff an animal in it to grind it into meat.
-
-
Meat spike:
- Stick an animal on it then begin collecting its meat.
-
-
-
Example recipes:
- Vanilla Cake: Microwave cake batter.
- Burger: 1 bun + 1 meat steak
- Bread: Microwave dough.
- Waffles: 2 pastry base
- Popcorn: Microwave corn.
- Meat Steak: Microwave meat.
- Meat Pie: 1 plain pie + 1u black pepper + 1u salt + 2 meat cutlets
- Boiled Spagetti: Microwave spaghetti.
- Donuts: 1u sugar + 1 pastry base
- Fries: Process potato.
-
-
Sharing your food:
- You can put your meals on your kitchen counter or load them in the snack vending machines.
-
-
- "}
-
-
-/obj/item/book/manual/barman_recipes
- name = "Barman Recipes"
- icon_state = "barbook"
- author = "Sir John Rose"
- title = "Barman Recipes"
- dat = {"
-
-
-
-
-
-
Drinks for dummies
- Heres a guide for some basic drinks.
-
-
Manly Dorf:
- Mix ale and beer into a glass.
-
-
Grog:
- Mix rum and water into a glass.
-
-
Black Russian:
- Mix vodka and kahlua into a glass.
-
-
Irish Cream:
- Mix cream and whiskey into a glass.
-
-
Screwdriver:
- Mix vodka and orange juice into a glass.
-
-
Cafe Latte:
- Mix milk and coffee into a glass.
-
-
Mead:
- Mix Enzyme, water and sugar into a glass.
-
-
Gin Tonic:
- Mix gin and tonic into a glass.
-
-
Classic Martini:
- Mix vermouth and gin into a glass.
-
-
-
-
- "}
-
-
-/obj/item/book/manual/detective
- name = "The Film Noir: Proper Procedures for Investigations"
- icon_state ="bookDetective"
- author = "Nanotrasen"
- title = "The Film Noir: Proper Procedures for Investigations"
- dat = {"
-
-
-
-
-
Detective Work
-
- Between your bouts of self-narration, and drinking whiskey on the rocks, you might get a case or two to solve.
- To have the best chance to solve your case, follow these directions:
-
-
-
Go to the crime scene.
-
Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog.)
-
Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too.
-
Return to your office.
-
Using your forensic scanning computer, scan your Scanner to upload all of your evidence into the database.
-
Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled.
-
If you have 80% or more of the print (The print is displayed) go to step 10, otherwise continue to step 8.
-
Look for clues from the suit fibres you found on your perp, and go about looking for more evidence with this new information, scanning as you go.
-
Try to get a fingerprint card of your perp, as if used in the computer, the prints will be completed on their dossier.
-
Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it.
-
Since you now have both your dossier and the name of the person, print both out as evidence, and get security to nab your baddie.
-
Give yourself a pat on the back and a bottle of the ships finest vodka, you did it!
-
-
- It really is that easy! Good luck!
-
-
- "}
-
-/obj/item/book/manual/nuclear
- name = "Fission Mailed: Nuclear Sabotage 101"
- icon_state ="bookNuclear"
- author = "Syndicate"
- title = "Fission Mailed: Nuclear Sabotage 101"
- dat = {"
- Nuclear Explosives 101:
- Hello and thank you for choosing the Syndicate for your nuclear information needs.
- Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.
- First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.
- Pressing any button on the compacted bomb will cause it to extend and bolt itself into place.
- If this is done to unbolt it one must completely log in which at this time may not be possible.
- To make the nuclear device functional:
-
Place the nuclear device in the designated detonation zone.
-
Extend and anchor the nuclear device from its interface.
-
Insert the nuclear authorisation disk into slot.
-
Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.
-
Press the E button to log onto the device.
- You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
- Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option.
- Note: Nanotrasen is a pain in the neck.
- Toggle off the SAFETY.
- Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
- So use the - - and + + to set a det time between 5 seconds and 10 minutes.
- Then press the timer toggle button to start the countdown.
- Now remove the auth. disk so that the buttons deactivate.
- Note: THE BOMB IS STILL SET AND WILL DETONATE
- Now before you remove the disk if you need to move the bomb you can:
- Toggle off the anchor, move it, and re-anchor.
- Good luck. Remember the order:
- Disk, Code, Safety, Timer, Disk, RUN!
- Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk.
- Good luck!
- "}
-
-// Wiki books that are linked to the configured wiki link.
-
-// A book that links to the wiki
-/obj/item/book/manual/wiki
- var/page_link = ""
- window_size = "970x710"
-
-/obj/item/book/manual/wiki/attack_self()
- if(!dat)
- initialize_wikibook()
- ..()
-
-/obj/item/book/manual/wiki/proc/initialize_wikibook()
- var/wikiurl = CONFIG_GET(string/wikiurl)
- if(wikiurl)
- dat = {"
-
-
-
-
-
-
-
You start skimming through the manual...
-
-
-
-
-
- "}
-
-/obj/item/book/manual/wiki/chemistry
- name = "Chemistry Textbook"
- icon_state ="chemistrybook"
- author = "Nanotrasen"
- title = "Chemistry Textbook"
- page_link = "Guide_to_chemistry"
-
-/obj/item/book/manual/wiki/engineering_construction
- name = "Station Repairs and Construction"
- icon_state ="bookEngineering"
- author = "Engineering Encyclopedia"
- title = "Station Repairs and Construction"
- page_link = "Guide_to_construction"
-
-/obj/item/book/manual/wiki/engineering_guide
- name = "Engineering Textbook"
- icon_state ="bookEngineering2"
- author = "Engineering Encyclopedia"
- title = "Engineering Textbook"
- page_link = "Guide_to_engineering"
-
-/obj/item/book/manual/wiki/security_space_law
- name = "Space Law"
- desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations."
- icon_state = "bookSpaceLaw"
- author = "Nanotrasen"
- title = "Space Law"
- page_link = "Space_Law"
-
-/obj/item/book/manual/wiki/infections
- name = "Infections - Making your own pandemic!"
- icon_state = "bookInfections"
- author = "Infections Encyclopedia"
- title = "Infections - Making your own pandemic!"
- page_link = "Infections"
-
-/obj/item/book/manual/wiki/telescience
- name = "Teleportation Science - Bluespace for dummies!"
- icon_state = "book7"
- author = "University of Bluespace"
- title = "Teleportation Science - Bluespace for dummies!"
- page_link = "Guide_to_telescience"
-
-/obj/item/book/manual/wiki/engineering_hacking
- name = "Hacking"
- icon_state ="bookHacking"
- author = "Engineering Encyclopedia"
- title = "Hacking"
- page_link = "Hacking"
+/*********************MANUALS (BOOKS)***********************/
+
+//Oh god what the fuck I am not good at computer
+/obj/item/book/manual
+ icon = 'icons/obj/library.dmi'
+ due_date = 0 // Game time in 1/10th seconds
+ unique = 1 // 0 - Normal book, 1 - Should not be treated as normal book, unable to be copied, unable to be modified
+
+/obj/item/book/manual/engineering_particle_accelerator
+ name = "Particle Accelerator User's Guide"
+ icon_state ="bookParticleAccelerator"
+ author = "Engineering Encyclopedia" // Whoever wrote the paper or book, can be changed by pen or PC. It is not automatically assigned.
+ title = "Particle Accelerator User's Guide"
+//book contents below
+
+ dat = {"
+
+
+
+
+
+
Experienced user's guide
+
+
Setting up
+
+
+
Wrench all pieces to the floor
+
Add wires to all the pieces
+
Close all the panels with your screwdriver
+
+
+
Use
+
+
+
Open the control panel
+
Set the speed to 2
+
Start firing at the singularity generator
+
When the singularity reaches a large enough size so it starts moving on its own set the speed down to 0, but don't shut it off
+
Remember to wear a radiation suit when working with this machine... we did tell you that at the start, right?
+
+
+
+ "}
+
+
+/obj/item/book/manual/engineering_singularity_safety
+ name = "Singularity Safety in Special Circumstances"
+ icon_state ="bookEngineeringSingularitySafety"
+ author = "Engineering Encyclopedia"
+ title = "Singularity Safety in Special Circumstances"
+ dat = {"
+
+
+
+
+
Singularity Safety in Special Circumstances
+
+
Power outage
+
+ A power problem has made the entire station lose power? Could be station-wide wiring problems or syndicate power sinks. In any case follow these steps:
+
+ Step one:PANIC!
+ Step two: Get your ass over to engineering! QUICKLY!!!
+ Step three: Make sure the SMES is still powering the emitters, if not, setup the generator in secure storage and disconnect the emitters from the SMES.
+ Step four: Next, head over to the APC and swipe it with your ID card - if it doesn't unlock, continue with step 15.
+ Step five: Open the console and disengage the cover lock.
+ Step six: Pry open the APC with a Crowbar.
+ Step seven: Take out the empty power cell.
+ Step eight: Put in the new, full power cell - if you don't have one, continue with step 15.
+ Step nine: Quickly put on a Radiation suit.
+ Step ten: Check if the singularity field generators withstood the down-time - if they didn't, continue with step 15.
+ Step eleven: Since disaster was averted you now have to ensure it doesn't repeat. If it was a powersink which caused it and if the engineering apc is wired to the same powernet, which the powersink is on, you have to remove the piece of wire which links the apc to the powernet. If it wasn't a powersink which caused it, then skip to step 14.
+ Step twelve: Grab your crowbar and pry away the tile closest to the APC.
+ Step thirteen: Use the wirecutters to cut the wire which is conecting the grid to the terminal.
+ Step fourteen: Go to the bar and tell the guys how you saved them all. Stop reading this guide here.
+ Step fifteen:GET THE FUCK OUT OF THERE!!!
+
+
+
Shields get damaged
+
+ Step one: GET THE FUCK OUT OF THERE!!! FORGET THE WOMEN AND CHILDREN, SAVE YOURSELF!!!
+
+
+ "}
+
+/obj/item/book/manual/hydroponics_pod_people
+ name = "The Human Harvest - From seed to market"
+ icon_state ="bookHydroponicsPodPeople"
+ author = "Farmer John"
+ title = "The Human Harvest - From seed to market"
+ dat = {"
+
+
+
+
+
Growing Humans
+
+ Why would you want to grow humans? Well I'm expecting most readers to be in the slave trade, but a few might actually
+ want to revive fallen comrades. Growing pod people is easy, but prone to disaster.
+
+
+
Find a dead person who is in need of cloning.
+
Take a blood sample with a syringe.
+
Inject a seed pack with the blood sample.
+
Plant the seeds.
+
Tend to the plants water and nutrition levels until it is time to harvest the cloned human.
+
+
+ It really is that easy! Good luck!
+
+
+
+ "}
+
+/obj/item/book/manual/medical_cloning
+ name = "Cloning techniques of the 26th century"
+ icon_state ="bookCloning"
+ author = "Medical Journal, volume 3"
+ title = "Cloning techniques of the 26th century"
+ dat = {"
+
+
+
+
+
+
How to Clone People
+ So there's fifty dead people lying on the floor, chairs are spinning like no tomorrow and you haven't the foggiest idea of what to do? Not to worry! This guide is intended to teach you how to clone people and how to do it right, in a simple step-by-step process! If at any point of the guide you have a mental meltdown, genetics probably isn't for you and you should get a job-change as soon as possible before you're sued for malpractice.
+
+
+
+ The Exosuit Fabricator is the most important piece of equipment related to cyborgs. It allows the construction of the core cyborg parts. Without these machines, cyborgs can not be built. It seems that they may also benefit from advanced research techniques.
+
+
Cyborg Recharging Station
+ This useful piece of equipment will suck power out of the power systems to charge a cyborg's power cell back up to full charge.
+
+
Robotics Control Console
+ This useful piece of equipment can be used to immobolize or destroy a cyborg. A word of warning: Cyborgs are expensive pieces of equipment, do not destroy them without good reason, or Nanotrasen may see to it that it never happens again.
+
+
+
+ When a cyborg is created it picks out of an array of modules to designate its purpose. There are 6 different cyborg modules.
+
+
Standard Cyborg
+ The standard cyborg module is a multi-purpose cyborg. It is equipped with various modules, allowing it to do basic tasks.
+
+
Engineering Cyborg
+ The Engineering cyborg module comes equipped with various engineering-related tools to help with engineering-related tasks.
+
+
Mining Cyborg
+ The Mining Cyborg module comes equipped with the latest in mining equipment. They are efficient at mining due to no need for oxygen, but their power cells limit their time in the mines.
+
+
Security Cyborg
+ The Security Cyborg module is equipped with effective security measures used to apprehend and arrest criminals without harming them a bit.
+
+
Janitor Cyborg
+ The Janitor Cyborg module is equipped with various cleaning-facilitating devices.
+
+
Service Cyborg
+ The service cyborg module comes ready to serve your human needs. It includes various entertainment and refreshment devices. Occasionally some service cyborgs may have been referred to as "Bros"
+
+
+ Cyborg construction is a rather easy process, requiring a decent amount of metal and a few other supplies. The required materials to make a cyborg are:
+
+
Metal
+
Two Flashes
+
One Power Cell (Preferrably rated to 15000w)
+
Some electrical wires
+
One Human Brain
+
One Man-Machine Interface
+
+ Once you have acquired the materials, you can start on construction of your cyborg. To construct a cyborg, follow the steps below:
+
+
Start the Exosuit Fabricators constructing all of the cyborg parts
+
While the parts are being constructed, take your human brain, and place it inside the Man-Machine Interface
+
Once you have a Robot Head, place your two flashes inside the eye sockets
+
Once you have your Robot Chest, wire the Robot chest, then insert the power cell
+
Attach all of the Robot parts to the Robot frame
+
Insert the Man-Machine Interface (With the Brain inside) Into the Robot Body
+ If you want to deconstruct a cyborg, say to remove its MMI without blowing the Cyborg to pieces, they come apart very quickly, and very safely, in a few simple steps.
+
+
Crowbar
+
Wrench
+ Optional:
+
Screwdriver
+
Wirecutters
+
+
+
Begin by unlocking the Cyborg's access panel using your ID
+
Use your crowbar to open the Cyborg's access panel
+
Using your bare hands, remove the power cell from the Cyborg
+
Lockdown the Cyborg to disengage safety protocols
+
+ Option 1: Robotics console
+
Use the Robotics console in the RD's office
+
Find the entry for your Cyborg
+
Press the Lockdown button on the Robotics console
+
+
+ Option 2: Lockdown wire
+
Use your screwdriver to expose the Cyborg's wiring
+
Use your wirecutters to start cutting all of the wires until the lockdown light turns off, cutting all of the wires irregardless of the lockdown light works as well
+
+
Use your wrench to unfasten the Cyborg's bolts, the Cyborg will then fall apart onto the floor, the MMI will be there as well
+ Occasionally Cyborgs may require maintenance of a couple types, this could include replacing a power cell with a charged one, or possibly maintaining the cyborg's internal wiring.
+
+
Replacing a Power Cell
+ Replacing a Power cell is a common type of maintenance for cyborgs. It usually involves replacing the cell with a fully charged one, or upgrading the cell with a larger capacity cell. The steps to replace a cell are follows:
+
+
Unlock the Cyborg's Interface by swiping your ID on it
+
Open the Cyborg's outer panel using a crowbar
+
Remove the old power cell
+
Insert the new power cell
+
Close the Cyborg's outer panel using a crowbar
+
Lock the Cyborg's Interface by swiping your ID on it, this will prevent non-qualified personnel from attempting to remove the power cell
+
+
+
Exposing the Internal Wiring
+ Exposing the internal wiring of a cyborg is fairly easy to do, and is mainly used for cyborg repairs. You can easily expose the internal wiring by following the steps below:
+
+
Follow Steps 1 - 3 of "Replacing a Cyborg's Power Cell"
+
Open the cyborg's internal wiring panel by using a screwdriver to unsecure the panel
+
+ To re-seal the cyborg's internal wiring:
+
+
Use a screwdriver to secure the cyborg's internal panel
+
Follow steps 4 - 6 of "Replacing a Cyborg's Power Cell" to close up the cyborg
+ Occasionally a Cyborg may become damaged. This could be in the form of impact damage from a heavy or fast-travelling object, or it could be heat damage from high temperatures, or even lasers or Electromagnetic Pulses (EMPs).
+
+
Dents
+ If a cyborg becomes damaged due to impact from heavy or fast-moving objects, it will become dented. Sure, a dent may not seem like much, but it can compromise the structural integrity of the cyborg, possibly causing a critical failure.
+ Dents in a cyborg's frame are rather easy to repair, all you need is to apply a welding tool to the dented area, and the high-tech cyborg frame will repair the dent under the heat of the welder.
+
+
Excessive Heat Damage
+ If a cyborg becomes damaged due to excessive heat, it is likely that the internal wires will have been damaged. You must replace those wires to ensure that the cyborg remains functioning properly. To replace the internal wiring follow the steps below:
+
+
Unlock the Cyborg's Interface by swiping your ID
+
Open the Cyborg's External Panel using a crowbar
+
Remove the Cyborg's Power Cell
+
Using a screwdriver, expose the internal wiring or the Cyborg
+
Replace the damaged wires inside the cyborg
+
Secure the internal wiring cover using a screwdriver
+
Insert the Cyborg's Power Cell
+
Close the Cyborg's External Panel using a crowbar
+
Lock the Cyborg's Interface by swiping your ID
+
+ These repair tasks may seem difficult, but are essential to keep your cyborgs running at peak efficiency.
+
+
+ In case of emergency, there are a few steps you can take.
+
+
"Rogue" Cyborgs
+ If the cyborgs seem to become "rogue", they may have non-standard laws. In this case, use extreme caution.
+ To repair the situation, follow these steps:
+
+
Locate the nearest robotics console
+
Determine which cyborgs are "Rogue"
+
Press the lockdown button to immobolize the cyborg
+
Locate the cyborg
+
Expose the cyborg's internal wiring
+
Check to make sure the LawSync and AI Sync lights are lit
+
If they are not lit, pulse the LawSync wire using a multitool to enable the cyborg's Law Sync
+
Proceed to a cyborg upload console. Nanotrasen usually places these in the same location as AI uplaod consoles.
+
Use a "Reset" upload moduleto reset the cyborg's laws
+
Proceed to a Robotics Control console
+
Remove the lockdown on the cyborg
+
+
+
As a last resort
+ If all else fails in a case of cyborg-related emergency. There may be only one option. Using a Robotics Control console, you may have to remotely detonate the cyborg.
+
WARNING:
Do not detonate a borg without an explicit reason for doing so. Cyborgs are expensive pieces of Nanotrasen equipment, and you may be punished for detonating them without reason.
+
+
+
+ "}
+
+
+
+/obj/item/book/manual/chef_recipes
+ name = "Chef Recipes"
+ icon_state = "cooked_book"
+ author = "Lord Frenrir Cageth"
+ title = "Chef Recipes"
+ dat = {"
+
+
+
+
+
+
Food for Dummies
+ Here is a guide on basic food recipes and also how to not poison your customers accidentally.
+
+
+
Basic ingredients preparation:
+
+ Dough: 10u water + 15u flour for simple dough.
+ 15u egg yolk + 15u flour + 5u sugar for cake batter.
+ Doughs can be transformed by using a knife and rolling pin.
+ All doughs can be microwaved.
+ Bowl: Add water to it for soup preparation.
+ Meat: Microwave it, process it, slice it into microwavable cutlets with your knife, or use it raw.
+ Cheese: Add 5u universal enzyme (catalyst) to milk and soy milk to prepare cheese (sliceable) and tofu.
+ Rice: Mix 10u rice with 10u water in a bowl then microwave it.
+
+
Custom food:
+ Add ingredients to a base item to prepare a custom meal.
+ The bases are:
+ - bun (burger)
+ - breadslices(sandwich)
+ - plain bread
+ - plain pie
+ - vanilla cake
+ - empty bowl (salad)
+ - bowl with 10u water (soup)
+ - boiled spaghetti
+ - pizza bread
+ - metal rod (kebab)
+
+
Table Craft:
+ Put ingredients on table, then click and drag the table onto yourself to see what recipes you can prepare.
+
+
Microwave:
+ Use it to cook or boil food ingredients (meats, doughs, egg, spaghetti, donkpocket, etc...).
+ It can cook multiple items at once.
+
+
Processor:
+ Use it to process certain ingredients (meat into faggot, doughslice into spaghetti, potato into fries,etc...)
+
+
Gibber:
+ Stuff an animal in it to grind it into meat.
+
+
Meat spike:
+ Stick an animal on it then begin collecting its meat.
+
+
+
Example recipes:
+ Vanilla Cake: Microwave cake batter.
+ Burger: 1 bun + 1 meat steak
+ Bread: Microwave dough.
+ Waffles: 2 pastry base
+ Popcorn: Microwave corn.
+ Meat Steak: Microwave meat.
+ Meat Pie: 1 plain pie + 1u black pepper + 1u salt + 2 meat cutlets
+ Boiled Spagetti: Microwave spaghetti.
+ Donuts: 1u sugar + 1 pastry base
+ Fries: Process potato.
+
+
Sharing your food:
+ You can put your meals on your kitchen counter or load them in the snack vending machines.
+
+
+ "}
+
+
+/obj/item/book/manual/barman_recipes
+ name = "Barman Recipes"
+ icon_state = "barbook"
+ author = "Sir John Rose"
+ title = "Barman Recipes"
+ dat = {"
+
+
+
+
+
+
Drinks for dummies
+ Heres a guide for some basic drinks.
+
+
Manly Dorf:
+ Mix ale and beer into a glass.
+
+
Grog:
+ Mix rum and water into a glass.
+
+
Black Russian:
+ Mix vodka and kahlua into a glass.
+
+
Irish Cream:
+ Mix cream and whiskey into a glass.
+
+
Screwdriver:
+ Mix vodka and orange juice into a glass.
+
+
Cafe Latte:
+ Mix milk and coffee into a glass.
+
+
Mead:
+ Mix Enzyme, water and sugar into a glass.
+
+
Gin Tonic:
+ Mix gin and tonic into a glass.
+
+
Classic Martini:
+ Mix vermouth and gin into a glass.
+
+
+
+
+ "}
+
+
+/obj/item/book/manual/detective
+ name = "The Film Noir: Proper Procedures for Investigations"
+ icon_state ="bookDetective"
+ author = "Nanotrasen"
+ title = "The Film Noir: Proper Procedures for Investigations"
+ dat = {"
+
+
+
+
+
Detective Work
+
+ Between your bouts of self-narration, and drinking whiskey on the rocks, you might get a case or two to solve.
+ To have the best chance to solve your case, follow these directions:
+
+
+
Go to the crime scene.
+
Take your scanner and scan EVERYTHING (Yes, the doors, the tables, even the dog.)
+
Once you are reasonably certain you have every scrap of evidence you can use, find all possible entry points and scan them, too.
+
Return to your office.
+
Using your forensic scanning computer, scan your Scanner to upload all of your evidence into the database.
+
Browse through the resulting dossiers, looking for the one that either has the most complete set of prints, or the most suspicious items handled.
+
If you have 80% or more of the print (The print is displayed) go to step 10, otherwise continue to step 8.
+
Look for clues from the suit fibres you found on your perp, and go about looking for more evidence with this new information, scanning as you go.
+
Try to get a fingerprint card of your perp, as if used in the computer, the prints will be completed on their dossier.
+
Assuming you have enough of a print to see it, grab the biggest complete piece of the print and search the security records for it.
+
Since you now have both your dossier and the name of the person, print both out as evidence, and get security to nab your baddie.
+
Give yourself a pat on the back and a bottle of the ships finest vodka, you did it!
+
+
+ It really is that easy! Good luck!
+
+
+ "}
+
+/obj/item/book/manual/nuclear
+ name = "Fission Mailed: Nuclear Sabotage 101"
+ icon_state ="bookNuclear"
+ author = "Syndicate"
+ title = "Fission Mailed: Nuclear Sabotage 101"
+ dat = {"
+ Nuclear Explosives 101:
+ Hello and thank you for choosing the Syndicate for your nuclear information needs.
+ Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.
+ First and foremost, DO NOT TOUCH ANYTHING UNTIL THE BOMB IS IN PLACE.
+ Pressing any button on the compacted bomb will cause it to extend and bolt itself into place.
+ If this is done to unbolt it one must completely log in which at this time may not be possible.
+ To make the nuclear device functional:
+
Place the nuclear device in the designated detonation zone.
+
Extend and anchor the nuclear device from its interface.
+
Insert the nuclear authorisation disk into slot.
+
Type numeric authorisation code into the keypad. This should have been provided. Note: If you make a mistake press R to reset the device.
+
Press the E button to log onto the device.
+ You now have activated the device. To deactivate the buttons at anytime for example when you've already prepped the bomb for detonation remove the auth disk OR press the R on the keypad.
+ Now the bomb CAN ONLY be detonated using the timer. Manual detonation is not an option.
+ Note: Nanotrasen is a pain in the neck.
+ Toggle off the SAFETY.
+ Note: You wouldn't believe how many Syndicate Operatives with doctorates have forgotten this step.
+ So use the - - and + + to set a det time between 5 seconds and 10 minutes.
+ Then press the timer toggle button to start the countdown.
+ Now remove the auth. disk so that the buttons deactivate.
+ Note: THE BOMB IS STILL SET AND WILL DETONATE
+ Now before you remove the disk if you need to move the bomb you can:
+ Toggle off the anchor, move it, and re-anchor.
+ Good luck. Remember the order:
+ Disk, Code, Safety, Timer, Disk, RUN!
+ Intelligence Analysts believe that normal Nanotrasen procedure is for the Captain to secure the nuclear authorisation disk.
+ Good luck!
+ "}
+
+// Wiki books that are linked to the configured wiki link.
+
+// A book that links to the wiki
+/obj/item/book/manual/wiki
+ var/page_link = ""
+ window_size = "970x710"
+
+/obj/item/book/manual/wiki/attack_self()
+ if(!dat)
+ initialize_wikibook()
+ ..()
+
+/obj/item/book/manual/wiki/proc/initialize_wikibook()
+ var/wikiurl = CONFIG_GET(string/wikiurl)
+ if(wikiurl)
+ dat = {"
+
+
+
+
+
+
+
You start skimming through the manual...
+
+
+
+
+
+ "}
+
+/obj/item/book/manual/wiki/chemistry
+ name = "Chemistry Textbook"
+ icon_state ="chemistrybook"
+ author = "Nanotrasen"
+ title = "Chemistry Textbook"
+ page_link = "Guide_to_chemistry"
+
+/obj/item/book/manual/wiki/engineering_construction
+ name = "Station Repairs and Construction"
+ icon_state ="bookEngineering"
+ author = "Engineering Encyclopedia"
+ title = "Station Repairs and Construction"
+ page_link = "Guide_to_construction"
+
+/obj/item/book/manual/wiki/engineering_guide
+ name = "Engineering Textbook"
+ icon_state ="bookEngineering2"
+ author = "Engineering Encyclopedia"
+ title = "Engineering Textbook"
+ page_link = "Guide_to_engineering"
+
+/obj/item/book/manual/wiki/security_space_law
+ name = "Space Law"
+ desc = "A set of Nanotrasen guidelines for keeping law and order on their space stations."
+ icon_state = "bookSpaceLaw"
+ author = "Nanotrasen"
+ title = "Space Law"
+ page_link = "Space_Law"
+
+/obj/item/book/manual/wiki/infections
+ name = "Infections - Making your own pandemic!"
+ icon_state = "bookInfections"
+ author = "Infections Encyclopedia"
+ title = "Infections - Making your own pandemic!"
+ page_link = "Infections"
+
+/obj/item/book/manual/wiki/telescience
+ name = "Teleportation Science - Bluespace for dummies!"
+ icon_state = "book7"
+ author = "University of Bluespace"
+ title = "Teleportation Science - Bluespace for dummies!"
+ page_link = "Guide_to_telescience"
+
+/obj/item/book/manual/wiki/engineering_hacking
+ name = "Hacking"
+ icon_state ="bookHacking"
+ author = "Engineering Encyclopedia"
+ title = "Hacking"
+ page_link = "Hacking"
diff --git a/code/game/objects/items/mop.dm b/code/game/objects/items/mop.dm
index c2a5df5f4c..f9be38a2fe 100644
--- a/code/game/objects/items/mop.dm
+++ b/code/game/objects/items/mop.dm
@@ -24,18 +24,17 @@
/obj/item/mop/proc/clean(turf/A)
if(reagents.has_reagent("water", 1) || reagents.has_reagent("holywater", 1) || reagents.has_reagent("vodka", 1) || reagents.has_reagent("cleaner", 1))
A.clean_blood()
+ A.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_MEDIUM)
for(var/obj/effect/O in A)
if(is_cleanable(O))
qdel(O)
- if(isclosedturf(A))
- var/turf/closed/C = A
- C.thermite = 0
reagents.reaction(A, TOUCH, 10) //Needed for proper floor wetting.
reagents.remove_any(1) //reaction() doesn't use up the reagents
/obj/item/mop/afterattack(atom/A, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(reagents.total_volume < 1)
to_chat(user, "Your mop is dry!")
diff --git a/code/game/objects/items/paint.dm b/code/game/objects/items/paint.dm
index 5e43d0fc5c..dd6fc77906 100644
--- a/code/game/objects/items/paint.dm
+++ b/code/game/objects/items/paint.dm
@@ -79,7 +79,8 @@
/obj/item/paint/afterattack(turf/target, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(paintleft <= 0)
icon_state = "paint_empty"
return
diff --git a/code/game/objects/items/plushes.dm b/code/game/objects/items/plushes.dm
index b22383ad58..f2fd53403a 100644
--- a/code/game/objects/items/plushes.dm
+++ b/code/game/objects/items/plushes.dm
@@ -1,20 +1,72 @@
/obj/item/toy/plush
name = "plush"
- desc = "this is the special coder plush, do not steal"
+ desc = "This is the special coder plush, do not steal."
icon = 'icons/obj/plushes.dmi'
icon_state = "debug"
attack_verb = list("thumped", "whomped", "bumped")
w_class = WEIGHT_CLASS_SMALL
resistance_flags = FLAMMABLE
var/list/squeak_override //Weighted list; If you want your plush to have different squeak sounds use this
+ var/stuffed = TRUE //If the plushie has stuffing in it
+ var/obj/item/grenade/grenade //You can remove the stuffing from a plushie and add a grenade to it for *nefarious uses*
/obj/item/toy/plush/Initialize()
. = ..()
AddComponent(/datum/component/squeak, squeak_override)
+/obj/item/toy/plush/Destroy()
+ QDEL_NULL(grenade)
+ return ..()
+
+/obj/item/toy/plush/handle_atom_del(atom/A)
+ if(A == grenade)
+ grenade = null
+ ..()
+
/obj/item/toy/plush/attack_self(mob/user)
. = ..()
- to_chat(user, "You pet [src]. D'awww.")
+ if(stuffed || grenade)
+ to_chat(user, "You pet [src]. D'awww.")
+ if(grenade && !grenade.active)
+ if(istype(grenade, /obj/item/grenade/chem_grenade))
+ var/obj/item/grenade/chem_grenade/G = grenade
+ if(G.nadeassembly) //We're activated through different methods
+ return
+ log_game("[key_name(user)] activated a hidden grenade in [src].")
+ grenade.preprime(user, msg = FALSE, volume = 10)
+ else
+ to_chat(user, "You try to pet [src], but it has no stuffing. Aww...")
+
+/obj/item/toy/plush/attackby(obj/item/I, mob/living/user, params)
+ if(I.is_sharp())
+ if(!grenade)
+ if(!stuffed)
+ to_chat(user, "You already murdered it!")
+ return
+ user.visible_message("[user] tears out the stuffing from [src]!", "You rip a bunch of the stuffing from [src]. Murderer.")
+ playsound(I, I.usesound, 50, TRUE)
+ stuffed = FALSE
+ else
+ to_chat(user, "You remove the grenade from [src].")
+ user.put_in_hands(grenade)
+ grenade = null
+ return
+ if(istype(I, /obj/item/grenade))
+ if(stuffed)
+ to_chat(user, "You need to remove some stuffing first!")
+ return
+ if(grenade)
+ to_chat(user, "[src] already has a grenade!")
+ return
+ if(!user.transferItemToLoc(I, src))
+ return
+ user.visible_message("[user] slides [grenade] into [src].", \
+ "You slide [I] into [src].")
+ grenade = I
+ var/turf/T = get_turf(user)
+ log_game("[key_name(user)] added a grenade ([I.name]) to [src] at [COORD(T)].")
+ return
+ return ..()
/obj/item/toy/plush/carpplushie
name = "space carp plushie"
@@ -35,11 +87,98 @@
name = "ratvar plushie"
desc = "An adorable plushie of the clockwork justiciar himself with new and improved spring arm action."
icon_state = "plushvar"
+ var/obj/item/toy/plush/narplush/clash_target
+
+/obj/item/toy/plush/plushvar/Moved()
+ . = ..()
+ if(clash_target)
+ return
+ var/obj/item/toy/plush/narplush/P = locate() in range(1, src)
+ if(P && istype(P.loc, /turf/open) && !P.clashing)
+ clash_of_the_plushies(P)
+
+/obj/item/toy/plush/plushvar/proc/clash_of_the_plushies(obj/item/toy/plush/narplush/P)
+ clash_target = P
+ P.clashing = TRUE
+ say("YOU.")
+ P.say("Ratvar?!")
+ var/obj/item/toy/plush/a_winnar_is
+ var/victory_chance = 10
+ for(var/i in 1 to 10) //We only fight ten times max
+ if(QDELETED(src))
+ P.clashing = FALSE
+ return
+ if(QDELETED(P))
+ clash_target = null
+ return
+ if(!Adjacent(P))
+ visible_message("The two plushies angrily flail at each other before giving up.")
+ clash_target = null
+ P.clashing = FALSE
+ return
+ playsound(src, 'sound/magic/clockwork/ratvar_attack.ogg', 50, TRUE, frequency = 2)
+ sleep(2.4)
+ if(QDELETED(src))
+ P.clashing = FALSE
+ return
+ if(QDELETED(P))
+ clash_target = null
+ return
+ if(prob(victory_chance))
+ a_winnar_is = src
+ break
+ P.SpinAnimation(5, 0)
+ sleep(5)
+ if(QDELETED(src))
+ P.clashing = FALSE
+ return
+ if(QDELETED(P))
+ clash_target = null
+ return
+ playsound(P, 'sound/magic/clockwork/narsie_attack.ogg', 50, TRUE, frequency = 2)
+ sleep(3.3)
+ if(QDELETED(src))
+ P.clashing = FALSE
+ return
+ if(QDELETED(P))
+ clash_target = null
+ return
+ if(prob(victory_chance))
+ a_winnar_is = P
+ break
+ SpinAnimation(5, 0)
+ victory_chance += 10
+ sleep(5)
+ if(!a_winnar_is)
+ a_winnar_is = pick(src, P)
+ if(a_winnar_is == src)
+ say(pick("DIE.", "ROT."))
+ P.say(pick("Nooooo...", "Not die. To y-", "Die. Ratv-", "Sas tyen re-"))
+ playsound(src, 'sound/magic/clockwork/anima_fragment_attack.ogg', 50, TRUE, frequency = 2)
+ playsound(P, 'sound/magic/demon_dies.ogg', 50, TRUE, frequency = 2)
+ explosion(P, 0, 0, 1)
+ qdel(P)
+ clash_target = null
+ else
+ say("NO! I will not be banished again...")
+ P.say(pick("Ha.", "Ra'sha fonn dest.", "You fool. To come here."))
+ playsound(src, 'sound/magic/clockwork/anima_fragment_death.ogg', 50, TRUE, frequency = 2)
+ playsound(P, 'sound/magic/demon_attack1.ogg', 50, TRUE, frequency = 2)
+ explosion(src, 0, 0, 1)
+ qdel(src)
+ P.clashing = FALSE
/obj/item/toy/plush/narplush
name = "nar'sie plushie"
desc = "A small stuffed doll of the elder god nar'sie. Who thought this was a good children's toy?"
icon_state = "narplush"
+ var/clashing
+
+/obj/item/toy/plush/narplush/Moved()
+ . = ..()
+ var/obj/item/toy/plush/plushvar/P = locate() in range(1, src)
+ if(P && istype(P.loc, /turf/open) && !P.clash_target && !clashing)
+ P.clash_of_the_plushies(src)
/obj/item/toy/plush/lizardplushie
name = "lizard plushie"
diff --git a/code/game/objects/items/pneumaticCannon.dm b/code/game/objects/items/pneumaticCannon.dm
index 6e9cbfa35f..b3960d1e5f 100644
--- a/code/game/objects/items/pneumaticCannon.dm
+++ b/code/game/objects/items/pneumaticCannon.dm
@@ -26,8 +26,31 @@
var/fire_mode = PCANNON_FIREALL
var/automatic = FALSE
var/clumsyCheck = TRUE
+ var/list/allowed_typecache //Leave as null to allow all.
+ var/charge_amount = 1
+ var/charge_ticks = 1
+ var/charge_tick = 0
+ var/charge_type
+ var/selfcharge = FALSE
trigger_guard = TRIGGER_GUARD_NORMAL
+
+/obj/item/pneumatic_cannon/Initialize()
+ . = ..()
+ if(selfcharge)
+ init_charge()
+
+/obj/item/pneumatic_cannon/proc/init_charge() //wrapper so it can be vv'd easier
+ START_PROCESSING(SSobj, src)
+
+/obj/item/pneumatic_cannon/process()
+ if(++charge_tick >= charge_ticks && charge_type)
+ fill_with_type(charge_type, charge_amount)
+
+/obj/item/pneumatic_cannon/Destroy()
+ STOP_PROCESSING(SSobj, src)
+ return ..()
+
/obj/item/pneumatic_cannon/CanItemAutoclick()
return automatic
@@ -75,6 +98,10 @@
load_item(IW, user)
/obj/item/pneumatic_cannon/proc/can_load_item(obj/item/I, mob/user)
+ if(allowed_typecache && !is_type_in_typecache(I, allowed_typecache))
+ if(user)
+ to_chat(user, "[I] won't fit into [src]!")
+ return
if((loadedWeightClass + I.w_class) > maxWeightClass) //Only make messages if there's a user
if(user)
to_chat(user, "\The [I] won't fit into \the [src]!")
@@ -223,7 +250,7 @@
/obj/item/pneumatic_cannon/pie
name = "pie cannon"
- desc = "Load cream pie for optimal results"
+ desc = "Load cream pie for optimal results."
force = 10
icon_state = "piecannon"
gasPerThrow = 0
@@ -233,28 +260,14 @@
throw_amount = 1
maxWeightClass = 150 //50 pies. :^)
clumsyCheck = FALSE
+ var/static/list/pie_typecache = typecacheof(/obj/item/reagent_containers/food/snacks/pie)
-/obj/item/pneumatic_cannon/pie/can_load_item(obj/item/I, mob/user)
- if(istype(I, /obj/item/reagent_containers/food/snacks/pie))
- return ..()
- to_chat(user, "[src] only accepts pies!")
- return FALSE
-
+/obj/item/pneumatic_cannon/pie/Initialize()
+ . = ..()
+ allowed_typecache = pie_typecache
+
/obj/item/pneumatic_cannon/pie/selfcharge
automatic = TRUE
- var/charge_amount = 1
- var/charge_ticks = 1
- var/charge_tick = 0
+ selfcharge = TRUE
+ charge_type = /obj/item/reagent_containers/food/snacks/pie/cream
maxWeightClass = 60 //20 pies.
-
-/obj/item/pneumatic_cannon/pie/selfcharge/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
-
-/obj/item/pneumatic_cannon/pie/selfcharge/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/item/pneumatic_cannon/pie/selfcharge/process()
- if(++charge_tick >= charge_ticks)
- fill_with_type(/obj/item/reagent_containers/food/snacks/pie/cream, charge_amount)
diff --git a/code/game/objects/items/religion.dm b/code/game/objects/items/religion.dm
index 007c590cac..b25184c4b1 100644
--- a/code/game/objects/items/religion.dm
+++ b/code/game/objects/items/religion.dm
@@ -207,7 +207,7 @@
name = "blue banner"
icon_state = "banner-blue"
item_state = "banner-blue"
- desc = "A banner with the logo of the blue deity"
+ desc = "A banner with the logo of the blue deity."
/obj/item/storage/backpack/bannerpack
name = "nanotrasen banner backpack"
diff --git a/code/game/objects/items/robot/robot_items.dm b/code/game/objects/items/robot/robot_items.dm
index 64fea6ef19..e4485266b5 100644
--- a/code/game/objects/items/robot/robot_items.dm
+++ b/code/game/objects/items/robot/robot_items.dm
@@ -274,17 +274,17 @@
to_chat(user, "You stop charging [target].")
/obj/item/device/harmalarm
- name = "Sonic Harm Prevention Tool"
- desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH"
+ name = "\improper Sonic Harm Prevention Tool"
+ desc = "Releases a harmless blast that confuses most organics. For when the harm is JUST TOO MUCH."
icon_state = "megaphone"
var/cooldown = 0
/obj/item/device/harmalarm/emag_act(mob/user)
emagged = !emagged
if(emagged)
- to_chat(user, "You short out the safeties on the [src]!")
+ to_chat(user, "You short out the safeties on [src]!")
else
- to_chat(user, "You reset the safeties on the [src]!")
+ to_chat(user, "You reset the safeties on [src]!")
/obj/item/device/harmalarm/attack_self(mob/user)
var/safety = !emagged
@@ -503,9 +503,8 @@
//Peacekeeper Cyborg Projectile Dampenening Field
/obj/item/borg/projectile_dampen
- name = "Hyperkinetic Dampening projector"
- desc = "A device that projects a dampening field that weakenss kinetic energy above a certain threshold. Projects a field that drains power per second \
- while active, that will weaken and slow damaging projectiles inside its field. Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
+ name = "\improper Hyperkinetic Dampening projector"
+ desc = "A device that projects a dampening field that weakens kinetic energy above a certain threshold. Projects a field that drains power per second while active, that will weaken and slow damaging projectiles inside its field. Still being a prototype, it tends to induce a charge on ungrounded metallic surfaces."
icon = 'icons/obj/device.dmi'
icon_state = "shield"
var/maxenergy = 1500
@@ -544,16 +543,18 @@
/obj/item/borg/projectile_dampen/attack_self(mob/user)
if(cycle_delay > world.time)
- to_chat(user, "\the [src] is still recycling its projectors!")
+ to_chat(user, "[src] is still recycling its projectors!")
return
cycle_delay = world.time + PKBORG_DAMPEN_CYCLE_DELAY
- active = !active
- if(active)
- activate_field(user)
+ if(!active)
+ if(!user.has_buckled_mobs())
+ activate_field()
+ else
+ to_chat(user, "[src]'s safety cutoff prevents you from activating it due to living beings being ontop of you!")
else
deactivate_field()
update_icon()
- to_chat(user, "You [active? "activate":"deactivate"] the [src].")
+ to_chat(user, "You [active? "activate":"deactivate"] [src].")
/obj/item/borg/projectile_dampen/update_icon()
icon_state = "[initial(icon_state)][active]"
@@ -562,12 +563,29 @@
if(istype(dampening_field))
QDEL_NULL(dampening_field)
dampening_field = make_field(/datum/proximity_monitor/advanced/peaceborg_dampener, list("current_range" = field_radius, "host" = src, "projector" = src))
+ var/mob/living/silicon/robot/owner = get_host()
+ if(owner)
+ owner.module.allow_riding = FALSE
+ active = TRUE
/obj/item/borg/projectile_dampen/proc/deactivate_field()
QDEL_NULL(dampening_field)
visible_message("\The [src] shuts off!")
for(var/P in tracked)
restore_projectile(P)
+ active = FALSE
+
+ var/mob/living/silicon/robot/owner = get_host()
+ if(owner)
+ owner.module.allow_riding = TRUE
+
+/obj/item/borg/projectile_dampen/proc/get_host()
+ if(istype(host))
+ return host
+ else
+ if(iscyborg(host.loc))
+ return host.loc
+ return null
/obj/item/borg/projectile_dampen/dropped()
. = ..()
@@ -601,7 +619,7 @@
energy = Clamp(energy - usage, 0, maxenergy)
if(energy <= 0)
deactivate_field()
- visible_message("The [src] blinks \"ENERGY DEPLETED\"")
+ visible_message("[src] blinks \"ENERGY DEPLETED\".")
/obj/item/borg/projectile_dampen/proc/process_recharge()
if(!istype(host))
@@ -685,4 +703,4 @@
/obj/item/borg/sight/hud/sec/New()
..()
hud = new /obj/item/clothing/glasses/hud/security(src)
- return
+ return
\ No newline at end of file
diff --git a/code/game/objects/items/robot/robot_upgrades.dm b/code/game/objects/items/robot/robot_upgrades.dm
index 3febaecfa9..59eef9a170 100644
--- a/code/game/objects/items/robot/robot_upgrades.dm
+++ b/code/game/objects/items/robot/robot_upgrades.dm
@@ -172,7 +172,7 @@
/obj/item/borg/upgrade/syndicate
name = "illegal equipment module"
- desc = "Unlocks the hidden, deadlier functions of a cyborg"
+ desc = "Unlocks the hidden, deadlier functions of a cyborg."
icon_state = "cyborg_upgrade3"
require_module = 1
origin_tech = "combat=4;syndicate=1"
@@ -320,7 +320,7 @@
/obj/item/borg/upgrade/hypospray/action(mob/living/silicon/robot/R)
if(..())
return
- for(var/obj/item/reagent_containers/borghypo/H in R.module)
+ for(var/obj/item/reagent_containers/borghypo/H in R.module.modules)
if(H.accepts_reagent_upgrades)
for(var/re in additional_reagents)
H.add_reagent(re)
@@ -355,7 +355,7 @@
return
var/found_hypo = FALSE
- for(var/obj/item/reagent_containers/borghypo/H in R.module)
+ for(var/obj/item/reagent_containers/borghypo/H in R.module.modules)
H.bypass_protection = TRUE
found_hypo = TRUE
diff --git a/code/game/objects/items/sharpener.dm b/code/game/objects/items/sharpener.dm
index ce2d73eff0..fb25cb1d76 100644
--- a/code/game/objects/items/sharpener.dm
+++ b/code/game/objects/items/sharpener.dm
@@ -3,6 +3,7 @@
icon = 'icons/obj/kitchen.dmi'
icon_state = "sharpener"
desc = "A block that makes things sharp."
+ force = 5
var/used = 0
var/increment = 4
var/max = 30
diff --git a/code/game/objects/items/shooting_range.dm b/code/game/objects/items/shooting_range.dm
index c8249024f8..6803d6bb7b 100644
--- a/code/game/objects/items/shooting_range.dm
+++ b/code/game/objects/items/shooting_range.dm
@@ -65,10 +65,12 @@
playsound(src.loc, 'sound/items/bikehorn.ogg', 50, 1)
/obj/item/target/bullet_act(obj/item/projectile/P)
+ if(istype(P, /obj/item/projectile/bullet/reusable)) // If it's a foam dart, don't bother with any of this other shit
+ return P.on_hit(src, 0)
var/p_x = P.p_x + pick(0,0,0,0,0,-1,1) // really ugly way of coding "sometimes offset P.p_x!"
var/p_y = P.p_y + pick(0,0,0,0,0,-1,1)
var/decaltype = DECALTYPE_SCORCH
- if(istype(/obj/item/projectile/bullet, P))
+ if(istype(P, /obj/item/projectile/bullet))
decaltype = DECALTYPE_BULLET
var/icon/C = icon(icon,icon_state)
if(C.GetPixel(p_x, p_y) && P.original == src && overlays.len <= 35) // if the located pixel isn't blank (null)
@@ -92,4 +94,4 @@
return -1
#undef DECALTYPE_SCORCH
-#undef DECALTYPE_BULLET
\ No newline at end of file
+#undef DECALTYPE_BULLET
diff --git a/code/game/objects/items/singularityhammer.dm b/code/game/objects/items/singularityhammer.dm
index 3eef88fb41..a0a9783519 100644
--- a/code/game/objects/items/singularityhammer.dm
+++ b/code/game/objects/items/singularityhammer.dm
@@ -58,7 +58,8 @@
return
/obj/item/twohanded/singularityhammer/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(wielded)
if(charged == 5)
charged = 0
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 2bb5d110fc..8c36a5965f 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -274,6 +274,9 @@ GLOBAL_LIST_INIT(titanium_recipes, list ( \
recipes = GLOB.titanium_recipes
. = ..()
+/obj/item/stack/sheet/mineral/titanium/fifty
+ amount = 50
+
/*
* Plastitanium
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 5f254d759d..5eb85379b7 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -256,6 +256,18 @@ GLOBAL_LIST_INIT(cardboard_recipes, list ( \
/obj/item/stack/sheet/cardboard/fifty
amount = 50
+/obj/item/stack/sheet/cardboard/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/stamp/clown) && !istype(loc, /obj/item/storage))
+ var/atom/droploc = drop_location()
+ if(use(1))
+ playsound(I, 'sound/items/bikehorn.ogg', 50, 1, -1)
+ to_chat(user, "You stamp the cardboard! Its a clown box! Honk!")
+ if (amount >= 0)
+ new/obj/item/storage/box/clown(droploc) //bugfix
+ else
+ . = ..()
+
+
/*
* Runed Metal
*/
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 7cef6094ea..89fdc6d694 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -136,7 +136,8 @@
if (usr.restrained() || usr.stat || usr.get_active_held_item() != src)
return
if (href_list["make"])
- if (get_amount() < 1) qdel(src) //Never should happen
+ if (get_amount() < 1)
+ qdel(src) //Never should happen
var/datum/stack_recipe/R = recipes[text2num(href_list["make"])]
var/multiplier = text2num(href_list["multiplier"])
@@ -168,6 +169,11 @@
W.ini_dir = W.dir
//END: oh fuck i'm so sorry
+ else if(istype(O, /obj/item/restraints/handcuffs/cable))
+ var/obj/item/cuffs = O
+ cuffs.item_color = item_color
+ cuffs.update_icon()
+
if (QDELETED(O))
return //It's a stack and has already been merged
@@ -244,6 +250,7 @@
S.copy_evidences(src)
use(transfer, TRUE)
S.add(transfer)
+ return transfer
/obj/item/stack/Crossed(obj/o)
if(istype(o, merge_type) && !o.throwing)
@@ -259,7 +266,7 @@
if (user.get_inactive_held_item() == src)
if(zero_amount())
return
- change_stack(user,1)
+ return change_stack(user,1)
else
..()
@@ -298,8 +305,8 @@
/obj/item/stack/attackby(obj/item/W, mob/user, params)
if(istype(W, merge_type))
var/obj/item/stack/S = W
- merge(S)
- to_chat(user, "Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.")
+ if(merge(S))
+ to_chat(user, "Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s.")
else
. = ..()
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 4cb4b6e8d6..87978ac58e 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -23,15 +23,15 @@
if(isitem(I) && I.hidden_uplink && I.hidden_uplink.active) //No metagaming by using this on every PDA around just to see if it gets used up.
I.hidden_uplink.telecrystals += amount
use(amount)
- to_chat(user, "You slot [src] into the [I] and charge its internal uplink.")
+ to_chat(user, "You slot [src] into [I] and charge its internal uplink.")
else if(istype(I, /obj/item/cartridge/virus/frame))
var/obj/item/cartridge/virus/frame/cart = I
if(!cart.charges)
- to_chat(user, "The [cart] is out of charges, it's refusing to accept the [src]")
+ to_chat(user, "[cart] is out of charges, it's refusing to accept [src].")
return
cart.telecrystals += amount
use(amount)
- to_chat(user, "You slot [src] into the [cart]. The next time it's used, it will also give telecrystals")
+ to_chat(user, "You slot [src] into [cart]. The next time it's used, it will also give telecrystals.")
/obj/item/stack/telecrystal/five
amount = 5
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 2428524383..2e11600d65 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -309,7 +309,7 @@
/obj/item/storage/backpack/satchel/flat/secret/Initialize()
. = ..()
- if(isfloorturf(loc) && !istype(loc, /turf/open/floor/plating/))
+ if(isfloorturf(loc) && !isplatingturf(loc))
hide(1)
/obj/item/storage/backpack/satchel/flat/secret/hide(intact)
@@ -518,7 +518,7 @@
new /obj/item/ammo_box/foambox/riot(src)
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle
- desc = "A large duffel bag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes"
+ desc = "A large duffel bag containing a deadly chemicals, a chemical spray, chemical grenade, a Donksoft assault rifle, riot grade darts, a minature syringe gun, and a box of syringes."
/obj/item/storage/backpack/duffelbag/syndie/med/bioterrorbundle/PopulateContents()
new /obj/item/reagent_containers/spray/chemsprayer/bioterror(src)
diff --git a/code/game/objects/items/storage/bags.dm b/code/game/objects/items/storage/bags.dm
index 638313386e..944604c6ac 100644
--- a/code/game/objects/items/storage/bags.dm
+++ b/code/game/objects/items/storage/bags.dm
@@ -173,7 +173,8 @@
// Modified handle_item_insertion. Would prefer not to, but...
/obj/item/storage/bag/sheetsnatcher/handle_item_insertion(obj/item/W, prevent_warning = 0)
var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
+ if(!istype(S))
+ return 0
var/amount
var/inserted = 0
@@ -254,7 +255,8 @@
// Instead of removing
/obj/item/storage/bag/sheetsnatcher/remove_from_storage(obj/item/W, atom/new_location)
var/obj/item/stack/sheet/S = W
- if(!istype(S)) return 0
+ if(!istype(S))
+ return 0
//I would prefer to drop a new stack, but the item/attack_hand code
// that calls this can't recieve a different object than you clicked on.
diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm
index 0266a65723..848010d68f 100644
--- a/code/game/objects/items/storage/belt.dm
+++ b/code/game/objects/items/storage/belt.dm
@@ -250,7 +250,7 @@
/obj/item/storage/belt/soulstone
name = "soul stone belt"
- desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
+ desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away."
icon_state = "soulstonebelt"
item_state = "soulstonebelt"
storage_slots = 6
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 313988b7d4..26ea13cb04 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -607,6 +607,29 @@
playsound(loc, "rustle", 50, 1, -5)
user.visible_message("[user] hugs \the [src].","You hug \the [src].")
+/////clown box & honkbot assembly
+obj/item/storage/box/clown
+ name = "clown box"
+ desc = "A colorful cardboard box for the clown"
+ icon_state = "clownbox"
+ illustration = null
+
+/obj/item/storage/box/clown/attackby(obj/item/I, mob/user, params)
+ if((istype(I, /obj/item/bodypart/l_arm/robot)) || (istype(I, /obj/item/bodypart/r_arm/robot)))
+ if(contents.len) //prevent accidently deleting contents
+ to_chat(user, "You need to empty [src] out first!")
+ return
+ if(!user.temporarilyRemoveItemFromInventory(I))
+ return
+ qdel(I)
+ to_chat(user, "You add some wheels to the [src]! You've got an honkbot assembly now! Honk!")
+ var/obj/item/honkbot_assembly/A = new
+ qdel(src)
+ user.put_in_hands(A)
+ else
+ return ..()
+
+//////
/obj/item/storage/box/hug/medical/PopulateContents()
new /obj/item/stack/medical/bruise_pack(src)
new /obj/item/stack/medical/ointment(src)
@@ -681,7 +704,7 @@
if(istype(W, /obj/item/pen))
//if a pen is used on the sack, dialogue to change its design appears
if(contents.len)
- to_chat(user, "You can't modify this [src] with items still inside!")
+ to_chat(user, "You can't modify [src] with items still inside!")
return
var/list/designs = list(NODESIGN, NANOTRASEN, SYNDI, HEART, SMILE, "Cancel")
var/switchDesign = input("Select a Design:", "Paper Sack Design", designs[1]) in designs
@@ -691,7 +714,7 @@
var/choice = designs.Find(switchDesign)
if(design == designs[choice] || designs[choice] == "Cancel")
return 0
- to_chat(usr, "You make some modifications to the [src] using your pen.")
+ to_chat(usr, "You make some modifications to [src] using your pen.")
design = designs[choice]
icon_state = "paperbag_[design]"
item_state = "paperbag_[design]"
@@ -710,12 +733,12 @@
else if(W.is_sharp())
if(!contents.len)
if(item_state == "paperbag_None")
- user.show_message("You cut eyeholes into the [src].", 1)
+ user.show_message("You cut eyeholes into [src].", 1)
new /obj/item/clothing/head/papersack(user.loc)
qdel(src)
return 0
else if(item_state == "paperbag_SmileyFace")
- user.show_message("You cut eyeholes into the [src] and modify the design.", 1)
+ user.show_message("You cut eyeholes into [src] and modify the design.", 1)
new /obj/item/clothing/head/papersack/smiley(user.loc)
qdel(src)
return 0
@@ -730,7 +753,7 @@
/obj/item/storage/box/ingredients //This box is for the randomely chosen version the chef spawns with, it shouldn't actually exist.
name = "ingredients box"
illustration = "fruit"
- var/theme_name
+ var/theme_name
/obj/item/storage/box/ingredients/Initialize()
. = ..()
diff --git a/code/game/objects/items/storage/fancy.dm b/code/game/objects/items/storage/fancy.dm
index a37ea9f8cf..d21e6988f2 100644
--- a/code/game/objects/items/storage/fancy.dm
+++ b/code/game/objects/items/storage/fancy.dm
@@ -27,10 +27,9 @@
for(var/i = 1 to storage_slots)
new spawn_type(src)
-/obj/item/storage/fancy/update_icon(itemremoved = 0)
+/obj/item/storage/fancy/update_icon()
if(fancy_open)
- var/total_contents = src.contents.len - itemremoved
- icon_state = "[icon_type]box[total_contents]"
+ icon_state = "[icon_type]box[contents.len]"
else
icon_state = "[icon_type]box"
@@ -38,9 +37,9 @@
..()
if(fancy_open)
if(contents.len == 1)
- to_chat(user, "There is one [src.icon_type] left.")
+ to_chat(user, "There is one [icon_type] left.")
else
- to_chat(user, "There are [contents.len <= 0 ? "no" : "[src.contents.len]"] [src.icon_type]s left.")
+ to_chat(user, "There are [contents.len <= 0 ? "no" : "[contents.len]"] [icon_type]s left.")
/obj/item/storage/fancy/attack_self(mob/user)
fancy_open = !fancy_open
@@ -58,9 +57,7 @@
/obj/item/storage/fancy/remove_from_storage(obj/item/W, atom/new_location, burn = 0)
fancy_open = TRUE
- . = ..()
- //Recall update icon with the fancy item snowflake arg (ugh)
- update_icon(1)
+ return ..()
/*
* Donut Box
diff --git a/code/game/objects/items/storage/lockbox.dm b/code/game/objects/items/storage/lockbox.dm
index 50898e72e1..195d5b25f5 100644
--- a/code/game/objects/items/storage/lockbox.dm
+++ b/code/game/objects/items/storage/lockbox.dm
@@ -128,11 +128,12 @@
if(!locked)
to_chat(user, "Alt-click to [open ? "close":"open"] it.")
-/obj/item/storage/lockbox/medal/AltClick()
- if(!locked)
- open = (open ? FALSE : TRUE)
- update_icon()
- ..()
+/obj/item/storage/lockbox/medal/AltClick(mob/user)
+ if(user.canUseTopic(src, be_close=TRUE))
+ if(!locked)
+ open = (open ? FALSE : TRUE)
+ update_icon()
+ ..()
/obj/item/storage/lockbox/medal/PopulateContents()
new /obj/item/clothing/accessory/medal/gold/captain(src)
diff --git a/code/game/objects/items/stunbaton.dm b/code/game/objects/items/stunbaton.dm
index ef2af5381b..92d00d9e2d 100644
--- a/code/game/objects/items/stunbaton.dm
+++ b/code/game/objects/items/stunbaton.dm
@@ -1,202 +1,202 @@
-/obj/item/melee/baton
- name = "stunbaton"
- desc = "A stun baton for incapacitating people with."
- icon_state = "stunbaton"
- item_state = "baton"
- lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
- slot_flags = SLOT_BELT
- force = 10
- throwforce = 7
- w_class = WEIGHT_CLASS_NORMAL
- origin_tech = "combat=2"
- attack_verb = list("beaten")
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 50, bio = 0, rad = 0, fire = 80, acid = 80)
-
- var/stunforce = 140
- var/status = 0
- var/obj/item/stock_parts/cell/high/cell
- var/hitcost = 1000
- var/throw_hit_chance = 35
-
-/obj/item/melee/baton/get_cell()
- return cell
-
-/obj/item/melee/baton/suicide_act(mob/user)
- user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!")
- return (FIRELOSS)
-
-/obj/item/melee/baton/Initialize()
- . = ..()
- update_icon()
-
-/obj/item/melee/baton/throw_impact(atom/hit_atom)
- ..()
- //Only mob/living types have stun handling
- if(status && prob(throw_hit_chance) && iscarbon(hit_atom))
- baton_stun(hit_atom)
-
-/obj/item/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
- cell = new(src)
- update_icon()
- . = ..()
-
-/obj/item/melee/baton/proc/deductcharge(chrgdeductamt)
- if(cell)
- //Note this value returned is significant, as it will determine
- //if a stun is applied or not
- . = cell.use(chrgdeductamt)
- if(status && cell.charge < hitcost)
- //we're below minimum, turn off
- status = 0
- update_icon()
- playsound(loc, "sparks", 75, 1, -1)
-
-
-/obj/item/melee/baton/update_icon()
- if(status)
- icon_state = "[initial(name)]_active"
- else if(!cell)
- icon_state = "[initial(name)]_nocell"
- else
- icon_state = "[initial(name)]"
-
-/obj/item/melee/baton/examine(mob/user)
- ..()
- if(cell)
- to_chat(user, "The baton is [round(cell.percent())]% charged.")
- else
- to_chat(user, "The baton does not have a power source installed.")
-
-/obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/stock_parts/cell))
- var/obj/item/stock_parts/cell/C = W
- if(cell)
- to_chat(user, "[src] already has a cell.")
- else
- if(C.maxcharge < hitcost)
- to_chat(user, "[src] requires a higher capacity cell.")
- return
- if(!user.transferItemToLoc(W, src))
- return
- cell = W
- to_chat(user, "You install a cell in [src].")
- update_icon()
-
- else if(istype(W, /obj/item/screwdriver))
- if(cell)
- cell.update_icon()
- cell.forceMove(get_turf(src))
- cell = null
- to_chat(user, "You remove the cell from [src].")
- status = 0
- update_icon()
- else
- return ..()
-
-/obj/item/melee/baton/attack_self(mob/user)
- if(cell && cell.charge > hitcost)
- status = !status
- to_chat(user, "[src] is now [status ? "on" : "off"].")
- playsound(loc, "sparks", 75, 1, -1)
- else
- status = 0
- if(!cell)
- to_chat(user, "[src] does not have a power source!")
- else
- to_chat(user, "[src] is out of charge.")
- update_icon()
- add_fingerprint(user)
-
-/obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
- if(status && user.disabilities & CLUMSY && prob(50))
- user.visible_message("[user] accidentally hits themself with [src]!", \
- "You accidentally hit yourself with [src]!")
- user.Knockdown(stunforce*3)
- deductcharge(hitcost)
- return
-
- if(iscyborg(M))
- ..()
- return
-
-
- if(ishuman(M))
- var/mob/living/carbon/human/L = M
- if(check_martial_counter(L, user))
- return
-
- if(user.a_intent != INTENT_HARM)
- if(status)
- if(baton_stun(M, user))
- user.do_attack_animation(M)
- return
- else
- M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \
- "[user] has prodded you with [src]. Luckily it was off")
- else
- if(status)
- baton_stun(M, user)
- ..()
-
-
-/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user)
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
- playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
- return 0
- if(iscyborg(loc))
- var/mob/living/silicon/robot/R = loc
- if(!R || !R.cell || !R.cell.use(hitcost))
- return 0
- else
- if(!deductcharge(hitcost))
- return 0
-
- L.Knockdown(stunforce)
- L.apply_effect(STUTTER, stunforce)
- if(user)
- user.lastattacked = L
- L.lastattacker = user
- L.visible_message("[user] has stunned [L] with [src]!", \
- "[user] has stunned you with [src]!")
- add_logs(user, L, "stunned")
-
- playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
-
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
- H.forcesay(GLOB.hit_appends)
-
-
- return 1
-
-/obj/item/melee/baton/emp_act(severity)
- deductcharge(1000 / severity)
- ..()
-
-//Makeshift stun baton. Replacement for stun gloves.
-/obj/item/melee/baton/cattleprod
- name = "stunprod"
- desc = "An improvised stun baton."
- icon_state = "stunprod_nocell"
- item_state = "prod"
- lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
- w_class = WEIGHT_CLASS_BULKY
- force = 3
- throwforce = 5
- stunforce = 100
- hitcost = 2000
- throw_hit_chance = 10
- slot_flags = SLOT_BACK
- var/obj/item/device/assembly/igniter/sparkler = 0
-
-/obj/item/melee/baton/cattleprod/Initialize()
- . = ..()
- sparkler = new (src)
-
-/obj/item/melee/baton/cattleprod/baton_stun()
- if(sparkler.activate())
- ..()
+/obj/item/melee/baton
+ name = "stunbaton"
+ desc = "A stun baton for incapacitating people with."
+ icon_state = "stunbaton"
+ item_state = "baton"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ slot_flags = SLOT_BELT
+ force = 10
+ throwforce = 7
+ w_class = WEIGHT_CLASS_NORMAL
+ origin_tech = "combat=2"
+ attack_verb = list("beaten")
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 50, bio = 0, rad = 0, fire = 80, acid = 80)
+
+ var/stunforce = 140
+ var/status = 0
+ var/obj/item/stock_parts/cell/high/cell
+ var/hitcost = 1000
+ var/throw_hit_chance = 35
+
+/obj/item/melee/baton/get_cell()
+ return cell
+
+/obj/item/melee/baton/suicide_act(mob/user)
+ user.visible_message("[user] is putting the live [name] in [user.p_their()] mouth! It looks like [user.p_theyre()] trying to commit suicide!")
+ return (FIRELOSS)
+
+/obj/item/melee/baton/Initialize()
+ . = ..()
+ update_icon()
+
+/obj/item/melee/baton/throw_impact(atom/hit_atom)
+ ..()
+ //Only mob/living types have stun handling
+ if(status && prob(throw_hit_chance) && iscarbon(hit_atom))
+ baton_stun(hit_atom)
+
+/obj/item/melee/baton/loaded/Initialize() //this one starts with a cell pre-installed.
+ cell = new(src)
+ update_icon()
+ . = ..()
+
+/obj/item/melee/baton/proc/deductcharge(chrgdeductamt)
+ if(cell)
+ //Note this value returned is significant, as it will determine
+ //if a stun is applied or not
+ . = cell.use(chrgdeductamt)
+ if(status && cell.charge < hitcost)
+ //we're below minimum, turn off
+ status = 0
+ update_icon()
+ playsound(loc, "sparks", 75, 1, -1)
+
+
+/obj/item/melee/baton/update_icon()
+ if(status)
+ icon_state = "[initial(name)]_active"
+ else if(!cell)
+ icon_state = "[initial(name)]_nocell"
+ else
+ icon_state = "[initial(name)]"
+
+/obj/item/melee/baton/examine(mob/user)
+ ..()
+ if(cell)
+ to_chat(user, "The baton is [round(cell.percent())]% charged.")
+ else
+ to_chat(user, "The baton does not have a power source installed.")
+
+/obj/item/melee/baton/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/stock_parts/cell))
+ var/obj/item/stock_parts/cell/C = W
+ if(cell)
+ to_chat(user, "[src] already has a cell.")
+ else
+ if(C.maxcharge < hitcost)
+ to_chat(user, "[src] requires a higher capacity cell.")
+ return
+ if(!user.transferItemToLoc(W, src))
+ return
+ cell = W
+ to_chat(user, "You install a cell in [src].")
+ update_icon()
+
+ else if(istype(W, /obj/item/screwdriver))
+ if(cell)
+ cell.update_icon()
+ cell.forceMove(get_turf(src))
+ cell = null
+ to_chat(user, "You remove the cell from [src].")
+ status = 0
+ update_icon()
+ else
+ return ..()
+
+/obj/item/melee/baton/attack_self(mob/user)
+ if(cell && cell.charge > hitcost)
+ status = !status
+ to_chat(user, "[src] is now [status ? "on" : "off"].")
+ playsound(loc, "sparks", 75, 1, -1)
+ else
+ status = 0
+ if(!cell)
+ to_chat(user, "[src] does not have a power source!")
+ else
+ to_chat(user, "[src] is out of charge.")
+ update_icon()
+ add_fingerprint(user)
+
+/obj/item/melee/baton/attack(mob/M, mob/living/carbon/human/user)
+ if(status && user.disabilities & CLUMSY && prob(50))
+ user.visible_message("[user] accidentally hits themself with [src]!", \
+ "You accidentally hit yourself with [src]!")
+ user.Knockdown(stunforce*3)
+ deductcharge(hitcost)
+ return
+
+ if(iscyborg(M))
+ ..()
+ return
+
+
+ if(ishuman(M))
+ var/mob/living/carbon/human/L = M
+ if(check_martial_counter(L, user))
+ return
+
+ if(user.a_intent != INTENT_HARM)
+ if(status)
+ if(baton_stun(M, user))
+ user.do_attack_animation(M)
+ return
+ else
+ M.visible_message("[user] has prodded [M] with [src]. Luckily it was off.", \
+ "[user] has prodded you with [src]. Luckily it was off")
+ else
+ if(status)
+ baton_stun(M, user)
+ ..()
+
+
+/obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user)
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ if(H.check_shields(src, 0, "[user]'s [name]", MELEE_ATTACK)) //No message; check_shields() handles that
+ playsound(L, 'sound/weapons/genhit.ogg', 50, 1)
+ return 0
+ if(iscyborg(loc))
+ var/mob/living/silicon/robot/R = loc
+ if(!R || !R.cell || !R.cell.use(hitcost))
+ return 0
+ else
+ if(!deductcharge(hitcost))
+ return 0
+
+ L.Knockdown(stunforce)
+ L.apply_effect(STUTTER, stunforce)
+ if(user)
+ L.lastattacker = user.real_name
+ L.lastattackerckey = user.ckey
+ L.visible_message("[user] has stunned [L] with [src]!", \
+ "[user] has stunned you with [src]!")
+ add_logs(user, L, "stunned")
+
+ playsound(loc, 'sound/weapons/egloves.ogg', 50, 1, -1)
+
+ if(ishuman(L))
+ var/mob/living/carbon/human/H = L
+ H.forcesay(GLOB.hit_appends)
+
+
+ return 1
+
+/obj/item/melee/baton/emp_act(severity)
+ deductcharge(1000 / severity)
+ ..()
+
+//Makeshift stun baton. Replacement for stun gloves.
+/obj/item/melee/baton/cattleprod
+ name = "stunprod"
+ desc = "An improvised stun baton."
+ icon_state = "stunprod_nocell"
+ item_state = "prod"
+ lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi'
+ w_class = WEIGHT_CLASS_BULKY
+ force = 3
+ throwforce = 5
+ stunforce = 100
+ hitcost = 2000
+ throw_hit_chance = 10
+ slot_flags = SLOT_BACK
+ var/obj/item/device/assembly/igniter/sparkler = 0
+
+/obj/item/melee/baton/cattleprod/Initialize()
+ . = ..()
+ sparkler = new (src)
+
+/obj/item/melee/baton/cattleprod/baton_stun()
+ if(sparkler.activate())
+ ..()
diff --git a/code/game/objects/items/tanks/jetpack.dm b/code/game/objects/items/tanks/jetpack.dm
index 63e9e0bb55..6946fa4a6d 100644
--- a/code/game/objects/items/tanks/jetpack.dm
+++ b/code/game/objects/items/tanks/jetpack.dm
@@ -8,7 +8,7 @@
w_class = WEIGHT_CLASS_BULKY
distribute_pressure = ONE_ATMOSPHERE * O2STANDARD
actions_types = list(/datum/action/item_action/set_internals, /datum/action/item_action/toggle_jetpack, /datum/action/item_action/jetpack_stabilization)
- var/gas_type = "o2"
+ var/gas_type = /datum/gas/oxygen
var/on = FALSE
var/stabilizers = FALSE
var/full_speed = TRUE // If the jetpack will have a speedboost in space/nograv or not
@@ -128,7 +128,7 @@
icon_state = "jetpack-black"
item_state = "jetpack-black"
distribute_pressure = 0
- gas_type = "co2"
+ gas_type = /datum/gas/carbon_dioxide
/obj/item/tank/jetpack/suit
diff --git a/code/game/objects/items/tanks/tank_types.dm b/code/game/objects/items/tanks/tank_types.dm
index 146693dd05..c6b6b1edf4 100644
--- a/code/game/objects/items/tanks/tank_types.dm
+++ b/code/game/objects/items/tanks/tank_types.dm
@@ -21,8 +21,8 @@
/obj/item/tank/internals/oxygen/New()
..()
- ASSERT_GAS("o2", air_contents)
- air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ ASSERT_GAS(/datum/gas/oxygen, air_contents)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -49,9 +49,9 @@
/obj/item/tank/internals/anesthetic/New()
..()
- air_contents.assert_gases("o2", "n2o")
- air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases["n2o"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrous_oxide)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gases[/datum/gas/nitrous_oxide][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
return
/*
@@ -67,9 +67,9 @@
/obj/item/tank/internals/air/New()
..()
- air_contents.assert_gases("o2","n2")
- air_contents.gases["o2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
- air_contents.gases["n2"][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
+ air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * O2STANDARD
+ air_contents.gases[/datum/gas/nitrogen][MOLES] = (6*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C) * N2STANDARD
return
@@ -87,8 +87,8 @@
/obj/item/tank/internals/plasma/New()
..()
- ASSERT_GAS("plasma", air_contents)
- air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ ASSERT_GAS(/datum/gas/plasma, air_contents)
+ air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
/obj/item/tank/internals/plasma/attackby(obj/item/W, mob/user, params)
@@ -106,7 +106,7 @@
/obj/item/tank/internals/plasma/full/New()
..() // Plasma asserted in parent
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -124,13 +124,13 @@
/obj/item/tank/internals/plasmaman/New()
..()
- ASSERT_GAS("plasma", air_contents)
- air_contents.gases["plasma"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ ASSERT_GAS(/datum/gas/plasma, air_contents)
+ air_contents.gases[/datum/gas/plasma][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
/obj/item/tank/internals/plasmaman/full/New()
..() // Plasma asserted in parent
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -144,7 +144,7 @@
/obj/item/tank/internals/plasmaman/belt/full/New()
..() // Plasma asserted in parent
- air_contents.gases["plasma"][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ air_contents.gases[/datum/gas/plasma][MOLES] = (10*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
@@ -166,8 +166,8 @@
/obj/item/tank/internals/emergency_oxygen/New()
..()
- ASSERT_GAS("o2", air_contents)
- air_contents.gases["o2"][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
+ ASSERT_GAS(/datum/gas/oxygen, air_contents)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = (3*ONE_ATMOSPHERE)*volume/(R_IDEAL_GAS_EQUATION*T20C)
return
/obj/item/tank/internals/emergency_oxygen/engi
diff --git a/code/game/objects/items/tanks/tanks.dm b/code/game/objects/items/tanks/tanks.dm
index 7628617923..513bdd2474 100644
--- a/code/game/objects/items/tanks/tanks.dm
+++ b/code/game/objects/items/tanks/tanks.dm
@@ -31,7 +31,7 @@
H.internal = null
H.update_internals_hud_icon(0)
else
- if(!H.getorganslot("breathing_tube"))
+ if(!H.getorganslot(ORGAN_SLOT_BREATHING_TUBE))
if(!H.wear_mask)
to_chat(H, "You need a mask!")
return
@@ -71,7 +71,8 @@
if (istype(src.loc, /obj/item/assembly))
icon = src.loc
if(!in_range(src, user))
- if (icon == src) to_chat(user, "If you want any more information you'll need to get closer.")
+ if (icon == src)
+ to_chat(user, "If you want any more information you'll need to get closer.")
return
to_chat(user, "The pressure gauge reads [round(src.air_contents.return_pressure(),0.01)] kPa.")
diff --git a/code/game/objects/items/teleportation.dm b/code/game/objects/items/teleportation.dm
index bc1a4aa321..2b3cad20ef 100644
--- a/code/game/objects/items/teleportation.dm
+++ b/code/game/objects/items/teleportation.dm
@@ -1,222 +1,230 @@
-
-#define SOURCE_PORTAL 1
-#define DESTINATION_PORTAL 2
-
-/* Teleportation devices.
- * Contains:
- * Locator
- * Hand-tele
- */
-
-/*
- * Locator
- */
-/obj/item/locator
- name = "locator"
- desc = "Used to track those with locater implants."
- icon = 'icons/obj/device.dmi'
- icon_state = "locator"
- var/temp = null
- var/frequency = 1451
- var/broadcasting = null
- var/listening = 1
- flags_1 = CONDUCT_1
- w_class = WEIGHT_CLASS_SMALL
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- throw_speed = 3
- throw_range = 7
- materials = list(MAT_METAL=400)
- origin_tech = "magnets=3;bluespace=2"
-
-/obj/item/locator/attack_self(mob/user)
- user.set_machine(src)
- var/dat
- if (src.temp)
- dat = "[src.temp]
Clear"
- else
- dat = {"
-Persistent Signal Locator
-Frequency:
--
-- [format_frequency(src.frequency)]
-+
-+
-
-Refresh"}
- user << browse(dat, "window=radio")
- onclose(user, "radio")
- return
-
-/obj/item/locator/Topic(href, href_list)
- ..()
- if (usr.stat || usr.restrained())
- return
- var/turf/current_location = get_turf(usr)//What turf is the user on?
- if(!current_location||current_location.z==2)//If turf was not found or they're on z level 2.
- to_chat(usr, "The [src] is malfunctioning.")
- return
- if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)))
- usr.set_machine(src)
- if (href_list["refresh"])
- src.temp = "Persistent Signal Locator"
- var/turf/sr = get_turf(src)
-
- if (sr)
- src.temp += "Located Beacons: "
-
- for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
- if (W.frequency == src.frequency)
- var/turf/tr = get_turf(W)
- if (tr.z == sr.z && tr)
- var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
- if (direct < 5)
- direct = "very strong"
- else
- if (direct < 10)
- direct = "strong"
- else
- if (direct < 20)
- direct = "weak"
- else
- direct = "very weak"
- src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct] "
-
- src.temp += "Extranneous Signals: "
- for (var/obj/item/implant/tracking/W in GLOB.tracked_implants)
- if (!W.imp_in || !ismob(W.loc))
- continue
- else
- var/mob/M = W.loc
- if (M.stat == DEAD)
- if (M.timeofdeath + 6000 < world.time)
- continue
-
- var/turf/tr = get_turf(W)
- if (tr.z == sr.z && tr)
- var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
- if (direct < 20)
- if (direct < 5)
- direct = "very strong"
- else
- if (direct < 10)
- direct = "strong"
- else
- direct = "weak"
- src.temp += "[W.imp_in.name]-[dir2text(get_dir(sr, tr))]-[direct] "
-
- src.temp += "You are at \[[sr.x],[sr.y],[sr.z]\] in orbital coordinates.
Refresh "
- else
- src.temp += "Processing Error: Unable to locate orbital position. "
- else
- if (href_list["freq"])
- src.frequency += text2num(href_list["freq"])
- src.frequency = sanitize_frequency(src.frequency)
- else
- if (href_list["temp"])
- src.temp = null
- if (ismob(src.loc))
- attack_self(src.loc)
- else
- for(var/mob/M in viewers(1, src))
- if (M.client)
- src.attack_self(M)
- return
-
-
-/*
- * Hand-tele
- */
-/obj/item/hand_tele
- name = "hand tele"
- desc = "A portable item using blue-space technology."
- icon = 'icons/obj/device.dmi'
- icon_state = "hand_tele"
- item_state = "electronic"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
- throwforce = 0
- w_class = WEIGHT_CLASS_SMALL
- throw_speed = 3
- throw_range = 5
- materials = list(MAT_METAL=10000)
- origin_tech = "magnets=3;bluespace=4"
- armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
- resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
- var/list/active_portal_pairs
- var/max_portal_pairs = 3
-
-/obj/item/hand_tele/Initialize()
- . = ..()
- active_portal_pairs = list()
-
-/obj/item/hand_tele/afterattack(atom/target, mob/user, proximity, params)
- if(is_parent_of_portal(target))
- qdel(target)
- to_chat(user, "You dispel [target] remotely with \the [src]!")
- return ..()
-
-
-/obj/item/hand_tele/attack_self(mob/user)
- var/turf/current_location = get_turf(user)//What turf is the user on?
- var/area/current_area = current_location.loc
- if(!current_location || current_area.noteleport || current_location.z > ZLEVEL_SPACEMAX || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
- to_chat(user, "\The [src] is malfunctioning.")
- return
- var/list/L = list( )
- for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
- if(com.target)
- var/area/A = get_area(com.target)
- if(!A || A.noteleport)
- continue
- if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
- L["[get_area(com.target)] (Active)"] = com.target
- else
- L["[get_area(com.target)] (Inactive)"] = com.target
- var/list/turfs = list( )
- for(var/turf/T in urange(10, orange=1))
- if(T.x>world.maxx-8 || T.x<8)
- continue //putting them at the edge is dumb
- if(T.y>world.maxy-8 || T.y<8)
- continue
- var/area/A = T.loc
- if(A.noteleport)
- continue
- turfs += T
- if(turfs.len)
- L["None (Dangerous)"] = pick(turfs)
- var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") as null|anything in L
- if (!t1 || user.get_active_held_item() != src || user.incapacitated())
- return
- if(active_portal_pairs.len >= max_portal_pairs)
- user.show_message("\The [src] is recharging!")
- return
- var/atom/T = L[t1]
- var/area/A = get_area(T)
- if(A.noteleport)
- to_chat(user, "\The [src] is malfunctioning.")
- return
- user.show_message("Locked In.", 2)
- var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1)
- if(!(LAZYLEN(created) == 2))
- return
- try_move_adjacent(created[1])
- active_portal_pairs[created[1]] = created[2]
- var/obj/effect/portal/c1 = created[1]
- var/obj/effect/portal/c2 = created[2]
- investigate_log("was used by [key_name(user)] at [COORD(user)] to create a portal pair with destinations [COORD(c1)] and [COORD(c2)].", INVESTIGATE_PORTAL)
- add_fingerprint(user)
-
-/obj/item/hand_tele/proc/on_portal_destroy(obj/effect/portal/P)
- active_portal_pairs -= P //If this portal pair is made by us it'll be erased along with the other portal by the portal.
-
-/obj/item/hand_tele/proc/is_parent_of_portal(obj/effect/portal/P)
- if(!istype(P))
- return FALSE
- if(active_portal_pairs[P])
- return SOURCE_PORTAL
- for(var/i in active_portal_pairs)
- if(active_portal_pairs[i] == P)
- return DESTINATION_PORTAL
- return FALSE
+#define SOURCE_PORTAL 1
+#define DESTINATION_PORTAL 2
+
+/* Teleportation devices.
+ * Contains:
+ * Locator
+ * Hand-tele
+ */
+
+/*
+ * Locator
+ */
+/obj/item/locator
+ name = "locator"
+ desc = "Used to track those with locater implants."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "locator"
+ var/temp = null
+ var/frequency = 1451
+ var/broadcasting = null
+ var/listening = 1
+ flags_1 = CONDUCT_1
+ w_class = WEIGHT_CLASS_SMALL
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ throw_speed = 3
+ throw_range = 7
+ materials = list(MAT_METAL=400)
+ origin_tech = "magnets=3;bluespace=2"
+
+/obj/item/locator/attack_self(mob/user)
+ user.set_machine(src)
+ var/dat
+ if (src.temp)
+ dat = "[src.temp]
Clear"
+ else
+ dat = {"
+Persistent Signal Locator
+Frequency:
+-
+- [format_frequency(src.frequency)]
++
++
+
+Refresh"}
+ user << browse(dat, "window=radio")
+ onclose(user, "radio")
+ return
+
+/obj/item/locator/Topic(href, href_list)
+ ..()
+ if (usr.stat || usr.restrained())
+ return
+ var/turf/current_location = get_turf(usr)//What turf is the user on?
+ if(!current_location || current_location.z == ZLEVEL_CENTCOM)//If turf was not found or they're on CentCom
+ to_chat(usr, "[src] is malfunctioning.")
+ return
+ if(usr.contents.Find(src) || (in_range(src, usr) && isturf(loc)))
+ usr.set_machine(src)
+ if (href_list["refresh"])
+ src.temp = "Persistent Signal Locator"
+ var/turf/sr = get_turf(src)
+
+ if (sr)
+ src.temp += "Located Beacons: "
+
+ for(var/obj/item/device/radio/beacon/W in GLOB.teleportbeacons)
+ if (W.frequency == src.frequency)
+ var/turf/tr = get_turf(W)
+ if (tr.z == sr.z && tr)
+ var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
+ if (direct < 5)
+ direct = "very strong"
+ else
+ if (direct < 10)
+ direct = "strong"
+ else
+ if (direct < 20)
+ direct = "weak"
+ else
+ direct = "very weak"
+ src.temp += "[W.code]-[dir2text(get_dir(sr, tr))]-[direct] "
+
+ src.temp += "Extranneous Signals: "
+ for (var/obj/item/implant/tracking/W in GLOB.tracked_implants)
+ if (!W.imp_in || !ismob(W.loc))
+ continue
+ else
+ var/mob/M = W.loc
+ if (M.stat == DEAD)
+ if (M.timeofdeath + 6000 < world.time)
+ continue
+
+ var/turf/tr = get_turf(W)
+ if (tr.z == sr.z && tr)
+ var/direct = max(abs(tr.x - sr.x), abs(tr.y - sr.y))
+ if (direct < 20)
+ if (direct < 5)
+ direct = "very strong"
+ else
+ if (direct < 10)
+ direct = "strong"
+ else
+ direct = "weak"
+ src.temp += "[W.imp_in.name]-[dir2text(get_dir(sr, tr))]-[direct] "
+
+ src.temp += "You are at \[[sr.x],[sr.y],[sr.z]\] in orbital coordinates.
Refresh "
+ else
+ src.temp += "Processing Error: Unable to locate orbital position. "
+ else
+ if (href_list["freq"])
+ src.frequency += text2num(href_list["freq"])
+ src.frequency = sanitize_frequency(src.frequency)
+ else
+ if (href_list["temp"])
+ src.temp = null
+ if (ismob(src.loc))
+ attack_self(src.loc)
+ else
+ for(var/mob/M in viewers(1, src))
+ if (M.client)
+ src.attack_self(M)
+ return
+
+
+/*
+ * Hand-tele
+ */
+/obj/item/hand_tele
+ name = "hand tele"
+ desc = "A portable item using blue-space technology."
+ icon = 'icons/obj/device.dmi'
+ icon_state = "hand_tele"
+ item_state = "electronic"
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ throwforce = 0
+ w_class = WEIGHT_CLASS_SMALL
+ throw_speed = 3
+ throw_range = 5
+ materials = list(MAT_METAL=10000)
+ origin_tech = "magnets=3;bluespace=4"
+ armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100)
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+ var/list/active_portal_pairs
+ var/max_portal_pairs = 3
+
+/obj/item/hand_tele/Initialize()
+ . = ..()
+ active_portal_pairs = list()
+
+/obj/item/hand_tele/pre_attackby(atom/target, mob/user, params)
+ if(try_dispel_portal(target, user))
+ return FALSE
+ return ..()
+
+/obj/item/hand_tele/proc/try_dispel_portal(atom/target, mob/user)
+ if(is_parent_of_portal(target))
+ qdel(target)
+ to_chat(user, "You dispel [target] with \the [src]!")
+ return TRUE
+ return FALSE
+
+/obj/item/hand_tele/afterattack(atom/target, mob/user)
+ try_dispel_portal(target, user)
+ . = ..()
+
+/obj/item/hand_tele/attack_self(mob/user)
+ var/turf/current_location = get_turf(user)//What turf is the user on?
+ var/area/current_area = current_location.loc
+ if(!current_location || current_area.noteleport || current_location.z > ZLEVEL_SPACEMAX || !isturf(user.loc))//If turf was not found or they're on z level 2 or >7 which does not currently exist. or if user is not located on a turf
+ to_chat(user, "\The [src] is malfunctioning.")
+ return
+ var/list/L = list( )
+ for(var/obj/machinery/computer/teleporter/com in GLOB.machines)
+ if(com.target)
+ var/area/A = get_area(com.target)
+ if(!A || A.noteleport)
+ continue
+ if(com.power_station && com.power_station.teleporter_hub && com.power_station.engaged)
+ L["[get_area(com.target)] (Active)"] = com.target
+ else
+ L["[get_area(com.target)] (Inactive)"] = com.target
+ var/list/turfs = list( )
+ for(var/turf/T in urange(10, orange=1))
+ if(T.x>world.maxx-8 || T.x<8)
+ continue //putting them at the edge is dumb
+ if(T.y>world.maxy-8 || T.y<8)
+ continue
+ var/area/A = T.loc
+ if(A.noteleport)
+ continue
+ turfs += T
+ if(turfs.len)
+ L["None (Dangerous)"] = pick(turfs)
+ var/t1 = input(user, "Please select a teleporter to lock in on.", "Hand Teleporter") as null|anything in L
+ if (!t1 || user.get_active_held_item() != src || user.incapacitated())
+ return
+ if(active_portal_pairs.len >= max_portal_pairs)
+ user.show_message("\The [src] is recharging!")
+ return
+ var/atom/T = L[t1]
+ var/area/A = get_area(T)
+ if(A.noteleport)
+ to_chat(user, "\The [src] is malfunctioning.")
+ return
+ user.show_message("Locked In.", 2)
+ var/list/obj/effect/portal/created = create_portal_pair(current_location, get_teleport_turf(get_turf(T)), src, 300, 1)
+ if(!(LAZYLEN(created) == 2))
+ return
+ try_move_adjacent(created[1])
+ active_portal_pairs[created[1]] = created[2]
+ var/obj/effect/portal/c1 = created[1]
+ var/obj/effect/portal/c2 = created[2]
+ investigate_log("was used by [key_name(user)] at [COORD(user)] to create a portal pair with destinations [COORD(c1)] and [COORD(c2)].", INVESTIGATE_PORTAL)
+ add_fingerprint(user)
+
+/obj/item/hand_tele/proc/on_portal_destroy(obj/effect/portal/P)
+ active_portal_pairs -= P //If this portal pair is made by us it'll be erased along with the other portal by the portal.
+
+/obj/item/hand_tele/proc/is_parent_of_portal(obj/effect/portal/P)
+ if(!istype(P))
+ return FALSE
+ if(active_portal_pairs[P])
+ return SOURCE_PORTAL
+ for(var/i in active_portal_pairs)
+ if(active_portal_pairs[i] == P)
+ return DESTINATION_PORTAL
+ return FALSE
diff --git a/code/game/objects/items/theft_tools.dm b/code/game/objects/items/theft_tools.dm
index d4432e0257..5f3e493677 100644
--- a/code/game/objects/items/theft_tools.dm
+++ b/code/game/objects/items/theft_tools.dm
@@ -33,7 +33,7 @@
if(cooldown < world.time - 60)
cooldown = world.time
flick(pulseicon, src)
- radiation_pulse(get_turf(src), 1, 4, 40, 1)
+ radiation_pulse(src, 400, 2)
//nuke core box, for carrying the core
/obj/item/nuke_core_container
@@ -140,7 +140,7 @@
return
else
to_chat(user, "As it touches \the [src], both \the [src] and \the [W] burst into dust!")
- radiation_pulse(get_turf(user), 1, 2, 10, 1)
+ radiation_pulse(user, 100)
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
qdel(W)
qdel(src)
@@ -151,13 +151,13 @@
return FALSE
var/mob/ded = user
to_chat(user, "You reach for the supermatter sliver with your hands. That was dumb.")
- radiation_pulse(get_turf(user), 2, 4, 50, 1)
+ radiation_pulse(user, 500, 2)
playsound(get_turf(user), 'sound/effects/supermatter.ogg', 50, 1)
ded.dust()
/obj/item/nuke_core_container/supermatter
name = "supermatter bin"
- desc = "A tiny receptacle that releases an inert freon mix upon sealing, allowing a sliver of a supermatter crystal to be safely stored.."
+ desc = "A tiny receptacle that releases an inert hyper-noblium mix upon sealing, allowing a sliver of a supermatter crystal to be safely stored.."
var/obj/item/nuke_core/supermatter_sliver/sliver
/obj/item/nuke_core_container/supermatter/Destroy()
@@ -193,7 +193,7 @@
/obj/item/scalpel/supermatter
name = "supermatter scalpel"
- desc = "A scalpel with a tip of condensed freon gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
+ desc = "A scalpel with a tip of condensed hyper-noblium gas, searingly cold to the touch, that can safely shave a sliver off a supermatter crystal."
icon = 'icons/obj/nuke_tools.dmi'
icon_state = "supermatter_scalpel"
toolspeed = 0.5
@@ -202,7 +202,7 @@
/obj/item/hemostat/supermatter
name = "supermatter extraction tongs"
- desc = "A pair of tongs made from condensed freon gas, searingly cold to the touch, that can safely grip a supermatter sliver."
+ desc = "A pair of tongs made from condensed hyper-noblium gas, searingly cold to the touch, that can safely grip a supermatter sliver."
icon = 'icons/obj/nuke_tools.dmi'
icon_state = "supermatter_tongs"
toolspeed = 0.75
@@ -240,7 +240,7 @@
user.visible_message("As [user] touches \the [AM] with \a [src], silence fills the room...",\
"You touch \the [AM] with \the [src], and everything suddenly goes silent.\n\The [AM] flashes into dust, and soon as you can register this, you do as well.",\
"Everything suddenly goes silent.")
- radiation_pulse(get_turf(user), 2, 4, 50, 1)
+ radiation_pulse(user, 500, 2)
playsound(src, 'sound/effects/supermatter.ogg', 50, 1)
user.dust()
icon_state = "supermatter_tongs"
diff --git a/code/game/objects/items/tools.dm b/code/game/objects/items/tools.dm
index 5f3150a63c..bd618f217e 100644
--- a/code/game/objects/items/tools.dm
+++ b/code/game/objects/items/tools.dm
@@ -131,7 +131,7 @@
name = "screwdriver"
desc = "You can be totally screwy with this."
icon = 'icons/obj/tools.dmi'
- icon_state = "screwdriver"
+ icon_state = "screwdriver_map"
item_state = "screwdriver"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
@@ -166,6 +166,7 @@
/obj/item/screwdriver/Initialize()
. = ..()
if(random_color) //random colors!
+ icon_state = "screwdriver"
var/our_color = pick(screwdriver_colors)
add_atom_colour(screwdriver_colors[our_color], FIXED_COLOUR_PRIORITY)
update_icon()
@@ -269,7 +270,7 @@
name = "wirecutters"
desc = "This cuts wires."
icon = 'icons/obj/tools.dmi'
- icon_state = null
+ icon_state = "cutters"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
flags_1 = CONDUCT_1
@@ -285,11 +286,12 @@
origin_tech = "materials=1;engineering=1"
toolspeed = 1
armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 30)
+ var/random_color = TRUE
/obj/item/wirecutters/New(loc, var/param_color = null)
..()
- if(!icon_state)
+ if(random_color)
if(!param_color)
param_color = pick("yellow","red")
icon_state = "cutters_[param_color]"
@@ -316,6 +318,7 @@
desc = "A pair of wirecutters made of brass. The handle feels freezing cold to the touch."
resistance_flags = FIRE_PROOF | ACID_PROOF
icon_state = "cutters_brass"
+ random_color = FALSE
toolspeed = 0.5
/obj/item/wirecutters/abductor
@@ -325,6 +328,7 @@
icon_state = "cutters"
toolspeed = 0.1
origin_tech = "materials=5;engineering=4;abductor=3"
+ random_color = FALSE
/obj/item/wirecutters/cyborg
name = "wirecutters"
@@ -340,6 +344,7 @@
materials = list(MAT_METAL=150,MAT_SILVER=50,MAT_TITANIUM=25)
usesound = 'sound/items/jaws_cut.ogg'
toolspeed = 0.25
+ random_color = FALSE
/obj/item/wirecutters/power/suicide_act(mob/user)
user.visible_message("[user] is wrapping \the [src] around [user.p_their()] neck. It looks like [user.p_theyre()] trying to rip [user.p_their()] head off!")
@@ -452,6 +457,15 @@
flamethrower_screwdriver(I, user)
else if(istype(I, /obj/item/stack/rods))
flamethrower_rods(I, user)
+ else if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
+ var/amountNeeded = max_fuel - get_fuel()
+ var/obj/item/reagent_containers/container = I
+ if(length(container.reagents.reagent_list) > 1)
+ to_chat(user, "[container] has too many chemicals mixed into it. You wouldn't want to put the wrong chemicals into [src].")
+ return ..()
+ if(amountNeeded > 0 && container.reagents.has_reagent("welding_fuel"))
+ container.reagents.trans_id_to(src, "welding_fuel", amountNeeded)
+ to_chat(user, "You transfer some fuel from [container] to [src].")
else
return ..()
@@ -475,7 +489,8 @@
/obj/item/weldingtool/afterattack(atom/O, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(welding)
remove_fuel(1)
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index 0ed1a7c566..8d56fccad6 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -49,7 +49,8 @@
return
/obj/item/toy/balloon/afterattack(atom/A as mob|obj, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if (istype(A, /obj/structure/reagent_dispensers))
var/obj/structure/reagent_dispensers/RD = A
if(RD.reagents.total_volume <= 0)
@@ -274,7 +275,7 @@
*/
/obj/item/toy/foamblade
name = "foam armblade"
- desc = "it says \"Sternside Changs #1 fan\" on it. "
+ desc = "It says \"Sternside Changs #1 fan\" on it."
icon = 'icons/obj/toy.dmi'
icon_state = "foamblade"
item_state = "arm_blade"
@@ -287,7 +288,7 @@
/obj/item/toy/windupToolbox
name = "windup toolbox"
- desc = "A replica toolbox that rumbles when you turn the key"
+ desc = "A replica toolbox that rumbles when you turn the key."
icon_state = "his_grace"
item_state = "artistic_toolbox"
lefthand_file = 'icons/mob/inhands/equipment/toolbox_lefthand.dmi'
@@ -1105,7 +1106,7 @@
/obj/item/toy/figure/attack_self(mob/user as mob)
if(cooldown <= world.time)
cooldown = world.time + 50
- to_chat(user, "The [src] says \"[toysay]\"")
+ to_chat(user, "[src] says \"[toysay]\"")
playsound(user, toysound, 20, 1)
/obj/item/toy/figure/cmo
diff --git a/code/game/objects/items/twohanded.dm b/code/game/objects/items/twohanded.dm
index 048184578a..2a986cc718 100644
--- a/code/game/objects/items/twohanded.dm
+++ b/code/game/objects/items/twohanded.dm
@@ -457,15 +457,15 @@
explosive.prime()
qdel(src)
-/obj/item/twohanded/spear/AltClick()
- ..()
- if(!explosive)
- return
- if(ismob(loc))
- var/mob/M = loc
- var/input = stripped_input(M,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
- if(input)
- src.war_cry = input
+/obj/item/twohanded/spear/AltClick(mob/user)
+ if(user.canUseTopic(src, be_close=TRUE))
+ ..()
+ if(!explosive)
+ return
+ if(istype(user) && loc == user)
+ var/input = stripped_input(user,"What do you want your war cry to be? You will shout it when you hit someone in melee.", ,"", 50)
+ if(input)
+ src.war_cry = input
/obj/item/twohanded/spear/CheckParts(list/parts_list)
var/obj/item/twohanded/spear/S = locate() in parts_list
diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm
index 5a4cd477e5..7b7c9c8ee5 100644
--- a/code/game/objects/items/weaponry.dm
+++ b/code/game/objects/items/weaponry.dm
@@ -1,10 +1,11 @@
/obj/item/banhammer
- desc = "A banhammer"
+ desc = "A banhammer."
name = "banhammer"
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "toyhammer"
slot_flags = SLOT_BELT
throwforce = 0
+ force = 1
w_class = WEIGHT_CLASS_TINY
throw_speed = 3
throw_range = 7
@@ -20,10 +21,11 @@
/obj/item/banhammer/attack(mob/M, mob/user)
if(user.zone_selected == "head")
M.visible_message("[user] are stroking the head of [M] with a bangammer", "[user] are stroking the head with a bangammer", "you hear a bangammer stroking a head");
-
else
M.visible_message("[M] has been banned FOR NO REISIN by [user]", "You have been banned FOR NO REISIN by [user]", "you hear a banhammer banning someone")
playsound(loc, 'sound/effects/adminhelp.ogg', 15) //keep it at 15% volume so people don't jump out of their skin too much
+ if(user.a_intent != INTENT_HELP)
+ return ..(M, user)
/obj/item/sord
name = "\improper SORD"
@@ -73,7 +75,7 @@
flags_1 = CONDUCT_1 | NODROP_1 | DROPDEL_1
slot_flags = null
block_chance = 0 //RNG WON'T HELP YOU NOW, PANSY
- luminosity = 3
+ light_range = 3
attack_verb = list("brutalized", "eviscerated", "disemboweled", "hacked", "carved", "cleaved") //ONLY THE MOST VISCERAL ATTACK VERBS
var/notches = 0 //HOW MANY PEOPLE HAVE BEEN SLAIN WITH THIS BLADE
var/obj/item/disk/nuclear/nuke_disk //OUR STORED NUKE DISK
@@ -192,7 +194,7 @@
/obj/item/katana
name = "katana"
- desc = "Woefully underpowered in D20"
+ desc = "Woefully underpowered in D20."
icon_state = "katana"
item_state = "katana"
lefthand_file = 'icons/mob/inhands/weapons/swords_lefthand.dmi'
@@ -201,7 +203,7 @@
slot_flags = SLOT_BELT | SLOT_BACK
force = 40
throwforce = 10
- w_class = WEIGHT_CLASS_NORMAL
+ w_class = WEIGHT_CLASS_HUGE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
block_chance = 50
@@ -257,7 +259,7 @@
/obj/item/throwing_star
name = "throwing star"
- desc = "An ancient weapon still used to this day due to it's ease of lodging itself into victim's body parts"
+ desc = "An ancient weapon still used to this day, due to its ease of lodging itself into its victim's body parts."
icon_state = "throwingstar"
item_state = "eshield0"
lefthand_file = 'icons/mob/inhands/equipment/shields_lefthand.dmi'
@@ -390,7 +392,7 @@
/obj/item/ectoplasm
name = "ectoplasm"
- desc = "spooky"
+ desc = "Spooky."
gender = PLURAL
icon = 'icons/obj/wizard.dmi'
icon_state = "ectoplasm"
@@ -590,7 +592,8 @@
name = "slapper"
desc = "This is how real men fight."
icon_state = "latexballon"
- force = 1
+ item_state = "nothing"
+ force = 0
throwforce = 0
flags_1 = DROPDEL_1 | ABSTRACT_1
attack_verb = list("slapped")
@@ -600,12 +603,11 @@
if(ishuman(M))
var/mob/living/carbon/human/L = M
L.endTailWag()
- if(user.a_intent != INTENT_HARM)
- var/aim_for_face = ((user.zone_selected == "mouth") || (user.zone_selected == "eyes") || (user.zone_selected == "head"))
+ if(user.a_intent != INTENT_HARM && ((user.zone_selected == "mouth") || (user.zone_selected == "eyes") || (user.zone_selected == "head")))
user.do_attack_animation(M)
playsound(M, 'sound/weapons/slap.ogg', 50, 1, -1)
- user.visible_message("[user] slaps [M] in the [(aim_for_face)?"face":user.zone_selected]!",
- "You slap [M] in the [(aim_for_face)?"face":user.zone_selected]! ",\
+ user.visible_message("[user] slaps [M]!",
+ "You slap [M]!",\
"You hear a slap.")
return
else
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index 646548bbca..ad5f69672b 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -7,8 +7,12 @@
damage_amount = run_obj_armor(damage_amount, damage_type, damage_flag, attack_dir)
if(damage_amount >= 0.1)
. = damage_amount
- obj_integrity = max(obj_integrity - damage_amount, 0)
+ var/old_integ = obj_integrity
+ obj_integrity = max(old_integ - damage_amount, 0)
if(obj_integrity <= 0)
+ var/int_fail = integrity_failure
+ if(int_fail && old_integ > int_fail)
+ obj_break(damage_flag)
obj_destruction(damage_flag)
else if(integrity_failure)
if(obj_integrity <= integrity_failure)
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index fb5a4344f0..e95a81822c 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -189,7 +189,7 @@
/obj/proc/check_uplink_validity()
return 1
-/obj/proc/on_mob_move(dir, mob, oldLoc)
+/obj/proc/on_mob_move(dir, mob, oldLoc, forced)
return
/obj/proc/on_mob_turn(dir, mob)
diff --git a/code/game/objects/radiation.dm b/code/game/objects/radiation.dm
index bda292ca62..81f5ef975f 100644
--- a/code/game/objects/radiation.dm
+++ b/code/game/objects/radiation.dm
@@ -1,5 +1,6 @@
/proc/radiation_pulse(turf/epicenter, heavy_range, light_range, severity, log=0)
- if(!epicenter || !severity) return
+ if(!epicenter || !severity)
+ return
if(!isturf(epicenter))
epicenter = get_turf(epicenter.loc)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index 85d124fefc..56b5469c86 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -31,7 +31,7 @@
user.changeNext_move(CLICK_CD_MELEE)
user.do_attack_animation(src)
structureclimber.Knockdown(40)
- structureclimber.visible_message("[structureclimber.name] has been knocked off the [src]", "You're knocked off the [src]!", "You see [structureclimber.name] get knocked off the [src]")
+ structureclimber.visible_message("[structureclimber] has been knocked off [src].", "You're knocked off [src]!", "You see [structureclimber] get knocked off [src].")
interact(user)
/obj/structure/interact(mob/user)
diff --git a/code/game/objects/structures/barsigns.dm b/code/game/objects/structures/barsigns.dm
index a6cc3d0464..6fda0f6a40 100644
--- a/code/game/objects/structures/barsigns.dm
+++ b/code/game/objects/structures/barsigns.dm
@@ -1,6 +1,6 @@
/obj/structure/sign/barsign // All Signs are 64 by 32 pixels, they take two tiles
name = "Bar Sign"
- desc = "A bar sign with no writing on it"
+ desc = "A bar sign with no writing on it."
icon = 'icons/obj/barsigns.dmi'
icon_state = "empty"
req_access = list(ACCESS_BAR)
diff --git a/code/game/objects/structures/beds_chairs/bed.dm b/code/game/objects/structures/beds_chairs/bed.dm
index 117695da84..14d29e96a7 100644
--- a/code/game/objects/structures/beds_chairs/bed.dm
+++ b/code/game/objects/structures/beds_chairs/bed.dm
@@ -21,10 +21,6 @@
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 2
-/obj/structure/bed/examine(mob/user)
- ..()
- to_chat(user, "It's held together by a couple of bolts.")
-
/obj/structure/bed/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(buildstacktype)
@@ -105,7 +101,7 @@
desc = "A collapsed roller bed that can be carried around."
icon = 'icons/obj/rollerbed.dmi'
icon_state = "folded"
- w_class = WEIGHT_CLASS_BULKY // Can't be put in backpacks.
+ w_class = WEIGHT_CLASS_NORMAL // No more excuses, stop getting blood everywhere
/obj/item/roller/attackby(obj/item/I, mob/living/user, params)
if(istype(I, /obj/item/roller/robo))
@@ -117,7 +113,8 @@
R.loaded = new/obj/structure/bed/roller(R)
qdel(src) //"Load"
return
- else return ..()
+ else
+ return ..()
/obj/item/roller/attack_self(mob/user)
deploy_roller(user, user.loc)
@@ -144,7 +141,7 @@
/obj/item/roller/robo/examine(mob/user)
..()
- to_chat(user, "The dock is [loaded ? "loaded" : "empty"].")
+ to_chat(user, "The dock is [loaded ? "loaded" : "empty"]")
/obj/item/roller/robo/deploy_roller(mob/user, atom/location)
if(loaded)
@@ -197,5 +194,5 @@
/obj/structure/bed/alien
name = "resting contraption"
- desc = "This looks similar to contraptions from earth. Could aliens be stealing our technology?"
- icon_state = "abed"
\ No newline at end of file
+ desc = "This looks similar to contraptions from Earth. Could aliens be stealing our technology?"
+ icon_state = "abed"
diff --git a/code/game/objects/structures/beds_chairs/chair.dm b/code/game/objects/structures/beds_chairs/chair.dm
index 606b10da0a..89ed70d104 100644
--- a/code/game/objects/structures/beds_chairs/chair.dm
+++ b/code/game/objects/structures/beds_chairs/chair.dm
@@ -352,6 +352,7 @@
max_integrity = 150
buildstacktype = /obj/item/stack/tile/brass
buildstackamount = 1
+ item_chair = null
/obj/structure/chair/brass/Destroy()
STOP_PROCESSING(SSfastprocess, src)
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index 35bfc1965f..d570775ee1 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -1,367 +1,367 @@
-// Closets for specific jobs
-
-/obj/structure/closet/gmcloset
- name = "formal closet"
- desc = "It's a storage unit for formal clothing."
- icon_door = "black"
-
-/obj/structure/closet/gmcloset/PopulateContents()
- ..()
- new /obj/item/clothing/head/that(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/clothing/head/that(src)
- new /obj/item/clothing/under/sl_suit(src)
- new /obj/item/clothing/under/sl_suit(src)
- new /obj/item/clothing/under/rank/bartender(src)
- new /obj/item/clothing/under/rank/bartender(src)
- new /obj/item/clothing/accessory/waistcoat(src)
- new /obj/item/clothing/accessory/waistcoat(src)
- new /obj/item/clothing/head/soft/black(src)
- new /obj/item/clothing/head/soft/black(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/reagent_containers/glass/rag(src)
- new /obj/item/reagent_containers/glass/rag(src)
- new /obj/item/storage/box/beanbag(src)
- new /obj/item/clothing/suit/armor/vest/alt(src)
- new /obj/item/clothing/glasses/sunglasses/reagent(src)
- new /obj/item/storage/belt/bandolier(src)
-
-/obj/structure/closet/chefcloset
- name = "\proper chef's closet"
- desc = "It's a storage unit for foodservice garments and mouse traps."
- icon_door = "black"
-
-/obj/structure/closet/chefcloset/PopulateContents()
- ..()
- new /obj/item/clothing/under/waiter(src)
- new /obj/item/clothing/under/waiter(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/device/radio/headset/headset_srv(src)
- new /obj/item/clothing/accessory/waistcoat(src)
- new /obj/item/clothing/accessory/waistcoat(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/suit/apron/chef(src)
- new /obj/item/clothing/head/soft/mime(src)
- new /obj/item/clothing/head/soft/mime(src)
- new /obj/item/storage/box/mousetraps(src)
- new /obj/item/storage/box/mousetraps(src)
- new /obj/item/clothing/suit/toggle/chef(src)
- new /obj/item/clothing/under/rank/chef(src)
- new /obj/item/clothing/head/chefhat(src)
- new /obj/item/reagent_containers/glass/rag(src)
-
-/obj/structure/closet/jcloset
- name = "custodial closet"
- desc = "It's a storage unit for janitorial clothes and gear."
- icon_door = "mixed"
-
-/obj/structure/closet/jcloset/PopulateContents()
- ..()
- new /obj/item/clothing/under/rank/janitor(src)
- new /obj/item/cartridge/janitor(src)
- new /obj/item/clothing/gloves/color/black(src)
- new /obj/item/clothing/head/soft/purple(src)
- new /obj/item/paint/paint_remover(src)
- new /obj/item/melee/flyswatter(src)
- new /obj/item/device/flashlight(src)
- for(var/i in 1 to 3)
- new /obj/item/caution(src)
- new /obj/item/holosign_creator(src)
- new /obj/item/device/lightreplacer(src)
- new /obj/item/soap(src)
- new /obj/item/storage/bag/trash(src)
- new /obj/item/clothing/shoes/galoshes(src)
- new /obj/item/watertank/janitor(src)
- new /obj/item/storage/belt/janitor(src)
-
-
-/obj/structure/closet/lawcloset
- name = "legal closet"
- desc = "It's a storage unit for courtroom apparel and items."
- icon_door = "blue"
-
-/obj/structure/closet/lawcloset/PopulateContents()
- ..()
- new /obj/item/clothing/under/lawyer/female(src)
- new /obj/item/clothing/under/lawyer/black(src)
- new /obj/item/clothing/under/lawyer/red(src)
- new /obj/item/clothing/under/lawyer/bluesuit(src)
- new /obj/item/clothing/suit/toggle/lawyer(src)
- new /obj/item/clothing/under/lawyer/purpsuit(src)
- new /obj/item/clothing/suit/toggle/lawyer/purple(src)
- new /obj/item/clothing/under/lawyer/blacksuit(src)
- new /obj/item/clothing/suit/toggle/lawyer/black(src)
- new /obj/item/clothing/shoes/laceup(src)
- new /obj/item/clothing/shoes/laceup(src)
- new /obj/item/clothing/accessory/lawyers_badge(src)
- new /obj/item/clothing/accessory/lawyers_badge(src)
-
-/obj/structure/closet/wardrobe/chaplain_black
- name = "chapel wardrobe"
- desc = "It's a storage unit for Nanotrasen-approved religious attire."
- icon_door = "black"
-
-/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
- new /obj/item/clothing/under/rank/chaplain(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/suit/nun(src)
- new /obj/item/clothing/head/nun_hood(src)
- new /obj/item/clothing/suit/studentuni(src)
- new /obj/item/clothing/head/cage(src)
- new /obj/item/clothing/suit/witchhunter(src)
- new /obj/item/clothing/head/witchunter_hat(src)
- new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
- new /obj/item/clothing/suit/holidaypriest(src)
- new /obj/item/storage/backpack/cultpack (src)
- new /obj/item/clothing/head/helmet/knight/templar(src)
- new /obj/item/clothing/suit/armor/riot/knight/templar(src)
- new /obj/item/storage/fancy/candle_box(src)
- new /obj/item/storage/fancy/candle_box(src)
- return
-
-/obj/structure/closet/coffin
- name = "coffin"
- desc = "It's a burial receptacle for the dearly departed."
- icon_state = "coffin"
- resistance_flags = FLAMMABLE
- max_integrity = 70
- horizontal = TRUE
- delivery_icon = "deliverycrate"
- material_drop = /obj/item/stack/sheet/mineral/wood
- material_drop_amount = 5
-
-/obj/structure/closet/wardrobe/red
- name = "security wardrobe"
- icon_door = "red"
-
-/obj/structure/closet/wardrobe/red/PopulateContents()
- new /obj/item/clothing/suit/hooded/wintercoat/security(src)
- new /obj/item/storage/backpack/security(src)
- new /obj/item/storage/backpack/satchel/sec(src)
- new /obj/item/storage/backpack/duffelbag/sec(src)
- new /obj/item/storage/backpack/duffelbag/sec(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/security(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/jackboots(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/head/beret/sec(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/head/soft/sec(src)
- new /obj/item/clothing/mask/bandana/red(src)
- new /obj/item/clothing/mask/bandana/red(src)
- return
-
-
-/obj/structure/closet/wardrobe/cargotech
- name = "cargo wardrobe"
- icon_door = "orange"
-
-/obj/structure/closet/wardrobe/cargotech/PopulateContents()
- new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/cargotech(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/sneakers/black(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/gloves/fingerless(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/head/soft(src)
- new /obj/item/device/radio/headset/headset_cargo(src)
-
-/obj/structure/closet/wardrobe/atmospherics_yellow
- name = "atmospherics wardrobe"
- icon_door = "atmos_wardrobe"
-
-/obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents()
- new /obj/item/storage/backpack/duffelbag/engineering(src)
- new /obj/item/storage/backpack/satchel/eng(src)
- new /obj/item/storage/backpack/industrial(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/atmospheric_technician(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/sneakers/black(src)
- return
-
-/obj/structure/closet/wardrobe/engineering_yellow
- name = "engineering wardrobe"
- icon_door = "yellow"
-
-/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
- new /obj/item/storage/backpack/duffelbag/engineering(src)
- new /obj/item/storage/backpack/industrial(src)
- new /obj/item/storage/backpack/satchel/eng(src)
- new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/engineer(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/suit/hazardvest(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/workboots(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/head/hardhat(src)
- return
-
-/obj/structure/closet/wardrobe/white/medical
- name = "medical doctor's wardrobe"
-
-/obj/structure/closet/wardrobe/white/medical/PopulateContents()
- new /obj/item/storage/backpack/duffelbag/med(src)
- new /obj/item/storage/backpack/medic(src)
- new /obj/item/storage/backpack/satchel/med(src)
- new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
- new /obj/item/clothing/under/rank/nursesuit (src)
- new /obj/item/clothing/head/nursehat (src)
- new /obj/item/clothing/under/rank/medical/blue(src)
- new /obj/item/clothing/under/rank/medical/green(src)
- new /obj/item/clothing/under/rank/medical/purple(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/medical(src)
- new /obj/item/clothing/suit/toggle/labcoat(src)
- new /obj/item/clothing/suit/toggle/labcoat(src)
- new /obj/item/clothing/suit/toggle/labcoat/emt(src)
- new /obj/item/clothing/suit/toggle/labcoat/emt(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/sneakers/white(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/head/soft/emt(src)
- return
-
-/obj/structure/closet/wardrobe/robotics_black
- name = "robotics wardrobe"
- icon_door = "black"
-
-/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
- new /obj/item/clothing/glasses/hud/diagnostic(src)
- new /obj/item/clothing/glasses/hud/diagnostic(src)
- new /obj/item/clothing/under/rank/roboticist(src)
- new /obj/item/clothing/under/rank/roboticist(src)
- new /obj/item/clothing/suit/toggle/labcoat(src)
- new /obj/item/clothing/suit/toggle/labcoat(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/shoes/sneakers/black(src)
- new /obj/item/clothing/gloves/fingerless(src)
- new /obj/item/clothing/gloves/fingerless(src)
- new /obj/item/clothing/head/soft/black(src)
- new /obj/item/clothing/head/soft/black(src)
- if(prob(40))
- new /obj/item/clothing/mask/bandana/skull(src)
- if(prob(40))
- new /obj/item/clothing/mask/bandana/skull(src)
- return
-
-
-/obj/structure/closet/wardrobe/chemistry_white
- name = "chemistry wardrobe"
- icon_door = "white"
-
-/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
- new /obj/item/clothing/under/rank/chemist(src)
- new /obj/item/clothing/under/rank/chemist(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
- new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
- new /obj/item/storage/backpack/chemistry(src)
- new /obj/item/storage/backpack/chemistry(src)
- new /obj/item/storage/backpack/satchel/chem(src)
- new /obj/item/storage/backpack/satchel/chem(src)
- new /obj/item/storage/bag/chemistry(src)
- new /obj/item/storage/bag/chemistry(src)
- return
-
-
-/obj/structure/closet/wardrobe/genetics_white
- name = "genetics wardrobe"
- icon_door = "white"
-
-/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
- new /obj/item/clothing/under/rank/geneticist(src)
- new /obj/item/clothing/under/rank/geneticist(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
- new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
- new /obj/item/storage/backpack/genetics(src)
- new /obj/item/storage/backpack/genetics(src)
- new /obj/item/storage/backpack/satchel/gen(src)
- new /obj/item/storage/backpack/satchel/gen(src)
- return
-
-
-/obj/structure/closet/wardrobe/virology_white
- name = "virology wardrobe"
- icon_door = "white"
-
-/obj/structure/closet/wardrobe/virology_white/PopulateContents()
- new /obj/item/clothing/under/rank/virologist(src)
- new /obj/item/clothing/under/rank/virologist(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
- new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
- new /obj/item/clothing/mask/surgical(src)
- new /obj/item/clothing/mask/surgical(src)
- new /obj/item/storage/backpack/virology(src)
- new /obj/item/storage/backpack/virology(src)
- new /obj/item/storage/backpack/satchel/vir(src)
- new /obj/item/storage/backpack/satchel/vir(src)
- return
-
-/obj/structure/closet/wardrobe/science_white
- name = "science wardrobe"
- icon_door = "white"
-
-/obj/structure/closet/wardrobe/science_white/PopulateContents()
- new /obj/item/storage/backpack/science(src)
- new /obj/item/storage/backpack/science(src)
- new /obj/item/storage/backpack/satchel/tox(src)
- new /obj/item/storage/backpack/satchel/tox(src)
- new /obj/item/clothing/suit/hooded/wintercoat/science(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/scientist(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/suit/toggle/labcoat/science(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/shoes/sneakers/white(src)
- new /obj/item/device/radio/headset/headset_sci(src)
- new /obj/item/device/radio/headset/headset_sci(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/mask/gas(src)
- return
-
-/obj/structure/closet/wardrobe/botanist
- name = "botanist wardrobe"
- icon_door = "green"
-
-/obj/structure/closet/wardrobe/botanist/PopulateContents()
- new /obj/item/storage/backpack/botany(src)
- new /obj/item/storage/backpack/botany(src)
- new /obj/item/storage/backpack/satchel/hyd(src)
- new /obj/item/storage/backpack/satchel/hyd(src)
- new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
- new /obj/item/clothing/suit/apron(src)
- new /obj/item/clothing/suit/apron(src)
- new /obj/item/clothing/suit/apron/overalls(src)
- new /obj/item/clothing/suit/apron/overalls(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/under/rank/hydroponics(src)
- for(var/i in 1 to 3)
- new /obj/item/clothing/mask/bandana(src)
-
-
-/obj/structure/closet/wardrobe/curator
- name = "treasure hunting wardrobe"
- icon_door = "black"
-
-/obj/structure/closet/wardrobe/curator/PopulateContents()
- new /obj/item/clothing/head/fedora/curator(src)
- new /obj/item/clothing/suit/curator(src)
- new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
- new /obj/item/clothing/shoes/workboots/mining(src)
- new /obj/item/storage/backpack/satchel/explorer(src)
-
+// Closets for specific jobs
+
+/obj/structure/closet/gmcloset
+ name = "formal closet"
+ desc = "It's a storage unit for formal clothing."
+ icon_door = "black"
+
+/obj/structure/closet/gmcloset/PopulateContents()
+ ..()
+ new /obj/item/clothing/head/that(src)
+ new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/clothing/head/that(src)
+ new /obj/item/clothing/under/sl_suit(src)
+ new /obj/item/clothing/under/sl_suit(src)
+ new /obj/item/clothing/under/rank/bartender(src)
+ new /obj/item/clothing/under/rank/bartender(src)
+ new /obj/item/clothing/accessory/waistcoat(src)
+ new /obj/item/clothing/accessory/waistcoat(src)
+ new /obj/item/clothing/head/soft/black(src)
+ new /obj/item/clothing/head/soft/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/reagent_containers/glass/rag(src)
+ new /obj/item/reagent_containers/glass/rag(src)
+ new /obj/item/storage/box/beanbag(src)
+ new /obj/item/clothing/suit/armor/vest/alt(src)
+ new /obj/item/clothing/glasses/sunglasses/reagent(src)
+ new /obj/item/clothing/neck/petcollar(src)
+ new /obj/item/storage/belt/bandolier(src)
+
+/obj/structure/closet/chefcloset
+ name = "\proper chef's closet"
+ desc = "It's a storage unit for foodservice garments and mouse traps."
+ icon_door = "black"
+
+/obj/structure/closet/chefcloset/PopulateContents()
+ ..()
+ new /obj/item/clothing/under/waiter(src)
+ new /obj/item/clothing/under/waiter(src)
+ new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/device/radio/headset/headset_srv(src)
+ new /obj/item/clothing/accessory/waistcoat(src)
+ new /obj/item/clothing/accessory/waistcoat(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/suit/apron/chef(src)
+ new /obj/item/clothing/head/soft/mime(src)
+ new /obj/item/clothing/head/soft/mime(src)
+ new /obj/item/storage/box/mousetraps(src)
+ new /obj/item/storage/box/mousetraps(src)
+ new /obj/item/clothing/suit/toggle/chef(src)
+ new /obj/item/clothing/under/rank/chef(src)
+ new /obj/item/clothing/head/chefhat(src)
+ new /obj/item/reagent_containers/glass/rag(src)
+
+/obj/structure/closet/jcloset
+ name = "custodial closet"
+ desc = "It's a storage unit for janitorial clothes and gear."
+ icon_door = "mixed"
+
+/obj/structure/closet/jcloset/PopulateContents()
+ ..()
+ new /obj/item/clothing/under/rank/janitor(src)
+ new /obj/item/cartridge/janitor(src)
+ new /obj/item/clothing/gloves/color/black(src)
+ new /obj/item/clothing/head/soft/purple(src)
+ new /obj/item/paint/paint_remover(src)
+ new /obj/item/melee/flyswatter(src)
+ new /obj/item/device/flashlight(src)
+ for(var/i in 1 to 3)
+ new /obj/item/caution(src)
+ new /obj/item/holosign_creator(src)
+ new /obj/item/device/lightreplacer(src)
+ new /obj/item/soap(src)
+ new /obj/item/storage/bag/trash(src)
+ new /obj/item/clothing/shoes/galoshes(src)
+ new /obj/item/watertank/janitor(src)
+ new /obj/item/storage/belt/janitor(src)
+
+
+/obj/structure/closet/lawcloset
+ name = "legal closet"
+ desc = "It's a storage unit for courtroom apparel and items."
+ icon_door = "blue"
+
+/obj/structure/closet/lawcloset/PopulateContents()
+ ..()
+ new /obj/item/clothing/under/lawyer/female(src)
+ new /obj/item/clothing/under/lawyer/black(src)
+ new /obj/item/clothing/under/lawyer/red(src)
+ new /obj/item/clothing/under/lawyer/bluesuit(src)
+ new /obj/item/clothing/suit/toggle/lawyer(src)
+ new /obj/item/clothing/under/lawyer/purpsuit(src)
+ new /obj/item/clothing/suit/toggle/lawyer/purple(src)
+ new /obj/item/clothing/under/lawyer/blacksuit(src)
+ new /obj/item/clothing/suit/toggle/lawyer/black(src)
+ new /obj/item/clothing/shoes/laceup(src)
+ new /obj/item/clothing/shoes/laceup(src)
+ new /obj/item/clothing/accessory/lawyers_badge(src)
+ new /obj/item/clothing/accessory/lawyers_badge(src)
+
+/obj/structure/closet/wardrobe/chaplain_black
+ name = "chapel wardrobe"
+ desc = "It's a storage unit for Nanotrasen-approved religious attire."
+ icon_door = "black"
+
+/obj/structure/closet/wardrobe/chaplain_black/PopulateContents()
+ new /obj/item/clothing/under/rank/chaplain(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/suit/nun(src)
+ new /obj/item/clothing/head/nun_hood(src)
+ new /obj/item/clothing/suit/studentuni(src)
+ new /obj/item/clothing/head/cage(src)
+ new /obj/item/clothing/suit/witchhunter(src)
+ new /obj/item/clothing/head/witchunter_hat(src)
+ new /obj/item/clothing/suit/hooded/chaplain_hoodie(src)
+ new /obj/item/clothing/suit/holidaypriest(src)
+ new /obj/item/storage/backpack/cultpack (src)
+ new /obj/item/clothing/head/helmet/knight/templar(src)
+ new /obj/item/clothing/suit/armor/riot/knight/templar(src)
+ new /obj/item/storage/fancy/candle_box(src)
+ new /obj/item/storage/fancy/candle_box(src)
+ return
+
+/obj/structure/closet/coffin
+ name = "coffin"
+ desc = "It's a burial receptacle for the dearly departed."
+ icon_state = "coffin"
+ resistance_flags = FLAMMABLE
+ max_integrity = 70
+ horizontal = TRUE
+ delivery_icon = "deliverycrate"
+ material_drop = /obj/item/stack/sheet/mineral/wood
+ material_drop_amount = 5
+
+/obj/structure/closet/wardrobe/red
+ name = "security wardrobe"
+ icon_door = "red"
+
+/obj/structure/closet/wardrobe/red/PopulateContents()
+ new /obj/item/clothing/suit/hooded/wintercoat/security(src)
+ new /obj/item/storage/backpack/security(src)
+ new /obj/item/storage/backpack/satchel/sec(src)
+ new /obj/item/storage/backpack/duffelbag/sec(src)
+ new /obj/item/storage/backpack/duffelbag/sec(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/security(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/jackboots(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/beret/sec(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/soft/sec(src)
+ new /obj/item/clothing/mask/bandana/red(src)
+ new /obj/item/clothing/mask/bandana/red(src)
+ return
+
+
+/obj/structure/closet/wardrobe/cargotech
+ name = "cargo wardrobe"
+ icon_door = "orange"
+
+/obj/structure/closet/wardrobe/cargotech/PopulateContents()
+ new /obj/item/clothing/suit/hooded/wintercoat/cargo(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/cargotech(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/gloves/fingerless(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/soft(src)
+ new /obj/item/device/radio/headset/headset_cargo(src)
+
+/obj/structure/closet/wardrobe/atmospherics_yellow
+ name = "atmospherics wardrobe"
+ icon_door = "atmos_wardrobe"
+
+/obj/structure/closet/wardrobe/atmospherics_yellow/PopulateContents()
+ new /obj/item/storage/backpack/duffelbag/engineering(src)
+ new /obj/item/storage/backpack/satchel/eng(src)
+ new /obj/item/storage/backpack/industrial(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/atmospheric_technician(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ return
+
+/obj/structure/closet/wardrobe/engineering_yellow
+ name = "engineering wardrobe"
+ icon_door = "yellow"
+
+/obj/structure/closet/wardrobe/engineering_yellow/PopulateContents()
+ new /obj/item/storage/backpack/duffelbag/engineering(src)
+ new /obj/item/storage/backpack/industrial(src)
+ new /obj/item/storage/backpack/satchel/eng(src)
+ new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/engineer(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/suit/hazardvest(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/workboots(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/hardhat(src)
+ return
+
+/obj/structure/closet/wardrobe/white/medical
+ name = "medical doctor's wardrobe"
+
+/obj/structure/closet/wardrobe/white/medical/PopulateContents()
+ new /obj/item/storage/backpack/duffelbag/med(src)
+ new /obj/item/storage/backpack/medic(src)
+ new /obj/item/storage/backpack/satchel/med(src)
+ new /obj/item/clothing/suit/hooded/wintercoat/medical(src)
+ new /obj/item/clothing/under/rank/nursesuit (src)
+ new /obj/item/clothing/head/nursehat (src)
+ new /obj/item/clothing/under/rank/medical/blue(src)
+ new /obj/item/clothing/under/rank/medical/green(src)
+ new /obj/item/clothing/under/rank/medical/purple(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/medical(src)
+ new /obj/item/clothing/suit/toggle/labcoat(src)
+ new /obj/item/clothing/suit/toggle/labcoat(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt(src)
+ new /obj/item/clothing/suit/toggle/labcoat/emt(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/head/soft/emt(src)
+ return
+
+/obj/structure/closet/wardrobe/robotics_black
+ name = "robotics wardrobe"
+ icon_door = "black"
+
+/obj/structure/closet/wardrobe/robotics_black/PopulateContents()
+ new /obj/item/clothing/glasses/hud/diagnostic(src)
+ new /obj/item/clothing/glasses/hud/diagnostic(src)
+ new /obj/item/clothing/under/rank/roboticist(src)
+ new /obj/item/clothing/under/rank/roboticist(src)
+ new /obj/item/clothing/suit/toggle/labcoat(src)
+ new /obj/item/clothing/suit/toggle/labcoat(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+ new /obj/item/clothing/gloves/fingerless(src)
+ new /obj/item/clothing/head/soft/black(src)
+ new /obj/item/clothing/head/soft/black(src)
+ if(prob(40))
+ new /obj/item/clothing/mask/bandana/skull(src)
+ if(prob(40))
+ new /obj/item/clothing/mask/bandana/skull(src)
+ return
+
+
+/obj/structure/closet/wardrobe/chemistry_white
+ name = "chemistry wardrobe"
+ icon_door = "white"
+
+/obj/structure/closet/wardrobe/chemistry_white/PopulateContents()
+ new /obj/item/clothing/under/rank/chemist(src)
+ new /obj/item/clothing/under/rank/chemist(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
+ new /obj/item/clothing/suit/toggle/labcoat/chemist(src)
+ new /obj/item/storage/backpack/chemistry(src)
+ new /obj/item/storage/backpack/chemistry(src)
+ new /obj/item/storage/backpack/satchel/chem(src)
+ new /obj/item/storage/backpack/satchel/chem(src)
+ new /obj/item/storage/bag/chemistry(src)
+ new /obj/item/storage/bag/chemistry(src)
+ return
+
+
+/obj/structure/closet/wardrobe/genetics_white
+ name = "genetics wardrobe"
+ icon_door = "white"
+
+/obj/structure/closet/wardrobe/genetics_white/PopulateContents()
+ new /obj/item/clothing/under/rank/geneticist(src)
+ new /obj/item/clothing/under/rank/geneticist(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
+ new /obj/item/clothing/suit/toggle/labcoat/genetics(src)
+ new /obj/item/storage/backpack/genetics(src)
+ new /obj/item/storage/backpack/genetics(src)
+ new /obj/item/storage/backpack/satchel/gen(src)
+ new /obj/item/storage/backpack/satchel/gen(src)
+ return
+
+
+/obj/structure/closet/wardrobe/virology_white
+ name = "virology wardrobe"
+ icon_door = "white"
+
+/obj/structure/closet/wardrobe/virology_white/PopulateContents()
+ new /obj/item/clothing/under/rank/virologist(src)
+ new /obj/item/clothing/under/rank/virologist(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
+ new /obj/item/clothing/suit/toggle/labcoat/virologist(src)
+ new /obj/item/clothing/mask/surgical(src)
+ new /obj/item/clothing/mask/surgical(src)
+ new /obj/item/storage/backpack/virology(src)
+ new /obj/item/storage/backpack/virology(src)
+ new /obj/item/storage/backpack/satchel/vir(src)
+ new /obj/item/storage/backpack/satchel/vir(src)
+ return
+
+/obj/structure/closet/wardrobe/science_white
+ name = "science wardrobe"
+ icon_door = "white"
+
+/obj/structure/closet/wardrobe/science_white/PopulateContents()
+ new /obj/item/storage/backpack/science(src)
+ new /obj/item/storage/backpack/science(src)
+ new /obj/item/storage/backpack/satchel/tox(src)
+ new /obj/item/storage/backpack/satchel/tox(src)
+ new /obj/item/clothing/suit/hooded/wintercoat/science(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/scientist(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/suit/toggle/labcoat/science(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/shoes/sneakers/white(src)
+ new /obj/item/device/radio/headset/headset_sci(src)
+ new /obj/item/device/radio/headset/headset_sci(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/mask/gas(src)
+ return
+
+/obj/structure/closet/wardrobe/botanist
+ name = "botanist wardrobe"
+ icon_door = "green"
+
+/obj/structure/closet/wardrobe/botanist/PopulateContents()
+ new /obj/item/storage/backpack/botany(src)
+ new /obj/item/storage/backpack/botany(src)
+ new /obj/item/storage/backpack/satchel/hyd(src)
+ new /obj/item/storage/backpack/satchel/hyd(src)
+ new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
+ new /obj/item/clothing/suit/apron(src)
+ new /obj/item/clothing/suit/apron(src)
+ new /obj/item/clothing/suit/apron/overalls(src)
+ new /obj/item/clothing/suit/apron/overalls(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/under/rank/hydroponics(src)
+ for(var/i in 1 to 3)
+ new /obj/item/clothing/mask/bandana(src)
+
+
+/obj/structure/closet/wardrobe/curator
+ name = "treasure hunting wardrobe"
+ icon_door = "black"
+
+/obj/structure/closet/wardrobe/curator/PopulateContents()
+ new /obj/item/clothing/head/fedora/curator(src)
+ new /obj/item/clothing/suit/curator(src)
+ new /obj/item/clothing/under/rank/curator/treasure_hunter(src)
+ new /obj/item/clothing/shoes/workboots/mining(src)
+ new /obj/item/storage/backpack/satchel/explorer(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index ee9ecfc908..0351fdc596 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -72,6 +72,7 @@
new /obj/item/reagent_containers/hypospray/CMO(src)
new /obj/item/device/autosurgeon/cmo(src)
new /obj/item/door_remote/chief_medical_officer(src)
+ new /obj/item/clothing/neck/petcollar(src)
/obj/structure/closet/secure_closet/animal
name = "animal control"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index aeacf17598..04e624a46b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -11,6 +11,7 @@
else
new /obj/item/storage/backpack/satchel/cap(src)
new /obj/item/clothing/neck/cloak/cap(src)
+ new /obj/item/clothing/neck/petcollar(src)
new /obj/item/storage/backpack/duffelbag/captain(src)
new /obj/item/clothing/head/crown/fancy(src)
new /obj/item/clothing/suit/captunic(src)
@@ -27,7 +28,7 @@
new /obj/item/clothing/gloves/color/captain(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
new /obj/item/storage/belt/sabre(src)
- new /obj/item/gun/energy/e_gun(src)
+ new /obj/item/gun/energy/e_gun/cx(src)
new /obj/item/door_remote/captain(src)
/obj/structure/closet/secure_closet/hop
@@ -50,7 +51,7 @@
new /obj/item/device/assembly/flash/handheld(src)
new /obj/item/clothing/glasses/sunglasses(src)
new /obj/item/restraints/handcuffs/cable/zipties(src)
- new /obj/item/gun/energy/e_gun(src)
+ new /obj/item/gun/energy/e_gun/cx(src)
new /obj/item/clothing/neck/petcollar(src)
new /obj/item/door_remote/civillian(src)
@@ -66,6 +67,8 @@
new /obj/item/device/radio/headset/heads/hos(src)
new /obj/item/clothing/under/hosparadefem(src)
new /obj/item/clothing/under/hosparademale(src)
+ new /obj/item/clothing/under/rank/head_of_security/skirt(src)
+ new /obj/item/clothing/suit/armor/hos/trenchcoat/cloak(src)
new /obj/item/clothing/suit/armor/vest/leather(src)
new /obj/item/clothing/suit/armor/hos(src)
new /obj/item/clothing/under/rank/head_of_security/alt(src)
@@ -108,7 +111,6 @@
new /obj/item/clothing/gloves/krav_maga/sec(src)
new /obj/item/door_remote/head_of_security(src)
new /obj/item/gun/ballistic/shotgun/automatic/combat/compact(src)
- new /obj/item/pinpointer/crew(src)
/obj/structure/closet/secure_closet/security
name = "security officer's locker"
@@ -117,6 +119,7 @@
/obj/structure/closet/secure_closet/security/PopulateContents()
..()
+ new /obj/item/clothing/under/rank/security/skirt(src)
new /obj/item/clothing/suit/armor/vest(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/device/radio/headset/headset_sec(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index a87d8c136e..b1e83a9d6f 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -1,180 +1,180 @@
-/* Utility Closets
- * Contains:
- * Emergency Closet
- * Fire Closet
- * Tool Closet
- * Radiation Closet
- * Bombsuit Closet
- * Hydrant
- * First Aid
- */
-
-/*
- * Emergency Closet
- */
-/obj/structure/closet/emcloset
- name = "emergency closet"
- desc = "It's a storage unit for emergency breath masks and O2 tanks."
- icon_state = "emergency"
-
-/obj/structure/closet/emcloset/anchored
- anchored = TRUE
-
-/obj/structure/closet/emcloset/PopulateContents()
- ..()
-
- if (prob(40))
- new /obj/item/storage/toolbox/emergency(src)
-
- switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
- if ("small")
- new /obj/item/tank/internals/emergency_oxygen(src)
- new /obj/item/tank/internals/emergency_oxygen(src)
- new /obj/item/clothing/mask/breath(src)
- new /obj/item/clothing/mask/breath(src)
-
- if ("aid")
- new /obj/item/tank/internals/emergency_oxygen(src)
- new /obj/item/storage/firstaid/o2(src)
- new /obj/item/clothing/mask/breath(src)
-
- if ("tank")
- new /obj/item/tank/internals/air(src)
- new /obj/item/clothing/mask/breath(src)
-
- if ("both")
- new /obj/item/tank/internals/emergency_oxygen(src)
- new /obj/item/clothing/mask/breath(src)
-
- if ("nothing")
- // doot
-
- // teehee
- if ("delete")
- qdel(src)
-
- //If you want to re-add fire, just add "fire" = 15 to the pick list.
- /*if ("fire")
- new /obj/structure/closet/firecloset(src.loc)
- qdel(src)*/
-
-/*
- * Fire Closet
- */
-/obj/structure/closet/firecloset
- name = "fire-safety closet"
- desc = "It's a storage unit for fire-fighting supplies."
- icon_state = "fire"
-
-/obj/structure/closet/firecloset/PopulateContents()
- ..()
-
- new /obj/item/clothing/suit/fire/firefighter(src)
- new /obj/item/clothing/mask/gas(src)
- new /obj/item/tank/internals/oxygen/red(src)
- new /obj/item/extinguisher(src)
- new /obj/item/clothing/head/hardhat/red(src)
-
-/obj/structure/closet/firecloset/full/PopulateContents()
- new /obj/item/clothing/suit/fire/firefighter(src)
- new /obj/item/clothing/mask/gas(src)
- new /obj/item/device/flashlight(src)
- new /obj/item/tank/internals/oxygen/red(src)
- new /obj/item/extinguisher(src)
- new /obj/item/clothing/head/hardhat/red(src)
-
-/*
- * Tool Closet
- */
-/obj/structure/closet/toolcloset
- name = "tool closet"
- desc = "It's a storage unit for tools."
- icon_state = "eng"
- icon_door = "eng_tool"
-
-/obj/structure/closet/toolcloset/PopulateContents()
- ..()
- if(prob(40))
- new /obj/item/clothing/suit/hazardvest(src)
- if(prob(70))
- new /obj/item/device/flashlight(src)
- if(prob(70))
- new /obj/item/screwdriver(src)
- if(prob(70))
- new /obj/item/wrench(src)
- if(prob(70))
- new /obj/item/weldingtool(src)
- if(prob(70))
- new /obj/item/crowbar(src)
- if(prob(70))
- new /obj/item/wirecutters(src)
- if(prob(70))
- new /obj/item/device/t_scanner(src)
- if(prob(20))
- new /obj/item/storage/belt/utility(src)
- if(prob(30))
- new /obj/item/stack/cable_coil/random(src)
- if(prob(30))
- new /obj/item/stack/cable_coil/random(src)
- if(prob(30))
- new /obj/item/stack/cable_coil/random(src)
- if(prob(20))
- new /obj/item/device/multitool(src)
- if(prob(5))
- new /obj/item/clothing/gloves/color/yellow(src)
- if(prob(40))
- new /obj/item/clothing/head/hardhat(src)
-
-
-/*
- * Radiation Closet
- */
-/obj/structure/closet/radiation
- name = "radiation suit closet"
- desc = "It's a storage unit for rad-protective suits."
- icon_state = "eng"
- icon_door = "eng_rad"
-
-/obj/structure/closet/radiation/PopulateContents()
- ..()
- new /obj/item/device/geiger_counter(src)
- new /obj/item/clothing/suit/radiation(src)
- new /obj/item/clothing/head/radiation(src)
-
-/*
- * Bombsuit closet
- */
-/obj/structure/closet/bombcloset
- name = "\improper EOD closet"
- desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bomb"
-
-/obj/structure/closet/bombcloset/PopulateContents()
- ..()
- new /obj/item/clothing/suit/bomb_suit( src )
- new /obj/item/clothing/under/color/black( src )
- new /obj/item/clothing/shoes/sneakers/black( src )
- new /obj/item/clothing/head/bomb_hood( src )
-
-
-/obj/structure/closet/bombclosetsecurity
- name = "\improper EOD closet"
- desc = "It's a storage unit for explosion-protective suits."
- icon_state = "bomb"
-
-/obj/structure/closet/bombclosetsecurity/PopulateContents()
- new /obj/item/clothing/suit/bomb_suit/security( src )
- new /obj/item/clothing/under/rank/security( src )
- new /obj/item/clothing/shoes/sneakers/brown( src )
- new /obj/item/clothing/head/bomb_hood/security( src )
-
-/*
- * Ammunition
- */
-/obj/structure/closet/ammunitionlocker
- name = "ammunition locker"
-
-/obj/structure/closet/ammunitionlocker/PopulateContents()
- ..()
- for(var/i in 1 to 8)
- new /obj/item/ammo_casing/shotgun/beanbag(src)
+/* Utility Closets
+ * Contains:
+ * Emergency Closet
+ * Fire Closet
+ * Tool Closet
+ * Radiation Closet
+ * Bombsuit Closet
+ * Hydrant
+ * First Aid
+ */
+
+/*
+ * Emergency Closet
+ */
+/obj/structure/closet/emcloset
+ name = "emergency closet"
+ desc = "It's a storage unit for emergency breath masks and O2 tanks."
+ icon_state = "emergency"
+
+/obj/structure/closet/emcloset/anchored
+ anchored = TRUE
+
+/obj/structure/closet/emcloset/PopulateContents()
+ ..()
+
+ if (prob(40))
+ new /obj/item/storage/toolbox/emergency(src)
+
+ switch (pickweight(list("small" = 40, "aid" = 25, "tank" = 20, "both" = 10, "nothing" = 4, "delete" = 1)))
+ if ("small")
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/breath(src)
+ new /obj/item/clothing/mask/breath(src)
+
+ if ("aid")
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/storage/firstaid/o2(src)
+ new /obj/item/clothing/mask/breath(src)
+
+ if ("tank")
+ new /obj/item/tank/internals/air(src)
+ new /obj/item/clothing/mask/breath(src)
+
+ if ("both")
+ new /obj/item/tank/internals/emergency_oxygen(src)
+ new /obj/item/clothing/mask/breath(src)
+
+ if ("nothing")
+ // doot
+
+ // teehee
+ if ("delete")
+ qdel(src)
+
+ //If you want to re-add fire, just add "fire" = 15 to the pick list.
+ /*if ("fire")
+ new /obj/structure/closet/firecloset(src.loc)
+ qdel(src)*/
+
+/*
+ * Fire Closet
+ */
+/obj/structure/closet/firecloset
+ name = "fire-safety closet"
+ desc = "It's a storage unit for fire-fighting supplies."
+ icon_state = "fire"
+
+/obj/structure/closet/firecloset/PopulateContents()
+ ..()
+
+ new /obj/item/clothing/suit/fire/firefighter(src)
+ new /obj/item/clothing/mask/gas(src)
+ new /obj/item/tank/internals/oxygen/red(src)
+ new /obj/item/extinguisher(src)
+ new /obj/item/clothing/head/hardhat/red(src)
+
+/obj/structure/closet/firecloset/full/PopulateContents()
+ new /obj/item/clothing/suit/fire/firefighter(src)
+ new /obj/item/clothing/mask/gas(src)
+ new /obj/item/device/flashlight(src)
+ new /obj/item/tank/internals/oxygen/red(src)
+ new /obj/item/extinguisher(src)
+ new /obj/item/clothing/head/hardhat/red(src)
+
+/*
+ * Tool Closet
+ */
+/obj/structure/closet/toolcloset
+ name = "tool closet"
+ desc = "It's a storage unit for tools."
+ icon_state = "eng"
+ icon_door = "eng_tool"
+
+/obj/structure/closet/toolcloset/PopulateContents()
+ ..()
+ if(prob(40))
+ new /obj/item/clothing/suit/hazardvest(src)
+ if(prob(70))
+ new /obj/item/device/flashlight(src)
+ if(prob(70))
+ new /obj/item/screwdriver(src)
+ if(prob(70))
+ new /obj/item/wrench(src)
+ if(prob(70))
+ new /obj/item/weldingtool(src)
+ if(prob(70))
+ new /obj/item/crowbar(src)
+ if(prob(70))
+ new /obj/item/wirecutters(src)
+ if(prob(70))
+ new /obj/item/device/t_scanner(src)
+ if(prob(20))
+ new /obj/item/storage/belt/utility(src)
+ if(prob(30))
+ new /obj/item/stack/cable_coil/random(src)
+ if(prob(30))
+ new /obj/item/stack/cable_coil/random(src)
+ if(prob(30))
+ new /obj/item/stack/cable_coil/random(src)
+ if(prob(20))
+ new /obj/item/device/multitool(src)
+ if(prob(5))
+ new /obj/item/clothing/gloves/color/yellow(src)
+ if(prob(40))
+ new /obj/item/clothing/head/hardhat(src)
+
+
+/*
+ * Radiation Closet
+ */
+/obj/structure/closet/radiation
+ name = "radiation suit closet"
+ desc = "It's a storage unit for rad-protective suits."
+ icon_state = "eng"
+ icon_door = "eng_rad"
+
+/obj/structure/closet/radiation/PopulateContents()
+ ..()
+ new /obj/item/device/geiger_counter(src)
+ new /obj/item/clothing/suit/radiation(src)
+ new /obj/item/clothing/head/radiation(src)
+
+/*
+ * Bombsuit closet
+ */
+/obj/structure/closet/bombcloset
+ name = "\improper EOD closet"
+ desc = "It's a storage unit for explosion-protective suits."
+ icon_state = "bomb"
+
+/obj/structure/closet/bombcloset/PopulateContents()
+ ..()
+ new /obj/item/clothing/suit/bomb_suit(src)
+ new /obj/item/clothing/under/color/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/head/bomb_hood(src)
+
+/obj/structure/closet/bombcloset/security/PopulateContents()
+ new /obj/item/clothing/suit/bomb_suit/security(src)
+ new /obj/item/clothing/under/rank/security(src)
+ new /obj/item/clothing/shoes/jackboots(src)
+ new /obj/item/clothing/head/bomb_hood/security(src)
+
+/obj/structure/closet/bombcloset/white/PopulateContents()
+ new /obj/item/clothing/suit/bomb_suit/white(src)
+ new /obj/item/clothing/under/color/black(src)
+ new /obj/item/clothing/shoes/sneakers/black(src)
+ new /obj/item/clothing/head/bomb_hood/white(src)
+
+/*
+ * Ammunition
+ */
+/obj/structure/closet/ammunitionlocker
+ name = "ammunition locker"
+
+/obj/structure/closet/ammunitionlocker/PopulateContents()
+ ..()
+ for(var/i in 1 to 8)
+ new /obj/item/ammo_casing/shotgun/beanbag(src)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 93e70cef72..241d7ea41c 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -1,362 +1,362 @@
-/obj/structure/displaycase
- name = "display case"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "glassbox0"
- desc = "A display case for prized possessions."
- density = TRUE
- anchored = TRUE
- resistance_flags = ACID_PROOF
- armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 100)
- max_integrity = 200
- integrity_failure = 50
- var/obj/item/showpiece = null
- var/alert = TRUE
- var/open = FALSE
- var/openable = TRUE
- var/obj/item/electronics/airlock/electronics
- var/start_showpiece_type = null //add type for items on display
-
-/obj/structure/displaycase/Initialize()
- . = ..()
- if(start_showpiece_type)
- showpiece = new start_showpiece_type (src)
- update_icon()
-
-/obj/structure/displaycase/Destroy()
- if(electronics)
- QDEL_NULL(electronics)
- if(showpiece)
- QDEL_NULL(showpiece)
- return ..()
-
-/obj/structure/displaycase/examine(mob/user)
- ..()
- if(alert)
- to_chat(user, "Hooked up with an anti-theft system.")
- if(showpiece)
- to_chat(user, "There's [showpiece] inside.")
-
-
-/obj/structure/displaycase/proc/dump()
- if (showpiece)
- showpiece.forceMove(loc)
- showpiece = null
-
-/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
- switch(damage_type)
- if(BRUTE)
- playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
- if(BURN)
- playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
-
-/obj/structure/displaycase/deconstruct(disassembled = TRUE)
- if(!(flags_1 & NODECONSTRUCT_1))
- dump()
- if(!disassembled)
- new /obj/item/shard( src.loc )
- trigger_alarm()
- qdel(src)
-
-/obj/structure/displaycase/obj_break(damage_flag)
- if(!broken && !(flags_1 & NODECONSTRUCT_1))
- density = FALSE
- broken = 1
- new /obj/item/shard( src.loc )
- playsound(src, "shatter", 70, 1)
- update_icon()
- trigger_alarm()
-
-/obj/structure/displaycase/proc/trigger_alarm()
- //Activate Anti-theft
- if(alert)
- var/area/alarmed = get_area(src)
- alarmed.burglaralert(src)
- playsound(src, 'sound/effects/alert.ogg', 50, 1)
-
-/*
-
-*/
-
-/obj/structure/displaycase/proc/is_directional(atom/A)
- try
- getFlatIcon(A,defdir=4)
- catch
- return 0
- return 1
-
-/obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
- //Get flatIcon even if dir is mismatched for directionless icons
- //SLOW
- var/icon/I
- if(is_directional(A))
- I = getFlatIcon(A)
- else
- var/old_dir = A.dir
- A.setDir(2)
- I = getFlatIcon(A)
- A.setDir(old_dir)
- return I
-
-/obj/structure/displaycase/update_icon()
- var/icon/I
- if(open)
- I = icon('icons/obj/stationobjs.dmi',"glassbox_open")
- else
- I = icon('icons/obj/stationobjs.dmi',"glassbox0")
- if(broken)
- I = icon('icons/obj/stationobjs.dmi',"glassboxb0")
- if(showpiece)
- var/icon/S = get_flat_icon_directional(showpiece)
- S.Scale(17,17)
- I.Blend(S,ICON_UNDERLAY,8,8)
- src.icon = I
- return
-
-/obj/structure/displaycase/attackby(obj/item/W, mob/user, params)
- if(W.GetID() && !broken && openable)
- if(allowed(user))
- to_chat(user, "You [open ? "close":"open"] the [src]")
- toggle_lock(user)
- else
- to_chat(user, "Access denied.")
- else if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP && !broken)
- var/obj/item/weldingtool/WT = W
- if(obj_integrity < max_integrity && WT.remove_fuel(5, user))
- to_chat(user, "You begin repairing [src].")
- playsound(loc, WT.usesound, 40, 1)
- if(do_after(user, 40*W.toolspeed, target = src))
- obj_integrity = max_integrity
- playsound(loc, 'sound/items/welder2.ogg', 50, 1)
- update_icon()
- to_chat(user, "You repair [src].")
- else
- to_chat(user, "[src] is already in good condition!")
- return
- else if(!alert && istype(W, /obj/item/crowbar) && openable) //Only applies to the lab cage and player made display cases
- if(broken)
- if(showpiece)
- to_chat(user, "Remove the displayed object first.")
- else
- to_chat(user, "You remove the destroyed case")
- qdel(src)
- else
- to_chat(user, "You start to [open ? "close":"open"] the [src]")
- if(do_after(user, 20*W.toolspeed, target = src))
- to_chat(user, "You [open ? "close":"open"] the [src]")
- toggle_lock(user)
- else if(open && !showpiece)
- if(user.transferItemToLoc(W, src))
- showpiece = W
- to_chat(user, "You put [W] on display")
- update_icon()
- else if(istype(W, /obj/item/stack/sheet/glass) && broken)
- var/obj/item/stack/sheet/glass/G = W
- if(G.get_amount() < 2)
- to_chat(user, "You need two glass sheets to fix the case!")
- return
- to_chat(user, "You start fixing [src]...")
- if(do_after(user, 20, target = src))
- G.use(2)
- broken = 0
- obj_integrity = max_integrity
- update_icon()
- else
- return ..()
-
-/obj/structure/displaycase/proc/toggle_lock(mob/user)
- open = !open
- update_icon()
-
-/obj/structure/displaycase/attack_paw(mob/user)
- return src.attack_hand(user)
-
-/obj/structure/displaycase/attack_hand(mob/user)
- user.changeNext_move(CLICK_CD_MELEE)
- if (showpiece && (broken || open))
- to_chat(user, "You deactivate the hover field built into the case.")
- dump()
- src.add_fingerprint(user)
- update_icon()
- return
- else
- //prevents remote "kicks" with TK
- if (!Adjacent(user))
- return
- user.visible_message("[user] kicks the display case.", null, null, COMBAT_MESSAGE_RANGE)
- user.do_attack_animation(src, ATTACK_EFFECT_KICK)
- take_damage(2)
-
-
-
-/obj/structure/displaycase_chassis
- anchored = TRUE
- density = FALSE
- name = "display case chassis"
- desc = "wooden base of display case"
- icon = 'icons/obj/stationobjs.dmi'
- icon_state = "glassbox_chassis"
- var/obj/item/electronics/airlock/electronics
-
-
-/obj/structure/displaycase_chassis/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/wrench)) //The player can only deconstruct the wooden frame
- to_chat(user, "You start disassembling [src]...")
- playsound(src.loc, I.usesound, 50, 1)
- if(do_after(user, 30*I.toolspeed, target = src))
- playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
- new /obj/item/stack/sheet/mineral/wood(get_turf(src), 5)
- qdel(src)
-
- else if(istype(I, /obj/item/electronics/airlock))
- to_chat(user, "You start installing the electronics into [src]...")
- playsound(src.loc, I.usesound, 50, 1)
- if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src))
- electronics = I
- to_chat(user, "You install the airlock electronics.")
-
- else if(istype(I, /obj/item/stack/sheet/glass))
- var/obj/item/stack/sheet/glass/G = I
- if(G.get_amount() < 10)
- to_chat(user, "You need ten glass sheets to do this!")
- return
- to_chat(user, "You start adding [G] to [src]...")
- if(do_after(user, 20, target = src))
- G.use(10)
- var/obj/structure/displaycase/display = new(src.loc)
- if(electronics)
- electronics.loc = display
- display.electronics = electronics
- if(electronics.one_access)
- display.req_one_access = electronics.accesses
- else
- display.req_access = electronics.accesses
- qdel(src)
- else
- return ..()
-
-//The captains display case requiring specops ID access is intentional.
-//The lab cage and captains display case do not spawn with electronics, which is why req_access is needed.
-/obj/structure/displaycase/captain
- alert = 1
- start_showpiece_type = /obj/item/gun/energy/laser/captain
- req_access = list(ACCESS_CENT_SPECOPS)
-
-/obj/structure/displaycase/labcage
- name = "lab cage"
- desc = "A glass lab container for storing interesting creatures."
- start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
- req_access = list(ACCESS_RD)
-
-
-
-/obj/structure/displaycase/trophy
- name = "trophy display case"
- desc = "Store your trophies of accomplishment in here, and they will stay forever."
- var/trophy_message = ""
- var/placer_key = ""
- var/added_roundstart = TRUE
- var/is_locked = TRUE
-
- alert = TRUE
- integrity_failure = 0
- openable = FALSE
-
-/obj/structure/displaycase/trophy/Initialize()
- . = ..()
- GLOB.trophy_cases += src
-
-/obj/structure/displaycase/trophy/Destroy()
- GLOB.trophy_cases -= src
- return ..()
-
-/obj/structure/displaycase/trophy/examine(mob/user)
- ..()
- if(trophy_message)
- to_chat(user, "The plaque reads:")
- to_chat(user, trophy_message)
-
-/obj/structure/displaycase/trophy/attackby(obj/item/W, mob/user, params)
-
- if(!user.Adjacent(src)) //no TK museology
- return
- if(user.a_intent == INTENT_HARM)
- return ..()
-
- if(user.is_holding_item_of_type(/obj/item/key/displaycase))
- if(added_roundstart)
- is_locked = !is_locked
- to_chat(user, "You [!is_locked ? "un" : ""]lock the case.")
- else
- to_chat(user, "The lock is stuck shut!")
- return
-
- if(is_locked)
- to_chat(user, "The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?")
- return
-
- if(!added_roundstart)
- to_chat(user, "You've already put something new in this case.")
- return
-
- if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
- to_chat(user, "The case rejects the [W].")
- return
-
- for(var/a in W.GetAllContents())
- if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
- to_chat(user, "The case rejects the [W].")
- return
-
- if(user.transferItemToLoc(W, src))
-
- if(showpiece)
- to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
- QDEL_NULL(showpiece)
-
- to_chat(user, "You insert [W] into the case.")
- showpiece = W
- added_roundstart = FALSE
- update_icon()
-
- placer_key = user.ckey
-
- trophy_message = W.desc //default value
-
- var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
- if(chosen_plaque)
- if(user.Adjacent(src))
- trophy_message = chosen_plaque
- to_chat(user, "You set the plaque's text.")
- else
- to_chat(user, "You are too far to set the plaque's text.")
-
- SSpersistence.SaveTrophy(src)
- return TRUE
-
- else
- to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!")
-
- return
-
-/obj/structure/displaycase/trophy/dump()
- if (showpiece)
- if(added_roundstart)
- visible_message("The [showpiece] crumbles to dust!")
- new /obj/effect/decal/cleanable/ash(loc)
- QDEL_NULL(showpiece)
- else
- ..()
-
-/obj/item/key/displaycase
- name = "display case key"
- desc = "The key to the curator's display cases."
-
-/obj/item/showpiece_dummy
- name = "Cheap replica"
-
-/obj/item/showpiece_dummy/Initialize(mapload, path)
- . = ..()
- var/obj/item/I = path
- name = initial(I.name)
- icon = initial(I.icon)
- icon_state = initial(I.icon_state)
+/obj/structure/displaycase
+ name = "display case"
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "glassbox0"
+ desc = "A display case for prized possessions."
+ density = TRUE
+ anchored = TRUE
+ resistance_flags = ACID_PROOF
+ armor = list(melee = 30, bullet = 0, laser = 0, energy = 0, bomb = 10, bio = 0, rad = 0, fire = 70, acid = 100)
+ max_integrity = 200
+ integrity_failure = 50
+ var/obj/item/showpiece = null
+ var/alert = TRUE
+ var/open = FALSE
+ var/openable = TRUE
+ var/obj/item/electronics/airlock/electronics
+ var/start_showpiece_type = null //add type for items on display
+
+/obj/structure/displaycase/Initialize()
+ . = ..()
+ if(start_showpiece_type)
+ showpiece = new start_showpiece_type (src)
+ update_icon()
+
+/obj/structure/displaycase/Destroy()
+ if(electronics)
+ QDEL_NULL(electronics)
+ if(showpiece)
+ QDEL_NULL(showpiece)
+ return ..()
+
+/obj/structure/displaycase/examine(mob/user)
+ ..()
+ if(alert)
+ to_chat(user, "Hooked up with an anti-theft system.")
+ if(showpiece)
+ to_chat(user, "There's [showpiece] inside.")
+
+
+/obj/structure/displaycase/proc/dump()
+ if (showpiece)
+ showpiece.forceMove(loc)
+ showpiece = null
+
+/obj/structure/displaycase/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ switch(damage_type)
+ if(BRUTE)
+ playsound(src.loc, 'sound/effects/glasshit.ogg', 75, 1)
+ if(BURN)
+ playsound(src.loc, 'sound/items/welder.ogg', 100, 1)
+
+/obj/structure/displaycase/deconstruct(disassembled = TRUE)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ dump()
+ if(!disassembled)
+ new /obj/item/shard( src.loc )
+ trigger_alarm()
+ qdel(src)
+
+/obj/structure/displaycase/obj_break(damage_flag)
+ if(!broken && !(flags_1 & NODECONSTRUCT_1))
+ density = FALSE
+ broken = 1
+ new /obj/item/shard( src.loc )
+ playsound(src, "shatter", 70, 1)
+ update_icon()
+ trigger_alarm()
+
+/obj/structure/displaycase/proc/trigger_alarm()
+ //Activate Anti-theft
+ if(alert)
+ var/area/alarmed = get_area(src)
+ alarmed.burglaralert(src)
+ playsound(src, 'sound/effects/alert.ogg', 50, 1)
+
+/*
+
+*/
+
+/obj/structure/displaycase/proc/is_directional(atom/A)
+ try
+ getFlatIcon(A,defdir=4)
+ catch
+ return 0
+ return 1
+
+/obj/structure/displaycase/proc/get_flat_icon_directional(atom/A)
+ //Get flatIcon even if dir is mismatched for directionless icons
+ //SLOW
+ var/icon/I
+ if(is_directional(A))
+ I = getFlatIcon(A)
+ else
+ var/old_dir = A.dir
+ A.setDir(2)
+ I = getFlatIcon(A)
+ A.setDir(old_dir)
+ return I
+
+/obj/structure/displaycase/update_icon()
+ var/icon/I
+ if(open)
+ I = icon('icons/obj/stationobjs.dmi',"glassbox_open")
+ else
+ I = icon('icons/obj/stationobjs.dmi',"glassbox0")
+ if(broken)
+ I = icon('icons/obj/stationobjs.dmi',"glassboxb0")
+ if(showpiece)
+ var/icon/S = get_flat_icon_directional(showpiece)
+ S.Scale(17,17)
+ I.Blend(S,ICON_UNDERLAY,8,8)
+ src.icon = I
+ return
+
+/obj/structure/displaycase/attackby(obj/item/W, mob/user, params)
+ if(W.GetID() && !broken && openable)
+ if(allowed(user))
+ to_chat(user, "You [open ? "close":"open"] the [src]")
+ toggle_lock(user)
+ else
+ to_chat(user, "Access denied.")
+ else if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP && !broken)
+ var/obj/item/weldingtool/WT = W
+ if(obj_integrity < max_integrity && WT.remove_fuel(5, user))
+ to_chat(user, "You begin repairing [src].")
+ playsound(loc, WT.usesound, 40, 1)
+ if(do_after(user, 40*W.toolspeed, target = src))
+ obj_integrity = max_integrity
+ playsound(loc, 'sound/items/welder2.ogg', 50, 1)
+ update_icon()
+ to_chat(user, "You repair [src].")
+ else
+ to_chat(user, "[src] is already in good condition!")
+ return
+ else if(!alert && istype(W, /obj/item/crowbar) && openable) //Only applies to the lab cage and player made display cases
+ if(broken)
+ if(showpiece)
+ to_chat(user, "Remove the displayed object first.")
+ else
+ to_chat(user, "You remove the destroyed case")
+ qdel(src)
+ else
+ to_chat(user, "You start to [open ? "close":"open"] the [src]")
+ if(do_after(user, 20*W.toolspeed, target = src))
+ to_chat(user, "You [open ? "close":"open"] the [src]")
+ toggle_lock(user)
+ else if(open && !showpiece)
+ if(user.transferItemToLoc(W, src))
+ showpiece = W
+ to_chat(user, "You put [W] on display")
+ update_icon()
+ else if(istype(W, /obj/item/stack/sheet/glass) && broken)
+ var/obj/item/stack/sheet/glass/G = W
+ if(G.get_amount() < 2)
+ to_chat(user, "You need two glass sheets to fix the case!")
+ return
+ to_chat(user, "You start fixing [src]...")
+ if(do_after(user, 20, target = src))
+ G.use(2)
+ broken = 0
+ obj_integrity = max_integrity
+ update_icon()
+ else
+ return ..()
+
+/obj/structure/displaycase/proc/toggle_lock(mob/user)
+ open = !open
+ update_icon()
+
+/obj/structure/displaycase/attack_paw(mob/user)
+ return src.attack_hand(user)
+
+/obj/structure/displaycase/attack_hand(mob/user)
+ user.changeNext_move(CLICK_CD_MELEE)
+ if (showpiece && (broken || open))
+ to_chat(user, "You deactivate the hover field built into the case.")
+ dump()
+ src.add_fingerprint(user)
+ update_icon()
+ return
+ else
+ //prevents remote "kicks" with TK
+ if (!Adjacent(user))
+ return
+ user.visible_message("[user] kicks the display case.", null, null, COMBAT_MESSAGE_RANGE)
+ user.do_attack_animation(src, ATTACK_EFFECT_KICK)
+ take_damage(2)
+
+
+
+/obj/structure/displaycase_chassis
+ anchored = TRUE
+ density = FALSE
+ name = "display case chassis"
+ desc = "The wooden base of a display case."
+ icon = 'icons/obj/stationobjs.dmi'
+ icon_state = "glassbox_chassis"
+ var/obj/item/electronics/airlock/electronics
+
+
+/obj/structure/displaycase_chassis/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/wrench)) //The player can only deconstruct the wooden frame
+ to_chat(user, "You start disassembling [src]...")
+ playsound(src.loc, I.usesound, 50, 1)
+ if(do_after(user, 30*I.toolspeed, target = src))
+ playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1)
+ new /obj/item/stack/sheet/mineral/wood(get_turf(src), 5)
+ qdel(src)
+
+ else if(istype(I, /obj/item/electronics/airlock))
+ to_chat(user, "You start installing the electronics into [src]...")
+ playsound(src.loc, I.usesound, 50, 1)
+ if(do_after(user, 30, target = src) && user.transferItemToLoc(I,src))
+ electronics = I
+ to_chat(user, "You install the airlock electronics.")
+
+ else if(istype(I, /obj/item/stack/sheet/glass))
+ var/obj/item/stack/sheet/glass/G = I
+ if(G.get_amount() < 10)
+ to_chat(user, "You need ten glass sheets to do this!")
+ return
+ to_chat(user, "You start adding [G] to [src]...")
+ if(do_after(user, 20, target = src))
+ G.use(10)
+ var/obj/structure/displaycase/display = new(src.loc)
+ if(electronics)
+ electronics.loc = display
+ display.electronics = electronics
+ if(electronics.one_access)
+ display.req_one_access = electronics.accesses
+ else
+ display.req_access = electronics.accesses
+ qdel(src)
+ else
+ return ..()
+
+//The captains display case requiring specops ID access is intentional.
+//The lab cage and captains display case do not spawn with electronics, which is why req_access is needed.
+/obj/structure/displaycase/captain
+ alert = 1
+ start_showpiece_type = /obj/item/gun/energy/laser/captain
+ req_access = list(ACCESS_CENT_SPECOPS)
+
+/obj/structure/displaycase/labcage
+ name = "lab cage"
+ desc = "A glass lab container for storing interesting creatures."
+ start_showpiece_type = /obj/item/clothing/mask/facehugger/lamarr
+ req_access = list(ACCESS_RD)
+
+
+
+/obj/structure/displaycase/trophy
+ name = "trophy display case"
+ desc = "Store your trophies of accomplishment in here, and they will stay forever."
+ var/trophy_message = ""
+ var/placer_key = ""
+ var/added_roundstart = TRUE
+ var/is_locked = TRUE
+
+ alert = TRUE
+ integrity_failure = 0
+ openable = FALSE
+
+/obj/structure/displaycase/trophy/Initialize()
+ . = ..()
+ GLOB.trophy_cases += src
+
+/obj/structure/displaycase/trophy/Destroy()
+ GLOB.trophy_cases -= src
+ return ..()
+
+/obj/structure/displaycase/trophy/examine(mob/user)
+ ..()
+ if(trophy_message)
+ to_chat(user, "The plaque reads:")
+ to_chat(user, trophy_message)
+
+/obj/structure/displaycase/trophy/attackby(obj/item/W, mob/user, params)
+
+ if(!user.Adjacent(src)) //no TK museology
+ return
+ if(user.a_intent == INTENT_HARM)
+ return ..()
+
+ if(user.is_holding_item_of_type(/obj/item/key/displaycase))
+ if(added_roundstart)
+ is_locked = !is_locked
+ to_chat(user, "You [!is_locked ? "un" : ""]lock the case.")
+ else
+ to_chat(user, "The lock is stuck shut!")
+ return
+
+ if(is_locked)
+ to_chat(user, "The case is shut tight with an old fashioned physical lock. Maybe you should ask the curator for the key?")
+ return
+
+ if(!added_roundstart)
+ to_chat(user, "You've already put something new in this case.")
+ return
+
+ if(is_type_in_typecache(W, GLOB.blacklisted_cargo_types))
+ to_chat(user, "The case rejects the [W].")
+ return
+
+ for(var/a in W.GetAllContents())
+ if(is_type_in_typecache(a, GLOB.blacklisted_cargo_types))
+ to_chat(user, "The case rejects the [W].")
+ return
+
+ if(user.transferItemToLoc(W, src))
+
+ if(showpiece)
+ to_chat(user, "You press a button, and [showpiece] descends into the floor of the case.")
+ QDEL_NULL(showpiece)
+
+ to_chat(user, "You insert [W] into the case.")
+ showpiece = W
+ added_roundstart = FALSE
+ update_icon()
+
+ placer_key = user.ckey
+
+ trophy_message = W.desc //default value
+
+ var/chosen_plaque = stripped_input(user, "What would you like the plaque to say? Default value is item's description.", "Trophy Plaque")
+ if(chosen_plaque)
+ if(user.Adjacent(src))
+ trophy_message = chosen_plaque
+ to_chat(user, "You set the plaque's text.")
+ else
+ to_chat(user, "You are too far to set the plaque's text.")
+
+ SSpersistence.SaveTrophy(src)
+ return TRUE
+
+ else
+ to_chat(user, "\The [W] is stuck to your hand, you can't put it in the [src.name]!")
+
+ return
+
+/obj/structure/displaycase/trophy/dump()
+ if (showpiece)
+ if(added_roundstart)
+ visible_message("The [showpiece] crumbles to dust!")
+ new /obj/effect/decal/cleanable/ash(loc)
+ QDEL_NULL(showpiece)
+ else
+ ..()
+
+/obj/item/key/displaycase
+ name = "display case key"
+ desc = "The key to the curator's display cases."
+
+/obj/item/showpiece_dummy
+ name = "Cheap replica"
+
+/obj/item/showpiece_dummy/Initialize(mapload, path)
+ . = ..()
+ var/obj/item/I = path
+ name = initial(I.name)
+ icon = initial(I.icon)
+ icon_state = initial(I.icon_state)
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 460fc62bec..3b59bdbcec 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -29,9 +29,13 @@
can_be_unanchored = FALSE
CanAtmosPass = ATMOS_PASS_DENSITY
-/obj/structure/falsewall/New(loc)
- ..()
- air_update_turf(1)
+/obj/structure/falsewall/Initialize()
+ . = ..()
+ air_update_turf(TRUE)
+
+/obj/structure/falsewall/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_MEDIUM_INSULATION)
/obj/structure/falsewall/Destroy()
density = FALSE
@@ -195,7 +199,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
- radiation_pulse(get_turf(src), 0, 3, 15, 1)
+ radiation_pulse(src, 150)
for(var/turf/closed/wall/mineral/uranium/T in orange(1,src))
T.radiate()
last_event = world.time
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index c1b6c56bf5..260285aff9 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -323,7 +323,7 @@
/obj/structure/flora/rock
icon_state = "basalt"
- desc = "A volcanic rock"
+ desc = "A volcanic rock."
icon = 'icons/obj/flora/rocks.dmi'
resistance_flags = FIRE_PROOF
density = TRUE
@@ -334,7 +334,7 @@
/obj/structure/flora/rock/pile
icon_state = "lavarocks"
- desc = "A pile of rocks"
+ desc = "A pile of rocks."
/obj/structure/flora/rock/pile/Initialize()
. = ..()
diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm
index 59aaaca12b..ea7ba25118 100644
--- a/code/game/objects/structures/ghost_role_spawners.dm
+++ b/code/game/objects/structures/ghost_role_spawners.dm
@@ -122,10 +122,10 @@
golems, so that no golem may ever be forced to serve again."
/obj/effect/mob_spawn/human/golem/Initialize(mapload, datum/species/golem/species = null, mob/creator = null)
- . = ..()
- if(species)
+ if(species) //spawners list uses object name to register so this goes before ..()
name += " ([initial(species.prefix)])"
mob_species = species
+ . = ..()
var/area/A = get_area(src)
if(!mapload && A)
notify_ghosts("\A [initial(species.prefix)] golem shell has been completed in \the [A.name].", source = src, action=NOTIFY_ATTACK, flashwindow = FALSE)
@@ -316,10 +316,10 @@
/obj/effect/mob_spawn/human/hotel_staff/security
name = "hotel security sleeper"
- mob_name = "hotel security memeber"
+ mob_name = "hotel security member"
outfit = /datum/outfit/hotelstaff/security
- flavour_text = "You are a peacekeeper assigned to this hotel to protect the intrests of the company while keeping the peace between \
- guests and the staff.Do NOT leave the hotel, as that is grounds for contract termination."
+ flavour_text = "You are a peacekeeper assigned to this hotel to protect the interests of the company while keeping the peace between \
+ guests and the staff. Do NOT leave the hotel, as that is grounds for contract termination."
objectives = "Do not leave your assigned hotel. Try and keep the peace between staff and guests, non-lethal force heavily advised if possible."
/datum/outfit/hotelstaff/security
@@ -458,7 +458,7 @@
//Ancient cryogenic sleepers. Players become NT crewmen from a hundred year old space station, now on the verge of collapse.
/obj/effect/mob_spawn/human/oldsec
name = "old cryogenics pod"
- desc = "A humming cryo pod. You can barely recognise a security uniform underneath the built up ice. The machine is attempting to wake up its occupant"
+ desc = "A humming cryo pod. You can barely recognise a security uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "a security officer"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
@@ -482,7 +482,7 @@
/obj/effect/mob_spawn/human/oldeng
name = "old cryogenics pod"
- desc = "A humming cryo pod. You can barely recognise an engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant"
+ desc = "A humming cryo pod. You can barely recognise an engineering uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "an engineer"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
@@ -506,7 +506,7 @@
/obj/effect/mob_spawn/human/oldsci
name = "old cryogenics pod"
- desc = "A humming cryo pod. You can barely recognise a science uniform underneath the built up ice. The machine is attempting to wake up its occupant"
+ desc = "A humming cryo pod. You can barely recognise a science uniform underneath the built up ice. The machine is attempting to wake up its occupant."
mob_name = "a scientist"
icon = 'icons/obj/cryogenic2.dmi'
icon_state = "sleeper"
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index b3b6022834..389e851404 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -10,6 +10,10 @@
var/can_displace = TRUE //If the girder can be moved around by wrenching it
max_integrity = 200
+/obj/structure/girder/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_VERY_LIGHT_INSULATION)
+
/obj/structure/girder/examine(mob/user)
. = ..()
switch(state)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 1683ac00e6..308a759929 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -17,6 +17,10 @@
var/grille_type = null
var/broken_type = /obj/structure/grille/broken
+/obj/structure/grille/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION)
+
/obj/structure/grille/examine(mob/user)
..()
if(anchored)
@@ -31,7 +35,8 @@
if(RCD_WINDOWGRILLE)
if(the_rcd.window_type == /obj/structure/window/reinforced/fulltile)
return list("mode" = RCD_WINDOWGRILLE, "delay" = 40, "cost" = 12)
- else return list("mode" = RCD_WINDOWGRILLE, "delay" = 20, "cost" = 8)
+ else
+ return list("mode" = RCD_WINDOWGRILLE, "delay" = 20, "cost" = 8)
return FALSE
/obj/structure/grille/rcd_act(mob/user, var/obj/item/construction/rcd/the_rcd, passed_mode)
@@ -62,6 +67,10 @@
var/mob/M = AM
shock(M, 70)
+/obj/structure/grille/attack_animal(mob/user)
+ . = ..()
+ if(!shock(user, 70))
+ take_damage(rand(5,10), BRUTE, "melee", 1)
/obj/structure/grille/attack_paw(mob/user)
attack_hand(user)
diff --git a/code/game/objects/structures/hivebot.dm b/code/game/objects/structures/hivebot.dm
index ea649a1f86..de3c07b410 100644
--- a/code/game/objects/structures/hivebot.dm
+++ b/code/game/objects/structures/hivebot.dm
@@ -1,36 +1,36 @@
-/obj/structure/hivebot_beacon
- name = "beacon"
- desc = "Some odd beacon thing."
- icon = 'icons/mob/hivebot.dmi'
- icon_state = "def_radar-off"
+/obj/structure/hivebot_beacon
+ name = "beacon"
+ desc = "Some odd beacon thing."
+ icon = 'icons/mob/hivebot.dmi'
+ icon_state = "def_radar-off"
anchored = TRUE
density = TRUE
- var/bot_type = "norm"
- var/bot_amt = 10
-
-/obj/structure/hivebot_beacon/New()
- ..()
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(2, loc)
- smoke.start()
- visible_message("The [src] warps in!")
- playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
- addtimer(CALLBACK(src, .proc/warpbots), rand(10, 600))
-
-/obj/structure/hivebot_beacon/proc/warpbots()
- icon_state = "def_radar"
- visible_message("The [src] turns on!")
- while(bot_amt > 0)
- bot_amt--
- switch(bot_type)
- if("norm")
- new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
- if("range")
- new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
- if("rapid")
- new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
- sleep(100)
- visible_message("The [src] warps out!")
- playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
- qdel(src)
- return
+ var/bot_type = "norm"
+ var/bot_amt = 10
+
+/obj/structure/hivebot_beacon/New()
+ ..()
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(2, loc)
+ smoke.start()
+ visible_message("[src] warps in!")
+ playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
+ addtimer(CALLBACK(src, .proc/warpbots), rand(10, 600))
+
+/obj/structure/hivebot_beacon/proc/warpbots()
+ icon_state = "def_radar"
+ visible_message("[src] turns on!")
+ while(bot_amt > 0)
+ bot_amt--
+ switch(bot_type)
+ if("norm")
+ new /mob/living/simple_animal/hostile/hivebot(get_turf(src))
+ if("range")
+ new /mob/living/simple_animal/hostile/hivebot/range(get_turf(src))
+ if("rapid")
+ new /mob/living/simple_animal/hostile/hivebot/rapid(get_turf(src))
+ sleep(100)
+ visible_message("[src] warps out!")
+ playsound(src.loc, 'sound/effects/empulse.ogg', 25, 1)
+ qdel(src)
+ return
diff --git a/code/game/objects/structures/holosign.dm b/code/game/objects/structures/holosign.dm
index dc9a1ee403..38981d1d99 100644
--- a/code/game/objects/structures/holosign.dm
+++ b/code/game/objects/structures/holosign.dm
@@ -61,6 +61,10 @@
/obj/structure/holosign/barrier/engineering
icon_state = "holosign_engi"
+/obj/structure/holosign/barrier/engineering/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_LIGHT_INSULATION)
+
/obj/structure/holosign/barrier/atmos
name = "holo firelock"
desc = "A holographic barrier resembling a firelock. Though it does not prevent solid objects from passing through, gas is kept out."
@@ -97,7 +101,7 @@
/obj/structure/holosign/barrier/cyborg/hacked
name = "Charged Energy Field"
- desc = "A powerful energy field that blocks movement. Energy arcs off it"
+ desc = "A powerful energy field that blocks movement. Energy arcs off it."
max_integrity = 20
var/shockcd = 0
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index a01cb936fc..5f1fa2ebb7 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -1,151 +1,151 @@
-//////Kitchen Spike
-#define VIABLE_MOB_CHECK(X) (isliving(X) && !issilicon(X) && !isbot(X))
-
-/obj/structure/kitchenspike_frame
- name = "meatspike frame"
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "spikeframe"
- desc = "The frame of a meat spike."
+//////Kitchen Spike
+#define VIABLE_MOB_CHECK(X) (isliving(X) && !issilicon(X) && !isbot(X))
+
+/obj/structure/kitchenspike_frame
+ name = "meatspike frame"
+ icon = 'icons/obj/kitchen.dmi'
+ icon_state = "spikeframe"
+ desc = "The frame of a meat spike."
density = TRUE
anchored = FALSE
- max_integrity = 200
-
-/obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
- add_fingerprint(user)
- if(default_unfasten_wrench(user, I))
- return
- else if(istype(I, /obj/item/stack/rods))
- var/obj/item/stack/rods/R = I
- if(R.get_amount() >= 4)
- R.use(4)
- to_chat(user, "You add spikes to the frame.")
- var/obj/F = new /obj/structure/kitchenspike(src.loc)
- transfer_fingerprints_to(F)
- qdel(src)
- else if(istype(I, /obj/item/weldingtool))
- var/obj/item/weldingtool/WT = I
- if(!WT.remove_fuel(0, user))
- return
- to_chat(user, "You begin cutting \the [src] apart...")
- playsound(src.loc, WT.usesound, 40, 1)
- if(do_after(user, 40*WT.toolspeed, 1, target = src))
- if(!WT.isOn())
- return
- playsound(src.loc, WT.usesound, 50, 1)
- visible_message("[user] slices apart \the [src].",
- "You cut \the [src] apart with \the [WT].",
- "You hear welding.")
- new /obj/item/stack/sheet/metal(src.loc, 4)
- qdel(src)
- return
- else
- return ..()
-
-/obj/structure/kitchenspike
- name = "meat spike"
- icon = 'icons/obj/kitchen.dmi'
- icon_state = "spike"
- desc = "A spike for collecting meat from animals"
+ max_integrity = 200
+
+/obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
+ add_fingerprint(user)
+ if(default_unfasten_wrench(user, I))
+ return
+ else if(istype(I, /obj/item/stack/rods))
+ var/obj/item/stack/rods/R = I
+ if(R.get_amount() >= 4)
+ R.use(4)
+ to_chat(user, "You add spikes to the frame.")
+ var/obj/F = new /obj/structure/kitchenspike(src.loc)
+ transfer_fingerprints_to(F)
+ qdel(src)
+ else if(istype(I, /obj/item/weldingtool))
+ var/obj/item/weldingtool/WT = I
+ if(!WT.remove_fuel(0, user))
+ return
+ to_chat(user, "You begin cutting \the [src] apart...")
+ playsound(src.loc, WT.usesound, 40, 1)
+ if(do_after(user, 40*WT.toolspeed, 1, target = src))
+ if(!WT.isOn())
+ return
+ playsound(src.loc, WT.usesound, 50, 1)
+ visible_message("[user] slices apart \the [src].",
+ "You cut \the [src] apart with \the [WT].",
+ "You hear welding.")
+ new /obj/item/stack/sheet/metal(src.loc, 4)
+ qdel(src)
+ return
+ else
+ return ..()
+
+/obj/structure/kitchenspike
+ name = "meat spike"
+ icon = 'icons/obj/kitchen.dmi'
+ icon_state = "spike"
+ desc = "A spike for collecting meat from animals."
density = TRUE
anchored = TRUE
- buckle_lying = 0
- can_buckle = 1
- max_integrity = 250
-
-
-/obj/structure/kitchenspike/attack_paw(mob/user)
- return src.attack_hand(usr)
-
-
-/obj/structure/kitchenspike/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/crowbar))
- if(!has_buckled_mobs())
- playsound(loc, I.usesound, 100, 1)
- if(do_after(user, 20*I.toolspeed, target = src))
- to_chat(user, "You pry the spikes out of the frame.")
- deconstruct(TRUE)
- else
- to_chat(user, "You can't do that while something's on the spike!")
- else
- return ..()
-
-/obj/structure/kitchenspike/attack_hand(mob/user)
- if(VIABLE_MOB_CHECK(user.pulling) && user.a_intent == INTENT_GRAB && !has_buckled_mobs())
- var/mob/living/L = user.pulling
- if(do_mob(user, src, 120))
- if(has_buckled_mobs()) //to prevent spam/queing up attacks
- return
- if(L.buckled)
- return
- if(user.pulling != L)
- return
- playsound(src.loc, 'sound/effects/splat.ogg', 25, 1)
- L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.")
- L.loc = src.loc
- L.emote("scream")
- L.add_splatter_floor()
- L.adjustBruteLoss(30)
- L.setDir(2)
- buckle_mob(L, force=1)
- var/matrix/m180 = matrix(L.transform)
- m180.Turn(180)
- animate(L, transform = m180, time = 3)
- L.pixel_y = L.get_standard_pixel_y_offset(180)
- else if (has_buckled_mobs())
- for(var/mob/living/L in buckled_mobs)
- user_unbuckle_mob(L, user)
- else
- ..()
-
-
-
-/obj/structure/kitchenspike/user_buckle_mob(mob/living/M, mob/living/user) //Don't want them getting put on the rack other than by spiking
- return
-
-/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/living/carbon/human/user)
- if(buckled_mob)
- var/mob/living/M = buckled_mob
- if(M != user)
- M.visible_message(\
- "[user.name] tries to pull [M.name] free of the [src]!",\
- "[user.name] is trying to pull you off the [src], opening up fresh wounds!",\
- "You hear a squishy wet noise.")
- if(!do_after(user, 300, target = src))
- if(M && M.buckled)
- M.visible_message(\
- "[user.name] fails to free [M.name]!",\
- "[user.name] fails to pull you off of the [src].")
- return
-
- else
- M.visible_message(\
- "[M.name] struggles to break free from the [src]!",\
- "You struggle to break free from the [src], exacerbating your wounds! (Stay still for two minutes.)",\
- "You hear a wet squishing noise..")
- M.adjustBruteLoss(30)
- if(!do_after(M, 1200, target = src))
- if(M && M.buckled)
- to_chat(M, "You fail to free yourself!")
- return
- if(!M.buckled)
- return
- var/matrix/m180 = matrix(M.transform)
- m180.Turn(180)
- animate(M, transform = m180, time = 3)
- M.pixel_y = M.get_standard_pixel_y_offset(180)
- M.adjustBruteLoss(30)
- src.visible_message(text("[M] falls free of the [src]!"))
- unbuckle_mob(M,force=1)
- M.emote("scream")
- M.AdjustKnockdown(20)
-
-/obj/structure/kitchenspike/deconstruct(disassembled = TRUE)
- if(disassembled)
- var/obj/F = new /obj/structure/kitchenspike_frame(src.loc)
- transfer_fingerprints_to(F)
- else
- new /obj/item/stack/sheet/metal(src.loc, 4)
- new /obj/item/stack/rods(loc, 4)
- qdel(src)
-
-#undef VIABLE_MOB_CHECK
+ buckle_lying = 0
+ can_buckle = 1
+ max_integrity = 250
+
+
+/obj/structure/kitchenspike/attack_paw(mob/user)
+ return src.attack_hand(usr)
+
+
+/obj/structure/kitchenspike/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/crowbar))
+ if(!has_buckled_mobs())
+ playsound(loc, I.usesound, 100, 1)
+ if(do_after(user, 20*I.toolspeed, target = src))
+ to_chat(user, "You pry the spikes out of the frame.")
+ deconstruct(TRUE)
+ else
+ to_chat(user, "You can't do that while something's on the spike!")
+ else
+ return ..()
+
+/obj/structure/kitchenspike/attack_hand(mob/user)
+ if(VIABLE_MOB_CHECK(user.pulling) && user.a_intent == INTENT_GRAB && !has_buckled_mobs())
+ var/mob/living/L = user.pulling
+ if(do_mob(user, src, 120))
+ if(has_buckled_mobs()) //to prevent spam/queing up attacks
+ return
+ if(L.buckled)
+ return
+ if(user.pulling != L)
+ return
+ playsound(src.loc, 'sound/effects/splat.ogg', 25, 1)
+ L.visible_message("[user] slams [L] onto the meat spike!", "[user] slams you onto the meat spike!", "You hear a squishy wet noise.")
+ L.loc = src.loc
+ L.emote("scream")
+ L.add_splatter_floor()
+ L.adjustBruteLoss(30)
+ L.setDir(2)
+ buckle_mob(L, force=1)
+ var/matrix/m180 = matrix(L.transform)
+ m180.Turn(180)
+ animate(L, transform = m180, time = 3)
+ L.pixel_y = L.get_standard_pixel_y_offset(180)
+ else if (has_buckled_mobs())
+ for(var/mob/living/L in buckled_mobs)
+ user_unbuckle_mob(L, user)
+ else
+ ..()
+
+
+
+/obj/structure/kitchenspike/user_buckle_mob(mob/living/M, mob/living/user) //Don't want them getting put on the rack other than by spiking
+ return
+
+/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/living/carbon/human/user)
+ if(buckled_mob)
+ var/mob/living/M = buckled_mob
+ if(M != user)
+ M.visible_message(\
+ "[user] tries to pull [M] free of [src]!",\
+ "[user] is trying to pull you off [src], opening up fresh wounds!",\
+ "You hear a squishy wet noise.")
+ if(!do_after(user, 300, target = src))
+ if(M && M.buckled)
+ M.visible_message(\
+ "[user] fails to free [M]!",\
+ "[user] fails to pull you off of [src].")
+ return
+
+ else
+ M.visible_message(\
+ "[M] struggles to break free from [src]!",\
+ "You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)",\
+ "You hear a wet squishing noise..")
+ M.adjustBruteLoss(30)
+ if(!do_after(M, 1200, target = src))
+ if(M && M.buckled)
+ to_chat(M, "You fail to free yourself!")
+ return
+ if(!M.buckled)
+ return
+ var/matrix/m180 = matrix(M.transform)
+ m180.Turn(180)
+ animate(M, transform = m180, time = 3)
+ M.pixel_y = M.get_standard_pixel_y_offset(180)
+ M.adjustBruteLoss(30)
+ src.visible_message(text("[M] falls free of [src]!"))
+ unbuckle_mob(M,force=1)
+ M.emote("scream")
+ M.AdjustKnockdown(20)
+
+/obj/structure/kitchenspike/deconstruct(disassembled = TRUE)
+ if(disassembled)
+ var/obj/F = new /obj/structure/kitchenspike_frame(src.loc)
+ transfer_fingerprints_to(F)
+ else
+ new /obj/item/stack/sheet/metal(src.loc, 4)
+ new /obj/item/stack/rods(loc, 4)
+ qdel(src)
+
+#undef VIABLE_MOB_CHECK
\ No newline at end of file
diff --git a/code/game/objects/structures/manned_turret.dm b/code/game/objects/structures/manned_turret.dm
index 52d9e38f6b..669abb792a 100644
--- a/code/game/objects/structures/manned_turret.dm
+++ b/code/game/objects/structures/manned_turret.dm
@@ -68,14 +68,15 @@
START_PROCESSING(SSfastprocess, src)
/obj/machinery/manned_turret/process()
- if(!LAZYLEN(buckled_mobs))
+ if (!update_positioning())
return PROCESS_KILL
- update_positioning()
/obj/machinery/manned_turret/proc/update_positioning()
+ if (!LAZYLEN(buckled_mobs))
+ return FALSE
var/mob/living/controller = buckled_mobs[1]
if(!istype(controller))
- return
+ return FALSE
var/client/C = controller.client
if(C)
var/atom/A = C.mouseObject
@@ -143,14 +144,13 @@
addtimer(CALLBACK(src, /obj/machinery/manned_turret/.proc/fire_helper, user), i*rate_of_fire)
/obj/machinery/manned_turret/proc/fire_helper(mob/user)
- if(user.incapacitated())
+ if(user.incapacitated() || !(user in buckled_mobs))
return
update_positioning() //REFRESH MOUSE TRACKING!!
var/turf/targets_from = get_turf(src)
if(QDELETED(target))
target = target_turf
var/obj/item/projectile/P = new projectile_type(targets_from)
- P.current = targets_from
P.starting = targets_from
P.firer = user
P.original = target
@@ -201,8 +201,8 @@
O.attacked_by(src, user)
/obj/item/gun_control/attack(mob/living/M, mob/living/user)
- user.lastattacked = M
- M.lastattacker = user
+ M.lastattacker = user.real_name
+ M.lastattackerckey = user.ckey
M.attacked_by(src, user)
add_fingerprint(user)
diff --git a/code/game/objects/structures/mineral_doors.dm b/code/game/objects/structures/mineral_doors.dm
index c767dd1c68..c124540d7d 100644
--- a/code/game/objects/structures/mineral_doors.dm
+++ b/code/game/objects/structures/mineral_doors.dm
@@ -22,10 +22,13 @@
var/closeSound = 'sound/effects/stonedoor_openclose.ogg'
CanAtmosPass = ATMOS_PASS_DENSITY
-/obj/structure/mineral_door/New(location)
- ..()
+/obj/structure/mineral_door/Initialize()
+ . = ..()
initial_state = icon_state
- air_update_turf(1)
+ air_update_turf(TRUE)
+
+/obj/structure/mineral_door/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_MEDIUM_INSULATION)
/obj/structure/mineral_door/Destroy()
density = FALSE
@@ -151,11 +154,17 @@
sheetType = /obj/item/stack/sheet/mineral/silver
max_integrity = 300
+/obj/structure/mineral_door/silver/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_HEAVY_INSULATION)
+
/obj/structure/mineral_door/gold
name = "gold door"
icon_state = "gold"
sheetType = /obj/item/stack/sheet/mineral/gold
+/obj/structure/mineral_door/gold/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_HEAVY_INSULATION)
+
/obj/structure/mineral_door/uranium
name = "uranium door"
icon_state = "uranium"
@@ -163,6 +172,9 @@
max_integrity = 300
light_range = 2
+/obj/structure/mineral_door/uranium/ComponentInitialize()
+ return
+
/obj/structure/mineral_door/sandstone
name = "sandstone door"
icon_state = "sandstone"
@@ -172,6 +184,9 @@
/obj/structure/mineral_door/transparent
opacity = FALSE
+/obj/structure/mineral_door/transparent/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_VERY_LIGHT_INSULATION)
+
/obj/structure/mineral_door/transparent/Close()
..()
set_opacity(FALSE)
@@ -181,6 +196,9 @@
icon_state = "plasma"
sheetType = /obj/item/stack/sheet/mineral/plasma
+/obj/structure/mineral_door/transparent/plasma/ComponentInitialize()
+ return
+
/obj/structure/mineral_door/transparent/plasma/attackby(obj/item/W, mob/user, params)
if(W.is_hot())
var/turf/T = get_turf(src)
@@ -204,6 +222,9 @@
sheetType = /obj/item/stack/sheet/mineral/diamond
max_integrity = 1000
+/obj/structure/mineral_door/transparent/diamond/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_EXTREME_INSULATION)
+
/obj/structure/mineral_door/wood
name = "wood door"
icon_state = "wood"
@@ -213,6 +234,9 @@
resistance_flags = FLAMMABLE
max_integrity = 200
+/obj/structure/mineral_door/wood/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_VERY_LIGHT_INSULATION)
+
/obj/structure/mineral_door/paperframe
name = "paper frame door"
icon_state = "paperframe"
@@ -227,6 +251,9 @@
. = ..()
queue_smooth_neighbors(src)
+/obj/structure/mineral_door/paperframe/ComponentInitialize()
+ return
+
/obj/structure/mineral_door/paperframe/Destroy()
queue_smooth_neighbors(src)
return ..()
diff --git a/code/game/objects/structures/mirror.dm b/code/game/objects/structures/mirror.dm
index 296e4ba757..711f9baf0b 100644
--- a/code/game/objects/structures/mirror.dm
+++ b/code/game/objects/structures/mirror.dm
@@ -101,8 +101,7 @@
..()
/obj/structure/mirror/magic/lesser/New()
- var/list/L = CONFIG_GET(keyed_flag_list/roundstart_races)
- choosable_races = L.Copy()
+ choosable_races = GLOB.roundstart_races.Copy()
..()
/obj/structure/mirror/magic/badmin/New()
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index cdf294fded..85c1694cb0 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -15,7 +15,8 @@
return
for(var/obj/item/I in loc)
- if(notices > 4) break
+ if(notices > 4)
+ break
if(istype(I, /obj/item/paper))
I.loc = src
notices++
diff --git a/code/game/objects/structures/reflector.dm b/code/game/objects/structures/reflector.dm
index 5b758377c4..e47afd53d4 100644
--- a/code/game/objects/structures/reflector.dm
+++ b/code/game/objects/structures/reflector.dm
@@ -1,138 +1,179 @@
/obj/structure/reflector
- name = "reflector frame"
- icon = 'icons/obj/stock_parts.dmi'
- icon_state = "box_0"
- desc = "An angled mirror for reflecting lasers. This one does so at a 90 degree angle."
+ name = "reflector base"
+ icon = 'icons/obj/structures.dmi'
+ icon_state = "reflector_map"
+ desc = "A base for reflector assemblies."
anchored = FALSE
- density = TRUE
+ density = FALSE
layer = BELOW_OBJ_LAYER
- var/finished = 0
- var/admin = 0 //Can't be rotated or deconstructed
+ var/deflector_icon_state
+ var/image/deflector_overlay
+ var/finished = FALSE
+ var/admin = FALSE //Can't be rotated or deconstructed
+ var/can_rotate = TRUE
var/framebuildstacktype = /obj/item/stack/sheet/metal
var/framebuildstackamount = 5
var/buildstacktype = /obj/item/stack/sheet/metal
var/buildstackamount = 0
+ var/list/allowed_projectile_typecache = list(/obj/item/projectile/beam)
+ var/rotation_angle = -1
+
+/obj/structure/reflector/Initialize()
+ . = ..()
+ icon_state = "reflector_base"
+ allowed_projectile_typecache = typecacheof(allowed_projectile_typecache)
+ if(deflector_icon_state)
+ deflector_overlay = image(icon, deflector_icon_state)
+ add_overlay(deflector_overlay)
+
+ if(rotation_angle == -1)
+ setAngle(dir2angle(dir))
+ else
+ setAngle(rotation_angle)
+
+ if(admin)
+ can_rotate = FALSE
/obj/structure/reflector/examine(mob/user)
..()
- to_chat(user, "Alt-click to adjust its direction.")
+ if(finished)
+ to_chat(user, "It is set to [rotation_angle] degrees, and the rotation is [can_rotate ? "unlocked" : "locked"].")
+ if(!admin)
+ if(can_rotate)
+ to_chat(user, "Alt-click to adjust its direction.")
+ else
+ to_chat(user, "Use screwdriver to unlock the rotation.")
+
+/obj/structure/reflector/proc/setAngle(new_angle)
+ if(can_rotate)
+ rotation_angle = new_angle
+ if(deflector_overlay)
+ cut_overlay(deflector_overlay)
+ deflector_overlay.transform = turn(matrix(), new_angle)
+ add_overlay(deflector_overlay)
+
+
+/obj/structure/reflector/setDir(new_dir)
+ setAngle(dir_map_to_angle(new_dir))
+ return ..(NORTH)
+
+/obj/structure/reflector/proc/dir_map_to_angle(dir)
+ return 0
/obj/structure/reflector/bullet_act(obj/item/projectile/P)
- var/turf/reflector_turf = get_turf(src)
- var/turf/reflect_turf
- var/new_dir = get_reflection(src.dir,P.dir)
- if(!istype(P, /obj/item/projectile/beam))
- return..()
- if(new_dir)
- reflect_turf = get_step(reflect_turf, new_dir)
- else
- visible_message("[src] is hit by the [P]!")
- new_dir = 0
- return ..() //Hits as normal, explodes or emps or whatever
-
- reflect_turf = get_step(loc,new_dir)
-
- P.original = reflect_turf
- P.starting = reflector_turf
- P.current = reflector_turf
- P.yo = reflect_turf.y - reflector_turf.y
- P.xo = reflect_turf.x - reflector_turf.x
- P.range = initial(P.range) //Keep the projectile healthy as long as its bouncing off things
- new_dir = 0
- return - 1
+ var/pdir = P.dir
+ var/pangle = P.Angle
+ var/ploc = get_turf(P)
+ if(!finished || !allowed_projectile_typecache[P.type] || !(P.dir in GLOB.cardinals))
+ return ..()
+ if(auto_reflect(P, pdir, ploc, pangle) != -1)
+ return ..()
+ return -1
+/obj/structure/reflector/proc/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
+ P.ignore_source_check = TRUE
+ return -1
/obj/structure/reflector/attackby(obj/item/W, mob/user, params)
if(admin)
return
+
+ if(istype(W, /obj/item/screwdriver))
+ can_rotate = !can_rotate
+ to_chat(user, "You [can_rotate ? "unlock" : "lock"] [src]'s rotation.")
+ playsound(src, W.usesound, 50, 1)
+ return
+
if(istype(W, /obj/item/wrench))
if(anchored)
- to_chat(user, "Unweld the [src] first!")
+ to_chat(user, "Unweld [src] from the floor first!")
+ return
+ user.visible_message("[user] starts to dismantle [src].", "You start to dismantle [src]...")
if(do_after(user, 80*W.toolspeed, target = src))
- playsound(src.loc, W.usesound, 50, 1)
- to_chat(user, "You dismantle the [src].")
- new framebuildstacktype(loc, framebuildstackamount)
- new buildstacktype(loc, buildstackamount)
+ playsound(src, W.usesound, 50, 1)
+ to_chat(user, "You dismantle [src].")
+ new framebuildstacktype(drop_location(), framebuildstackamount)
+ if(buildstackamount)
+ new buildstacktype(drop_location(), buildstackamount)
qdel(src)
else if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
- switch(anchored)
- if(0)
- if (WT.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
- user.visible_message("[user.name] starts to weld the [src.name] to the floor.", \
- "You start to weld \the [src] to the floor...", \
- "You hear welding.")
- if (do_after(user,20*W.toolspeed, target = src))
- if(!src || !WT.isOn())
- return
- anchored = TRUE
- to_chat(user, "You weld \the [src] to the floor.")
- if(1)
- if (WT.remove_fuel(0,user))
- playsound(src.loc, 'sound/items/welder2.ogg', 50, 1)
- user.visible_message("[user.name] starts to cut the [src.name] free from the floor.", \
- "You start to cut \the [src] free from the floor...", \
- "You hear welding.")
- if (do_after(user,20*W.toolspeed, target = src))
- if(!src || !WT.isOn())
- return
- anchored = 0
- to_chat(user, "You cut \the [src] free from the floor.")
+
+ if(obj_integrity < max_integrity)
+ if(WT.remove_fuel(0,user))
+ user.visible_message("[user] starts to repair [src].",
+ "You begin repairing [src]...",
+ "You hear welding.")
+ playsound(src, W.usesound, 40, 1)
+ if(do_after(user,40*WT.toolspeed, target = src))
+ obj_integrity = max_integrity
+ user.visible_message("[user] has repaired [src].", \
+ "You finish repairing [src].")
+
+ else if(!anchored)
+ if (WT.remove_fuel(0,user))
+ playsound(src, W.usesound, 50, 1)
+ user.visible_message("[user] starts to weld [src] to the floor.",
+ "You start to weld [src] to the floor...",
+ "You hear welding.")
+ if (do_after(user,20*W.toolspeed, target = src))
+ if(!WT.isOn())
+ return
+ anchored = TRUE
+ to_chat(user, "You weld [src] to the floor.")
+ else
+ if (WT.remove_fuel(0,user))
+ playsound(src, W.usesound, 50, 1)
+ user.visible_message("[user] starts to cut [src] free from the floor.", "You start to cut [src] free from the floor...", "You hear welding.")
+ if (do_after(user,20*W.toolspeed, target = src))
+ if(!WT.isOn())
+ return
+ anchored = FALSE
+ to_chat(user, "You cut [src] free from the floor.")
//Finishing the frame
else if(istype(W, /obj/item/stack/sheet))
if(finished)
return
var/obj/item/stack/sheet/S = W
- if(istype(W, /obj/item/stack/sheet/glass))
- if(S.get_amount() < 5)
+ if(istype(S, /obj/item/stack/sheet/glass))
+ if(S.use(5))
+ new /obj/structure/reflector/single(drop_location())
+ qdel(src)
+ else
to_chat(user, "You need five sheets of glass to create a reflector!")
return
+ if(istype(S, /obj/item/stack/sheet/rglass))
+ if(S.use(10))
+ new /obj/structure/reflector/double(drop_location())
+ qdel(src)
else
- S.use(5)
- new /obj/structure/reflector/single (src.loc)
- qdel (src)
- if(istype(W, /obj/item/stack/sheet/rglass))
- if(S.get_amount() < 10)
to_chat(user, "You need ten sheets of reinforced glass to create a double reflector!")
return
- else
- S.use(10)
- new /obj/structure/reflector/double (src.loc)
- qdel(src)
- if(istype(W, /obj/item/stack/sheet/mineral/diamond))
- if(S.get_amount() >= 1)
- S.use(1)
- new /obj/structure/reflector/box (src.loc)
+ if(istype(S, /obj/item/stack/sheet/mineral/diamond))
+ if(S.use(1))
+ new /obj/structure/reflector/box(drop_location())
qdel(src)
else
return ..()
-/obj/structure/reflector/proc/get_reflection(srcdir,pdir)
- return 0
-
-
-/obj/structure/reflector/verb/rotate()
- set name = "Rotate"
- set category = "Object"
- set src in oview(1)
-
- if(usr.stat || !usr.canmove || usr.restrained())
- return
- if (src.anchored)
- to_chat(usr, "It is fastened to the floor!")
- return 0
- src.setDir(turn(src.dir, 270))
- return 1
-
-
-/obj/structure/reflector/AltClick(mob/user)
- ..()
+/obj/structure/reflector/proc/rotate(mob/user)
+ if (!can_rotate || admin)
+ to_chat(user, "The rotation is locked!")
+ return FALSE
+ var/new_angle = input(user, "Input a new angle for primary reflection face.", "Reflector Angle", rotation_angle) as null|num
if(!user.canUseTopic(src, be_close=TRUE))
to_chat(user, "You can't do that right now!")
return
- else
- rotate()
+ if(!isnull(new_angle))
+ setAngle(NORM_ROT(new_angle))
+ return TRUE
+
+/obj/structure/reflector/AltClick(mob/user)
+ if(!user.canUseTopic(src, be_close=TRUE))
+ to_chat(user, "You can't do that right now!")
+ return
+ else if(finished)
+ rotate(user)
//TYPES OF REFLECTORS, SINGLE, DOUBLE, BOX
@@ -141,90 +182,98 @@
/obj/structure/reflector/single
name = "reflector"
- icon = 'icons/obj/structures.dmi'
- icon_state = "reflector"
- desc = "A double sided angled mirror for reflecting lasers. This one does so at a 90 degree angle."
- finished = 1
- var/static/list/rotations = list("[NORTH]" = list("[SOUTH]" = WEST, "[EAST]" = NORTH),
-"[EAST]" = list("[SOUTH]" = EAST, "[WEST]" = NORTH),
-"[SOUTH]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH),
-"[WEST]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH) )
+ deflector_icon_state = "reflector"
+ desc = "An angled mirror for reflecting laser beams."
+ density = TRUE
+ finished = TRUE
buildstacktype = /obj/item/stack/sheet/glass
buildstackamount = 5
/obj/structure/reflector/single/anchored
anchored = TRUE
-/obj/structure/reflector/single/get_reflection(srcdir,pdir)
- var/new_dir = rotations["[srcdir]"]["[pdir]"]
- return new_dir
-
/obj/structure/reflector/single/mapping
- admin = 1
+ admin = TRUE
anchored = TRUE
+/obj/structure/reflector/single/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
+ var/incidence = get_angle_of_incidence(rotation_angle, P.Angle)
+ var/incidence_norm = get_angle_of_incidence(rotation_angle, P.Angle, FALSE)
+ if((incidence_norm > -90) && (incidence_norm < 90))
+ return FALSE
+ var/new_angle_s = rotation_angle + incidence
+ while(new_angle_s > 180) // Translate to regular projectile degrees
+ new_angle_s -= 360
+ while(new_angle_s < -180)
+ new_angle_s += 360
+ P.Angle = new_angle_s
+ return ..()
+
//DOUBLE
/obj/structure/reflector/double
name = "double sided reflector"
- icon = 'icons/obj/structures.dmi'
- icon_state = "reflector_double"
- desc = "A double sided angled mirror for reflecting lasers. This one does so at a 90 degree angle."
- finished = 1
- var/static/list/double_rotations = list("[NORTH]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH, "[SOUTH]" = EAST, "[WEST]" = NORTH),
-"[EAST]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH, "[SOUTH]" = WEST, "[EAST]" = NORTH),
-"[SOUTH]" = list("[NORTH]" = EAST, "[WEST]" = SOUTH, "[SOUTH]" = WEST, "[EAST]" = NORTH),
-"[WEST]" = list("[NORTH]" = WEST, "[EAST]" = SOUTH, "[SOUTH]" = EAST, "[WEST]" = NORTH) )
+ deflector_icon_state = "reflector_double"
+ desc = "A double sided angled mirror for reflecting laser beams."
+ density = TRUE
+ finished = TRUE
buildstacktype = /obj/item/stack/sheet/rglass
buildstackamount = 10
/obj/structure/reflector/double/anchored
anchored = TRUE
-/obj/structure/reflector/double/get_reflection(srcdir,pdir)
- var/new_dir = double_rotations["[srcdir]"]["[pdir]"]
- return new_dir
-
/obj/structure/reflector/double/mapping
- admin = 1
+ admin = TRUE
anchored = TRUE
+/obj/structure/reflector/double/auto_reflect(obj/item/projectile/P, pdir, turf/ploc, pangle)
+ var/incidence = get_angle_of_incidence(rotation_angle, P.Angle)
+ var/incidence_norm = get_angle_of_incidence(rotation_angle, P.Angle, FALSE)
+ var/invert = ((incidence_norm > -90) && (incidence_norm < 90))
+ var/new_angle_s = rotation_angle + incidence
+ if(invert)
+ new_angle_s += 180
+ while(new_angle_s > 180) // Translate to regular projectile degrees
+ new_angle_s -= 360
+ while(new_angle_s < -180)
+ new_angle_s += 360
+ P.Angle = new_angle_s
+ return ..()
+
//BOX
/obj/structure/reflector/box
name = "reflector box"
- icon = 'icons/obj/structures.dmi'
- icon_state = "reflector_box"
- desc = "A box with an internal set of mirrors that reflects all laser fire in a single direction."
- finished = 1
- var/static/list/box_rotations = list("[NORTH]" = list("[SOUTH]" = NORTH, "[EAST]" = NORTH, "[WEST]" = NORTH, "[NORTH]" = NORTH),
-"[EAST]" = list("[SOUTH]" = EAST, "[EAST]" = EAST, "[WEST]" = EAST, "[NORTH]" = EAST),
-"[SOUTH]" = list("[SOUTH]" = SOUTH, "[EAST]" = SOUTH, "[WEST]" = SOUTH, "[NORTH]" = SOUTH),
-"[WEST]" = list("[SOUTH]" = WEST, "[EAST]" = WEST, "[WEST]" = WEST, "[NORTH]" = WEST) )
+ deflector_icon_state = "reflector_box"
+ desc = "A box with an internal set of mirrors that reflects all laser beams in a single direction."
+ density = TRUE
+ finished = TRUE
buildstacktype = /obj/item/stack/sheet/mineral/diamond
buildstackamount = 1
/obj/structure/reflector/box/anchored
anchored = TRUE
-/obj/structure/reflector/box/get_reflection(srcdir,pdir)
- var/new_dir = box_rotations["[srcdir]"]["[pdir]"]
- return new_dir
-
-
/obj/structure/reflector/box/mapping
- admin = 1
+ admin = TRUE
anchored = TRUE
+/obj/structure/reflector/box/auto_reflect(obj/item/projectile/P)
+ P.Angle = rotation_angle
+ return ..()
+
/obj/structure/reflector/ex_act()
if(admin)
return
else
- ..()
+ return ..()
+/obj/structure/reflector/dir_map_to_angle(dir)
+ return dir2angle(dir)
/obj/structure/reflector/singularity_act()
if(admin)
return
else
- ..()
+ return ..()
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 0ba290ac31..de8d913f4f 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -53,7 +53,8 @@ FLOOR SAFES
if(tumbler_2_pos == tumbler_2_open)
to_chat(user, "You hear a [pick("tink", "krink", "plink")] from [src].")
if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open)
- if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!")
+ if(user)
+ visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!")
return 1
return 0
diff --git a/code/game/objects/structures/showcase.dm b/code/game/objects/structures/showcase.dm
index 61f4efa824..4d1c60acf8 100644
--- a/code/game/objects/structures/showcase.dm
+++ b/code/game/objects/structures/showcase.dm
@@ -24,7 +24,7 @@
/obj/structure/showcase/fakesec
name = "\improper CentCom security records"
- desc = "Used to view and edit personnel's security records"
+ desc = "Used to view and edit personnel's security records."
icon = 'icons/obj/computer.dmi'
icon_state = "computer"
@@ -98,7 +98,7 @@
/obj/structure/showcase/machinery/signal_decrypter
name = "subsystem signal decrypter"
- desc = "A strange machine thats supposedly used to help pick up and decrypt wave signals. "
+ desc = "A strange machine that's supposedly used to help pick up and decrypt wave signals."
icon = 'icons/obj/machines/telecomms.dmi'
icon_state = "processor"
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index fb46dd45de..254ec956c3 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -8,6 +8,10 @@
armor = list(melee = 50, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 50)
var/buildable_sign = 1 //unwrenchable and modifiable
+/obj/structure/sign/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION) // Since this is on a wall if it becomes irradiated it will smuggle the radiation past the wall
+
/obj/structure/sign/basic
name = "blank sign"
desc = "How can signs be real if our eyes aren't real?"
@@ -213,7 +217,7 @@
/obj/structure/sign/kiddieplaque
name = "AI developers plaque"
- desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\""
+ desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child appears to be retarded. Beneath the image, someone has scratched the word \"PACKETS\"."
icon_state = "kiddieplaque"
/obj/structure/sign/kiddieplaque/badger
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 63333ba07b..b89dca9d4f 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -131,7 +131,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
- radiation_pulse(get_turf(src), 3, 3, 12, 0)
+ radiation_pulse(src, 30)
last_event = world.time
active = null
return
@@ -244,7 +244,7 @@
/obj/structure/statue/diamond
max_integrity = 1000
material_drop_type = /obj/item/stack/sheet/mineral/diamond
- desc = "This is a very expensive diamond statue"
+ desc = "This is a very expensive diamond statue."
/obj/structure/statue/diamond/captain
name = "statue of THE captain."
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index a3dfe2b669..40edea8ff4 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -41,23 +41,20 @@
/obj/structure/table/proc/deconstruction_hints(mob/user)
to_chat(user, "The top is screwed on, but the main bolts are also visible.")
-/obj/structure/table/Initialize()
- . = ..()
- for(var/obj/structure/table/T in src.loc)
- if(T != src)
- qdel(T)
-
/obj/structure/table/update_icon()
if(smooth)
queue_smooth(src)
queue_smooth_neighbors(src)
/obj/structure/table/narsie_act()
- new /obj/structure/table/wood(src.loc)
+ var/atom/A = loc
+ qdel(src)
+ new /obj/structure/table/wood(A)
/obj/structure/table/ratvar_act()
- new /obj/structure/table/reinforced/brass(src.loc)
-
+ var/atom/A = loc
+ qdel(src)
+ new /obj/structure/table/reinforced/brass(A)
/obj/structure/table/attack_paw(mob/user)
attack_hand(user)
@@ -315,13 +312,15 @@
if(deconstruction_ready)
to_chat(user, "You start strengthening the reinforced table...")
if (do_after(user, 50*W.toolspeed, target = src))
- if(!src || !WT.isOn()) return
+ if(!src || !WT.isOn())
+ return
to_chat(user, "You strengthen the table.")
deconstruction_ready = 0
else
to_chat(user, "You start weakening the reinforced table...")
if (do_after(user, 50*W.toolspeed, target = src))
- if(!src || !WT.isOn()) return
+ if(!src || !WT.isOn())
+ return
to_chat(user, "You weaken the table.")
deconstruction_ready = 1
else
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 16d1072779..e93372b831 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -11,9 +11,9 @@
/obj/structure/transit_tube_pod/Initialize()
. = ..()
- air_contents.add_gases("o2", "n2")
- air_contents.gases["o2"][MOLES] = MOLES_O2STANDARD
- air_contents.gases["n2"][MOLES] = MOLES_N2STANDARD
+ air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = MOLES_O2STANDARD
+ air_contents.gases[/datum/gas/nitrogen][MOLES] = MOLES_N2STANDARD
air_contents.temperature = T20C
@@ -88,7 +88,8 @@
/obj/structure/transit_tube_pod/Process_Spacemove()
if(moving) //No drifting while moving in the tubes
return 1
- else return ..()
+ else
+ return ..()
/obj/structure/transit_tube_pod/proc/follow_tube()
set waitfor = 0
@@ -182,4 +183,4 @@
return
/obj/structure/transit_tube_pod/return_temperature()
- return air_contents.temperature
\ No newline at end of file
+ return air_contents.temperature
diff --git a/code/game/objects/structures/traps.dm b/code/game/objects/structures/traps.dm
index 8e6ba993cb..7c5c9f1635 100644
--- a/code/game/objects/structures/traps.dm
+++ b/code/game/objects/structures/traps.dm
@@ -1,6 +1,6 @@
/obj/structure/trap
name = "IT'S A TRAP"
- desc = "stepping on me is a guaranteed bad day"
+ desc = "Stepping on me is a guaranteed bad day."
icon = 'icons/obj/hand_of_god_structures.dmi'
icon_state = "trap"
density = FALSE
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index 18d8b8f7f0..0e5675a5a0 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -199,7 +199,15 @@
var/obj/effect/mist/mymist = null
var/ismist = 0 //needs a var so we can make it linger~
var/watertemp = "normal" //freezing, normal, or boiling
+ var/datum/looping_sound/showering/soundloop
+/obj/machinery/shower/Initialize()
+ . = ..()
+ soundloop = new(list(src), FALSE)
+
+/obj/machinery/shower/Destroy()
+ QDEL_NULL(soundloop)
+ return ..()
/obj/effect/mist
name = "mist"
@@ -215,14 +223,17 @@
update_icon()
add_fingerprint(M)
if(on)
+ soundloop.start()
wash_turf()
for(var/atom/movable/G in loc)
+ G.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
if(isliving(G))
var/mob/living/L = G
wash_mob(L)
else if(isobj(G)) // Skip the light objects
wash_obj(G)
else
+ soundloop.stop()
if(isopenturf(loc))
var/turf/open/tile = loc
tile.MakeSlippery(min_wet_time = 5, wet_time_to_add = 1)
@@ -285,6 +296,7 @@
/obj/machinery/shower/proc/wash_obj(obj/O)
+ O.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
. = O.clean_blood()
O.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
if(isitem(O))
@@ -296,6 +308,7 @@
/obj/machinery/shower/proc/wash_turf()
if(isturf(loc))
var/turf/tile = loc
+ tile.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
tile.remove_atom_colour(WASHABLE_COLOUR_PRIORITY)
tile.clean_blood()
for(var/obj/effect/E in tile)
@@ -304,6 +317,7 @@
/obj/machinery/shower/proc/wash_mob(mob/living/L)
+ L.SendSignal(COMSIG_COMPONENT_CLEAN_ACT, CLEAN_WEAK)
L.wash_cream()
L.ExtinguishMob()
L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
@@ -368,6 +382,15 @@
else
L.clean_blood()
+/obj/machinery/shower/proc/contamination_cleanse(atom/movable/thing)
+ var/datum/component/radioactive/healthy_green_glow = thing.GetComponent(/datum/component/radioactive)
+ if(!healthy_green_glow || QDELETED(healthy_green_glow))
+ return
+ var/strength = healthy_green_glow.strength
+ if(strength <= RAD_BACKGROUND_RADIATION)
+ qdel(healthy_green_glow)
+ return
+ healthy_green_glow.strength = max(strength-1, 0)
/obj/machinery/shower/process()
if(on)
@@ -377,6 +400,7 @@
wash_mob(AM)
else if(isobj(AM))
wash_obj(AM)
+ contamination_cleanse(AM)
/obj/machinery/shower/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/metal (loc, 3)
@@ -474,7 +498,7 @@
flick("baton_active", src)
var/stunforce = B.stunforce
user.Knockdown(stunforce)
- user.stuttering = stunforce
+ user.stuttering = stunforce/20
B.deductcharge(B.hitcost)
user.visible_message("[user] shocks themself while attempting to wash the active [B.name]!", \
"You unwisely attempt to wash [B] while it's still on.")
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index cb22c2a8c1..520ba2ee69 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -98,7 +98,8 @@
playsound(loc, 'sound/items/welder2.ogg', 50, 1)
if(do_after(user, 40*W.toolspeed, target = src))
- if(!src || !WT.isOn()) return
+ if(!src || !WT.isOn())
+ return
to_chat(user, "You disassemble the windoor assembly.")
var/obj/item/stack/sheet/rglass/RG = new (get_turf(src), 5)
RG.add_fingerprint(user)
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 59db363399..18073a6f6b 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -78,6 +78,10 @@
real_explosion_block = explosion_block
explosion_block = EXPLOSION_BLOCK_PROC
+/obj/structure/window/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_VERY_LIGHT_INSULATION, TRUE, FALSE)
+
/obj/structure/window/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
switch(the_rcd.mode)
if(RCD_DECONSTRUCT)
@@ -208,6 +212,7 @@
to_chat(user, "You begin to [anchored ? "unscrew the window from":"screw the window to"] the floor...")
if(do_after(user, decon_speed*I.toolspeed, target = src, extra_checks = CALLBACK(src, .proc/check_anchored, anchored)))
anchored = !anchored
+ air_update_turf(TRUE)
update_nearby_icons()
to_chat(user, "You [anchored ? "fasten the window to":"unfasten the window from"] the floor.")
return
@@ -330,7 +335,6 @@
return FALSE
setDir(target_dir)
- air_update_turf(1)
ini_dir = dir
add_fingerprint(usr)
return TRUE
@@ -359,11 +363,9 @@
move_update_air(T)
/obj/structure/window/CanAtmosPass(turf/T)
- if(get_dir(loc, T) == dir)
- return !density
- if(dir == FULLTILE_WINDOW_DIR)
- return !density
- return 1
+ if(!anchored || !density)
+ return TRUE
+ return !(FULLTILE_WINDOW_DIR == dir || dir == get_dir(loc, T))
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
@@ -432,6 +434,9 @@
explosion_block = 1
glass_type = /obj/item/stack/sheet/rglass
+/obj/structure/window/reinforced/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_HEAVY_INSULATION, TRUE, FALSE)
+
/obj/structure/window/reinforced/spawner/east
dir = EAST
@@ -455,6 +460,9 @@
explosion_block = 1
glass_type = /obj/item/stack/sheet/plasmaglass
+/obj/structure/window/plasma/ComponentInitialize()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION, TRUE, FALSE)
+
/obj/structure/window/plasma/spawner/east
dir = EAST
@@ -640,7 +648,7 @@
/obj/structure/window/reinforced/clockwork/Initialize(mapload, direct)
if(fulltile)
made_glow = TRUE
- ..()
+ . = ..()
QDEL_LIST(debris)
var/amount_of_gears = 2
if(fulltile)
diff --git a/code/game/sound.dm b/code/game/sound.dm
index 13a3343e06..b150c1c148 100644
--- a/code/game/sound.dm
+++ b/code/game/sound.dm
@@ -102,7 +102,7 @@
UNTIL(SSticker.login_music) //wait for SSticker init to set the login music
if(prefs && (prefs.toggles & SOUND_LOBBY))
- SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC) // MAD JAMS)
+ SEND_SOUND(src, sound(SSticker.login_music, repeat = 0, wait = 0, volume = vol, channel = CHANNEL_LOBBYMUSIC)) // MAD JAMS
/proc/get_rand_frequency()
return rand(32000, 55000) //Frequency stuff only works with 45kbps oggs.
@@ -180,4 +180,6 @@
soundin = pick('sound/weapons/bulletflyby.ogg', 'sound/weapons/bulletflyby2.ogg', 'sound/weapons/bulletflyby3.ogg')
if("law")
soundin = pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg')
+ if("honkbot_e")
+ soundin = pick('sound/items/bikehorn.ogg', 'sound/items/AirHorn2.ogg', 'sound/misc/sadtrombone.ogg', 'sound/items/AirHorn.ogg', 'sound/effects/reee.ogg', 'sound/items/WEEOO1.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bcreep.ogg','sound/magic/Fireball.ogg' ,'sound/effects/pray.ogg', 'sound/voice/hiss1.ogg','sound/machines/buzz-sigh.ogg', 'sound/machines/ping.ogg', 'sound/weapons/flashbang.ogg', 'sound/weapons/bladeslice.ogg')
return soundin
diff --git a/code/game/turfs/closed.dm b/code/game/turfs/closed.dm
index c9eb1a6762..322a337117 100644
--- a/code/game/turfs/closed.dm
+++ b/code/game/turfs/closed.dm
@@ -1,10 +1,17 @@
/turf/closed
- var/thermite = 0
layer = CLOSED_TURF_LAYER
opacity = 1
density = TRUE
blocks_air = 1
+/turf/closed/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_MEDIUM_INSULATION)
+
+/turf/closed/ChangeTurf()
+ . = ..()
+ SSair.high_pressure_delta -= src
+
/turf/closed/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
return FALSE
@@ -29,7 +36,7 @@
/turf/closed/indestructible/splashscreen
name = "Space Station 13"
- icon = 'config/title_screens/images/title1.dmi'
+ icon = 'icons/blank_title.png'
icon_state = ""
layer = FLY_LAYER
@@ -153,16 +160,3 @@
desc = "A wall made out of a strange metal. The squares on it pulse in a predictable pattern."
icon = 'icons/turf/walls/hierophant_wall.dmi'
icon_state = "wall"
-
-/turf/closed/bullet_act(obj/item/projectile/Proj)
- . = ..()
- if((. != -1) && !Proj.nodamage && (Proj.damage_type == BRUTE || Proj.damage_type == BURN))
- var/mutable_appearance/bullet_hole = mutable_appearance('icons/effects/effects.dmi', "bullet_hole", BULLET_HOLE_LAYER)
-
- var/random_x = rand(-13, 13)
- bullet_hole.pixel_x += random_x
-
- var/random_y = rand(-13, 13)
- bullet_hole.pixel_y += random_y
-
- add_overlay(bullet_hole, TRUE)
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index 3f5cb9b27f..d227710b32 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -177,11 +177,6 @@
for(var/obj/effect/O in src)
if(is_cleanable(O))
qdel(O)
-
- var/obj/effect/hotspot/hotspot = (locate(/obj/effect/hotspot) in src)
- if(hotspot && !isspaceturf(src))
- air.temperature = max(min(air.temperature-2000,air.temperature/2),0)
- qdel(hotspot)
return 1
/turf/open/handle_slip(mob/living/carbon/C, knockdown_amount, obj/O, lube)
diff --git a/code/game/turfs/simulated/dirtystation.dm b/code/game/turfs/simulated/dirtystation.dm
index cc3688d064..c411d4b6b1 100644
--- a/code/game/turfs/simulated/dirtystation.dm
+++ b/code/game/turfs/simulated/dirtystation.dm
@@ -72,7 +72,7 @@
return
//Hangars and pods covered in oil.
- var/static/list/oily_areas = typecacheof(list(/area/quartermaster))
+ var/static/list/oily_areas = typecacheof(/area/quartermaster)
if(is_type_in_typecache(A, oily_areas))
if(prob(25))
new /obj/effect/decal/cleanable/oil(src)
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 97634f7629..3978bc802d 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -62,7 +62,8 @@
switch(pick(1,2;75,3))
if(1)
src.ReplaceWithLattice()
- if(prob(33)) new /obj/item/stack/sheet/metal(src)
+ if(prob(33))
+ new /obj/item/stack/sheet/metal(src)
if(2)
src.ChangeTurf(src.baseturf)
if(3)
@@ -71,7 +72,8 @@
else
src.break_tile()
src.hotspot_expose(1000,CELL_VOLUME)
- if(prob(33)) new /obj/item/stack/sheet/metal(src)
+ if(prob(33))
+ new /obj/item/stack/sheet/metal(src)
if(3)
if (prob(50))
src.break_tile()
@@ -209,7 +211,8 @@
if(RCD_AIRLOCK)
if(the_rcd.airlock_glass)
return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 20)
- else return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 16)
+ else
+ return list("mode" = RCD_AIRLOCK, "delay" = 50, "cost" = 16)
if(RCD_DECONSTRUCT)
return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 33)
if(RCD_WINDOWGRILLE)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index 428c965197..b2a764f77a 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -122,7 +122,7 @@
/turf/open/floor/grass/fakebasalt //Heart is not a real planeteer power
name = "aesthetic volcanic flooring"
- desc = "Safely recreated turf for your hellplanet-scaping"
+ desc = "Safely recreated turf for your hellplanet-scaping."
icon = 'icons/turf/floors.dmi'
icon_state = "basalt"
floor_tile = /obj/item/stack/tile/basalt
diff --git a/code/game/turfs/simulated/floor/mineral_floor.dm b/code/game/turfs/simulated/floor/mineral_floor.dm
index 6f863d4bd0..5de453d531 100644
--- a/code/game/turfs/simulated/floor/mineral_floor.dm
+++ b/code/game/turfs/simulated/floor/mineral_floor.dm
@@ -206,7 +206,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
- radiation_pulse(get_turf(src), 3, 3, 1, 0)
+ radiation_pulse(src, 10)
for(var/turf/open/floor/mineral/uranium/T in orange(1,src))
T.radiate()
last_event = world.time
diff --git a/code/game/turfs/simulated/floor/misc_floor.dm b/code/game/turfs/simulated/floor/misc_floor.dm
index 794b886537..3e7540cdf6 100644
--- a/code/game/turfs/simulated/floor/misc_floor.dm
+++ b/code/game/turfs/simulated/floor/misc_floor.dm
@@ -231,12 +231,12 @@
/turf/open/floor/bluespace
slowdown = -1
icon_state = "bluespace"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds"
+ desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
floor_tile = /obj/item/stack/tile/bluespace
/turf/open/floor/sepia
slowdown = 2
icon_state = "sepia"
- desc = "Time seems to flow very slowly around these tiles"
+ desc = "Time seems to flow very slowly around these tiles."
floor_tile = /obj/item/stack/tile/sepia
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 3e16da8b9f..27afebef7c 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -11,13 +11,17 @@
name = "plating"
icon_state = "plating"
intact = FALSE
+ var/attachment_holes = TRUE
/turf/open/floor/plating/examine(mob/user)
..()
if(broken || burnt)
to_chat(user, "It looks like the dents could be welded smooth.")
return
- to_chat(user, "There are few attachment holes for a new tile or reinforcement rods.")
+ if(attachment_holes)
+ to_chat(user, "There are few attachment holes for a new tile or reinforcement rods.")
+ else
+ to_chat(user, "You might be able to build ontop of it with some tiles...")
/turf/open/floor/plating/Initialize()
if (!broken_states)
@@ -36,7 +40,7 @@
/turf/open/floor/plating/attackby(obj/item/C, mob/user, params)
if(..())
return
- if(istype(C, /obj/item/stack/rods))
+ if(istype(C, /obj/item/stack/rods) && attachment_holes)
if(broken || burnt)
to_chat(user, "Repair the plating first!")
return
@@ -55,6 +59,11 @@
return
else if(istype(C, /obj/item/stack/tile))
if(!broken && !burnt)
+ for(var/obj/O in src)
+ if(O.level == 1) //ex. pipes laid underneath a tile
+ for(var/M in O.buckled_mobs)
+ to_chat(user, "Someone is buckled to \the [O]! Unbuckle [M] to move \him out of the way.")
+ return
var/obj/item/stack/tile/W = C
if(!W.use(1))
return
diff --git a/code/game/turfs/simulated/floor/plating/asteroid.dm b/code/game/turfs/simulated/floor/plating/asteroid.dm
index 848a7e8219..abbf83a164 100644
--- a/code/game/turfs/simulated/floor/plating/asteroid.dm
+++ b/code/game/turfs/simulated/floor/plating/asteroid.dm
@@ -14,6 +14,7 @@
var/turf_type = /turf/open/floor/plating/asteroid //Because caves do whacky shit to revert to normal
var/floor_variance = 20 //probability floor has a different icon state
archdrops = list(/obj/item/ore/glass = 5)
+ attachment_holes = FALSE
/turf/open/floor/plating/asteroid/Initialize()
var/proper_name = name
@@ -56,8 +57,6 @@
playsound(src, 'sound/weapons/genhit.ogg', 50, 1)
return
- return ..()
-
/turf/open/floor/plating/asteroid/singularity_act()
if(turf_z_is_planet(src))
@@ -193,7 +192,7 @@
var/list/L = list(45)
if(IsOdd(dir2angle(dir))) // We're going at an angle and we want thick angled tunnels.
- L -= 45
+ L += -45
// Expand the edges of our tunnel
for(var/edge_angle in L)
diff --git a/code/game/turfs/simulated/floor/plating/dirt.dm b/code/game/turfs/simulated/floor/plating/dirt.dm
index 9d07c53917..3795150b2e 100644
--- a/code/game/turfs/simulated/floor/plating/dirt.dm
+++ b/code/game/turfs/simulated/floor/plating/dirt.dm
@@ -6,6 +6,7 @@
baseturf = /turf/open/chasm/straight_down/jungle
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
+ attachment_holes = FALSE
/turf/open/floor/plating/dirt/dark
icon_state = "greenerdirt"
diff --git a/code/game/turfs/simulated/floor/plating/misc_plating.dm b/code/game/turfs/simulated/floor/plating/misc_plating.dm
index 13c8988ae2..259e374869 100644
--- a/code/game/turfs/simulated/floor/plating/misc_plating.dm
+++ b/code/game/turfs/simulated/floor/plating/misc_plating.dm
@@ -40,6 +40,7 @@
baseturf = /turf/open/floor/plating/ashplanet/wateryrock //I assume this will be a chasm eventually, once this becomes an actual surface
initial_gas_mix = LAVALAND_DEFAULT_ATMOS
planetary_atmos = TRUE
+ attachment_holes = FALSE
/turf/open/floor/plating/ashplanet/Initialize()
if(smooth)
@@ -81,6 +82,7 @@
name = "beach"
icon = 'icons/misc/beach.dmi'
flags_1 = NONE
+ attachment_holes = FALSE
/turf/open/floor/plating/beach/ex_act(severity, target)
contents_explosion(severity, target)
@@ -130,6 +132,7 @@
baseturf = /turf/open/floor/plating/ice
slowdown = 1
wet = TURF_WET_PERMAFROST
+ attachment_holes = FALSE
/turf/open/floor/plating/ice/colder
temperature = 140
@@ -150,6 +153,7 @@
icon = 'icons/turf/snow.dmi'
icon_state = "snowplating"
temperature = 180
+ attachment_holes = FALSE
/turf/open/floor/plating/snowed/colder
temperature = 140
diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm
index 6ae60a6e49..0578861074 100644
--- a/code/game/turfs/simulated/wall/mineral_walls.dm
+++ b/code/game/turfs/simulated/wall/mineral_walls.dm
@@ -38,9 +38,6 @@
explosion_block = 3
canSmoothWith = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond)
-/turf/closed/wall/mineral/diamond/thermitemelt(mob/user)
- return
-
/turf/closed/wall/mineral/clown
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
@@ -70,7 +67,7 @@
if(!active)
if(world.time > last_event+15)
active = 1
- radiation_pulse(get_turf(src), 3, 3, 4, 0)
+ radiation_pulse(src, 40)
for(var/turf/closed/wall/mineral/uranium/T in orange(1,src))
T.radiate()
last_event = world.time
@@ -258,6 +255,12 @@
icon_state = "map-overspace"
fixed_underlay = list("space"=1)
+/turf/closed/wall/mineral/plastitanium/explosive/dismantle_wall(devastated, explode)
+ var/obj/item/bombcore/large/bombcore = new(get_turf(src))
+ if(devastated || explode)
+ bombcore.detonate()
+ ..()
+
//have to copypaste this code
/turf/closed/wall/mineral/plastitanium/interior/copyTurf(turf/T)
if(T.type != type)
diff --git a/code/game/turfs/simulated/wall/misc_walls.dm b/code/game/turfs/simulated/wall/misc_walls.dm
index e39c791cee..bb45e2df20 100644
--- a/code/game/turfs/simulated/wall/misc_walls.dm
+++ b/code/game/turfs/simulated/wall/misc_walls.dm
@@ -59,7 +59,7 @@
var/obj/effect/clockwork/overlay/wall/realappearence
/turf/closed/wall/clockwork/Initialize()
- ..()
+ . = ..()
new /obj/effect/temp_visual/ratvar/wall(src)
new /obj/effect/temp_visual/ratvar/beam(src)
realappearence = new /obj/effect/clockwork/overlay/wall(src)
diff --git a/code/game/turfs/simulated/wall/reinf_walls.dm b/code/game/turfs/simulated/wall/reinf_walls.dm
index 5c95d108b4..4211c83d37 100644
--- a/code/game/turfs/simulated/wall/reinf_walls.dm
+++ b/code/game/turfs/simulated/wall/reinf_walls.dm
@@ -13,6 +13,10 @@
girder_type = /obj/structure/girder/reinforced
explosion_block = 2
+/turf/closed/wall/r_wall/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_HEAVY_INSULATION)
+
/turf/closed/wall/r_wall/deconstruction_hints(mob/user)
switch(d_state)
if(INTACT)
@@ -252,11 +256,10 @@
dismantle_wall()
/turf/closed/wall/r_wall/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd)
- if(!the_rcd.canRturf)
- return FALSE
- return ..()
+ if(the_rcd.canRturf)
+ return ..()
+
/turf/closed/wall/r_wall/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
- if(!the_rcd.canRturf)
- return FALSE
- return ..()
+ if(the_rcd.canRturf)
+ return ..()
\ No newline at end of file
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index baee3b31c1..6d8db55ad8 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -25,6 +25,19 @@
/turf/closed/wall/clockwork)
smooth = SMOOTH_TRUE
+ var/list/dent_decals
+
+ var/static/list/dent_decal_list = list(
+ WALL_DENT_HIT = list(
+ mutable_appearance('icons/effects/effects.dmi', "impact1", BULLET_HOLE_LAYER),
+ mutable_appearance('icons/effects/effects.dmi', "impact2", BULLET_HOLE_LAYER),
+ mutable_appearance('icons/effects/effects.dmi', "impact3", BULLET_HOLE_LAYER)
+ ),
+ WALL_DENT_SHOT = list(
+ mutable_appearance('icons/effects/effects.dmi', "bullet_hole", BULLET_HOLE_LAYER)
+ )
+ )
+
/turf/closed/wall/examine(mob/user)
..()
deconstruction_hints(user)
@@ -99,6 +112,8 @@
/turf/closed/wall/blob_act(obj/structure/blob/B)
if(prob(50))
dismantle_wall()
+ else
+ add_dent(WALL_DENT_HIT)
/turf/closed/wall/mech_melee_attack(obj/mecha/M)
M.do_attack_animation(src)
@@ -109,11 +124,13 @@
if(prob(hardness + M.force) && M.force > 20)
dismantle_wall(1)
playsound(src, 'sound/effects/meteorimpact.ogg', 100, 1)
+ else
+ add_dent(WALL_DENT_HIT)
if(BURN)
playsound(src, 'sound/items/welder.ogg', 100, 1)
if(TOX)
playsound(src, 'sound/effects/spray2.ogg', 100, 1)
- return 0
+ return FALSE
/turf/closed/wall/attack_paw(mob/living/user)
user.changeNext_move(CLICK_CD_MELEE)
@@ -136,8 +153,9 @@
dismantle_wall(1)
else
playsound(src, 'sound/effects/bang.ogg', 50, 1)
+ add_dent(WALL_DENT_HIT)
to_chat(user, text("You punch the wall."))
- return 1
+ return TRUE
/turf/closed/wall/attack_hand(mob/user)
user.changeNext_move(CLICK_CD_MELEE)
@@ -159,18 +177,28 @@
add_fingerprint(user)
- //THERMITE related stuff. Calls src.thermitemelt() which handles melting simulated walls and the relevant effects
- if( thermite )
- if(W.is_hot())
- thermitemelt(user)
- return
-
var/turf/T = user.loc //get user's location for delay checks
//the istype cascade has been spread among various procs for easy overriding
- if(try_wallmount(W,user,T) || try_decon(W,user,T) || try_destroy(W,user,T))
+ if(try_clean(W, user, T) || try_wallmount(W, user, T) || try_decon(W, user, T) || try_destroy(W, user, T))
return
+ return ..()
+
+/turf/closed/wall/proc/try_clean(obj/item/W, mob/user, turf/T)
+ if((user.a_intent != INTENT_HELP) || !LAZYLEN(dent_decals) || !istype(W, /obj/item/weldingtool))
+ return FALSE
+ var/obj/item/weldingtool/WT = W
+ if(WT.remove_fuel(0, user))
+ to_chat(user, "You begin fixing dents on the wall...")
+ playsound(src, W.usesound, 100, 1)
+ if(do_after(user, slicing_duration * W.toolspeed * 0.1, target = src))
+ if(iswallturf(src) && user && !QDELETED(WT) && WT.isOn() && !QDELETED(T) && (user.loc == T) && (user.get_active_held_item() == WT) && LAZYLEN(dent_decals))
+ to_chat(user, "You fix some dents on the wall.")
+ cut_overlay(dent_decals)
+ LAZYCLEARLIST(dent_decals)
+ return TRUE
+ return FALSE
/turf/closed/wall/proc/try_wallmount(obj/item/W, mob/user, turf/T)
//check for wall mounted frames
@@ -178,78 +206,50 @@
var/obj/item/wallframe/F = W
if(F.try_build(src, user))
F.attach(src, user)
- return 1
+ return TRUE
//Poster stuff
else if(istype(W, /obj/item/poster))
place_poster(W,user)
- return 1
-
- return 0
+ return TRUE
+ return FALSE
/turf/closed/wall/proc/try_decon(obj/item/W, mob/user, turf/T)
- if( istype(W, /obj/item/weldingtool) )
+ if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/WT = W
- if( WT.remove_fuel(0,user) )
+ if(WT.remove_fuel(0, user))
to_chat(user, "You begin slicing through the outer plating...")
playsound(src, W.usesound, 100, 1)
- if(do_after(user, slicing_duration*W.toolspeed, target = src))
- if(!iswallturf(src) || !user || !WT || !WT.isOn() || !T)
- return 1
- if( user.loc == T && user.get_active_held_item() == WT )
+ if(do_after(user, slicing_duration * W.toolspeed, target = src))
+ if(iswallturf(src) && user && !QDELETED(WT) && WT.isOn() && !QDELETED(T) && (user.loc == T) && (user.get_active_held_item() == WT))
to_chat(user, "You remove the outer plating.")
dismantle_wall()
- return 1
- else if( istype(W, /obj/item/gun/energy/plasmacutter) )
+ return TRUE
+ else if(istype(W, /obj/item/gun/energy/plasmacutter))
to_chat(user, "You begin slicing through the outer plating...")
playsound(src, 'sound/items/welder.ogg', 100, 1)
- if(do_after(user, slicing_duration*W.toolspeed, target = src))
- if(!iswallturf(src) || !user || !W || !T)
- return 1
- if( user.loc == T && user.get_active_held_item() == W )
+ if(do_after(user, slicing_duration * W.toolspeed, target = src))
+ if(!iswallturf(src) || !user || QDELETED(W) || QDELETED(T))
+ return TRUE
+ if((user.loc == T) && (user.get_active_held_item() == W))
to_chat(user, "You remove the outer plating.")
dismantle_wall()
visible_message("The wall was sliced apart by [user]!", "You hear metal being sliced apart.")
- return 1
- return 0
+ return TRUE
+ return FALSE
/turf/closed/wall/proc/try_destroy(obj/item/W, mob/user, turf/T)
if(istype(W, /obj/item/pickaxe/drill/jackhammer))
var/obj/item/pickaxe/drill/jackhammer/D = W
if(!iswallturf(src) || !user || !W || !T)
- return 1
+ return TRUE
if( user.loc == T && user.get_active_held_item() == W )
D.playDigSound()
dismantle_wall()
visible_message("[user] smashes through the [name] with the [W.name]!", "You hear the grinding of metal.")
- return 1
- return 0
-
-
-/turf/closed/wall/proc/thermitemelt(mob/user)
- cut_overlays()
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "thermite"
- O.desc = "Looks hot."
- O.icon = 'icons/effects/fire.dmi'
- O.icon_state = "2"
- O.anchored = TRUE
- O.opacity = 1
- O.density = TRUE
- O.layer = FLY_LAYER
-
- playsound(src, 'sound/items/welder.ogg', 100, 1)
-
- if(thermite >= 50)
- var/burning_time = max(100,300 - thermite)
- var/turf/open/floor/F = ChangeTurf(/turf/open/floor/plating)
- F.burn_tile()
- F.add_hiddenprint(user)
- QDEL_IN(O, burning_time)
- else
- thermite = 0
- QDEL_IN(O, 50)
+ return TRUE
+ return FALSE
/turf/closed/wall/singularity_pull(S, current_size)
..()
@@ -271,7 +271,7 @@
if(.)
ChangeTurf(/turf/closed/wall/clockwork)
-/turf/closed/wall/get_dumping_location(obj/item/storage/source,mob/user)
+/turf/closed/wall/get_dumping_location(obj/item/storage/source, mob/user)
return null
/turf/closed/wall/acid_act(acidpwr, acid_volume)
@@ -295,3 +295,12 @@
ChangeTurf(/turf/open/floor/plating)
return TRUE
return FALSE
+
+/turf/closed/wall/proc/add_dent(denttype, x=rand(-8, 8), y=rand(-8, 8))
+ var/mutable_appearance/decal = pick(dent_decal_list[denttype])
+ decal.pixel_x = x
+ decal.pixel_y = y
+
+ cut_overlay(dent_decals)
+ LAZYADD(dent_decals, decal)
+ add_overlay(dent_decals)
diff --git a/code/game/turfs/space/space.dm b/code/game/turfs/space/space.dm
index a51030be2b..54c43cdcea 100644
--- a/code/game/turfs/space/space.dm
+++ b/code/game/turfs/space/space.dm
@@ -44,6 +44,8 @@
if (opacity)
has_opaque_atom = TRUE
+ ComponentInitialize()
+
return INITIALIZE_HINT_NORMAL
/turf/open/space/attack_ghost(mob/dead/observer/user)
@@ -177,7 +179,8 @@
var/obj/structure/lattice/L = locate(/obj/structure/lattice, src)
if(L)
return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 1)
- else return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
+ else
+ return list("mode" = RCD_FLOORWALL, "delay" = 0, "cost" = 3)
return FALSE
/turf/open/space/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index cf611560c3..2ba08fa2a9 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -3,6 +3,7 @@
dir = SOUTH
baseturf = /turf/open/space/transit
flags_1 = NOJAUNT_1 //This line goes out to every wizard that ever managed to escape the den. I'm sorry.
+ explosion_block = INFINITY
/turf/open/space/transit/get_smooth_underlay_icon(mutable_appearance/underlay_appearance, turf/asking_turf, adjacency_dir)
. = ..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 77ef696714..36ba033eef 100755
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -56,6 +56,9 @@
if (opacity)
has_opaque_atom = TRUE
+
+ ComponentInitialize()
+
return INITIALIZE_HINT_NORMAL
/turf/proc/Initalize_Atmos(times_fired)
@@ -112,7 +115,8 @@
return FALSE
/turf/CanPass(atom/movable/mover, turf/target)
- if(!target) return FALSE
+ if(!target)
+ return FALSE
if(istype(mover)) // turf/Enter(...) will perform more advanced checks
return !density
@@ -276,12 +280,12 @@
//////Assimilate Air//////
/turf/open/proc/Assimilate_Air()
- if(blocks_air)
+ var/turf_count = LAZYLEN(atmos_adjacent_turfs)
+ if(blocks_air || !turf_count) //if there weren't any open turfs, no need to update.
return
var/datum/gas_mixture/total = new//Holders to assimilate air from nearby turfs
var/list/total_gases = total.gases
- var/turf_count = LAZYLEN(atmos_adjacent_turfs)
for(var/T in atmos_adjacent_turfs)
var/turf/open/S = T
@@ -295,9 +299,6 @@
air.copy_from(total)
- if(!turf_count) //if there weren't any open turfs, no need to update.
- return
-
var/list/air_gases = air.gases
for(var/id in air_gases)
air_gases[id][MOLES] /= turf_count //Averages contents of the turfs, ignoring walls and the like
@@ -347,7 +348,8 @@
// possible. It results in more efficient (CPU-wise) pathing
// for bots and anything else that only moves in cardinal dirs.
/turf/proc/Distance_cardinal(turf/T)
- if(!src || !T) return FALSE
+ if(!src || !T)
+ return FALSE
return abs(x - T.x) + abs(y - T.y)
////////////////////////////////////////////////////
@@ -438,13 +440,13 @@
/turf/proc/empty(turf_type=/turf/open/space, baseturf_type, list/ignore_typecache, forceop = FALSE)
// Remove all atoms except observers, landmarks, docking ports
var/static/list/ignored_atoms = typecacheof(list(/mob/dead, /obj/effect/landmark, /obj/docking_port, /atom/movable/lighting_object))
- var/list/allowed_contents = typecache_filter_list_reverse(GetAllContents(), ignored_atoms | ignore_typecache)
+ var/list/allowed_contents = typecache_filter_list_reverse(GetAllContentsIgnoring(ignore_typecache), ignored_atoms)
allowed_contents -= src
for(var/i in 1 to allowed_contents.len)
var/thing = allowed_contents[i]
qdel(thing, force=TRUE)
- var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE, forceop = forceop)
+ var/turf/newT = ChangeTurf(turf_type, baseturf_type, FALSE, FALSE, forceop)
SSair.remove_from_active(newT)
newT.CalculateAdjacentTurfs()
diff --git a/code/game/world.dm b/code/game/world.dm
index bd04008ea3..026d7324e4 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -1,6 +1,3 @@
-#define PR_ANNOUNCEMENTS_PER_ROUND 5 //The number of unique PR announcements allowed per round
- //This makes sure that a single person can only spam 3 reopens and 3 closes before being ignored
-
GLOBAL_VAR(security_mode)
GLOBAL_PROTECT(security_mode)
@@ -9,7 +6,7 @@ GLOBAL_PROTECT(security_mode)
SetupExternalRSC()
- GLOB.config_error_log = GLOB.world_pda_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
+ GLOB.config_error_log = GLOB.manifest_log = GLOB.world_pda_log = GLOB.sql_error_log = GLOB.world_href_log = GLOB.world_runtime_log = GLOB.world_attack_log = GLOB.world_game_log = file("data/logs/config_error.log") //temporary file used to record errors with loading config, moved to log directory once logging is set bl
CheckSecurityMode()
@@ -91,10 +88,12 @@ GLOBAL_PROTECT(security_mode)
GLOB.world_href_log = file("[GLOB.log_directory]/hrefs.html")
GLOB.world_pda_log = file("[GLOB.log_directory]/pda.log")
GLOB.sql_error_log = file("[GLOB.log_directory]/sql.log")
+ GLOB.manifest_log = file("[GLOB.log_directory]/manifest.log")
WRITE_FILE(GLOB.world_game_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_attack_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_runtime_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
WRITE_FILE(GLOB.world_pda_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
+ WRITE_FILE(GLOB.manifest_log, "\n\nStarting up round ID [GLOB.round_id]. [time_stamp()]\n---------------------")
GLOB.changelog_hash = md5('html/changelog.html') //used for telling if the changelog has changed recently
if(fexists(GLOB.config_error_log))
fcopy(GLOB.config_error_log, "[GLOB.log_directory]/config_error.log")
@@ -118,91 +117,24 @@ GLOBAL_PROTECT(security_mode)
warning("/tg/station 13 uses many file operations, a few shell()s, and some external call()s. Trusted mode is recommended. You can download our source code for your own browsing and compilation at https://github.com/tgstation/tgstation")
/world/Topic(T, addr, master, key)
+ var/static/list/topic_handlers = TopicHandlers()
var/list/input = params2list(T)
-
- var/pinging = ("ping" in input)
- var/playing = ("players" in input)
-
- if(!pinging && !playing && config && CONFIG_GET(flag/log_world_topic))
+ var/datum/world_topic/handler
+ for(var/I in topic_handlers)
+ if(I in input)
+ handler = topic_handlers[I]
+ break
+
+ if((!handler || initial(handler.log)) && config && CONFIG_GET(flag/log_world_topic))
WRITE_FILE(GLOB.world_game_log, "TOPIC: \"[T]\", from:[addr], master:[master], key:[key]")
SERVER_TOOLS_ON_TOPIC //redirect to server tools if necessary
- var/comms_key = CONFIG_GET(string/comms_key)
- var/key_valid = (comms_key && input["key"] == comms_key)
+ if(!handler)
+ return
- if(pinging)
- var/x = 1
- for (var/client/C in GLOB.clients)
- x++
- return x
-
- else if(playing)
- var/n = 0
- for(var/mob/M in GLOB.player_list)
- if(M.client)
- n++
- return n
-
- else if("status" in input)
- var/list/s = list()
- s["version"] = GLOB.game_version
- s["mode"] = GLOB.master_mode
- s["respawn"] = config ? !CONFIG_GET(flag/norespawn) : FALSE
- s["enter"] = GLOB.enter_allowed
- s["vote"] = CONFIG_GET(flag/allow_vote_mode)
- s["ai"] = CONFIG_GET(flag/allow_ai)
- s["host"] = host ? host : null
- s["active_players"] = get_active_player_count()
- s["players"] = GLOB.clients.len
- s["revision"] = GLOB.revdata.commit
- s["revision_date"] = GLOB.revdata.date
-
- var/list/adm = get_admin_counts()
- var/list/presentmins = adm["present"]
- var/list/afkmins = adm["afk"]
- s["admins"] = presentmins.len + afkmins.len //equivalent to the info gotten from adminwho
- s["gamestate"] = SSticker.current_state
-
- s["map_name"] = SSmapping.config.map_name
-
- if(key_valid && SSticker.HasRoundStarted())
- s["real_mode"] = SSticker.mode.name
- // Key-authed callers may know the truth behind the "secret"
-
- s["security_level"] = get_security_level()
- s["round_duration"] = SSticker ? round((world.time-SSticker.round_start_time)/10) : 0
- // Amount of world's ticks in seconds, useful for calculating round duration
-
- if(SSshuttle && SSshuttle.emergency)
- s["shuttle_mode"] = SSshuttle.emergency.mode
- // Shuttle status, see /__DEFINES/stat.dm
- s["shuttle_timer"] = SSshuttle.emergency.timeLeft()
- // Shuttle timer, in seconds
-
- return list2params(s)
-
- else if("announce" in input)
- if(!key_valid)
- return "Bad Key"
- else
- AnnouncePR(input["announce"], json_decode(input["payload"]))
-
- else if("crossmessage" in input)
- if(!key_valid)
- return
- else
- if(input["crossmessage"] == "Ahelp")
- relay_msg_admins("HELP: [input["source"]] [input["message_sender"]]: [input["message"]]")
- if(input["crossmessage"] == "Comms_Console")
- minor_announce(input["message"], "Incoming message from [input["message_sender"]]")
- for(var/obj/machinery/computer/communications/CM in GLOB.machines)
- CM.overrideCooldown()
- if(input["crossmessage"] == "News_Report")
- minor_announce(input["message"], "Breaking Update From [input["message_sender"]]")
-
- else if("server_hop" in input)
- show_server_hop_transfer_screen(input["server_hop"])
+ handler = new handler()
+ return handler.TryRun(input)
/world/proc/AnnouncePR(announcement, list/payload)
var/static/list/PRcounts = list() //PR id -> number of times announced this round
diff --git a/code/modules/VR/vr_sleeper.dm b/code/modules/VR/vr_sleeper.dm
index 44e6c3d07f..429e917e36 100644
--- a/code/modules/VR/vr_sleeper.dm
+++ b/code/modules/VR/vr_sleeper.dm
@@ -4,7 +4,7 @@
// it's """VR"""
/obj/machinery/vr_sleeper
name = "virtual reality sleeper"
- desc = "a sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds"
+ desc = "A sleeper modified to alter the subconscious state of the user, allowing them to visit virtual worlds."
icon = 'icons/obj/Cryogenic2.dmi'
icon_state = "sleeper"
state_open = TRUE
diff --git a/code/modules/admin/DB_ban/functions.dm b/code/modules/admin/DB_ban/functions.dm
index 086df300d3..6bd01183ad 100644
--- a/code/modules/admin/DB_ban/functions.dm
+++ b/code/modules/admin/DB_ban/functions.dm
@@ -50,9 +50,12 @@
announceinirc = 1
blockselfban = 1
kickbannedckey = 1
- if( !bantype_pass ) return
- if( !istext(reason) ) return
- if( !isnum(duration) ) return
+ if( !bantype_pass )
+ return
+ if( !istext(reason) )
+ return
+ if( !isnum(duration) )
+ return
var/ckey
var/computerid
@@ -174,7 +177,8 @@
if(BANTYPE_ANY_JOB)
bantype_str = "ANYJOB"
bantype_pass = 1
- if( !bantype_pass ) return
+ if( !bantype_pass )
+ return
var/bantype_sql
if(bantype_str == "ANY")
@@ -434,7 +438,7 @@
output += "
"
diff --git a/code/modules/admin/IsBanned.dm b/code/modules/admin/IsBanned.dm
index 10a3774ae1..9c1acca6eb 100644
--- a/code/modules/admin/IsBanned.dm
+++ b/code/modules/admin/IsBanned.dm
@@ -6,8 +6,10 @@
#define STICKYBAN_MAX_EXISTING_USER_MATCHES 5 //ie, users who were connected before the ban triggered
#define STICKYBAN_MAX_ADMIN_MATCHES 2
-/world/IsBanned(key,address,computer_id)
+/world/IsBanned(key,address,computer_id,type,real_bans_only=FALSE)
if (!key || !address || !computer_id)
+ if(real_bans_only)
+ return FALSE
log_access("Failed Login (invalid data): [key] [address]-[computer_id]")
return list("reason"="invalid login data", "desc"="Error: Could not check ban status, Please try again. Error message: Your computer provided invalid or blank information to the server on connection (byond username, IP, and Computer ID.) Provided information for reference: Username:'[key]' IP:'[address]' Computer ID:'[computer_id]'. (If you continue to get this error, please restart byond or contact byond support.)")
@@ -31,7 +33,7 @@
return list("reason"="whitelist", "desc" = "\nReason: You are not on the white list for this server")
//Guest Checking
- if(IsGuestKey(key))
+ if(!real_bans_only && IsGuestKey(key))
if (CONFIG_GET(flag/guest_ban))
log_access("Failed Login: [key] - Guests not allowed")
return list("reason"="guest", "desc"="\nReason: Guests not allowed. Please sign in with a byond account.")
@@ -41,7 +43,7 @@
//Population Cap Checking
var/extreme_popcap = CONFIG_GET(number/extreme_popcap)
- if(extreme_popcap && living_player_count() >= extreme_popcap && !admin)
+ if(!real_bans_only && extreme_popcap && living_player_count() >= extreme_popcap && !admin)
log_access("Failed Login: [key] - Population cap reached")
return list("reason"="popcap", "desc"= "\nReason: [CONFIG_GET(string/extreme_popcap_message)]")
diff --git a/code/modules/admin/NewBan.dm b/code/modules/admin/NewBan.dm
index 27d5502edf..add7254934 100644
--- a/code/modules/admin/NewBan.dm
+++ b/code/modules/admin/NewBan.dm
@@ -25,7 +25,7 @@ GLOBAL_PROTECT(Banlist)
.["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: [GetExp(GLOB.Banlist["minutes"])]\nBy: [GLOB.Banlist["bannedby"]][appeal]"
else
GLOB.Banlist.cd = "/base/[ckey][id]"
- .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: PERMENANT\nBy: [GLOB.Banlist["bannedby"]][appeal]"
+ .["desc"] = "\nReason: [GLOB.Banlist["reason"]]\nExpires: PERMANENT\nBy: [GLOB.Banlist["bannedby"]][appeal]"
.["reason"] = "ckey/id"
return .
else
@@ -65,7 +65,8 @@ GLOBAL_PROTECT(Banlist)
GLOB.Banlist = new("data/banlist.bdb")
log_admin("Loading Banlist")
- if (!length(GLOB.Banlist.dir)) log_admin("Banlist is empty.")
+ if (!length(GLOB.Banlist.dir))
+ log_admin("Banlist is empty.")
if (!GLOB.Banlist.dir.Find("base"))
log_admin("Banlist missing base dir.")
@@ -89,8 +90,10 @@ GLOBAL_PROTECT(Banlist)
message_admins("Invalid Ban.")
continue
- if (!GLOB.Banlist["temp"]) continue
- if (GLOB.CMinutes >= GLOB.Banlist["minutes"]) RemoveBan(A)
+ if (!GLOB.Banlist["temp"])
+ continue
+ if (GLOB.CMinutes >= GLOB.Banlist["minutes"])
+ RemoveBan(A)
return 1
@@ -133,7 +136,8 @@ GLOBAL_PROTECT(Banlist)
GLOB.Banlist["id"] >> id
GLOB.Banlist.cd = "/base"
- if (!GLOB.Banlist.dir.Remove(foldername)) return 0
+ if (!GLOB.Banlist.dir.Remove(foldername))
+ return 0
if(!usr)
log_admin_private("Ban Expired: [key]")
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 46eef5b8be..01f825492f 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -594,7 +594,8 @@ GLOBAL_LIST_INIT(admin_verbs_hideable, list(
set name = "Give Disease"
set desc = "Gives a Disease to a mob."
var/datum/disease/D = input("Choose the disease to give to that guy", "ACHOO") as null|anything in SSdisease.diseases
- if(!D) return
+ if(!D)
+ return
T.ForceContractDisease(new D)
SSblackbox.add_details("admin_verb","Give Disease") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
log_admin("[key_name(usr)] gave [key_name(T)] the disease [D].")
diff --git a/code/modules/admin/banjob.dm b/code/modules/admin/banjob.dm
index a260746e66..7e200c3aa2 100644
--- a/code/modules/admin/banjob.dm
+++ b/code/modules/admin/banjob.dm
@@ -1,7 +1,7 @@
-//returns a reason if M is banned from rank, returns 0 otherwise
+//returns a reason if M is banned from rank, returns FALSE otherwise
/proc/jobban_isbanned(mob/M, rank)
if(!M || !istype(M) || !M.ckey)
- return 0
+ return FALSE
if(!M.client) //no cache. fallback to a datum/DBQuery
var/datum/DBQuery/query_jobban_check_ban = SSdbcore.NewQuery("SELECT reason FROM [format_table_name("ban")] WHERE ckey = '[sanitizeSQL(M.ckey)]' AND (bantype = 'JOB_PERMABAN' OR (bantype = 'JOB_TEMPBAN' AND expiration_time > Now())) AND isnull(unbanned) AND job = '[sanitizeSQL(rank)]'")
@@ -9,17 +9,17 @@
return
if(query_jobban_check_ban.NextRow())
var/reason = query_jobban_check_ban.item[1]
- return reason ? reason : 1 //we don't want to return "" if there is no ban reason, as that would evaluate to false
+ return reason ? reason : TRUE //we don't want to return "" if there is no ban reason, as that would evaluate to false
else
- return 0
+ return FALSE
if(!M.client.jobbancache)
jobban_buildcache(M.client)
if(rank in M.client.jobbancache)
var/reason = M.client.jobbancache[rank]
- return (reason) ? reason : 1 //see above for why we need to do this
- return 0
+ return (reason) ? reason : TRUE //see above for why we need to do this
+ return FALSE
/proc/jobban_buildcache(client/C)
if(!SSdbcore.Connect())
diff --git a/code/modules/admin/chat_commands.dm b/code/modules/admin/chat_commands.dm
index f24e03aabc..ec79aaca07 100644
--- a/code/modules/admin/chat_commands.dm
+++ b/code/modules/admin/chat_commands.dm
@@ -49,8 +49,8 @@
admin_only = TRUE
/datum/server_tools_command/namecheck/Run(sender, params)
- log_admin("IRC Name Check: [sender] on [params]")
- message_admins("IRC name checking on [params] from [sender]")
+ log_admin("Chat Name Check: [sender] on [params]")
+ message_admins("Name checking [params] from [sender]")
return keywords_lookup(params, 1)
/datum/server_tools_command/adminwho
diff --git a/code/modules/admin/create_poll.dm b/code/modules/admin/create_poll.dm
index d93b21d7f8..b1cda46ece 100644
--- a/code/modules/admin/create_poll.dm
+++ b/code/modules/admin/create_poll.dm
@@ -6,7 +6,7 @@
if(!SSdbcore.Connect())
to_chat(src, "Failed to establish database connection.")
return
- var/polltype = input("Choose poll type.","Poll Type") in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting")|null
+ var/polltype = input("Choose poll type.","Poll Type") as null|anything in list("Single Option","Text Reply","Rating","Multiple Choice", "Instant Runoff Voting")
var/choice_amount = 0
switch(polltype)
if("Single Option")
@@ -18,10 +18,14 @@
if("Multiple Choice")
polltype = POLLTYPE_MULTI
choice_amount = input("How many choices should be allowed?","Select choice amount") as num|null
- if(choice_amount == 0)
- to_chat(src, "Multiple choice poll must have at least one choice allowed.")
- else if (choice_amount == null)
- return
+ switch(choice_amount)
+ if(0)
+ to_chat(src, "Multiple choice poll must have at least one choice allowed.")
+ return
+ if(1)
+ polltype = POLLTYPE_OPTION
+ if(null)
+ return
if ("Instant Runoff Voting")
polltype = POLLTYPE_IRV
else
diff --git a/code/modules/admin/fun_balloon.dm b/code/modules/admin/fun_balloon.dm
index 1872b98ffa..3336f3d0a8 100644
--- a/code/modules/admin/fun_balloon.dm
+++ b/code/modules/admin/fun_balloon.dm
@@ -104,7 +104,7 @@
/obj/effect/shuttle_build
name = "shuttle_build"
- desc = "Some assembly required"
+ desc = "Some assembly required."
icon = 'icons/obj/items_and_weapons.dmi'
icon_state = "syndballoon"
anchored = TRUE
diff --git a/code/modules/admin/holder2.dm b/code/modules/admin/holder2.dm
index 04d03dbf4f..cdc53ae338 100644
--- a/code/modules/admin/holder2.dm
+++ b/code/modules/admin/holder2.dm
@@ -101,7 +101,8 @@ if it doesn't return 1 and show_msg=1 it will prints a message explaining why th
generally it would be used like so:
/proc/admin_proc()
- if(!check_rights(R_ADMIN)) return
+ if(!check_rights(R_ADMIN))
+ return
to_chat(world, "you have enough rights!")
NOTE: it checks usr! not src! So if you're checking somebody's rank in a proc which they did not call
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 95f4bd55c7..f91ebb7557 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -410,9 +410,10 @@
dat += "in [disk_loc.loc] at ([disk_loc.x], [disk_loc.y], [disk_loc.z])"
dat += ""
- if(SSticker.mode.head_revolutionaries.len || SSticker.mode.revolutionaries.len)
+ var/list/revs = get_antagonists(/datum/antagonist/rev)
+ if(revs.len > 0)
dat += "
Revolutionaries
"
- for(var/datum/mind/N in SSticker.mode.head_revolutionaries)
+ for(var/datum/mind/N in get_antagonists(/datum/antagonist/rev/head))
var/mob/M = N.current
if(!M)
dat += "
"
diff --git a/code/modules/admin/secrets.dm b/code/modules/admin/secrets.dm
index 9fd49ed497..5e1a8300c4 100644
--- a/code/modules/admin/secrets.dm
+++ b/code/modules/admin/secrets.dm
@@ -215,8 +215,8 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Send CentCom Ferry")
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")
+ message_admins("[key_name_admin(usr)] moved the CentCom ferry")
+ log_admin("[key_name(usr)] moved the CentCom ferry")
if("togglearrivals")
if(!check_rights(R_ADMIN))
@@ -334,17 +334,19 @@
return
SSblackbox.add_details("admin_secrets_fun_used","Traitor All ([objective])")
for(var/mob/living/H in GLOB.player_list)
- if(!(ishuman(H)||istype(H, /mob/living/silicon/))) continue
- if(H.stat == DEAD || !H.client || !H.mind || ispAI(H)) continue
- if(is_special_character(H)) continue
- H.mind.add_antag_datum(ANTAG_DATUM_TRAITOR_CUSTOM)
- var/datum/antagonist/traitor/traitordatum = H.mind.has_antag_datum(ANTAG_DATUM_TRAITOR) //original datum self deletes
+ if(!(ishuman(H)||istype(H, /mob/living/silicon/)))
+ continue
+ if(H.stat == DEAD || !H.client || !H.mind || ispAI(H))
+ continue
+ if(is_special_character(H))
+ continue
+ var/datum/antagonist/traitor/human/T = new(H.mind)
+ T.give_objectives = FALSE
var/datum/objective/new_objective = new
new_objective.owner = H
new_objective.explanation_text = objective
- traitordatum.add_objective(new_objective)
- traitordatum.equip(FALSE)
- traitordatum.greet()
+ T.add_objective(new_objective)
+ H.mind.add_antag_datum(T)
message_admins("[key_name_admin(usr)] used everyone is a traitor secret. Objective is [objective]")
log_admin("[key_name(usr)] used everyone is a traitor secret. Objective is [objective]")
@@ -546,7 +548,8 @@
if(!check_rights(R_DEBUG))
return
var/datum/job/J = SSjob.GetJob("Security Officer")
- if(!J) return
+ if(!J)
+ return
J.total_positions = -1
J.spawn_positions = -1
message_admins("[key_name_admin(usr)] has removed the cap on security officers.")
diff --git a/code/modules/admin/sound_emitter.dm b/code/modules/admin/sound_emitter.dm
new file mode 100644
index 0000000000..129c6c92c8
--- /dev/null
+++ b/code/modules/admin/sound_emitter.dm
@@ -0,0 +1,149 @@
+#define SOUND_EMITTER_LOCAL "local" //Plays the sound like a normal heard sound
+#define SOUND_EMITTER_DIRECT "direct" //Plays the sound directly to hearers regardless of pressure/proximity/et cetera
+
+#define SOUND_EMITTER_RADIUS "radius" //Plays the sound to everyone in a radius
+#define SOUND_EMITTER_ZLEVEL "zlevel" //Plays the sound to everyone on the z-level
+#define SOUND_EMITTER_GLOBAL "global" //Plays the sound to everyone in the game world
+
+//Admin sound emitters with highly customizable functions!
+/obj/effect/sound_emitter
+ name = "sound emitter"
+ desc = "Emits sounds, presumably."
+ icon = 'icons/effects/effects.dmi'
+ icon_state = "shield2"
+ invisibility = INVISIBILITY_OBSERVER
+ anchored = TRUE
+ density = FALSE
+ opacity = FALSE
+ alpha = 175
+ var/sound_file //The sound file the emitter plays
+ var/sound_volume = 50 //The volume the sound file is played at
+ var/play_radius = 3 //Any mobs within this many tiles will hear the sounds played if it's using the appropriate mode
+ var/motus_operandi = SOUND_EMITTER_LOCAL //The mode this sound emitter is using
+ var/emitter_range = SOUND_EMITTER_ZLEVEL //The range this emitter's sound is heard at; this isn't a number, but a string (see the defines above)
+
+/obj/effect/sound_emitter/Destroy(force)
+ if(!force)
+ return QDEL_HINT_LETMELIVE
+ . = ..()
+
+/obj/effect/sound_emitter/singularity_act()
+ return
+
+/obj/effect/sound_emitter/examine(mob/user)
+ ..()
+ if(!isobserver(user))
+ return
+ to_chat(user, "Sound File: [sound_file ? sound_file : "None chosen"]")
+ to_chat(user, "Mode: [motus_operandi]")
+ to_chat(user, "Range: [emitter_range]")
+ to_chat(user, "Sound is playing at [sound_volume]% volume.")
+ if(user.client.holder)
+ to_chat(user, "Alt-click it to quickly activate it!")
+
+/obj/effect/sound_emitter/attack_ghost(mob/user)
+ if(!check_rights_for(user.client, R_SOUNDS))
+ examine(user)
+ return
+ edit_emitter(user)
+
+/obj/effect/sound_emitter/AltClick(mob/user)
+ if(check_rights_for(user.client, R_SOUNDS))
+ activate(user)
+ to_chat(user, "Sound emitter activated.")
+
+/obj/effect/sound_emitter/proc/edit_emitter(mob/user)
+ var/dat = ""
+ dat += "Label:[maptext ? maptext : "No label set!"] "
+ dat += " "
+ dat += "Sound File:[sound_file ? sound_file : "No file chosen!"] "
+ dat += "Volume:[sound_volume]% "
+ dat += " "
+ dat += "Mode:[motus_operandi] "
+ if(motus_operandi != SOUND_EMITTER_LOCAL)
+ dat += "Range:[emitter_range][emitter_range == SOUND_EMITTER_RADIUS ? "[play_radius]-tile radius" : ""] "
+ dat += " "
+ dat += "Play Sound (interrupts other sound emitter sounds)"
+ var/datum/browser/popup = new(user, "emitter", "", 500, 600)
+ popup.set_content(dat)
+ popup.open()
+
+/obj/effect/sound_emitter/Topic(href, href_list)
+ ..()
+ if(!ismob(usr) || !usr.client || !check_rights_for(usr.client, R_SOUNDS))
+ return
+ var/mob/user = usr
+ if(href_list["edit_label"])
+ var/new_label = stripped_input(user, "Choose a new label.", "Sound Emitter")
+ if(!new_label)
+ return
+ maptext = new_label
+ to_chat(user, "Label set to [maptext].")
+ if(href_list["edit_sound_file"])
+ var/new_file = input(user, "Choose a sound file.", "Sound Emitter") as null|sound
+ if(!new_file)
+ return
+ sound_file = new_file
+ to_chat(user, "New sound file set to [sound_file].")
+ if(href_list["edit_volume"])
+ var/new_volume = input(user, "Choose a volume.", "Sound Emitter", sound_volume) as null|num
+ if(isnull(new_volume))
+ return
+ new_volume = Clamp(new_volume, 0, 100)
+ sound_volume = new_volume
+ to_chat(user, "Volume set to [sound_volume]%.")
+ if(href_list["edit_mode"])
+ var/new_mode
+ var/mode_list = list("Local (normal sound)" = SOUND_EMITTER_LOCAL, "Direct (not affected by environment/location)" = SOUND_EMITTER_DIRECT)
+ new_mode = input(user, "Choose a new mode.", "Sound Emitter") as null|anything in mode_list
+ if(!new_mode)
+ return
+ motus_operandi = mode_list[new_mode]
+ to_chat(user, "Mode set to [motus_operandi].")
+ if(href_list["edit_range"])
+ var/new_range
+ var/range_list = list("Radius (all mobs within a radius)" = SOUND_EMITTER_RADIUS, "Z-Level (all mobs on the same z)" = SOUND_EMITTER_ZLEVEL, "Global (all players)" = SOUND_EMITTER_GLOBAL)
+ new_range = input(user, "Choose a new range.", "Sound Emitter") as null|anything in range_list
+ if(!new_range)
+ return
+ emitter_range = range_list[new_range]
+ to_chat(user, "Range set to [emitter_range].")
+ if(href_list["edit_radius"])
+ var/new_radius = input(user, "Choose a radius.", "Sound Emitter", sound_volume) as null|num
+ if(isnull(new_radius))
+ return
+ new_radius = Clamp(new_radius, 0, 127)
+ play_radius = new_radius
+ to_chat(user, "Audible radius set to [play_radius].")
+ if(href_list["play"])
+ activate(user)
+ edit_emitter(user) //Refresh the UI to see our changes
+
+/obj/effect/sound_emitter/proc/activate(mob/user)
+ var/list/hearing_mobs = list()
+ if(motus_operandi == SOUND_EMITTER_LOCAL)
+ playsound(src, sound_file, sound_volume, FALSE)
+ return
+ switch(emitter_range)
+ if(SOUND_EMITTER_RADIUS)
+ for(var/mob/M in GLOB.player_list)
+ if(get_dist(src, M) <= play_radius)
+ hearing_mobs += M
+ if(SOUND_EMITTER_ZLEVEL)
+ for(var/mob/M in GLOB.player_list)
+ if(M.z == z)
+ hearing_mobs += M
+ if(SOUND_EMITTER_GLOBAL)
+ hearing_mobs = GLOB.player_list.Copy()
+ for(var/mob/M in hearing_mobs)
+ if(M.client.prefs.toggles & SOUND_MIDI)
+ M.playsound_local(M, sound_file, sound_volume, FALSE, channel = CHANNEL_ADMIN, pressure_affected = FALSE)
+ if(user)
+ log_admin("[ADMIN_LOOKUPFLW(user)] activated a sound emitter with file \"[sound_file]\" at [COORD(src)]")
+ flick("shield1", src)
+
+#undef SOUND_EMITTER_LOCAL
+#undef SOUND_EMITTER_DIRECT
+#undef SOUND_EMITTER_RADIUS
+#undef SOUND_EMITTER_ZLEVEL
+#undef SOUND_EMITTER_GLOBAL
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index c182107a6a..73da8d9424 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -165,6 +165,7 @@
return
var/datum/round_event_control/E = locate(href_list["forceevent"]) in SSevents.control
if(E)
+ E.admin_setup(usr)
var/datum/round_event/event = E.runEvent()
if(event.announceWhen>0)
event.processing = FALSE
@@ -1210,33 +1211,10 @@
cmd_admin_mute(href_list["mute"], text2num(href_list["mute_type"]))
else if(href_list["c_mode"])
- if(!check_rights(R_ADMIN))
- return
-
- if(SSticker.HasRoundStarted())
- return alert(usr, "The game has already started.", null, null, null, null)
- var/dat = {"What mode do you wish to play?"}
- for(var/mode in config.modes)
- dat += {"[config.mode_names[mode]] "}
- dat += {"Secret "}
- dat += {"Random "}
- dat += {"Now: [GLOB.master_mode]"}
- usr << browse(dat, "window=c_mode")
+ return HandleCMode()
else if(href_list["f_secret"])
- if(!check_rights(R_ADMIN))
- return
-
- if(SSticker.HasRoundStarted())
- return alert(usr, "The game has already started.", null, null, null, null)
- if(GLOB.master_mode != "secret")
- return alert(usr, "The game mode has to be secret!", null, null, null, null)
- var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret."}
- for(var/mode in config.modes)
- dat += {"[config.mode_names[mode]] "}
- dat += {"Random (default) "}
- dat += {"Now: [GLOB.secret_force_mode]"}
- usr << browse(dat, "window=f_secret")
+ return HandleFSecret()
else if(href_list["c_mode2"])
if(!check_rights(R_ADMIN|R_SERVER))
@@ -1250,7 +1228,7 @@
to_chat(world, "The mode is now: [GLOB.master_mode]")
Game() // updates the main game menu
SSticker.save_mode(GLOB.master_mode)
- .(href, list("c_mode"=1))
+ HandleCMode()
else if(href_list["f_secret2"])
if(!check_rights(R_ADMIN|R_SERVER))
@@ -1264,7 +1242,7 @@
log_admin("[key_name(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
message_admins("[key_name_admin(usr)] set the forced secret mode as [GLOB.secret_force_mode].")
Game() // updates the main game menu
- .(href, list("f_secret"=1))
+ HandleFSecret()
else if(href_list["monkeyone"])
if(!check_rights(R_SPAWN))
@@ -2263,7 +2241,7 @@
if(!newname)
return
G.name = newname
- var/description = input("Enter centcom message contents:") as message|null
+ var/description = input("Enter CentCom message contents:") as message|null
if(!description)
return
G.report_message = description
@@ -2296,3 +2274,32 @@
dat += thing_to_check
usr << browse(dat.Join(" "), "window=related_[C];size=420x300")
+
+/datum/admins/proc/HandleCMode()
+ if(!check_rights(R_ADMIN))
+ return
+
+ if(SSticker.HasRoundStarted())
+ return alert(usr, "The game has already started.", null, null, null, null)
+ var/dat = {"What mode do you wish to play?"}
+ for(var/mode in config.modes)
+ dat += {"[config.mode_names[mode]] "}
+ dat += {"Secret "}
+ dat += {"Random "}
+ dat += {"Now: [GLOB.master_mode]"}
+ usr << browse(dat, "window=c_mode")
+
+/datum/admins/proc/HandleFSecret()
+ if(!check_rights(R_ADMIN))
+ return
+
+ if(SSticker.HasRoundStarted())
+ return alert(usr, "The game has already started.", null, null, null, null)
+ if(GLOB.master_mode != "secret")
+ return alert(usr, "The game mode has to be secret!", null, null, null, null)
+ var/dat = {"What game mode do you want to force secret to be? Use this if you want to change the game mode, but want the players to believe it's secret. This will only work if the current game mode is secret."}
+ for(var/mode in config.modes)
+ dat += {"[config.mode_names[mode]] "}
+ dat += {"Random (default) "}
+ dat += {"Now: [GLOB.secret_force_mode]"}
+ usr << browse(dat, "window=f_secret")
diff --git a/code/modules/admin/verbs/BrokenInhands.dm b/code/modules/admin/verbs/BrokenInhands.dm
index 732ae9e91c..20721077df 100644
--- a/code/modules/admin/verbs/BrokenInhands.dm
+++ b/code/modules/admin/verbs/BrokenInhands.dm
@@ -2,7 +2,8 @@
var/text
for(var/A in typesof(/obj/item))
var/obj/item/O = new A( locate(1,1,1) )
- if(!O) continue
+ if(!O)
+ continue
var/icon/IL = new(O.lefthand_file)
var/list/Lstates = IL.IconStates()
var/icon/IR = new(O.righthand_file)
@@ -28,7 +29,5 @@
if(text)
var/F = file("broken_icons.txt")
fdel(F)
- WRITE_FILE(F, text)
+ WRITE_FILE(F, text)
to_chat(world, "Completely successfully and written to [F]")
-
-
diff --git a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
index 7176ac726c..8a7c030458 100644
--- a/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
+++ b/code/modules/admin/verbs/SDQL2/SDQL_2_wrappers.dm
@@ -3,9 +3,11 @@
/proc/_abs(A)
return abs(A)
-/*/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags_1 = null)
- animate(A, set_vars, time, loop, easing, flags_1)
- Borked. If anyone wants to fix this be my guest.*/
+/proc/_animate(atom/A, set_vars, time = 10, loop = 1, easing = LINEAR_EASING, flags = null)
+ var/mutable_appearance/MA = new()
+ for(var/v in set_vars)
+ MA.vars[v] = set_vars[v]
+ animate(A, appearance = MA, time, loop, easing, flags)
/proc/_acrccos(A)
return arccos(A)
diff --git a/code/modules/admin/verbs/adminhelp.dm b/code/modules/admin/verbs/adminhelp.dm
index ac846bca69..2f059d1829 100644
--- a/code/modules/admin/verbs/adminhelp.dm
+++ b/code/modules/admin/verbs/adminhelp.dm
@@ -237,6 +237,7 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
. += " (IC)"
. += " (CLOSE)"
. += " (RSLVE)"
+ . += " (HANDLE)"
//private
/datum/admin_help/proc/LinkedReplyName(ref_src)
@@ -335,10 +336,10 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
addtimer(CALLBACK(initiator, /client/proc/giveadminhelpverb), 50)
AddInteraction("Resolved by [key_name].")
+ to_chat(initiator, "Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.")
if(!silent)
SSblackbox.inc("ahelp_resolve")
var/msg = "Ticket [TicketHref("#[id]")] resolved by [key_name]"
- to_chat(initiator, "Your ticket has been resolved by an admin. The Adminhelp verb will be returned to you shortly.")
message_admins(msg)
log_admin_private(msg)
@@ -382,6 +383,22 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
AddInteraction("Marked as IC issue by [key_name]")
Resolve(silent = TRUE)
+//Let the initiator know their ahelp is being handled
+/datum/admin_help/proc/HandleIssue(key_name = key_name_admin(usr))
+ if(state != AHELP_ACTIVE)
+ return
+
+ var/msg = "Your ticket is now being handled by an admin. Please be patient."
+
+ if(initiator)
+ to_chat(initiator, msg)
+
+ SSblackbox.inc("ahelp_handleissue")
+ msg = "Ticket [TicketHref("#[id]")] is being handled by [key_name]"
+ message_admins(msg)
+ log_admin_private(msg)
+ AddInteraction("Being handled by [key_name]")
+
//Show the ticket panel
/datum/admin_help/proc/TicketPanel()
var/list/dat = list("Ticket #[id]")
@@ -442,6 +459,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
Close()
if("resolve")
Resolve()
+ if("handleissue")
+ HandleIssue()
if("reopen")
Reopen()
@@ -490,6 +509,8 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
if(handle_spam_prevention(msg,MUTE_ADMINHELP))
return
+ msg = trim(msg)
+
if(!msg)
return
@@ -588,8 +609,9 @@ GLOBAL_DATUM_INIT(ahelp_tickets, /datum/admin_help_tickets, new)
/proc/send2irc(msg,msg2)
- if(SERVER_TOOLS_PRESENT)
- SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
+ msg = replacetext(replacetext(msg, "\proper", ""), "\improper", "")
+ msg2 = replacetext(replacetext(msg2, "\proper", ""), "\improper", "")
+ SERVER_TOOLS_RELAY_BROADCAST("[msg] | [msg2]")
/proc/send2otherserver(source,msg,type = "Ahelp")
var/comms_key = CONFIG_GET(string/comms_key)
diff --git a/code/modules/admin/verbs/adminpm.dm b/code/modules/admin/verbs/adminpm.dm
index 038e454a24..706c6e03bb 100644
--- a/code/modules/admin/verbs/adminpm.dm
+++ b/code/modules/admin/verbs/adminpm.dm
@@ -131,7 +131,7 @@
//clean the message if it's not sent by a high-rank admin
if(!check_rights(R_SERVER|R_DEBUG,0)||irc)//no sending html to the poor bots
- msg = sanitize(copytext(msg,1,MAX_MESSAGE_LEN))
+ msg = trim(sanitize(copytext(msg,1,MAX_MESSAGE_LEN)))
if(!msg)
return
diff --git a/code/modules/admin/verbs/buildmode.dm b/code/modules/admin/verbs/buildmode.dm
index 922e15e8b4..7789fe4a47 100644
--- a/code/modules/admin/verbs/buildmode.dm
+++ b/code/modules/admin/verbs/buildmode.dm
@@ -82,6 +82,7 @@
var/valueholder = "derp"
var/objholder = /obj/structure/closet
var/atom/movable/stored = null
+ var/list/preview = list()
/datum/buildmode/New(client/c)
create_buttons()
@@ -94,6 +95,8 @@
holder.screen -= buttons
holder.click_intercept = null
holder.show_popup_menus = 1
+ usr.client.images -= preview
+ preview.Cut()
qdel(src)
return
@@ -150,6 +153,7 @@
if(AREA_BUILDMODE)
dat += "***********************************************************"
dat += "Left Mouse Button on turf/obj/mob = Select corner"
+ dat += "Right Mouse Button on turf/obj/mob = Reset corner selection"
dat += "Right Mouse Button on buildmode button = Select generator"
dat += "***********************************************************"
if(COPY_BUILDMODE)
@@ -181,7 +185,8 @@
if(varholder in locked && !check_rights(R_DEBUG,0))
return 1
var/thetype = input(user,"Select variable type:" ,"Type") in list("text","number","mob-reference","obj-reference","turf-reference")
- if(!thetype) return 1
+ if(!thetype)
+ return 1
switch(thetype)
if("text")
valueholder = input(user,"Enter variable value:" ,"Value", "value") as text
@@ -200,7 +205,8 @@
var/datum/mapGenerator/MP = path
options[initial(MP.buildmode_name)] = path
var/type = input(user,"Select Generator Type","Type") as null|anything in options
- if(!type) return
+ if(!type)
+ return
generator_path = options[type]
cornerA = null
@@ -336,13 +342,20 @@
throw_atom.throw_at(object, 10, 1,user)
log_admin("Build Mode: [key_name(user)] threw [throw_atom] at [object] ([object.x],[object.y],[object.z])")
if(AREA_BUILDMODE)
- if(!cornerA)
- cornerA = get_turf(object)
- return
- if(cornerA && !cornerB)
- cornerB = get_turf(object)
-
if(left_click) //rectangular
+ if(!cornerA)
+ cornerA = get_turf(object)
+ preview += image('icons/turf/overlays.dmi',cornerA,"greenOverlay")
+ usr.client.images -= preview
+ usr.client.images += preview
+ return
+ if(cornerA && !cornerB)
+ cornerB = get_turf(object)
+ preview += image('icons/turf/overlays.dmi',cornerB,"blueOverlay")
+ usr.client.images -= preview
+ usr.client.images += preview
+ to_chat(user, "Region selected, if you're happy with your selection left click again, otherwise right click.")
+ return
if(cornerA && cornerB)
if(!generator_path)
to_chat(user, "Select generator type first.")
@@ -352,10 +365,18 @@
if(GLOB.reloading_map)
to_chat(user, "You are already reloading an area! Please wait for it to fully finish loading before trying to load another!")
return
- G.defineRegion(cornerA,cornerB,1)
- G.generate()
+ G.defineRegion(cornerA, cornerB, 1)
+ for(var/t in G.map)
+ preview += image('icons/turf/overlays.dmi', t ,"redOverlay")
+ usr.client.images -= preview
+ usr.client.images += preview
+ var/confirm = alert("Are you sure you want run the map generator?", "Run generator", "Yes", "No")
+ if(confirm == "Yes")
+ G.generate()
cornerA = null
cornerB = null
+ usr.client.images -= preview
+ preview.Cut()
return
//Something wrong - Reset
cornerA = null
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index 7fc6bc2e9f..dadbe7da5f 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -31,7 +31,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
set name = "Advanced ProcCall"
set waitfor = 0
- if(!check_rights(R_DEBUG)) return
+ if(!check_rights(R_DEBUG))
+ return
var/datum/target = null
var/targetselected = 0
@@ -127,8 +128,10 @@ GLOBAL_PROTECT(LastAdminCalledProc)
/world/proc/WrapAdminProcCall(target, procname, list/arguments)
if(target == GLOBAL_PROC)
return call(procname)(arglist(arguments))
- else
+ else if(target != world)
return call(target, procname)(arglist(arguments))
+ else
+ log_admin_private("[key_name(usr)] attempted to call world/proc/[procname] with arguments: [english_list(arguments)]")
/proc/IsAdminAdvancedProcCall()
#ifdef TESTING
@@ -261,10 +264,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
if(ishuman(M))
log_admin("[key_name(src)] has blobized [M.key].")
var/mob/living/carbon/human/H = M
- spawn(0)
- var/mob/camera/blob/B = H.become_overmind(FALSE)
- B.place_blob_core(B.base_point_rate, -1) //place them wherever they are
-
+ H.become_overmind()
else
alert("Invalid mob")
@@ -715,8 +715,8 @@ GLOBAL_PROTECT(LastAdminCalledProc)
if(Rad.anchored)
if(!Rad.loaded_tank)
var/obj/item/tank/internals/plasma/Plasma = new/obj/item/tank/internals/plasma(Rad)
- ASSERT_GAS("plasma", Plasma.air_contents)
- Plasma.air_contents.gases["plasma"][MOLES] = 70
+ ASSERT_GAS(/datum/gas/plasma, Plasma.air_contents)
+ Plasma.air_contents.gases[/datum/gas/plasma][MOLES] = 70
Rad.drainratio = 0
Rad.loaded_tank = Plasma
Plasma.loc = Rad
@@ -780,7 +780,7 @@ GLOBAL_PROTECT(LastAdminCalledProc)
/client/proc/cmd_display_init_log()
set category = "Debug"
- set name = "Display Initialzie() Log"
+ set name = "Display Initialize() Log"
set desc = "Displays a list of things that didn't handle Initialize() properly"
usr << browse(replacetext(SSatoms.InitLog(), "\n", " "), "window=initlog")
@@ -873,3 +873,42 @@ GLOBAL_PROTECT(LastAdminCalledProc)
message_admins("[key_name_admin(src)] pumped a random event.")
SSblackbox.add_details("admin_verb","Pump Random Event")
log_admin("[key_name(src)] pumped a random event.")
+
+/client/proc/start_line_profiling()
+ set category = "Profile"
+ set name = "Start Line Profiling"
+ set desc = "Starts tracking line by line profiling for code lines that support it"
+
+ PROFILE_START
+
+ message_admins("[key_name_admin(src)] started line by line profiling.")
+ SSblackbox.add_details("admin_verb","Start Line Profiling")
+ log_admin("[key_name(src)] started line by line profiling.")
+
+/client/proc/stop_line_profiling()
+ set category = "Profile"
+ set name = "Stops Line Profiling"
+ set desc = "Stops tracking line by line profiling for code lines that support it"
+
+ PROFILE_STOP
+
+ message_admins("[key_name_admin(src)] stopped line by line profiling.")
+ SSblackbox.add_details("admin_verb","stop Line Profiling")
+ log_admin("[key_name(src)] stopped line by line profiling.")
+
+/client/proc/show_line_profiling()
+ set category = "Profile"
+ set name = "Show Line Profiling"
+ set desc = "Shows tracked profiling info from code lines that support it"
+
+ var/sortlist = list(
+ "Avg time" = /proc/cmp_profile_avg_time_dsc,
+ "Total Time" = /proc/cmp_profile_time_dsc,
+ "Call Count" = /proc/cmp_profile_count_dsc
+ )
+ var/sort = input(src, "Sort type?", "Sort Type", "Avg time") as null|anything in sortlist
+ if (!sort)
+ return
+ sort = sortlist[sort]
+ profile_show(src, sort)
+
diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm
index 279d157c93..5edb1e7bca 100644
--- a/code/modules/admin/verbs/manipulate_organs.dm
+++ b/code/modules/admin/verbs/manipulate_organs.dm
@@ -36,7 +36,8 @@
var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
organ = organs[organ]
- if(!organ) return
+ if(!organ)
+ return
var/obj/item/organ/O
var/obj/item/implant/I
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index 6283201b41..d560099563 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -42,7 +42,10 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
/client/proc/print_pointers,
/client/proc/cmd_show_at_list,
/client/proc/cmd_show_at_markers,
- /client/proc/manipulate_organs
+ /client/proc/manipulate_organs,
+ /client/proc/start_line_profiling,
+ /client/proc/stop_line_profiling,
+ /client/proc/show_line_profiling
))
/obj/effect/debugging/mapfix_marker
@@ -194,15 +197,20 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
set category = "Mapping"
set name = "Count Objects On Level"
var/level = input("Which z-level?","Level?") as text
- if(!level) return
+ if(!level)
+ return
var/num_level = text2num(level)
- if(!num_level) return
- if(!isnum(num_level)) return
+ if(!num_level)
+ return
+ if(!isnum(num_level))
+ return
var/type_text = input("Which type path?","Path?") as text
- if(!type_text) return
+ if(!type_text)
+ return
var/type_path = text2path(type_text)
- if(!type_path) return
+ if(!type_path)
+ return
var/count = 0
@@ -238,9 +246,11 @@ GLOBAL_LIST_INIT(admin_verbs_debug_mapping, list(
set name = "Count Objects All"
var/type_text = input("Which type path?","") as text
- if(!type_text) return
+ if(!type_text)
+ return
var/type_path = text2path(type_text)
- if(!type_path) return
+ if(!type_path)
+ return
var/count = 0
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index 2a0575eb28..e06506708d 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -433,12 +433,13 @@ GLOBAL_PROTECT(VVpixelmovement)
to_chat(src, "Variable appears to be [uppertext(default)].")
- to_chat(src, "Variable contains: [L[index]]")
+ to_chat(src, "Variable contains: [variable]")
if(default == VV_NUM)
var/dir_text = ""
- if(dir < 0 && dir < 16)
- if(dir & 1)
+ var/tdir = variable
+ if(tdir > 0 && tdir < 16)
+ if(tdir & 1)
dir_text += "NORTH"
if(dir & 2)
dir_text += "SOUTH"
@@ -450,11 +451,8 @@ GLOBAL_PROTECT(VVpixelmovement)
if(dir_text)
to_chat(usr, "If a direction, direction is: [dir_text]")
- var/original_var
- if(assoc)
- original_var = L[assoc_key]
- else
- original_var = L[index]
+ var/original_var = variable
+
if (O)
L = L.Copy()
var/class
@@ -612,8 +610,8 @@ GLOBAL_PROTECT(VVpixelmovement)
if (O.vv_edit_var(variable, var_new) == FALSE)
to_chat(src, "Your edit was rejected by the object.")
return
- log_world("### VarEdit by [src]: [O.type] [variable]=[html_encode("[var_new]")]")
- log_admin("[key_name(src)] modified [original_name]'s [variable] to [var_new]")
- var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] to [var_new]"
+ log_world("### VarEdit by [key_name(src)]: [O.type] [variable]=[var_value] => [var_new]")
+ log_admin("[key_name(src)] modified [original_name]'s [variable] to from [html_encode("[var_value]")] to [html_encode("[var_new]")]")
+ var/msg = "[key_name_admin(src)] modified [original_name]'s [variable] from [var_value] to [var_new]"
message_admins(msg)
admin_ticket_log(O, msg)
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 3021f9badd..4e4f44347d 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -213,7 +213,6 @@
/datum/admins/proc/makeNukeTeam()
-
var/datum/game_mode/nuclear/temp = new
var/list/mob/dead/observer/candidates = pollGhostCandidates("Do you wish to be considered for a nuke team being sent in?", "operative", temp)
var/list/mob/dead/observer/chosen = list()
@@ -246,24 +245,18 @@
nuke.r_code = nuke_code
//Let's find the spawn locations
- var/list/turf/synd_spawn = list()
- for(var/obj/effect/landmark/A in GLOB.landmarks_list)
- if(A.name == "Syndicate-Spawn")
- synd_spawn += get_turf(A)
- continue
-
- var/leader_chosen
+ var/leader_chosen = FALSE
var/spawnpos = 1 //Decides where they'll spawn. 1=leader.
for(var/mob/c in chosen)
- if(spawnpos > synd_spawn.len)
- spawnpos = 2 //Ran out of spawns. Let's loop back to the first non-leader position
+ if(spawnpos > GLOB.nukeop_start.len)
+ spawnpos = 1 //Ran out of spawns. Let's loop back to the first non-leader position
var/mob/living/carbon/human/new_character=makeBody(c)
if(!leader_chosen)
- leader_chosen = 1
- new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code,1)
+ leader_chosen = TRUE
+ new_character.mind.make_Nuke(pick(GLOB.nukeop_leader_start), nuke_code, TRUE)
else
- new_character.mind.make_Nuke(synd_spawn[spawnpos],nuke_code)
+ new_character.mind.make_Nuke(GLOB.nukeop_start[spawnpos], nuke_code)
spawnpos++
return 1
else
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index e81ab011e4..7430617806 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -382,7 +382,8 @@ Traitors and the like can also be revived with the previous role mostly intact.
switch(new_character.mind.special_role)
if("Wizard")
new_character.forceMove(pick(GLOB.wizardstart))
- SSticker.mode.equip_wizard(new_character)
+ var/datum/antagonist/wizard/A = new_character.mind.has_antag_datum(/datum/antagonist/wizard,TRUE)
+ A.equip_wizard()
if("Syndicate")
new_character.forceMove(pick(GLOB.nukeop_start))
call(/datum/game_mode/proc/equip_syndicate)(new_character)
@@ -398,7 +399,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
else//They may also be a cyborg or AI.
switch(new_character.mind.assigned_role)
if("Cyborg")//More rigging to make em' work and check if they're traitor.
- new_character = new_character.Robotize()
+ new_character = new_character.Robotize(TRUE)
if("AI")
new_character = new_character.AIize()
else
@@ -544,15 +545,20 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
var/devastation = input("Range of total devastation. -1 to none", text("Input")) as num|null
- if(devastation == null) return
+ if(devastation == null)
+ return
var/heavy = input("Range of heavy impact. -1 to none", text("Input")) as num|null
- if(heavy == null) return
+ if(heavy == null)
+ return
var/light = input("Range of light impact. -1 to none", text("Input")) as num|null
- if(light == null) return
+ if(light == null)
+ return
var/flash = input("Range of flash. -1 to none", text("Input")) as num|null
- if(flash == null) return
+ if(flash == null)
+ return
var/flames = input("Range of flames. -1 to none", text("Input")) as num|null
- if(flames == null) return
+ if(flames == null)
+ return
if ((devastation != -1) || (heavy != -1) || (light != -1) || (flash != -1) || (flames != -1))
if ((devastation > 20) || (heavy > 20) || (light > 20) || (flames > 20))
@@ -576,9 +582,11 @@ Traitors and the like can also be revived with the previous role mostly intact.
return
var/heavy = input("Range of heavy pulse.", text("Input")) as num|null
- if(heavy == null) return
+ if(heavy == null)
+ return
var/light = input("Range of light pulse.", text("Input")) as num|null
- if(light == null) return
+ if(light == null)
+ return
if (heavy || light)
@@ -959,7 +967,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
set name = "Toggle AntagHUD"
set desc = "Toggles the Admin AntagHUD"
- if(!holder) return
+ if(!holder)
+ return
var/adding_hud = !has_antag_hud()
@@ -1165,7 +1174,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
if(!holder)
return
- var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA)
+ var/list/punishment_list = list(ADMIN_PUNISHMENT_LIGHTNING, ADMIN_PUNISHMENT_BRAINDAMAGE, ADMIN_PUNISHMENT_GIB, ADMIN_PUNISHMENT_BSA, ADMIN_PUNISHMENT_FIREBALL)
var/punishment = input("Choose a punishment", "DIVINE SMITING") as null|anything in punishment_list
@@ -1185,6 +1194,8 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
target.gib(FALSE)
if(ADMIN_PUNISHMENT_BSA)
bluespace_artillery(target)
+ if(ADMIN_PUNISHMENT_FIREBALL)
+ new /obj/effect/temp_visual/target(get_turf(target))
var/msg = "[key_name_admin(usr)] punished [key_name_admin(target)] with [punishment]."
message_admins(msg)
@@ -1252,4 +1263,4 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
to_chat(usr, "ERROR: Unable to update player flags. Please check logs.")
else
message_admins("[key_name_admin(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name_admin(C)]")
- log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
\ No newline at end of file
+ log_admin("[key_name(usr)] has [newstate ? "activated" : "deactivated"] job exp exempt status on [key_name(C)]")
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index 5f4ddd27b0..6c2df587e1 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -1,120 +1,117 @@
-/obj/item/device/assembly
- name = "assembly"
- desc = "A small electronic device that should never exist."
- icon = 'icons/obj/assemblies/new_assemblies.dmi'
- icon_state = ""
+#define WIRE_RECEIVE 1
+#define WIRE_PULSE 2
+#define WIRE_PULSE_SPECIAL 4
+#define WIRE_RADIO_RECEIVE 8
+#define WIRE_RADIO_PULSE 16
+
+/obj/item/device/assembly
+ name = "assembly"
+ desc = "A small electronic device that should never exist."
+ icon = 'icons/obj/assemblies/new_assemblies.dmi'
+ icon_state = ""
flags_1 = CONDUCT_1
- w_class = WEIGHT_CLASS_SMALL
- materials = list(MAT_METAL=100)
- throwforce = 2
- throw_speed = 3
- throw_range = 7
- origin_tech = "magnets=1;engineering=1"
-
- var/secured = 1
- var/list/attached_overlays = null
- var/obj/item/device/assembly_holder/holder = null
- var/wire_type = WIRE_RECEIVE | WIRE_PULSE
- var/attachable = 0 // can this be attached to wires
- var/datum/wires/connected = null
-
- var/const/WIRE_RECEIVE = 1 //Allows Pulsed(0) to call Activate()
- var/const/WIRE_PULSE = 2 //Allows Pulse(0) to act on the holder
- var/const/WIRE_PULSE_SPECIAL = 4 //Allows Pulse(0) to act on the holders special assembly
- var/const/WIRE_RADIO_RECEIVE = 8 //Allows Pulsed(1) to call Activate()
- var/const/WIRE_RADIO_PULSE = 16 //Allows Pulse(1) to send a radio message
-
- var/next_activate = 0 //When we're next allowed to activate - for spam control
-
-/obj/item/device/assembly/proc/on_attach()
-
-/obj/item/device/assembly/proc/on_detach()
-
-/obj/item/device/assembly/proc/holder_movement() //Called when the holder is moved
- return
-
-/obj/item/device/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
- return "The trigger assembly looks broken!"
-
-
-/obj/item/device/assembly/proc/is_secured(mob/user)
- if(!secured)
- to_chat(user, "The [name] is unsecured!")
- return 0
- return 1
-
-
-//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
-/obj/item/device/assembly/proc/pulsed(radio = 0)
- if(wire_type & WIRE_RECEIVE)
- spawn(0)
- activate()
- if(radio && (wire_type & WIRE_RADIO_RECEIVE))
- spawn(0)
- activate()
- return 1
-
-
-//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
-/obj/item/device/assembly/proc/pulse(radio = 0)
- if(connected && wire_type)
- connected.pulse_assembly(src)
- return 1
- if(holder && (wire_type & WIRE_PULSE))
- holder.process_activation(src, 1, 0)
- if(holder && (wire_type & WIRE_PULSE_SPECIAL))
- holder.process_activation(src, 0, 1)
- return 1
-
-
-// What the device does when turned on
-/obj/item/device/assembly/proc/activate()
- if(QDELETED(src) || !secured || (next_activate > world.time))
- return FALSE
- next_activate = world.time + 30
- return TRUE
-
-
-/obj/item/device/assembly/proc/toggle_secure()
- secured = !secured
- update_icon()
- return secured
-
-
-/obj/item/device/assembly/attackby(obj/item/W, mob/user, params)
- if(isassembly(W))
- var/obj/item/device/assembly/A = W
- if((!A.secured) && (!secured))
- holder = new/obj/item/device/assembly_holder(get_turf(src))
- holder.assemble(src,A,user)
- to_chat(user, "You attach and secure \the [A] to \the [src]!")
- else
- to_chat(user, "Both devices must be in attachable mode to be attached together.")
- return
- if(istype(W, /obj/item/screwdriver))
- if(toggle_secure())
- to_chat(user, "\The [src] is ready!")
- else
- to_chat(user, "\The [src] can now be attached!")
- return
- ..()
-
-
-/obj/item/device/assembly/examine(mob/user)
- ..()
- if(secured)
- to_chat(user, "\The [src] is secured and ready to be used.")
- else
- to_chat(user, "\The [src] can be attached to other things.")
-
-
-/obj/item/device/assembly/attack_self(mob/user)
- if(!user)
- return 0
- user.set_machine(src)
- interact(user)
- return 1
-
-/obj/item/device/assembly/interact(mob/user)
- return //HTML MENU FOR WIRES GOES HERE
-
+ w_class = WEIGHT_CLASS_SMALL
+ materials = list(MAT_METAL=100)
+ throwforce = 2
+ throw_speed = 3
+ throw_range = 7
+ origin_tech = "magnets=1;engineering=1"
+
+ var/secured = TRUE
+ var/list/attached_overlays = null
+ var/obj/item/device/assembly_holder/holder = null
+ var/wire_type = WIRE_RECEIVE | WIRE_PULSE
+ var/attachable = FALSE // can this be attached to wires
+ var/datum/wires/connected = null
+
+ var/next_activate = 0 //When we're next allowed to activate - for spam control
+
+/obj/item/device/assembly/proc/on_attach()
+
+/obj/item/device/assembly/proc/on_detach()
+
+/obj/item/device/assembly/proc/holder_movement() //Called when the holder is moved
+ return
+
+/obj/item/device/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
+ return "The trigger assembly looks broken!"
+
+
+/obj/item/device/assembly/proc/is_secured(mob/user)
+ if(!secured)
+ to_chat(user, "The [name] is unsecured!")
+ return FALSE
+ return TRUE
+
+
+//Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+/obj/item/device/assembly/proc/pulsed(radio = 0)
+ if(wire_type & WIRE_RECEIVE)
+ INVOKE_ASYNC(src, .proc/activate)
+ if(radio && (wire_type & WIRE_RADIO_RECEIVE))
+ INVOKE_ASYNC(src, .proc/activate)
+ return TRUE
+
+
+//Called when this device attempts to act on another device, var/radio determines if it was sent via radio or direct
+/obj/item/device/assembly/proc/pulse(radio = 0)
+ if(connected && wire_type)
+ connected.pulse_assembly(src)
+ return TRUE
+ if(holder && (wire_type & WIRE_PULSE))
+ holder.process_activation(src, 1, 0)
+ if(holder && (wire_type & WIRE_PULSE_SPECIAL))
+ holder.process_activation(src, 0, 1)
+ return TRUE
+
+
+// What the device does when turned on
+/obj/item/device/assembly/proc/activate()
+ if(QDELETED(src) || !secured || (next_activate > world.time))
+ return FALSE
+ next_activate = world.time + 30
+ return TRUE
+
+
+/obj/item/device/assembly/proc/toggle_secure()
+ secured = !secured
+ update_icon()
+ return secured
+
+
+/obj/item/device/assembly/attackby(obj/item/W, mob/user, params)
+ if(isassembly(W))
+ var/obj/item/device/assembly/A = W
+ if((!A.secured) && (!secured))
+ holder = new/obj/item/device/assembly_holder(get_turf(src))
+ holder.assemble(src,A,user)
+ to_chat(user, "You attach and secure \the [A] to \the [src]!")
+ else
+ to_chat(user, "Both devices must be in attachable mode to be attached together.")
+ return
+ if(istype(W, /obj/item/screwdriver))
+ if(toggle_secure())
+ to_chat(user, "\The [src] is ready!")
+ else
+ to_chat(user, "\The [src] can now be attached!")
+ return
+ ..()
+
+
+/obj/item/device/assembly/examine(mob/user)
+ ..()
+ if(secured)
+ to_chat(user, "\The [src] is secured and ready to be used.")
+ else
+ to_chat(user, "\The [src] can be attached to other things.")
+
+
+/obj/item/device/assembly/attack_self(mob/user)
+ if(!user)
+ return FALSE
+ user.set_machine(src)
+ interact(user)
+ return TRUE
+
+/obj/item/device/assembly/interact(mob/user)
+ return //HTML MENU FOR WIRES GOES HERE
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index ebd2214aba..b895297d83 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -14,12 +14,13 @@
var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
origin_tech = "materials=1;engineering=1"
+
/obj/item/device/onetankbomb/examine(mob/user)
- ..()
- user.examinate(bombtank)
+ bombtank.examine(user)
/obj/item/device/onetankbomb/update_icon()
if(bombtank)
+ icon = bombtank.icon
icon_state = bombtank.icon_state
if(bombassembly)
add_overlay(bombassembly.icon_state)
@@ -34,11 +35,11 @@
to_chat(user, "You disassemble [src].")
- bombassembly.loc = user.loc
+ bombassembly.forceMove(drop_location())
bombassembly.master = null
bombassembly = null
- bombtank.loc = user.loc
+ bombtank.forceMove(drop_location())
bombtank.master = null
bombtank = null
@@ -51,15 +52,11 @@
GLOB.bombers += "[key_name(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
message_admins("[key_name_admin(user)] welded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]")
to_chat(user, "A pressure hole has been bored to [bombtank] valve. \The [bombtank] can now be ignited.")
- else
- status = FALSE
- GLOB.bombers += "[key_name(user)] unwelded a single tank bomb. Temp: [bombtank.air_contents.temperature-T0C]"
- to_chat(user, "The hole has been closed.")
add_fingerprint(user)
..()
/obj/item/device/onetankbomb/attack_self(mob/user) //pressing the bomb accesses its assembly
- bombassembly.attack_self(user, 1)
+ bombassembly.attack_self(user, TRUE)
add_fingerprint(user)
return
@@ -84,31 +81,40 @@
// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
-/obj/item/tank/proc/bomb_assemble(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb
- var/obj/item/device/assembly_holder/S = W
- var/mob/M = user
- if(isigniter(S.a_left) == isigniter(S.a_right)) //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
- return
- if(!M.temporarilyRemoveItemFromInventory(src)) //Remove the assembly from your hands
+//Bomb assembly proc. This turns assembly+tank into a bomb
+/obj/item/tank/proc/bomb_assemble(obj/item/device/assembly_holder/assembly, mob/living/user)
+ //Check if either part of the assembly has an igniter, but if both parts are igniters, then fuck it
+ if(isigniter(assembly.a_left) == isigniter(assembly.a_right))
return
- var/obj/item/device/onetankbomb/R = new
+ if((src in user.get_equipped_items()) && !user.canUnEquip(src))
+ to_chat(user, "[src] is stuck to you!")
+ return
- M.put_in_hands(R) //Equips the bomb if possible, or puts it on the floor.
+ if(!user.canUnEquip(assembly))
+ to_chat(user, "[assembly] is stuck to your hand!")
+ return
- R.bombassembly = S //Tell the bomb about its assembly part
- S.master = R //Tell the assembly about its new owner
- S.forceMove(R) //Move the assembly out of the fucking way
+ var/obj/item/device/onetankbomb/bomb = new
+ user.transferItemToLoc(src, bomb)
+ user.transferItemToLoc(assembly, bomb)
- R.bombtank = src //Same for tank
- master = R
- forceMove(R)
- R.update_icon()
+ bomb.bombassembly = assembly //Tell the bomb about its assembly part
+ assembly.master = bomb //Tell the assembly about its new owner
+
+ bomb.bombtank = src //Same for tank
+ master = bomb
+
+ forceMove(bomb)
+ bomb.update_icon()
+
+ user.put_in_hands(bomb) //Equips the bomb if possible, or puts it on the floor.
+ to_chat(user, "You attach [assembly] to [src].")
return
/obj/item/tank/proc/ignite() //This happens when a bomb is told to explode
- air_contents.assert_gases("plasma", "o2")
- var/fuel_moles = air_contents.gases["plasma"][MOLES] + air_contents.gases["o2"][MOLES]/6
+ air_contents.assert_gases(/datum/gas/plasma, /datum/gas/oxygen)
+ var/fuel_moles = air_contents.gases[/datum/gas/plasma][MOLES] + air_contents.gases[/datum/gas/oxygen][MOLES]/6
air_contents.garbage_collect()
var/strength = 1
@@ -164,4 +170,4 @@
if(!T)
return
T.assume_air(removed)
- air_update_turf()
\ No newline at end of file
+ air_update_turf()
diff --git a/code/modules/assembly/flash.dm b/code/modules/assembly/flash.dm
index 2dd7b71cc5..3a36b4cdd0 100644
--- a/code/modules/assembly/flash.dm
+++ b/code/modules/assembly/flash.dm
@@ -146,27 +146,20 @@
/obj/item/device/assembly/flash/proc/terrible_conversion_proc(mob/living/carbon/human/H, mob/user)
if(istype(H) && ishuman(user) && H.stat != DEAD)
- if(user.mind && (user.mind in SSticker.mode.head_revolutionaries))
- if(H.client)
- if(H.stat == CONSCIOUS)
- H.mind_initialize() //give them a mind datum if they don't have one.
- var/resisted
- if(!H.isloyal())
- if(user.mind in SSticker.mode.head_revolutionaries)
- if(SSticker.mode.add_revolutionary(H.mind))
- H.Stun(60)
- times_used -- //Flashes less likely to burn out for headrevs when used for conversion
- else
- resisted = 1
- else
- resisted = 1
-
- if(resisted)
- to_chat(user, "This mind seems resistant to the flash!")
- else
- to_chat(user, "They must be conscious before you can convert them!")
- else
+ if(user.mind)
+ var/datum/antagonist/rev/head/converter = user.mind.has_antag_datum(/datum/antagonist/rev/head)
+ if(!converter)
+ return
+ if(!H.client)
to_chat(user, "This mind is so vacant that it is not susceptible to influence!")
+ return
+ if(H.stat != CONSCIOUS)
+ to_chat(user, "They must be conscious before you can convert them!")
+ return
+ if(converter.add_revolutionary(H.mind))
+ times_used -- //Flashes less likely to burn out for headrevs when used for conversion
+ else
+ to_chat(user, "This mind seems resistant to the flash!")
/obj/item/device/assembly/flash/cyborg
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 6c5ab82959..ecb05c17d0 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -107,7 +107,8 @@ Code:
..()
/obj/item/device/assembly/signaler/proc/signal()
- if(!radio_connection) return
+ if(!radio_connection)
+ return
var/datum/signal/signal = new
signal.source = src
@@ -173,7 +174,8 @@ Code:
return "The radio receiver is [on?"on":"off"]."
/obj/item/device/assembly/signaler/reciever/receive_signal(datum/signal/signal)
- if(!on) return
+ if(!on)
+ return
return ..(signal)
diff --git a/code/modules/atmospherics/environmental/LINDA_fire.dm b/code/modules/atmospherics/environmental/LINDA_fire.dm
index 93862f16b4..58edfaae94 100644
--- a/code/modules/atmospherics/environmental/LINDA_fire.dm
+++ b/code/modules/atmospherics/environmental/LINDA_fire.dm
@@ -12,12 +12,12 @@
if(!air_contents)
return 0
- var/oxy = air_contents.gases["o2"] ? air_contents.gases["o2"][MOLES] : 0
- var/tox = air_contents.gases["plasma"] ? air_contents.gases["plasma"][MOLES] : 0
-
+ var/oxy = air_contents.gases[/datum/gas/oxygen] ? air_contents.gases[/datum/gas/oxygen][MOLES] : 0
+ var/tox = air_contents.gases[/datum/gas/plasma] ? air_contents.gases[/datum/gas/plasma][MOLES] : 0
+ var/trit = air_contents.gases[/datum/gas/tritium] ? air_contents.gases[/datum/gas/tritium][MOLES] : 0
if(active_hotspot)
if(soh)
- if(tox > 0.5 && oxy > 0.5)
+ if((tox > 0.5 || trit > 0.5) && oxy > 0.5)
if(active_hotspot.temperature < exposed_temperature)
active_hotspot.temperature = exposed_temperature
if(active_hotspot.volume < exposed_volume)
@@ -26,11 +26,11 @@
var/igniting = 0
- if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && tox > 0.5)
+ if((exposed_temperature > PLASMA_MINIMUM_BURN_TEMPERATURE) && (tox > 0.5 || trit > 0.5))
igniting = 1
if(igniting)
- if(oxy < 0.5 || tox < 0.5)
+ if(oxy < 0.5)
return 0
active_hotspot = new /obj/effect/hotspot(src)
@@ -54,11 +54,11 @@
var/volume = 125
var/temperature = FIRE_MINIMUM_TEMPERATURE_TO_EXIST
- var/just_spawned = 1
- var/bypassing = 0
+ var/just_spawned = TRUE
+ var/bypassing = FALSE
-/obj/effect/hotspot/New()
- ..()
+/obj/effect/hotspot/Initialize()
+ . = ..()
SSair.hotspots += src
perform_exposure()
setDir(pick(GLOB.cardinals))
@@ -67,14 +67,14 @@
/obj/effect/hotspot/proc/perform_exposure()
var/turf/open/location = loc
if(!istype(location) || !(location.air))
- return 0
+ return
location.active_hotspot = src
if(volume > CELL_VOLUME*0.95)
- bypassing = 1
+ bypassing = TRUE
else
- bypassing = 0
+ bypassing = FALSE
if(bypassing)
if(!just_spawned)
@@ -88,17 +88,17 @@
volume = affected.reaction_results["fire"]*FIRE_GROWTH_RATE
location.assume_air(affected)
- for(var/A in loc)
+ for(var/A in location)
var/atom/AT = A
if(AT && AT != src) // It's possible that the item is deleted in temperature_expose
AT.fire_act(temperature, volume)
- return 0
+ return
/obj/effect/hotspot/process()
if(just_spawned)
- just_spawned = 0
- return 0
+ just_spawned = FALSE
+ return
var/turf/open/location = loc
if(!istype(location))
@@ -112,7 +112,13 @@
qdel(src)
return
- if(!(location.air) || !location.air.gases["plasma"] || !location.air.gases["o2"] || location.air.gases["plasma"][MOLES] < 0.5 || location.air.gases["o2"][MOLES] < 0.5)
+ //Nothing to burn
+ if(!(location.air) || !(location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/tritium]) || !location.air.gases[/datum/gas/oxygen])
+ qdel(src)
+ return
+
+ //Not enough to burn
+ if(((!location.air.gases[/datum/gas/plasma] || location.air.gases[/datum/gas/plasma][MOLES] < 0.5) && (!location.air.gases[/datum/gas/tritium] || location.air.gases[/datum/gas/tritium][MOLES] < 0.5)) || location.air.gases[/datum/gas/oxygen][MOLES] < 0.5)
qdel(src)
return
@@ -140,11 +146,8 @@
location.max_fire_temperature_sustained = temperature
if(location.heat_capacity && temperature > location.heat_capacity)
- location.to_be_destroyed = 1
- /*if(prob(25))
- location.ReplaceWithSpace()
- return 0*/
- return 1
+ location.to_be_destroyed = TRUE
+ return TRUE
/obj/effect/hotspot/Destroy()
set_light(0)
@@ -153,8 +156,7 @@
if(istype(T) && T.active_hotspot == src)
T.active_hotspot = null
DestroyTurf()
- loc = null
- . = ..()
+ return ..()
/obj/effect/hotspot/proc/DestroyTurf()
if(isturf(loc))
@@ -168,12 +170,13 @@
if(prob(chance_of_deletion))
T.ChangeTurf(T.baseturf)
else
- T.to_be_destroyed = 0
+ T.to_be_destroyed = FALSE
T.max_fire_temperature_sustained = 0
-/obj/effect/hotspot/Crossed(mob/living/L)
+/obj/effect/hotspot/Crossed(atom/movable/AM, oldLoc)
..()
- if(isliving(L))
+ if(isliving(AM))
+ var/mob/living/L = AM
L.fire_act(temperature, volume)
/obj/effect/dummy/fire
@@ -186,4 +189,4 @@
/obj/effect/dummy/fire/Initialize()
. = ..()
if(!isliving(loc))
- qdel(src)
+ return INITIALIZE_HINT_QDEL
diff --git a/code/modules/atmospherics/environmental/LINDA_system.dm b/code/modules/atmospherics/environmental/LINDA_system.dm
index a16e58056b..268528355e 100644
--- a/code/modules/atmospherics/environmental/LINDA_system.dm
+++ b/code/modules/atmospherics/environmental/LINDA_system.dm
@@ -43,7 +43,7 @@
var/turf/T = get_step(src, direction)
if(!T)
continue
- if(CANATMOSPASS(T, src))
+ if( !(blocks_air || T.blocks_air) && CANATMOSPASS(T, src) )
LAZYINITLIST(atmos_adjacent_turfs)
LAZYINITLIST(T.atmos_adjacent_turfs)
atmos_adjacent_turfs[T] = TRUE
diff --git a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
index 721ed63794..265731e96e 100644
--- a/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
+++ b/code/modules/atmospherics/environmental/LINDA_turf_tile.dm
@@ -27,7 +27,7 @@
var/datum/excited_group/excited_group
var/excited = 0
var/recently_active = 0
- var/datum/gas_mixture/air
+ var/datum/gas_mixture/turf/air
var/obj/effect/hotspot/active_hotspot
var/atmos_cooldown = 0
diff --git a/code/modules/atmospherics/gasmixtures/gas_mixture.dm b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
index b9cba55ae6..8ddde526a7 100644
--- a/code/modules/atmospherics/gasmixtures/gas_mixture.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_mixture.dm
@@ -6,7 +6,6 @@ What are the archived variables for?
#define MINIMUM_HEAT_CAPACITY 0.0003
#define QUANTIZE(variable) (round(variable,0.0000001))/*I feel the need to document what happens here. Basically this is used to catch most rounding errors, however it's previous value made it so that
once gases got hot enough, most procedures wouldnt occur due to the fact that the mole counts would get rounded away. Thus, we lowered it a few orders of magnititude */
-
GLOBAL_LIST_INIT(meta_gas_info, meta_gas_list()) //see ATMOSPHERICS/gas_types.dm
GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
@@ -65,19 +64,17 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
//PV = nRT
-/datum/gas_mixture/proc/heat_capacity() //joules per kelvin
+/datum/gas_mixture/proc/heat_capacity(data = MOLES) //joules per kelvin
var/list/cached_gases = gases
. = 0
for(var/id in cached_gases)
var/gas_data = cached_gases[id]
- . += gas_data[MOLES] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
+ . += gas_data[data] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
-/datum/gas_mixture/proc/heat_capacity_archived() //joules per kelvin
- var/list/cached_gases = gases
- . = 0
- for(var/id in cached_gases)
- var/gas_data = cached_gases[id]
- . += gas_data[ARCHIVE] * gas_data[GAS_META][META_GAS_SPECIFIC_HEAT]
+/datum/gas_mixture/turf/heat_capacity()
+ . = ..()
+ if(!.)
+ . += HEAT_CAPACITY_VACUUM //we want vacuums in turfs to have the same heat capacity as space
//prefer this in performance critical areas
#define TOTAL_MOLES(cached_gases, out_var)\
@@ -192,7 +189,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
amount = min(amount, sum) //Can not take more air than tile has!
if(amount <= 0)
return null
- var/datum/gas_mixture/removed = new
+ var/datum/gas_mixture/removed = new type
var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
removed.temperature = temperature
@@ -210,7 +207,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
ratio = min(ratio, 1)
var/list/cached_gases = gases
- var/datum/gas_mixture/removed = new
+ var/datum/gas_mixture/removed = new type
var/list/removed_gases = removed.gases //accessing datum vars is slower than proc vars
removed.temperature = temperature
@@ -225,7 +222,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
/datum/gas_mixture/copy()
var/list/cached_gases = gases
- var/datum/gas_mixture/copy = new
+ var/datum/gas_mixture/copy = new type
var/list/copy_gases = copy.gases
copy.temperature = temperature
@@ -268,8 +265,11 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
gas -= "TEMP"
gases.Cut()
for(var/id in gas)
- ADD_GAS(id, gases)
- gases[id][MOLES] = text2num(gas[id])
+ var/path = id
+ if(!ispath(path))
+ path = gas_id2path(path) //a lot of these strings can't have embedded expressions (especially for mappers), so support for IDs needs to stick around
+ ADD_GAS(path, gases)
+ gases[path][MOLES] = text2num(gas[id])
return 1
/datum/gas_mixture/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
@@ -358,8 +358,8 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
sharer_temperature = sharer.temperature_archived
var/temperature_delta = temperature_archived - sharer_temperature
if(abs(temperature_delta) > MINIMUM_TEMPERATURE_DELTA_TO_CONSIDER)
- var/self_heat_capacity = heat_capacity_archived()
- sharer_heat_capacity = sharer_heat_capacity || sharer.heat_capacity_archived()
+ var/self_heat_capacity = heat_capacity(ARCHIVE)
+ sharer_heat_capacity = sharer_heat_capacity || sharer.heat_capacity(ARCHIVE)
if((sharer_heat_capacity > MINIMUM_HEAT_CAPACITY) && (self_heat_capacity > MINIMUM_HEAT_CAPACITY))
var/heat = conduction_coefficient*temperature_delta* \
@@ -400,8 +400,7 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
/datum/gas_mixture/react(turf/open/dump_location)
. = 0
- if(temperature < TCMB) //just for safety
- temperature = TCMB
+
reaction_results = new
var/list/cached_gases = gases
@@ -439,8 +438,13 @@ GLOBAL_LIST_INIT(gaslist_cache, init_gaslist_cache())
*/
. |= reaction.react(src, dump_location)
+ //to_chat(world,reaction.name)
+ if (. & STOP_REACTIONS)
+ break
if(.)
garbage_collect()
+ if(temperature < TCMB) //just for safety
+ temperature = TCMB
//Takes the amount of the gas you want to PP as an argument
//So I don't have to do some hacky switches/defines/magic strings
diff --git a/code/modules/atmospherics/gasmixtures/gas_types.dm b/code/modules/atmospherics/gasmixtures/gas_types.dm
index 2135b9fbd0..cab2e1d62d 100644
--- a/code/modules/atmospherics/gasmixtures/gas_types.dm
+++ b/code/modules/atmospherics/gasmixtures/gas_types.dm
@@ -1,9 +1,9 @@
-GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main four gases, which were at one time hardcoded
+GLOBAL_LIST_INIT(hardcoded_gases, list(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/carbon_dioxide, /datum/gas/plasma)) //the main four gases, which were at one time hardcoded
/proc/meta_gas_list()
- . = new /list
- for(var/gas_path in subtypesof(/datum/gas))
- var/list/gas_info = new(5)
+ . = subtypesof(/datum/gas)
+ for(var/gas_path in .)
+ var/list/gas_info = new(6)
var/datum/gas/gas = gas_path
gas_info[META_GAS_SPECIFIC_HEAT] = initial(gas.specific_heat)
@@ -12,7 +12,14 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
if(initial(gas.moles_visible) != null)
gas_info[META_GAS_OVERLAY] = new /obj/effect/overlay/gas(initial(gas.gas_overlay))
gas_info[META_GAS_DANGER] = initial(gas.dangerous)
- .[initial(gas.id)] = gas_info
+ gas_info[META_GAS_ID] = initial(gas.id)
+ .[gas_path] = gas_info
+
+/proc/gas_id2path(id)
+ var/list/meta_gas = GLOB.meta_gas_info
+ for(var/path in meta_gas)
+ if(meta_gas[path][META_GAS_ID] == id)
+ return path
/*||||||||||||||/----------\||||||||||||||*\
||||||||||||||||[GAS DATUMS]||||||||||||||||
@@ -51,7 +58,7 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
specific_heat = 200
name = "Plasma"
gas_overlay = "plasma"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
/datum/gas/water_vapor
@@ -59,14 +66,14 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
specific_heat = 40
name = "Water Vapor"
gas_overlay = "water_vapor"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
-/datum/gas/freon
- id = "freon"
+/datum/gas/hypernoblium
+ id = "nob"
specific_heat = 2000
- name = "Freon"
+ name = "Hyper-noblium"
gas_overlay = "freon"
- moles_visible = MOLES_PLASMA_VISIBLE
+ moles_visible = MOLES_GAS_VISIBLE
dangerous = TRUE
/datum/gas/nitrous_oxide
@@ -77,15 +84,21 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
moles_visible = 1
dangerous = TRUE
-/datum/gas/oxygen_agent_b
- id = "agent_b"
- specific_heat = 300
- name = "Oxygen Agent B"
+/datum/gas/nitryl
+ id = "no2"
+ specific_heat = 20
+ name = "Nitryl"
+ gas_overlay = "nitryl"
+ moles_visible = MOLES_GAS_VISIBLE
+ dangerous = TRUE
-/datum/gas/volatile_fuel
- id = "v_fuel"
- specific_heat = 30
- name = "Volatile Fuel"
+/datum/gas/tritium
+ id = "tritium"
+ specific_heat = 10
+ name = "Tritium"
+ gas_overlay = "tritium"
+ moles_visible = MOLES_GAS_VISIBLE
+ dangerous = TRUE
/datum/gas/bz
id = "bz"
@@ -93,6 +106,16 @@ GLOBAL_LIST_INIT(hardcoded_gases, list("o2","n2","co2","plasma")) //the main fou
name = "BZ"
dangerous = TRUE
+/datum/gas/stimulum
+ id = "stim"
+ specific_heat = 5
+ name = "Stimulum"
+
+/datum/gas/pluoxium
+ id = "pluox"
+ specific_heat = 80
+ name = "Pluoxium"
+
/obj/effect/overlay/gas
icon = 'icons/effects/tile_effects.dmi'
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
diff --git a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
index 50e1b38e52..90b9550028 100644
--- a/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
+++ b/code/modules/atmospherics/gasmixtures/immutable_mixtures.dm
@@ -19,9 +19,6 @@
/datum/gas_mixture/immutable/merge()
return 0 //we're immutable.
-/datum/gas_mixture/immutable/heat_capacity_archived()
- return heat_capacity()
-
/datum/gas_mixture/immutable/share(datum/gas_mixture/sharer, atmos_adjacent_turfs = 4)
. = ..(sharer, 0)
garbage_collect()
@@ -54,7 +51,7 @@
initial_temperature = TCMB
/datum/gas_mixture/immutable/space/heat_capacity()
- return 7000
+ return HEAT_CAPACITY_VACUUM
/datum/gas_mixture/immutable/space/remove()
return copy() //we're always empty, so we can just return a copy.
@@ -69,8 +66,8 @@
/datum/gas_mixture/immutable/cloner/garbage_collect()
..()
- ADD_GAS("n2", gases)
- gases["n2"][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
+ ADD_GAS(/datum/gas/nitrogen, gases)
+ gases[/datum/gas/nitrogen][MOLES] = MOLES_O2STANDARD + MOLES_N2STANDARD
/datum/gas_mixture/immutable/cloner/heat_capacity()
return (MOLES_O2STANDARD + MOLES_N2STANDARD)*20 //specific heat of nitrogen is 20
diff --git a/code/modules/atmospherics/gasmixtures/reactions.dm b/code/modules/atmospherics/gasmixtures/reactions.dm
index c466213409..bcb2f75bb4 100644
--- a/code/modules/atmospherics/gasmixtures/reactions.dm
+++ b/code/modules/atmospherics/gasmixtures/reactions.dm
@@ -1,6 +1,33 @@
#define NO_REACTION 0
#define REACTING 1
-
+//Plasma fire properties
+#define OXYGEN_BURN_RATE_BASE 1.4
+#define PLASMA_BURN_RATE_DELTA 9
+#define PLASMA_UPPER_TEMPERATURE 1370+T0C
+#define PLASMA_MINIMUM_OXYGEN_NEEDED 2
+#define PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO 30
+#define PLASMA_OXYGEN_FULLBURN 10
+#define FIRE_CARBON_ENERGY_RELEASED 100000 //Amount of heat released per mole of burnt carbon into the tile
+#define FIRE_PLASMA_ENERGY_RELEASED 3000000 //Amount of heat released per mole of burnt plasma into the tile
+//General assmos defines.
+#define WATER_VAPOR_FREEZE 200
+#define NITRYL_FORMATION_ENERGY 100000
+#define TRITIUM_BURN_OXY_FACTOR 100
+#define TRITIUM_BURN_TRIT_FACTOR 10
+#define SUPER_SATURATION_THRESHOLD 96
+#define STIMULUM_HEAT_SCALE 100000
+#define STIMULUM_FIRST_RISE 0.65
+#define STIMULUM_FIRST_DROP 0.065
+#define STIMULUM_SECOND_RISE 0.0009
+#define STIMULUM_ABSOLUTE_DROP 0.00000335
+#define REACTION_OPPRESSION_THRESHOLD 5
+ //Plasma fusion properties
+#define PLASMA_BINDING_ENERGY 3000000
+#define MAX_CATALYST_EFFICENCY 9
+#define PLASMA_FUSED_COEFFICENT 0.08
+#define CATALYST_COEFFICENT 0.01
+#define FUSION_PURITY_THRESHOLD 0.9
+#define FUSION_HEAT_DROPOFF 20000+T0C
/datum/controller/subsystem/air/var/list/gas_reactions //this is our singleton of all reactions
/proc/init_gas_reactions()
@@ -35,48 +62,15 @@
/datum/gas_reaction/proc/react(datum/gas_mixture/air, atom/location)
return NO_REACTION
-//agent b: converts hot co2 and agent b to oxygen. requires plasma as a catalyst. endothermic
-/datum/gas_reaction/agent_b
- priority = 2
- name = "Agent B"
- id = "agent_b"
+/datum/gas_reaction/nobliumsupression
+ priority = INFINITY
+ name = "Hyper-Noblium Reaction Supression"
+ id = "nobstop"
+/datum/gas_reaction/nobliumsupression/init_reqs()
+ min_requirements = list(/datum/gas/hypernoblium = REACTION_OPPRESSION_THRESHOLD)
-/datum/gas_reaction/agent_b/init_reqs()
- min_requirements = list(
- "TEMP" = 900,
- "agent_b" = MINIMUM_HEAT_CAPACITY,
- "plasma" = MINIMUM_HEAT_CAPACITY,
- "co2" = MINIMUM_HEAT_CAPACITY
- )
-
-
-/datum/gas_reaction/agent_b/react(datum/gas_mixture/air)
- var/list/cached_gases = air.gases
- var/reaction_rate = min(cached_gases["co2"][MOLES]*0.75, cached_gases["plasma"][MOLES]*0.25, cached_gases["agent_b"][MOLES]*0.05)
-
- cached_gases["co2"][MOLES] -= reaction_rate
- cached_gases["agent_b"][MOLES] -= reaction_rate*0.05
-
- ASSERT_GAS("o2", air) //only need to assert oxygen, as this reaction doesn't occur without the other gases existing
- cached_gases["o2"][MOLES] += reaction_rate
-
- air.temperature -= (reaction_rate*20000)/air.heat_capacity()
-
- return REACTING
-
-//freon: does a freezy thing?
-/datum/gas_reaction/freon
- priority = 1
- name = "Freon"
- id = "freon"
-
-/datum/gas_reaction/freon/init_reqs()
- min_requirements = list("freon" = MOLES_PLASMA_VISIBLE)
-
-/datum/gas_reaction/freon/react(datum/gas_mixture/air, turf/open/location)
- . = NO_REACTION
- if(location && location.freon_gas_act())
- . = REACTING
+/datum/gas_reaction/nobliumsupression/react()
+ return STOP_REACTIONS
//water vapor: puts out fires?
/datum/gas_reaction/water_vapor
@@ -85,12 +79,15 @@
id = "vapor"
/datum/gas_reaction/water_vapor/init_reqs()
- min_requirements = list("water_vapor" = MOLES_PLASMA_VISIBLE)
+ min_requirements = list(/datum/gas/water_vapor = MOLES_GAS_VISIBLE)
/datum/gas_reaction/water_vapor/react(datum/gas_mixture/air, turf/open/location)
. = NO_REACTION
- if(location && location.water_vapor_gas_act())
- air.gases["water_vapor"][MOLES] -= MOLES_PLASMA_VISIBLE
+ if (air.temperature <= WATER_VAPOR_FREEZE)
+ if(location && location.freon_gas_act())
+ . = REACTING
+ else if(location && location.water_vapor_gas_act())
+ air.gases[/datum/gas/water_vapor][MOLES] -= MOLES_GAS_VISIBLE
. = REACTING
//fire: combustion of plasma and volatile fuel (treated as hydrocarbons). creates hotspots. exothermic
@@ -100,7 +97,7 @@
id = "fire"
/datum/gas_reaction/fire/init_reqs()
- min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of volatile fuel stuff - consider finally axing volatile fuel
+ min_requirements = list("TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST) //doesn't include plasma reqs b/c of other, rarer, burning gases.
/datum/gas_reaction/fire/react(datum/gas_mixture/air, turf/open/location)
var/energy_released = 0
@@ -111,48 +108,59 @@
cached_results[id] = 0
//General volatile gas burn
- if(cached_gases["v_fuel"] && cached_gases["v_fuel"][MOLES])
+ if(cached_gases[/datum/gas/tritium] && cached_gases[/datum/gas/tritium][MOLES])
var/burned_fuel
- if(!cached_gases["o2"])
+ if(!cached_gases[/datum/gas/oxygen])
burned_fuel = 0
- else if(cached_gases["o2"][MOLES] < cached_gases["v_fuel"][MOLES])
- burned_fuel = cached_gases["o2"][MOLES]
- cached_gases["v_fuel"][MOLES] -= burned_fuel
- cached_gases["o2"][MOLES] = 0
+ else if(cached_gases[/datum/gas/oxygen][MOLES] < cached_gases[/datum/gas/tritium][MOLES])
+ burned_fuel = cached_gases[/datum/gas/oxygen][MOLES]/TRITIUM_BURN_OXY_FACTOR
+ cached_gases[/datum/gas/tritium][MOLES] -= burned_fuel
else
- burned_fuel = cached_gases["v_fuel"][MOLES]
- cached_gases["o2"][MOLES] -= cached_gases["v_fuel"][MOLES]
+ burned_fuel = cached_gases[/datum/gas/tritium][MOLES]*TRITIUM_BURN_TRIT_FACTOR
+ cached_gases[/datum/gas/tritium][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]/TRITIUM_BURN_TRIT_FACTOR
+ cached_gases[/datum/gas/oxygen][MOLES] -= cached_gases[/datum/gas/tritium][MOLES]
if(burned_fuel)
energy_released += FIRE_CARBON_ENERGY_RELEASED * burned_fuel
- ASSERT_GAS("co2", air)
- cached_gases["co2"][MOLES] += burned_fuel
+ ASSERT_GAS(/datum/gas/carbon_dioxide, air)
+ cached_gases[/datum/gas/carbon_dioxide][MOLES] += burned_fuel/TRITIUM_BURN_OXY_FACTOR
cached_results[id] += burned_fuel
//Handle plasma burning
- if(cached_gases["plasma"] && cached_gases["plasma"][MOLES] > MINIMUM_HEAT_CAPACITY)
+ if(cached_gases[/datum/gas/plasma] && cached_gases[/datum/gas/plasma][MOLES] > MINIMUM_HEAT_CAPACITY)
var/plasma_burn_rate = 0
var/oxygen_burn_rate = 0
//more plasma released at higher temperatures
var/temperature_scale
+ var/super_saturation
if(temperature > PLASMA_UPPER_TEMPERATURE)
temperature_scale = 1
else
temperature_scale = (temperature-PLASMA_MINIMUM_BURN_TEMPERATURE)/(PLASMA_UPPER_TEMPERATURE-PLASMA_MINIMUM_BURN_TEMPERATURE)
if(temperature_scale > 0)
- ASSERT_GAS("o2", air)
+ var/o2 = cached_gases[/datum/gas/oxygen] ? cached_gases[/datum/gas/oxygen][MOLES] : 0
oxygen_burn_rate = OXYGEN_BURN_RATE_BASE - temperature_scale
- if(cached_gases["o2"][MOLES] > cached_gases["plasma"][MOLES]*PLASMA_OXYGEN_FULLBURN)
- plasma_burn_rate = (cached_gases["plasma"][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+ if (o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
+ plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
+ if(o2 / cached_gases[/datum/gas/plasma][MOLES] > SUPER_SATURATION_THRESHOLD) //supersaturation. Form Tritium.
+ super_saturation = TRUE
+ if(o2 > cached_gases[/datum/gas/plasma][MOLES]*PLASMA_OXYGEN_FULLBURN)
+ plasma_burn_rate = (cached_gases[/datum/gas/plasma][MOLES]*temperature_scale)/PLASMA_BURN_RATE_DELTA
else
- plasma_burn_rate = (temperature_scale*(cached_gases["o2"][MOLES]/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+ plasma_burn_rate = (temperature_scale*(o2/PLASMA_OXYGEN_FULLBURN))/PLASMA_BURN_RATE_DELTA
+
if(plasma_burn_rate > MINIMUM_HEAT_CAPACITY)
- ASSERT_GAS("co2", air)
- cached_gases["plasma"][MOLES] = QUANTIZE(cached_gases["plasma"][MOLES] - plasma_burn_rate)
- cached_gases["o2"][MOLES] = QUANTIZE(cached_gases["o2"][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
- cached_gases["co2"][MOLES] += plasma_burn_rate
+ ASSERT_GAS(/datum/gas/carbon_dioxide, air) //don't need to assert o2, since if it isn't present we'll never reach this point anyway
+ cached_gases[/datum/gas/plasma][MOLES] = QUANTIZE(cached_gases[/datum/gas/plasma][MOLES] - plasma_burn_rate)
+ cached_gases[/datum/gas/oxygen][MOLES] = QUANTIZE(cached_gases[/datum/gas/oxygen][MOLES] - (plasma_burn_rate * oxygen_burn_rate))
+ if (super_saturation)
+ ASSERT_GAS(/datum/gas/tritium,air)
+ cached_gases[/datum/gas/tritium][MOLES] += plasma_burn_rate
+ else
+ ASSERT_GAS(/datum/gas/carbon_dioxide,air)
+ cached_gases[/datum/gas/carbon_dioxide][MOLES] += plasma_burn_rate
energy_released += FIRE_PLASMA_ENERGY_RELEASED * (plasma_burn_rate)
@@ -175,9 +183,9 @@
return cached_results[id] ? REACTING : NO_REACTION
-//fusion: a terrible idea that was fun to try. turns co2 and plasma into REALLY HOT oxygen and nitrogen. super exothermic lol
+//fusion: a terrible idea that was fun but broken. Now reworked to be less broken and more interesting.
/datum/gas_reaction/fusion
- exclude = TRUE
+ exclude = FALSE
priority = 2
name = "Plasmic Fusion"
id = "fusion"
@@ -185,36 +193,38 @@
/datum/gas_reaction/fusion/init_reqs()
min_requirements = list(
"ENER" = PLASMA_BINDING_ENERGY * 10,
- "plasma" = MINIMUM_HEAT_CAPACITY,
- "co2" = MINIMUM_HEAT_CAPACITY
+ /datum/gas/plasma = MINIMUM_HEAT_CAPACITY,
+ /datum/gas/tritium = MINIMUM_HEAT_CAPACITY
)
/datum/gas_reaction/fusion/react(datum/gas_mixture/air)
var/list/cached_gases = air.gases
var/temperature = air.temperature
- if((cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD)
- //Fusion wont occur if the level of impurities is too high.
+ if(((cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])/air.total_moles() < FUSION_PURITY_THRESHOLD) || air.return_pressure() < 10*ONE_ATMOSPHERE)
+ //Fusion wont occur if the level of impurities is too high or if there is too little pressure.
return NO_REACTION
var/old_heat_capacity = air.heat_capacity()
- var/carbon_efficency = min(cached_gases["plasma"][MOLES]/cached_gases["co2"][MOLES],MAX_CARBON_EFFICENCY)
+ var/catalyst_efficency = max(min(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],MAX_CATALYST_EFFICENCY)-(temperature/FUSION_HEAT_DROPOFF),1)
var/reaction_energy = THERMAL_ENERGY(air)
- var/moles_impurities = air.total_moles()-(cached_gases["plasma"][MOLES]+cached_gases["co2"][MOLES])
+ var/moles_impurities = air.total_moles()-(cached_gases[/datum/gas/plasma][MOLES]+cached_gases[/datum/gas/tritium][MOLES])
- var/plasma_fused = (PLASMA_FUSED_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
- var/carbon_catalyzed = (CARBON_CATALYST_COEFFICENT*carbon_efficency)*(temperature/PLASMA_BINDING_ENERGY)
- var/oxygen_added = carbon_catalyzed
- var/nitrogen_added = (plasma_fused-oxygen_added)-(THERMAL_ENERGY(air)/PLASMA_BINDING_ENERGY)
+ var/plasma_fused = (PLASMA_FUSED_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)*4
+ var/tritium_catalyzed = (CATALYST_COEFFICENT*catalyst_efficency)*(temperature/PLASMA_BINDING_ENERGY)
+ var/oxygen_added = tritium_catalyzed
+ var/waste_added = (plasma_fused-oxygen_added)-((air.total_moles()*air.heat_capacity())/PLASMA_BINDING_ENERGY)
+ reaction_energy = max(reaction_energy+((catalyst_efficency*cached_gases[/datum/gas/plasma][MOLES])/((moles_impurities/catalyst_efficency)+2)*10)+((plasma_fused/((moles_impurities/catalyst_efficency)))*PLASMA_BINDING_ENERGY),0)
- reaction_energy = max(reaction_energy+((carbon_efficency*cached_gases["plasma"][MOLES])/((moles_impurities/carbon_efficency)+2)*10)+((plasma_fused/(moles_impurities/carbon_efficency))*PLASMA_BINDING_ENERGY),0)
-
- air.assert_gases("o2", "n2")
-
- cached_gases["plasma"][MOLES] -= plasma_fused
- cached_gases["co2"][MOLES] -= carbon_catalyzed
- cached_gases["o2"][MOLES] += oxygen_added
- cached_gases["n2"][MOLES] += nitrogen_added
+ air.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen, /datum/gas/water_vapor, /datum/gas/nitrous_oxide, /datum/gas/nitryl)
+ //Fusion produces an absurd amount of waste products now, requiring active filtration.
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - plasma_fused,0)
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES] - tritium_catalyzed,0)
+ cached_gases[/datum/gas/oxygen][MOLES] += oxygen_added
+ cached_gases[/datum/gas/nitrogen][MOLES] += waste_added
+ cached_gases[/datum/gas/water_vapor][MOLES] += waste_added
+ cached_gases[/datum/gas/nitrous_oxide][MOLES] += waste_added
+ cached_gases[/datum/gas/nitryl][MOLES] += waste_added
if(reaction_energy > 0)
var/new_heat_capacity = air.heat_capacity()
@@ -223,5 +233,152 @@
//Prevents whatever mechanism is causing it to hit negative temperatures.
return REACTING
+/datum/gas_reaction/nitrylformation //The formation of nitryl. Endothermic. Requires N2O as a catalyst.
+ priority = 3
+ name = "Nitryl formation"
+ id = "nitrylformation"
+
+/datum/gas_reaction/nitrylformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/oxygen = 20,
+ /datum/gas/nitrogen = 20,
+ /datum/gas/nitrous_oxide = 5,
+ "TEMP" = FIRE_MINIMUM_TEMPERATURE_TO_EXIST*400
+ )
+
+/datum/gas_reaction/nitrylformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ var/temperature = air.temperature
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/heat_efficency = temperature/(FIRE_MINIMUM_TEMPERATURE_TO_EXIST*100)
+ var/energy_used = heat_efficency*NITRYL_FORMATION_ENERGY
+ ASSERT_GAS(/datum/gas/nitryl,air)
+
+ cached_gases[/datum/gas/oxygen][MOLES] -= heat_efficency
+ cached_gases[/datum/gas/nitrogen][MOLES] -= heat_efficency
+ cached_gases[/datum/gas/nitryl][MOLES] += heat_efficency*2
+
+ if(energy_used > 0)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((temperature*old_heat_capacity - energy_used)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/bzformation //Formation of BZ by combining plasma and tritium at low pressures. Exothermic.
+ priority = 4
+ name = "BZ Gas formation"
+ id = "bzformation"
+
+/datum/gas_reaction/bzformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/tritium = 10,
+ /datum/gas/plasma = 10
+ )
+
+
+/datum/gas_reaction/bzformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ var/temperature = air.temperature
+ var/pressure = air.return_pressure()
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/reaction_efficency = 1/((pressure/(0.1*ONE_ATMOSPHERE))*(max(cached_gases[/datum/gas/plasma][MOLES]/cached_gases[/datum/gas/tritium][MOLES],1)))
+ var/energy_released = 2*reaction_efficency*FIRE_CARBON_ENERGY_RELEASED
+
+ ASSERT_GAS(/datum/gas/bz,air)
+ cached_gases[/datum/gas/bz][MOLES]+= reaction_efficency
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 2*reaction_efficency,0)
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES] - reaction_efficency,0)
+
+
+ if(energy_released > 0)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((temperature*old_heat_capacity + energy_released)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/stimformation //Stimulum formation follows a strange pattern of how effective it will be at a given temperature, having some multiple peaks and some large dropoffs. Exo and endo thermic.
+ priority = 5
+ name = "Stimulum formation"
+ id = "stimformation"
+/datum/gas_reaction/stimformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/tritium = 30,
+ /datum/gas/plasma = 10,
+ /datum/gas/bz = 20,
+ /datum/gas/nitryl = 30,
+ "TEMP" = STIMULUM_HEAT_SCALE/2)
+
+/datum/gas_reaction/stimformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+
+ var/old_heat_capacity = air.heat_capacity()
+ var/heat_scale = air.temperature/STIMULUM_HEAT_SCALE
+ var/stim_energy_change
+ stim_energy_change =heat_scale + (STIMULUM_FIRST_RISE(heat_scale**2)) - (STIMULUM_FIRST_DROP(heat_scale**3)) + (STIMULUM_SECOND_RISE(heat_scale**4)) - (STIMULUM_ABSOLUTE_DROP(heat_scale**5))
+
+ ASSERT_GAS(/datum/gas/stimulum,air)
+ cached_gases[/datum/gas/stimulum][MOLES]+= heat_scale/10
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- heat_scale,0)
+ cached_gases[/datum/gas/plasma][MOLES] = max(cached_gases[/datum/gas/plasma][MOLES]- heat_scale,0)
+ cached_gases[/datum/gas/nitryl][MOLES] = max(cached_gases[/datum/gas/nitryl][MOLES]- heat_scale,0)
+
+ if(stim_energy_change)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((air.temperature*old_heat_capacity + stim_energy_change)/new_heat_capacity),TCMB)
+ return REACTING
+
+/datum/gas_reaction/nobliumformation //Hyper-Nobelium formation is extrememly endothermic, but requires high temperatures to start. Due to its high mass, hyper-nobelium uses large amounts of nitrogen and tritium. BZ can be used as a catalyst to make it less endothermic.
+ priority = 6
+ name = "Hyper-Noblium condensation"
+ id = "nobformation"
+
+/datum/gas_reaction/nobliumformation/init_reqs()
+ min_requirements = list(
+ /datum/gas/nitrogen = 10,
+ /datum/gas/tritium = 5,
+ "TEMP" = 5000000)
+
+/datum/gas_reaction/nobliumformation/react(datum/gas_mixture/air)
+ var/list/cached_gases = air.gases
+ air.assert_gases(/datum/gas/hypernoblium,/datum/gas/bz)
+ var/old_heat_capacity = air.heat_capacity()
+ var/nob_formed = (cached_gases[/datum/gas/nitrogen][MOLES]*cached_gases[/datum/gas/tritium][MOLES])/100
+ var/energy_taken = nob_formed*(10000000/(max(cached_gases[/datum/gas/bz][MOLES],1)))
+ cached_gases[/datum/gas/tritium][MOLES] = max(cached_gases[/datum/gas/tritium][MOLES]- 10*nob_formed,0)
+ cached_gases[/datum/gas/nitrogen][MOLES] = max(cached_gases[/datum/gas/nitrogen][MOLES]- 20*nob_formed,0)
+ cached_gases[/datum/gas/hypernoblium][MOLES]+= nob_formed
+
+
+ if (nob_formed)
+ var/new_heat_capacity = air.heat_capacity()
+ if(new_heat_capacity > MINIMUM_HEAT_CAPACITY)
+ air.temperature = max(((air.temperature*old_heat_capacity - energy_taken)/new_heat_capacity),TCMB)
#undef REACTING
#undef NO_REACTION
+#undef OXYGEN_BURN_RATE_BASE
+#undef PLASMA_BURN_RATE_DELTA
+#undef PLASMA_UPPER_TEMPERATURE
+#undef PLASMA_MINIMUM_OXYGEN_NEEDED
+#undef PLASMA_MINIMUM_OXYGEN_PLASMA_RATIO
+#undef PLASMA_OXYGEN_FULLBURN
+#undef FIRE_CARBON_ENERGY_RELEASED
+#undef FIRE_PLASMA_ENERGY_RELEASED
+#undef WATER_VAPOR_FREEZE
+#undef NITRYL_FORMATION_ENERGY
+#undef TRITIUM_BURN_OXY_FACTOR
+#undef SUPER_SATURATION_THRESHOLD
+#undef STIMULUM_HEAT_SCALE
+#undef STIMULUM_FIRST_RISE
+#undef STIMULUM_FIRST_DROP
+#undef STIMULUM_SECOND_RISE
+#undef STIMULUM_ABSOLUTE_DROP
+#undef REACTION_OPPRESSION_THRESHOLD
+#undef PLASMA_BINDING_ENERGY
+#undef MAX_CATALYST_EFFICENCY
+#undef PLASMA_FUSED_COEFFICENT
+#undef CATALYST_COEFFICENT
+#undef FUSION_PURITY_THRESHOLD
+#undef FUSION_HEAT_DROPOFF
\ No newline at end of file
diff --git a/code/modules/atmospherics/machinery/airalarm.dm b/code/modules/atmospherics/machinery/airalarm.dm
index 6de564da6d..316f9f248d 100644
--- a/code/modules/atmospherics/machinery/airalarm.dm
+++ b/code/modules/atmospherics/machinery/airalarm.dm
@@ -5,10 +5,10 @@
var/max2
/datum/tlv/New(min2 as num, min1 as num, max1 as num, max2 as num)
- src.min2 = min2
- src.min1 = min1
- src.max1 = max1
- src.max2 = max2
+ if(min2) src.min2 = min2
+ if(min1) src.min1 = min1
+ if(max1) src.max1 = max1
+ if(max2) src.max2 = max2
/datum/tlv/proc/get_danger_level(val as num)
if(max2 != -1 && val >= max2)
@@ -21,13 +21,25 @@
return 1
return 0
+/datum/tlv/no_checks
+ min2 = -1
+ min1 = -1
+ max1 = -1
+ max2 = -1
+
+/datum/tlv/dangerous
+ min2 = -1
+ min1 = -1
+ max1 = 0.2
+ max2 = 0.5
+
/obj/item/electronics/airalarm
name = "air alarm electronics"
icon_state = "airalarm_electronics"
/obj/item/wallframe/airalarm
name = "air alarm frame"
- desc = "Used for building Air Alarms"
+ desc = "Used for building Air Alarms."
icon = 'icons/obj/monitors.dmi'
icon_state = "alarm_bitem"
result_path = /obj/machinery/airalarm
@@ -73,44 +85,56 @@
var/datum/radio_frequency/radio_connection
var/list/TLV = list( // Breathable air.
- "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
- "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K
- "o2" = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
- "n2" = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
- "co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
- "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "bz" = new/datum/tlv(-1, -1, 0.2, 0.5),
- "freon" = new/datum/tlv(-1, -1, 0.2, 0.5),
- "water_vapor" = new/datum/tlv(-1, -1, 0.2, 0.5)
+ "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
+ "temperature" = new/datum/tlv(T0C, T0C+10, T0C+40, T0C+66), // K
+ /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+ /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
+ /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
+ /datum/gas/plasma = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/bz = new/datum/tlv/dangerous,
+ /datum/gas/hypernoblium = new/datum/tlv/dangerous,
+ /datum/gas/water_vapor = new/datum/tlv/dangerous,
+ /datum/gas/tritium = new/datum/tlv/dangerous,
+ /datum/gas/stimulum = new/datum/tlv/dangerous,
+ /datum/gas/nitryl = new/datum/tlv/dangerous,
+ /datum/gas/pluoxium = new/datum/tlv/dangerous
)
/obj/machinery/airalarm/server // No checks here.
TLV = list(
- "pressure" = new/datum/tlv(-1, -1, -1, -1),
- "temperature" = new/datum/tlv(-1, -1, -1, -1),
- "o2" = new/datum/tlv(-1, -1, -1, -1),
- "n2" = new/datum/tlv(-1, -1, -1, -1),
- "co2" = new/datum/tlv(-1, -1, -1, -1),
- "plasma" = new/datum/tlv(-1, -1, -1, -1),
- "n2o" = new/datum/tlv(-1, -1, -1, -1),
- "bz" = new/datum/tlv(-1, -1, -1, -1),
- "freon" = new/datum/tlv(-1, -1, -1, -1),
- "water_vapor" = new/datum/tlv(-1, -1, -1, -1)
+ "pressure" = new/datum/tlv/no_checks,
+ "temperature" = new/datum/tlv/no_checks,
+ /datum/gas/oxygen = new/datum/tlv/no_checks,
+ /datum/gas/nitrogen = new/datum/tlv/no_checks,
+ /datum/gas/carbon_dioxide = new/datum/tlv/no_checks,
+ /datum/gas/plasma = new/datum/tlv/no_checks,
+ /datum/gas/nitrous_oxide = new/datum/tlv/no_checks,
+ /datum/gas/bz = new/datum/tlv/no_checks,
+ /datum/gas/hypernoblium = new/datum/tlv/no_checks,
+ /datum/gas/water_vapor = new/datum/tlv/no_checks,
+ /datum/gas/tritium = new/datum/tlv/no_checks,
+ /datum/gas/stimulum = new/datum/tlv/no_checks,
+ /datum/gas/nitryl = new/datum/tlv/no_checks,
+ /datum/gas/pluoxium = new/datum/tlv/no_checks
)
/obj/machinery/airalarm/kitchen_cold_room // Copypasta: to check temperatures.
TLV = list(
- "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
- "temperature" = new/datum/tlv(200,210,273.15,283.15), // K
- "o2" = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
- "n2" = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
- "co2" = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
- "plasma" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "n2o" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "bz" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "freon" = new/datum/tlv(-1, -1, 0.2, 0.5), // Partial pressure, kpa
- "water_vapor" = new/datum/tlv(-1, -1, 0.2, 0.5)
+ "pressure" = new/datum/tlv(ONE_ATMOSPHERE * 0.8, ONE_ATMOSPHERE* 0.9, ONE_ATMOSPHERE * 1.1, ONE_ATMOSPHERE * 1.2), // kPa
+ "temperature" = new/datum/tlv(200,210,273.15,283.15), // K
+ /datum/gas/oxygen = new/datum/tlv(16, 19, 135, 140), // Partial pressure, kpa
+ /datum/gas/nitrogen = new/datum/tlv(-1, -1, 1000, 1000), // Partial pressure, kpa
+ /datum/gas/carbon_dioxide = new/datum/tlv(-1, -1, 5, 10), // Partial pressure, kpa
+ /datum/gas/plasma = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/nitrous_oxide = new/datum/tlv/dangerous, // Partial pressure, kpa
+ /datum/gas/bz = new/datum/tlv/dangerous,
+ /datum/gas/hypernoblium = new/datum/tlv/dangerous,
+ /datum/gas/water_vapor = new/datum/tlv/dangerous,
+ /datum/gas/tritium = new/datum/tlv/dangerous,
+ /datum/gas/stimulum = new/datum/tlv/dangerous,
+ /datum/gas/nitryl = new/datum/tlv/dangerous,
+ /datum/gas/pluoxium = new/datum/tlv/dangerous
)
/obj/machinery/airalarm/engine
@@ -237,7 +261,9 @@
"incheck" = info["checks"]&2,
"direction" = info["direction"],
"external" = info["external"],
- "extdefault"= (info["external"] == ONE_ATMOSPHERE)
+ "internal" = info["internal"],
+ "extdefault"= (info["external"] == ONE_ATMOSPHERE),
+ "intdefault"= (info["internal"] == 0)
))
data["scrubbers"] = list()
for(var/id_tag in A.air_scrub_names)
@@ -254,8 +280,7 @@
"filter_co2" = info["filter_co2"],
"filter_toxins" = info["filter_toxins"],
"filter_n2o" = info["filter_n2o"],
- "filter_bz" = info["filter_bz"],
- "filter_freon" = info["filter_freon"],
+ "filter_rare" = info["filter_rare"],
"filter_water_vapor" = info["filter_water_vapor"]
))
data["mode"] = mode
@@ -312,7 +337,7 @@
if(usr.has_unlimited_silicon_privilege && !wires.is_cut(WIRE_IDSCAN))
locked = !locked
. = TRUE
- if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "bz_scrub", "freon_scrub","water_vapor_scrub", "widenet", "scrubbing")
+ if("power", "co2_scrub", "tox_scrub", "n2o_scrub", "rare_scrub","water_vapor_scrub", "widenet", "scrubbing")
send_signal(device_id, list("[action]" = text2num(params["val"])))
. = TRUE
if("excheck")
@@ -321,15 +346,18 @@
if("incheck")
send_signal(device_id, list("checks" = text2num(params["val"])^2))
. = TRUE
- if("set_external_pressure")
+ if("set_external_pressure", "set_internal_pressure")
var/area/A = get_area(src)
- var/target = input("New target pressure:", name, A.air_vent_info[device_id]["external"]) as num|null
+ var/target = input("New target pressure:", name, A.air_vent_info[device_id][(action == "set_external_pressure" ? "external" : "internal")]) as num|null
if(!isnull(target) && !..())
- send_signal(device_id, list("set_external_pressure" = target))
+ send_signal(device_id, list("[action]" = target))
. = TRUE
if("reset_external_pressure")
send_signal(device_id, list("reset_external_pressure"))
. = TRUE
+ if("reset_internal_pressure")
+ send_signal(device_id, list("reset_internal_pressure"))
+ . = TRUE
if("threshold")
var/env = params["env"]
var/name = params["var"]
@@ -428,8 +456,7 @@
"co2_scrub" = 1,
"tox_scrub" = 0,
"n2o_scrub" = 0,
- "bz_scrub" = 0,
- "freon_scrub"= 0,
+ "rare_scrub"= 0,
"water_vapor_scrub"= 0,
"scrubbing" = 1,
"widenet" = 0,
@@ -447,8 +474,7 @@
"co2_scrub" = 1,
"tox_scrub" = 1,
"n2o_scrub" = 1,
- "bz_scrub" = 1,
- "freon_scrub"= 1,
+ "rare_scrub"= 1,
"water_vapor_scrub"= 1,
"scrubbing" = 1,
"widenet" = 1,
@@ -479,8 +505,7 @@
"co2_scrub" = 1,
"tox_scrub" = 0,
"n2o_scrub" = 0,
- "bz_scrub" = 0,
- "freon_scrub"= 0,
+ "rare_scrub"= 0,
"water_vapor_scrub"= 0,
"scrubbing" = 1,
"widenet" = 0,
@@ -760,4 +785,4 @@
#undef AALARM_MODE_SIPHON
#undef AALARM_MODE_CONTAMINATED
#undef AALARM_MODE_REFILL
-#undef AALARM_REPORT_TIMEOUT
\ No newline at end of file
+#undef AALARM_REPORT_TIMEOUT
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index ce68eecdc9..6c335bf896 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -25,6 +25,8 @@ Pipelines + Other Objects -> Pipe network
var/can_unwrench = 0
var/initialize_directions = 0
var/pipe_color
+ var/piping_layer = PIPING_LAYER_DEFAULT
+ var/pipe_flags = NONE
var/global/list/iconsetids = list()
var/global/list/pipeimages = list()
@@ -34,12 +36,21 @@ Pipelines + Other Objects -> Pipe network
var/device_type = 0
var/list/obj/machinery/atmospherics/nodes
-/obj/machinery/atmospherics/examine(mob/living/user)
- ..()
- if(is_type_in_list(src, GLOB.ventcrawl_machinery) && user.ventcrawler)
- to_chat(user, "Alt-click to crawl through it.")
+ var/construction_type
+ var/pipe_state //icon_state as a pipe item
-/obj/machinery/atmospherics/New(loc, process = TRUE)
+/obj/machinery/atmospherics/examine(mob/user)
+ ..()
+ if(is_type_in_list(src, GLOB.ventcrawl_machinery) && isliving(user))
+ var/mob/living/L = user
+ if(L.ventcrawler)
+ to_chat(L, "Alt-click to crawl through it.")
+
+/obj/machinery/atmospherics/New(loc, process = TRUE, setdir)
+ if(!isnull(setdir))
+ setDir(setdir)
+ if(pipe_flags & PIPING_CARDINAL_AUTONORMALIZE)
+ normalize_cardinal_directions()
nodes = new(device_type)
if (!armor)
armor = list(melee = 25, bullet = 10, laser = 10, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 100, acid = 70)
@@ -61,6 +72,13 @@ Pipelines + Other Objects -> Pipe network
return ..()
//return QDEL_HINT_FINDREFERENCE
+/obj/machinery/atmospherics/proc/destroy_network()
+ return
+
+/obj/machinery/atmospherics/proc/build_network()
+ // Called to build a network from this node
+ return
+
/obj/machinery/atmospherics/proc/nullifyNode(I)
if(NODE_I)
var/obj/machinery/atmospherics/N = NODE_I
@@ -80,6 +98,11 @@ Pipelines + Other Objects -> Pipe network
break
return node_connects
+/obj/machinery/atmospherics/proc/normalize_cardinal_directions()
+ if(dir==SOUTH)
+ setDir(NORTH)
+ else if(dir==WEST)
+ setDir(EAST)
//this is called just after the air controller sets up turfs
/obj/machinery/atmospherics/proc/atmosinit(var/list/node_connects)
@@ -91,12 +114,37 @@ Pipelines + Other Objects -> Pipe network
if(can_be_node(target, I))
NODE_I = target
break
-
update_icon()
+/obj/machinery/atmospherics/proc/setPipingLayer(new_layer)
+ if(pipe_flags & PIPING_DEFAULT_LAYER_ONLY)
+ new_layer = PIPING_LAYER_DEFAULT
+ piping_layer = new_layer
+ pixel_x = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
+ pixel_y = (piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
+ layer = initial(layer) + ((piping_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_LCHANGE)
+
/obj/machinery/atmospherics/proc/can_be_node(obj/machinery/atmospherics/target)
- if(target.initialize_directions & get_dir(target,src))
+ return connection_check(target, piping_layer)
+
+//Find a connecting /obj/machinery/atmospherics in specified direction
+/obj/machinery/atmospherics/proc/findConnecting(direction, prompted_layer)
+ for(var/obj/machinery/atmospherics/target in get_step(src, direction))
+ if(target.initialize_directions & get_dir(target,src))
+ if(connection_check(target, prompted_layer))
+ return target
+
+/obj/machinery/atmospherics/proc/connection_check(obj/machinery/atmospherics/target, given_layer)
+ if(isConnectable(target, given_layer) && target.isConnectable(src, given_layer) && (target.initialize_directions & get_dir(target,src)))
return TRUE
+ return FALSE
+
+/obj/machinery/atmospherics/proc/isConnectable(obj/machinery/atmospherics/target, given_layer)
+ if(isnull(given_layer))
+ given_layer = piping_layer
+ if((target.piping_layer == given_layer) || (target.pipe_flags & PIPING_ALL_LAYER))
+ return TRUE
+ return FALSE
/obj/machinery/atmospherics/proc/pipeline_expansion()
return nodes
@@ -119,14 +167,10 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/proc/replacePipenet()
return
-/obj/machinery/atmospherics/proc/build_network()
- // Called to build a network from this node
- return
-
/obj/machinery/atmospherics/proc/disconnect(obj/machinery/atmospherics/reference)
if(istype(reference, /obj/machinery/atmospherics/pipe))
var/obj/machinery/atmospherics/pipe/P = reference
- qdel(P.parent)
+ P.destroy_network()
var/I = nodes.Find(reference)
NODE_I = null
update_icon()
@@ -135,12 +179,17 @@ Pipelines + Other Objects -> Pipe network
return
/obj/machinery/atmospherics/attackby(obj/item/W, mob/user, params)
+ if(istype(W, /obj/item/pipe)) //lets you autodrop
+ var/obj/item/pipe/pipe = W
+ if(user.dropItemToGround(pipe))
+ pipe.setPipingLayer(piping_layer) //align it with us
+ return TRUE
if(istype(W, /obj/item/wrench))
if(can_unwrench(user))
var/turf/T = get_turf(src)
if (level==1 && isturf(T) && T.intact)
to_chat(user, "You must remove the plating first!")
- return 1
+ return TRUE
var/datum/gas_mixture/int_air = return_air()
var/datum/gas_mixture/env_air = loc.return_air()
add_fingerprint(user)
@@ -148,7 +197,7 @@ Pipelines + Other Objects -> Pipe network
var/unsafe_wrenching = FALSE
var/internal_pressure = int_air.return_pressure()-env_air.return_pressure()
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
to_chat(user, "You begin to unfasten \the [src]...")
if (internal_pressure > 2*ONE_ATMOSPHERE)
to_chat(user, "As you begin unwrenching \the [src] a gush of air blows in your face... maybe you should reconsider?")
@@ -193,7 +242,8 @@ Pipelines + Other Objects -> Pipe network
/obj/machinery/atmospherics/deconstruct(disassembled = TRUE)
if(!(flags_1 & NODECONSTRUCT_1))
if(can_unwrench)
- var/obj/item/pipe/stored = new(loc, make_from=src)
+ var/obj/item/pipe/stored = new construction_type(loc, null, dir, src)
+ stored.setPipingLayer(piping_layer)
if(!disassembled)
stored.obj_integrity = stored.max_integrity * 0.5
transfer_fingerprints_to(stored)
@@ -224,10 +274,11 @@ Pipelines + Other Objects -> Pipe network
if(unconnected & direction)
underlays += getpipeimage('icons/obj/atmospherics/components/binary_devices.dmi', "pipe_exposed", direction)
-/obj/machinery/atmospherics/on_construction(pipe_type, obj_color)
+/obj/machinery/atmospherics/on_construction(obj_color, set_layer)
if(can_unwrench)
add_atom_colour(obj_color, FIXED_COLOUR_PRIORITY)
pipe_color = obj_color
+ setPipingLayer(set_layer)
var/turf/T = get_turf(src)
level = T.intact ? 2 : 1
atmosinit()
@@ -237,18 +288,16 @@ Pipelines + Other Objects -> Pipe network
A.addMember(src)
build_network()
+/obj/machinery/atmospherics/Entered(atom/movable/AM)
+ if(istype(AM, /mob/living))
+ var/mob/living/L = AM
+ L.ventcrawl_layer = piping_layer
+ return ..()
+
/obj/machinery/atmospherics/singularity_pull(S, current_size)
- ..()
if(current_size >= STAGE_FIVE)
deconstruct(FALSE)
-
-
-//Find a connecting /obj/machinery/atmospherics in specified direction
-/obj/machinery/atmospherics/proc/findConnecting(direction)
- for(var/obj/machinery/atmospherics/target in get_step(src, direction))
- if(target.initialize_directions & get_dir(target,src))
- return target
-
+ return ..()
#define VENT_SOUND_DELAY 30
@@ -259,7 +308,7 @@ Pipelines + Other Objects -> Pipe network
if(user in buckled_mobs)// fixes buckle ventcrawl edgecase fuck bug
return
- var/obj/machinery/atmospherics/target_move = findConnecting(direction)
+ var/obj/machinery/atmospherics/target_move = findConnecting(direction, user.ventcrawl_layer)
if(target_move)
if(target_move.can_crawl_through())
if(is_type_in_typecache(target_move, GLOB.ventcrawl_machinery))
@@ -269,14 +318,14 @@ Pipelines + Other Objects -> Pipe network
var/list/pipenetdiff = returnPipenets() ^ target_move.returnPipenets()
if(pipenetdiff.len)
user.update_pipe_vision(target_move)
- user.loc = target_move
+ user.forceMove(target_move)
user.client.eye = target_move //Byond only updates the eye every tick, This smooths out the movement
if(world.time - user.last_played_vent > VENT_SOUND_DELAY)
user.last_played_vent = world.time
playsound(src, 'sound/machines/ventcrawl.ogg', 50, 1, -3)
else
if((direction & initialize_directions) || is_type_in_typecache(src, GLOB.ventcrawl_machinery) && can_crawl_through()) //if we move in a way the pipe can connect, but doesn't - or we're in a vent
- user.forceMove(src.loc)
+ user.forceMove(loc)
user.visible_message("You hear something squeezing through the ducts...","You climb out the ventilation system.")
user.canmove = 0
spawn(1)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
index 786aff1038..ef6dd85afa 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/circulator.dm
@@ -11,6 +11,7 @@
var/status = 0
var/last_pressure_delta = 0
+ pipe_flags = PIPING_ONE_PER_TURF
anchored = TRUE
density = TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
index 158c272543..86c5375d07 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/passive_gate.dm
@@ -21,6 +21,9 @@ Passive gate is similar to the regular pump except:
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "passivegate"
+
/obj/machinery/atmospherics/components/binary/passive_gate/Destroy()
SSradio.remove_object(src,frequency)
return ..()
@@ -167,4 +170,3 @@ Passive gate is similar to the regular pump except:
if(. && on)
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
index c5242fb5cc..97bba0e534 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/pump.dm
@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "pump"
+
/obj/machinery/atmospherics/components/binary/pump/on
on = TRUE
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
index dbe1343667..e613012e82 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/valve.dm
@@ -15,6 +15,9 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
var/open = FALSE
var/valve_type = "m" //lets us have a nice, clean, OOP update_icon_nopipes()
+ construction_type = /obj/item/pipe/binary
+ pipe_state = "mvalve"
+
/obj/machinery/atmospherics/components/binary/valve/open
open = TRUE
@@ -65,6 +68,7 @@ It's like a regular ol' straight pipe, but you can turn it on and off.
desc = "A digitally controlled valve."
icon_state = "dvalve_map"
valve_type = "d"
+ pipe_state = "dvalve"
/obj/machinery/atmospherics/components/binary/valve/digital/attack_ai(mob/user)
return src.attack_hand(user)
diff --git a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
index 227c34d9ca..b154c0d3e4 100644
--- a/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
+++ b/code/modules/atmospherics/machinery/components/binary_devices/volume_pump.dm
@@ -26,6 +26,9 @@ Thus, the two variables affect pump operation are set in New():
var/id = null
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "volumepump"
+
/obj/machinery/atmospherics/components/binary/volume_pump/Destroy()
SSradio.remove_object(src,frequency)
return ..()
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
index 4e3ef0f3cc..1ba013e237 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/filter.dm
@@ -6,10 +6,13 @@
can_unwrench = TRUE
var/on = FALSE
var/target_pressure = ONE_ATMOSPHERE
- var/filter_type = ""
+ var/filter_type = null
var/frequency = 0
var/datum/radio_frequency/radio_connection
+ construction_type = /obj/item/pipe/trinary/flippable
+ pipe_state = "filter"
+
/obj/machinery/atmospherics/components/trinary/filter/flipped
icon_state = "filter_off_f"
flipped = TRUE
@@ -28,6 +31,9 @@
if(frequency)
radio_connection = SSradio.add_object(src, frequency, GLOB.RADIO_ATMOSIA)
+/obj/machinery/atmospherics/components/trinary/filter/New()
+ ..()
+
/obj/machinery/atmospherics/components/trinary/filter/Destroy()
SSradio.remove_object(src,frequency)
return ..()
@@ -67,7 +73,7 @@
var/output_starting_pressure = air3.return_pressure()
if(output_starting_pressure >= target_pressure)
- //No need to mix if target is already full!
+ //No need to transfer if target is already full!
return
//Calculate necessary moles to transfer using PV=nRT
@@ -86,11 +92,12 @@
if(!removed)
return
- var/filtering = filter_type ? TRUE : FALSE
-
- if(filtering && !istext(filter_type))
- WARNING("Wrong gas ID in [src]'s filter_type var. filter_type == [filter_type]")
- filtering = FALSE
+ var/filtering = TRUE
+ if(!ispath(filter_type))
+ if(filter_type)
+ filter_type = gas_id2path(filter_type) //support for mappers so they don't need to type out paths
+ else
+ filtering = FALSE
if(filtering && removed.gases[filter_type])
var/datum/gas_mixture/filtered_out = new
@@ -102,7 +109,8 @@
removed.gases[filter_type][MOLES] = 0
removed.garbage_collect()
- air2.merge(filtered_out)
+ var/datum/gas_mixture/target = (air2.return_pressure() < target_pressure ? air2 : air1) //if there's no room for the filtered gas; just leave it in air1
+ target.merge(filtered_out)
air3.merge(removed)
@@ -116,7 +124,7 @@
datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
ui = SStgui.try_update_ui(user, src, ui_key, ui, force_open)
if(!ui)
- ui = new(user, src, ui_key, "atmos_filter", name, 475, 155, master_ui, state)
+ ui = new(user, src, ui_key, "atmos_filter", name, 475, 180, master_ui, state)
ui.open()
/obj/machinery/atmospherics/components/trinary/filter/ui_data()
@@ -124,7 +132,15 @@
data["on"] = on
data["pressure"] = round(target_pressure)
data["max_pressure"] = round(MAX_OUTPUT_PRESSURE)
- data["filter_type"] = filter_type
+
+ if(filter_type) //ui code is garbage and this is needed for it to work grr
+ if(ispath(filter_type)) //we need to send the gas ID. if it's a path, get it from the metainfo list...
+ data["filter_type"] = GLOB.meta_gas_info[filter_type][META_GAS_ID]
+ else //...otherwise, it's already in the form we need.
+ data["filter_type"] = filter_type
+ else
+ data["filter_type"] = "none"
+
return data
/obj/machinery/atmospherics/components/trinary/filter/ui_act(action, params)
@@ -151,9 +167,9 @@
target_pressure = Clamp(pressure, 0, MAX_OUTPUT_PRESSURE)
investigate_log("was set to [target_pressure] kPa by [key_name(usr)]", INVESTIGATE_ATMOS)
if("filter")
- filter_type = ""
+ filter_type = null
var/filter_name = "nothing"
- var/gas = params["mode"]
+ var/gas = text2path(params["mode"]) || gas_id2path(params["mode"])
if(gas in GLOB.meta_gas_info)
filter_type = gas
filter_name = GLOB.meta_gas_info[gas][META_GAS_NAME]
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
index 1fb8b072c6..b706cd3cd9 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/mixer.dm
@@ -12,6 +12,9 @@
var/node1_concentration = 0.5
var/node2_concentration = 0.5
+ construction_type = /obj/item/pipe/trinary/flippable
+ pipe_state = "mixer"
+
//node 3 is the outlet, nodes 1 & 2 are intakes
/obj/machinery/atmospherics/components/trinary/mixer/flipped
@@ -171,4 +174,3 @@
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
index 14495cd237..8ba105fdb1 100644
--- a/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/trinary_devices/trinary_devices.dm
@@ -5,6 +5,7 @@
use_power = IDLE_POWER_USE
device_type = TRINARY
layer = GAS_FILTER_LAYER
+ pipe_flags = PIPING_ONE_PER_TURF
var/flipped = FALSE
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index ee7228fdca..4bcbd95c21 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -11,6 +11,7 @@
layer = ABOVE_WINDOW_LAYER
state_open = FALSE
circuit = /obj/item/circuitboard/machine/cryo_tube
+ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
var/on = FALSE
var/autoeject = FALSE
@@ -187,7 +188,7 @@
if(reagent_transfer == 0) // Magically transfer reagents. Because cryo magic.
beaker.reagents.trans_to(occupant, 1, 10 * efficiency) // Transfer reagents, multiplied because cryo magic.
beaker.reagents.reaction(occupant, VAPOR)
- air1.gases["o2"][MOLES] -= 2 / efficiency // Lets use gas for this.
+ air1.gases[/datum/gas/oxygen][MOLES] -= 2 / efficiency //Let's use gas for this
if(++reagent_transfer >= 10 * efficiency) // Throttle reagent transfer (higher efficiency will transfer the same amount but consume less from the beaker).
reagent_transfer = 0
@@ -201,7 +202,7 @@
var/datum/gas_mixture/air1 = AIR1
- if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases["o2"][MOLES] < 5) // Turn off if the machine won't work.
+ if(!NODE1 || !AIR1 || !air1.gases.len || air1.gases[/datum/gas/oxygen][MOLES] < 5) // Turn off if the machine won't work.
on = FALSE
update_icon()
return
@@ -217,11 +218,13 @@
if(abs(temperature_delta) > 1)
var/air_heat_capacity = air1.heat_capacity()
- var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (1 / air_heat_capacity + 1 / heat_capacity)
+
+ var/heat = ((1 - cold_protection) * 0.1 + conduction_coefficient) * temperature_delta * (air_heat_capacity * heat_capacity / (air_heat_capacity + heat_capacity))
+
air1.temperature = max(air1.temperature - heat / air_heat_capacity, TCMB)
mob_occupant.bodytemperature = max(mob_occupant.bodytemperature + heat / heat_capacity, TCMB)
- air1.gases["o2"][MOLES] -= 0.5 / efficiency // Magically consume gas? Why not, we run on cryo magic.
+ air1.gases[/datum/gas/oxygen][MOLES] -= 0.5 / efficiency // Magically consume gas? Why not, we run on cryo magic.
/obj/machinery/atmospherics/components/unary/cryo_cell/power_change()
..()
@@ -291,10 +294,15 @@
var/reagentlist = pretty_string_from_reagent_list(I.reagents.reagent_list)
log_game("[key_name(user)] added an [I] to cyro containing [reagentlist]")
return
- if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-o", "pod-off", I) || exchange_parts(user, I)) \
+ if(!on && !occupant && !state_open && (default_deconstruction_screwdriver(user, "pod-off", "pod-off", I) || exchange_parts(user, I)) \
|| default_change_direction_wrench(user, I) \
|| default_pry_open(I) \
|| default_deconstruction_crowbar(I))
+ update_icon()
+ return
+ else if(istype(I, /obj/item/screwdriver))
+ to_chat(user, "You can't access the maintenance panel while the pod is " \
+ + (on ? "active" : (occupant ? "full" : "open")) + ".")
return
return ..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
index ee6e31175b..c8daf29ad3 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/heat_exchanger.dm
@@ -3,7 +3,7 @@
icon_state = "he_intact"
name = "heat exchanger"
- desc = "Exchanges heat between two input gases. Setup for fast heat transfer"
+ desc = "Exchanges heat between two input gases. Set up for fast heat transfer."
can_unwrench = TRUE
@@ -12,6 +12,8 @@
var/obj/machinery/atmospherics/components/unary/heat_exchanger/partner = null
var/update_cycle
+ pipe_state = "heunary"
+
/obj/machinery/atmospherics/components/unary/heat_exchanger/update_icon()
if(NODE1)
icon_state = "he_intact"
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
index 215ee77572..37bfb5d952 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/outlet_injector.dm
@@ -1,6 +1,6 @@
/obj/machinery/atmospherics/components/unary/outlet_injector
name = "air injector"
- desc = "Has a valve and pump attached to it"
+ desc = "Has a valve and pump attached to it."
icon_state = "inje_map"
use_power = IDLE_POWER_USE
can_unwrench = TRUE
@@ -18,6 +18,8 @@
level = 1
layer = GAS_SCRUBBER_LAYER
+ pipe_state = "injector"
+
/obj/machinery/atmospherics/components/unary/outlet_injector/Destroy()
SSradio.remove_object(src,frequency)
return ..()
@@ -188,4 +190,3 @@
if(. && on && is_operational())
to_chat(user, "You cannot unwrench [src], turn it off first!")
return FALSE
-
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
index c0a887e3aa..0070cce9a1 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/oxygen_generator.dm
@@ -3,7 +3,7 @@
icon_state = "o2gen_map"
name = "oxygen generator"
- desc = "Generates oxygen"
+ desc = "Generates oxygen."
dir = SOUTH
initialize_directions = SOUTH
@@ -49,8 +49,8 @@
var/added_oxygen = oxygen_content - total_moles
air_contents.temperature = (current_heat_capacity*air_contents.temperature + 20*added_oxygen*T0C)/(current_heat_capacity+20*added_oxygen)
- ASSERT_GAS("o2", air_contents)
- air_contents.gases["o2"][MOLES] += added_oxygen
+ ASSERT_GAS(/datum/gas/oxygen, air_contents)
+ air_contents.gases[/datum/gas/oxygen][MOLES] += added_oxygen
update_parents()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
index e17a2f796c..051f3136ee 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/portables_connector.dm
@@ -8,6 +8,8 @@
use_power = NO_POWER_USE
level = 0
layer = GAS_FILTER_LAYER
+ pipe_flags = PIPING_ONE_PER_TURF
+ pipe_state = "connector"
/obj/machinery/atmospherics/components/unary/portables_connector/New()
..()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
index 3b0055edab..ec1fcdfc52 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/tank.dm
@@ -9,6 +9,7 @@
density = TRUE
var/gas_type = 0
layer = ABOVE_WINDOW_LAYER
+ pipe_flags = PIPING_ONE_PER_TURF
/obj/machinery/atmospherics/components/unary/tank/New()
..()
@@ -21,23 +22,20 @@
name = "[name] ([air_contents.gases[gas_type][GAS_META][META_GAS_NAME]])"
/obj/machinery/atmospherics/components/unary/tank/carbon_dioxide
- gas_type = "co2"
+ gas_type = /datum/gas/carbon_dioxide
/obj/machinery/atmospherics/components/unary/tank/toxins
icon_state = "orange"
- gas_type = "plasma"
+ gas_type = /datum/gas/plasma
-/obj/machinery/atmospherics/components/unary/tank/oxygen_agent_b
- icon_state = "orange_2"
- gas_type = "agent_b"
/obj/machinery/atmospherics/components/unary/tank/oxygen
icon_state = "blue"
- gas_type = "o2"
+ gas_type = /datum/gas/oxygen
/obj/machinery/atmospherics/components/unary/tank/nitrogen
icon_state = "red"
- gas_type = "n2"
+ gas_type = /datum/gas/nitrogen
/obj/machinery/atmospherics/components/unary/tank/air
icon_state = "grey"
@@ -46,6 +44,6 @@
/obj/machinery/atmospherics/components/unary/tank/air/New()
..()
var/datum/gas_mixture/air_contents = AIR1
- air_contents.assert_gases("o2", "n2")
- air_contents.gases["o2"][MOLES] = AIR_CONTENTS * 0.2
- air_contents.gases["n2"][MOLES] = AIR_CONTENTS * 0.8
+ air_contents.assert_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = AIR_CONTENTS * 0.2
+ air_contents.gases[/datum/gas/nitrogen][MOLES] = AIR_CONTENTS * 0.8
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index dc482eda02..d7bfe1ecb8 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -11,6 +11,7 @@
armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 30)
layer = OBJ_LAYER
circuit = /obj/item/circuitboard/machine/thermomachine
+ pipe_flags = PIPING_ONE_PER_TURF | PIPING_DEFAULT_LAYER_ONLY
var/on = FALSE
var/min_temperature = 0
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
index a6ac9760e8..a335fd2f59 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/unary_devices.dm
@@ -3,6 +3,8 @@
dir = SOUTH
initialize_directions = SOUTH
device_type = UNARY
+ pipe_flags = PIPING_ONE_PER_TURF
+ construction_type = /obj/item/pipe/directional
/obj/machinery/atmospherics/components/unary/SetInitDirections()
initialize_directions = dir
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
index aa6c12a006..82482b562f 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_pump.dm
@@ -31,6 +31,8 @@
var/radio_filter_out
var/radio_filter_in
+ pipe_state = "uvent"
+
/obj/machinery/atmospherics/components/unary/vent_pump/on
on = TRUE
icon_state = "vent_map_on"
@@ -235,6 +237,9 @@
if("reset_external_pressure" in signal.data)
external_pressure_bound = ONE_ATMOSPHERE
+ if("reset_internal_pressure" in signal.data)
+ internal_pressure_bound = 0
+
if("adjust_internal_pressure" in signal.data)
internal_pressure_bound = Clamp(internal_pressure_bound + text2num(signal.data["adjust_internal_pressure"]),0,ONE_ATMOSPHERE*50)
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
index e1365e5a7e..7f74711367 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/vent_scrubber.dm
@@ -20,8 +20,7 @@
var/scrub_CO2 = TRUE
var/scrub_Toxins = FALSE
var/scrub_N2O = FALSE
- var/scrub_BZ = FALSE
- var/scrub_Freon = FALSE
+ var/scrub_Rare = FALSE
var/scrub_WaterVapor = FALSE
@@ -34,6 +33,8 @@
var/radio_filter_out
var/radio_filter_in
+ pipe_state = "scrubber"
+
/obj/machinery/atmospherics/components/unary/vent_scrubber/New()
..()
if(!id_tag)
@@ -70,9 +71,7 @@
amount += idle_power_usage
if(scrub_N2O)
amount += idle_power_usage
- if(scrub_BZ)
- amount += idle_power_usage
- if(scrub_Freon)
+ if(scrub_Rare)
amount += idle_power_usage
if(scrub_WaterVapor)
amount += idle_power_usage
@@ -125,8 +124,7 @@
"filter_co2" = scrub_CO2,
"filter_toxins" = scrub_Toxins,
"filter_n2o" = scrub_N2O,
- "filter_bz" = scrub_BZ,
- "filter_freon" = scrub_Freon,
+ "filter_rare" =scrub_Rare,
"filter_water_vapor" = scrub_WaterVapor,
"sigtype" = "status"
)
@@ -171,10 +169,13 @@
var/datum/gas_mixture/air_contents = AIR1
var/list/env_gases = environment.gases
+ if(air_contents.return_pressure() >= 50*ONE_ATMOSPHERE)
+ return FALSE
+
if(scrubbing & SCRUBBING)
var/should_we_scrub = FALSE
for(var/id in env_gases)
- if(id == "n2" || id == "o2")
+ if(id == /datum/gas/nitrogen || id == /datum/gas/oxygen)
continue
if(env_gases[id][MOLES])
should_we_scrub = TRUE
@@ -194,40 +195,55 @@
var/list/filtered_gases = filtered_out.gases
filtered_out.temperature = removed.temperature
- if(scrub_Toxins && removed_gases["plasma"])
- ADD_GAS("plasma", filtered_out.gases)
- filtered_gases["plasma"][MOLES] = removed_gases["plasma"][MOLES]
- removed.gases["plasma"][MOLES] = 0
+ if(scrub_Toxins && removed_gases[/datum/gas/plasma])
+ ADD_GAS(/datum/gas/plasma, filtered_gases)
+ filtered_gases[/datum/gas/plasma][MOLES] = removed_gases[/datum/gas/plasma][MOLES]
+ removed_gases[/datum/gas/plasma][MOLES] = 0
- if(scrub_CO2 && removed_gases["co2"])
- ADD_GAS("co2", filtered_out.gases)
- filtered_gases["co2"][MOLES] = removed_gases["co2"][MOLES]
- removed_gases["co2"][MOLES] = 0
+ if(scrub_CO2 && removed_gases[/datum/gas/carbon_dioxide])
+ ADD_GAS(/datum/gas/carbon_dioxide, filtered_gases)
+ filtered_gases[/datum/gas/carbon_dioxide][MOLES] = removed_gases[/datum/gas/carbon_dioxide][MOLES]
+ removed_gases[/datum/gas/carbon_dioxide][MOLES] = 0
- if(removed_gases["agent_b"])
- ADD_GAS("agent_b", filtered_out.gases)
- filtered_gases["agent_b"][MOLES] = removed_gases["agent_b"][MOLES]
- removed_gases["agent_b"][MOLES] = 0
+ if(scrub_N2O && removed_gases[/datum/gas/nitrous_oxide])
+ ADD_GAS(/datum/gas/nitrous_oxide, filtered_gases)
+ filtered_gases[/datum/gas/nitrous_oxide][MOLES] = removed_gases[/datum/gas/nitrous_oxide][MOLES]
+ removed_gases[/datum/gas/nitrous_oxide][MOLES] = 0
- if(scrub_N2O && removed_gases["n2o"])
- ADD_GAS("n2o", filtered_out.gases)
- filtered_gases["n2o"][MOLES] = removed_gases["n2o"][MOLES]
- removed_gases["n2o"][MOLES] = 0
+ if(scrub_Rare && removed_gases[/datum/gas/bz])
+ ADD_GAS(/datum/gas/bz, filtered_gases)
+ filtered_gases[/datum/gas/bz][MOLES] = removed_gases[/datum/gas/bz][MOLES]
+ removed_gases[/datum/gas/bz][MOLES] = 0
- if(scrub_BZ && removed_gases["bz"])
- ADD_GAS("bz", filtered_out.gases)
- filtered_gases["bz"][MOLES] = removed_gases["bz"][MOLES]
- removed_gases["bz"][MOLES] = 0
+ if(scrub_Rare && removed_gases[/datum/gas/hypernoblium])
+ ADD_GAS(/datum/gas/hypernoblium, filtered_gases)
+ filtered_gases[/datum/gas/hypernoblium][MOLES] = removed_gases[/datum/gas/hypernoblium][MOLES]
+ removed_gases[/datum/gas/hypernoblium][MOLES] = 0
- if(scrub_Freon && removed_gases["freon"])
- ADD_GAS("freon", filtered_out.gases)
- filtered_gases["freon"][MOLES] = removed_gases["freon"][MOLES]
- removed_gases["freon"][MOLES] = 0
+ if(scrub_Rare && removed_gases[/datum/gas/stimulum])
+ ADD_GAS(/datum/gas/stimulum, filtered_gases)
+ filtered_gases[/datum/gas/stimulum][MOLES] = removed_gases[/datum/gas/stimulum][MOLES]
+ removed_gases[/datum/gas/stimulum][MOLES] = 0
- if(scrub_WaterVapor && removed_gases["water_vapor"])
- ADD_GAS("water_vapor", filtered_out.gases)
- filtered_gases["water_vapor"][MOLES] = removed_gases["water_vapor"][MOLES]
- removed_gases["water_vapor"][MOLES] = 0
+ if(scrub_Rare && removed_gases[/datum/gas/pluoxium])
+ ADD_GAS(/datum/gas/pluoxium, filtered_gases)
+ filtered_gases[/datum/gas/pluoxium][MOLES] = removed_gases[/datum/gas/pluoxium][MOLES]
+ removed_gases[/datum/gas/pluoxium][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/nitryl])
+ ADD_GAS(/datum/gas/nitryl, filtered_gases)
+ filtered_gases[/datum/gas/nitryl][MOLES] = removed_gases[/datum/gas/nitryl][MOLES]
+ removed_gases[/datum/gas/nitryl][MOLES] = 0
+
+ if(scrub_Rare && removed_gases[/datum/gas/tritium])
+ ADD_GAS(/datum/gas/tritium, filtered_gases)
+ filtered_gases[/datum/gas/tritium][MOLES] = removed_gases[/datum/gas/tritium][MOLES]
+ removed_gases[/datum/gas/tritium][MOLES] = 0
+
+ if(scrub_WaterVapor && removed_gases[/datum/gas/water_vapor])
+ ADD_GAS(/datum/gas/water_vapor, filtered_gases)
+ filtered_gases[/datum/gas/water_vapor][MOLES] = removed_gases[/datum/gas/water_vapor][MOLES]
+ removed_gases[/datum/gas/water_vapor][MOLES] = 0
removed.garbage_collect()
@@ -238,8 +254,6 @@
tile.air_update_turf()
else //Just siphoning all air
- if(air_contents.return_pressure()>=50*ONE_ATMOSPHERE)
- return FALSE
var/transfer_moles = environment.total_moles()*(volume_rate/environment.volume)
@@ -302,15 +316,10 @@
if("toggle_n2o_scrub" in signal.data)
scrub_N2O = !scrub_N2O
- if("bz_scrub" in signal.data)
- scrub_BZ = text2num(signal.data["bz_scrub"])
- if("toggle_bz_scrub" in signal.data)
- scrub_BZ = !scrub_BZ
-
- if("freon_scrub" in signal.data)
- scrub_Freon = text2num(signal.data["freon_scrub"])
- if("toggle_freon_scrub" in signal.data)
- scrub_Freon = !scrub_Freon
+ if("rare_scrub" in signal.data)
+ scrub_Rare = text2num(signal.data["rare_scrub"])
+ if("toggle_rare_scrub" in signal.data)
+ scrub_Rare = !scrub_Rare
if("water_vapor_scrub" in signal.data)
scrub_WaterVapor = text2num(signal.data["water_vapor_scrub"])
diff --git a/code/modules/atmospherics/machinery/other/meter.dm b/code/modules/atmospherics/machinery/other/meter.dm
index 124caa23be..4edced52b3 100644
--- a/code/modules/atmospherics/machinery/other/meter.dm
+++ b/code/modules/atmospherics/machinery/other/meter.dm
@@ -13,19 +13,33 @@
active_power_usage = 4
max_integrity = 150
armor = list(melee = 0, bullet = 0, laser = 0, energy = 100, bomb = 0, bio = 100, rad = 100, fire = 40, acid = 0)
-
-
-/obj/machinery/meter/Initialize(mapload)
- . = ..()
- SSair.atmos_machinery += src
- if (!target)
- target = locate(/obj/machinery/atmospherics/pipe) in loc
+ var/target_layer = PIPING_LAYER_DEFAULT
/obj/machinery/meter/Destroy()
SSair.atmos_machinery -= src
- src.target = null
+ target = null
return ..()
+/obj/machinery/meter/Initialize(mapload, new_piping_layer)
+ if(!isnull(new_piping_layer))
+ target_layer = new_piping_layer
+ SSair.atmos_machinery += src
+ if(!target)
+ reattach_to_layer()
+ return ..()
+
+/obj/machinery/meter/proc/reattach_to_layer()
+ for(var/obj/machinery/atmospherics/pipe/pipe in loc)
+ if(pipe.piping_layer == target_layer)
+ target = pipe
+ setAttachLayer(pipe.piping_layer)
+ break
+
+/obj/machinery/meter/proc/setAttachLayer(var/new_layer)
+ target_layer = new_layer
+ pixel_x = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
+ pixel_y = (new_layer - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
+
/obj/machinery/meter/process_atmos()
if(!target)
icon_state = "meterX"
@@ -75,7 +89,7 @@
radio_connection.post_signal(src, signal)
/obj/machinery/meter/proc/status()
- if (src.target)
+ if (target)
var/datum/gas_mixture/environment = target.return_air()
if(environment)
. = "The pressure gauge reads [round(environment.return_pressure(), 0.01)] kPa; [round(environment.temperature,0.01)] K ([round(environment.temperature-T0C,0.01)]°C)."
@@ -91,23 +105,23 @@
/obj/machinery/meter/attackby(obj/item/W, mob/user, params)
if (istype(W, /obj/item/wrench))
- playsound(src.loc, W.usesound, 50, 1)
+ playsound(src, W.usesound, 50, 1)
to_chat(user, "You begin to unfasten \the [src]...")
if (do_after(user, 40*W.toolspeed, target = src))
user.visible_message( \
"[user] unfastens \the [src].", \
"You unfasten \the [src].", \
"You hear ratchet.")
- new /obj/item/pipe_meter(src.loc)
+ new /obj/item/pipe_meter(loc)
qdel(src)
else
return ..()
/obj/machinery/meter/attack_ai(mob/user)
- return src.attack_hand(user)
+ return attack_hand(user)
/obj/machinery/meter/attack_paw(mob/user)
- return src.attack_hand(user)
+ return attack_hand(user)
/obj/machinery/meter/attack_hand(mob/user)
@@ -129,4 +143,4 @@
/obj/machinery/meter/turf/Initialize()
. = ..()
- src.target = loc
+ target = loc
diff --git a/code/modules/atmospherics/machinery/other/miner.dm b/code/modules/atmospherics/machinery/other/miner.dm
index 75e6807fa5..cb28f17802 100644
--- a/code/modules/atmospherics/machinery/other/miner.dm
+++ b/code/modules/atmospherics/machinery/other/miner.dm
@@ -146,49 +146,34 @@
/obj/machinery/atmospherics/miner/n2o
name = "\improper N2O Gas Miner"
overlay_color = "#FFCCCC"
- spawn_id = "n2o"
+ spawn_id = /datum/gas/nitrous_oxide
/obj/machinery/atmospherics/miner/nitrogen
name = "\improper N2 Gas Miner"
overlay_color = "#CCFFCC"
- spawn_id = "n2"
+ spawn_id = /datum/gas/nitrogen
/obj/machinery/atmospherics/miner/oxygen
name = "\improper O2 Gas Miner"
overlay_color = "#007FFF"
- spawn_id = "o2"
+ spawn_id = /datum/gas/oxygen
/obj/machinery/atmospherics/miner/toxins
name = "\improper Plasma Gas Miner"
overlay_color = "#FF0000"
- spawn_id = "plasma"
+ spawn_id = /datum/gas/plasma
/obj/machinery/atmospherics/miner/carbon_dioxide
name = "\improper CO2 Gas Miner"
overlay_color = "#CDCDCD"
- spawn_id = "co2"
+ spawn_id = /datum/gas/carbon_dioxide
/obj/machinery/atmospherics/miner/bz
name = "\improper BZ Gas Miner"
overlay_color = "#FAFF00"
- spawn_id = "bz"
-
-/obj/machinery/atmospherics/miner/freon
- name = "\improper Freon Gas Miner"
- overlay_color = "#00FFE5"
- spawn_id = "freon"
-
-/obj/machinery/atmospherics/miner/volatile_fuel
- name = "\improper Volatile Fuel Gas Miner"
- overlay_color = "#564040"
- spawn_id = "v_fuel"
-
-/obj/machinery/atmospherics/miner/agent_b
- name = "\improper Agent B Gas Miner"
- overlay_color = "#E81E24"
- spawn_id = "agent_b"
+ spawn_id = /datum/gas/bz
/obj/machinery/atmospherics/miner/water_vapor
name = "\improper Water Vapor Gas Miner"
overlay_color = "#99928E"
- spawn_id = "water_vapor"
+ spawn_id = /datum/gas/water_vapor
diff --git a/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm b/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm
deleted file mode 100644
index 476235d3d9..0000000000
--- a/code/modules/atmospherics/machinery/pipes/bluespace_pipe.dm
+++ /dev/null
@@ -1,47 +0,0 @@
-GLOBAL_LIST_EMPTY(bluespace_pipes)
-
-/obj/machinery/atmospherics/pipe/bluespace
- name = "bluespace pipe"
- desc = "Transmits gas across large distances of space. Developed using bluespace technology."
- icon = 'icons/obj/atmospherics/pipes/bluespace.dmi'
- icon_state = "map"
- dir = SOUTH
- initialize_directions = SOUTH
- device_type = UNARY
- can_buckle = FALSE
-
-/obj/machinery/atmospherics/pipe/bluespace/New()
- icon_state = "pipe"
- GLOB.bluespace_pipes += src
- ..()
-
-/obj/machinery/atmospherics/pipe/bluespace/Destroy()
- GLOB.bluespace_pipes -= src
- for(var/p in GLOB.bluespace_pipes)
- var/obj/machinery/atmospherics/pipe/bluespace/P = p
- QDEL_NULL(P.parent)
- P.build_network()
- return ..()
-
-/obj/machinery/atmospherics/pipe/bluespace/SetInitDirections()
- initialize_directions = dir
-
-/obj/machinery/atmospherics/pipe/bluespace/pipeline_expansion()
- return ..() + GLOB.bluespace_pipes - src
-
-/obj/machinery/atmospherics/components/pipe/bluespace/hide()
- update_icon()
-
-/obj/machinery/atmospherics/pipe/bluespace/update_icon(showpipe)
- underlays.Cut()
- var/turf/T = loc
- if(level != 2 && T.intact)
- return //no need to update the pipes if they aren't showing
- var/connected = 0 //Direction bitset
- for(DEVICE_TYPE_LOOP) //adds intact pieces
- if(NODE_I)
- connected |= icon_addintact(NODE_I)
- icon_addbroken(connected) //adds broken pieces
-
-/obj/machinery/atmospherics/pipe/bluespace/paint()
- return FALSE
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
index 46146a16f6..c50ccc942b 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/he_pipes.dm
@@ -31,7 +31,7 @@
var/turf/T = loc
if(istype(T))
- if(istype(T, /turf/open/lava))
+ if(islava(T))
environment_temperature = 5000
else if(T.blocks_air)
environment_temperature = T.temperature
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
index 49c911b858..67186f09f5 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/junction.dm
@@ -3,7 +3,7 @@
icon_state = "intact"
name = "junction"
- desc = "A one meter junction that connects regular and heat-exchanging pipe"
+ desc = "A one meter junction that connects regular and heat-exchanging pipe."
minimum_temperature_difference = 300
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
@@ -13,6 +13,9 @@
initialize_directions_he = SOUTH
device_type = BINARY
+
+ construction_type = /obj/item/pipe/directional
+ pipe_state = "junction"
/obj/machinery/atmospherics/pipe/heat_exchanging/junction/SetInitDirections()
switch(dir)
@@ -43,4 +46,4 @@
return 0
init_dir = H.initialize_directions_he
if(init_dir & get_dir(target,src))
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
index 119ca08c7d..e4df82073b 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/manifold.dm
@@ -3,13 +3,16 @@
icon_state = "manifold"
name = "pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions_he = EAST|NORTH|WEST
device_type = TRINARY
+ construction_type = /obj/item/pipe/trinary
+ pipe_state = "he_manifold"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold/SetInitDirections()
switch(dir)
if(NORTH)
@@ -38,12 +41,15 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
- desc = "A manifold composed of heat-exchanging pipes"
+ desc = "A manifold composed of heat-exchanging pipes."
initialize_directions_he = NORTH|SOUTH|EAST|WEST
device_type = QUATERNARY
+ construction_type = /obj/item/pipe/quaternary
+ pipe_state = "he_manifold4w"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/manifold4w/SetInitDirections()
initialize_directions_he = initial(initialize_directions_he)
@@ -57,4 +63,4 @@
//Add non-broken pieces
for(DEVICE_TYPE_LOOP)
if(NODE_I)
- add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))
\ No newline at end of file
+ add_overlay(getpipeimage('icons/obj/atmospherics/pipes/heat.dmi', "manifold_intact[invis]", get_dir(src, NODE_I)))
diff --git a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
index 46ebf95dd0..637d55306f 100644
--- a/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/heat_exchange/simple.dm
@@ -2,13 +2,16 @@
icon_state = "intact"
name = "pipe"
- desc = "A one meter section of heat-exchanging pipe"
+ desc = "A one meter section of heat-exchanging pipe."
dir = SOUTH
initialize_directions_he = SOUTH|NORTH
device_type = BINARY
+ construction_type = /obj/item/pipe/binary/bendable
+ pipe_state = "he"
+
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/SetInitDirections()
if(dir in GLOB.diagonals)
initialize_directions_he = dir
@@ -30,4 +33,4 @@
/obj/machinery/atmospherics/pipe/heat_exchanging/simple/update_icon()
normalize_dir()
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/atmospherics/machinery/pipes/layermanifold.dm b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
new file mode 100644
index 0000000000..fee00baf50
--- /dev/null
+++ b/code/modules/atmospherics/machinery/pipes/layermanifold.dm
@@ -0,0 +1,127 @@
+/obj/machinery/atmospherics/pipe/layer_manifold
+ name = "pipe-layer manifold"
+ icon = 'icons/obj/atmospherics/pipes/manifold.dmi'
+ icon_state = "manifoldlayer"
+ desc = "A special pipe to bridge pipe layers with."
+ dir = SOUTH
+ initialize_directions = NORTH|SOUTH
+ pipe_flags = PIPING_ALL_LAYER | PIPING_DEFAULT_LAYER_ONLY | PIPING_CARDINAL_AUTONORMALIZE
+ piping_layer = PIPING_LAYER_DEFAULT
+ device_type = 0
+ volume = 260
+ var/list/front_nodes
+ var/list/back_nodes
+ construction_type = /obj/item/pipe/binary
+ pipe_state = "layer_manifold"
+
+/obj/machinery/atmospherics/pipe/layer_manifold/Initialize()
+ front_nodes = list()
+ back_nodes = list()
+ return ..()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/Destroy()
+ nullifyAllNodes()
+ return ..()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/proc/nullifyAllNodes()
+ var/list/obj/machinery/atmospherics/needs_nullifying = get_all_connected_nodes()
+ front_nodes = null
+ back_nodes = null
+ nodes = list()
+ for(var/obj/machinery/atmospherics/A in needs_nullifying)
+ A.disconnect(src)
+ A.build_network()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/proc/get_all_connected_nodes()
+ return front_nodes + back_nodes + nodes
+
+/obj/machinery/atmospherics/pipe/layer_manifold/update_icon() //HEAVILY WIP FOR UPDATE ICONS!!
+ layer = (initial(layer) + (PIPING_LAYER_MAX * PIPING_LAYER_LCHANGE)) //This is above everything else.
+ var/invis = invisibility ? "-f" : ""
+ icon_state = "[initial(icon_state)][invis]"
+ cut_overlays()
+ for(var/obj/machinery/atmospherics/A in front_nodes)
+ add_attached_image(A)
+ for(var/obj/machinery/atmospherics/A in back_nodes)
+ add_attached_image(A)
+
+/obj/machinery/atmospherics/pipe/layer_manifold/proc/add_attached_image(obj/machinery/atmospherics/A)
+ var/invis = A.invisibility ? "-f" : ""
+ if(istype(A, /obj/machinery/atmospherics/pipe/layer_manifold))
+ for(var/i = PIPING_LAYER_MIN, i <= PIPING_LAYER_MAX, i++)
+ var/image/I = getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full_layer_long[invis]", get_dir(src, A), A.pipe_color)
+ I.pixel_x = (i - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_X
+ I.pixel_y = (i - PIPING_LAYER_DEFAULT) * PIPING_LAYER_P_Y
+ I.layer = layer - 0.01
+ add_overlay(I)
+ else
+ var/image/I = getpipeimage('icons/obj/atmospherics/pipes/manifold.dmi', "manifold_full_layer_long[invis]", get_dir(src, A), A.pipe_color)
+ I.pixel_x = A.pixel_x
+ I.pixel_y = A.pixel_y
+ I.layer = layer - 0.01
+ add_overlay(I)
+
+/obj/machinery/atmospherics/pipe/layer_manifold/SetInitDirections()
+ switch(dir)
+ if(NORTH || SOUTH)
+ initialize_directions = NORTH|SOUTH
+ if(EAST || WEST)
+ initialize_directions = EAST|WEST
+
+/obj/machinery/atmospherics/pipe/layer_manifold/isConnectable(obj/machinery/atmospherics/target, given_layer)
+ if(!given_layer)
+ return TRUE
+ . = ..()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/proc/findAllConnections()
+ front_nodes = list()
+ back_nodes = list()
+ var/list/new_nodes = list()
+ for(var/iter in PIPING_LAYER_MIN to PIPING_LAYER_MAX)
+ var/obj/machinery/atmospherics/foundfront = findConnecting(dir, iter)
+ var/obj/machinery/atmospherics/foundback = findConnecting(turn(dir, 180), iter)
+ front_nodes += foundfront
+ back_nodes += foundback
+ if(foundfront && !QDELETED(foundfront))
+ new_nodes += foundfront
+ if(foundback && !QDELETED(foundback))
+ new_nodes += foundback
+ update_icon()
+ return new_nodes
+
+/obj/machinery/atmospherics/pipe/layer_manifold/atmosinit()
+ normalize_cardinal_directions()
+ findAllConnections()
+ var/turf/T = loc // hide if turf is not intact
+ hide(T.intact)
+
+/obj/machinery/atmospherics/pipe/layer_manifold/setPipingLayer()
+ piping_layer = PIPING_LAYER_DEFAULT
+
+/obj/machinery/atmospherics/pipe/layer_manifold/pipeline_expansion()
+ return get_all_connected_nodes()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/disconnect(obj/machinery/atmospherics/reference)
+ if(istype(reference, /obj/machinery/atmospherics/pipe))
+ var/obj/machinery/atmospherics/pipe/P = reference
+ P.destroy_network()
+ while(reference in get_all_connected_nodes())
+ if(reference in nodes)
+ var/I = nodes.Find(reference)
+ NODE_I = null
+ if(reference in front_nodes)
+ var/I = front_nodes.Find(reference)
+ front_nodes[I] = null
+ if(reference in back_nodes)
+ var/I = back_nodes.Find(reference)
+ back_nodes[I] = null
+ update_icon()
+
+/obj/machinery/atmospherics/pipe/layer_manifold/relaymove(mob/living/user, dir)
+ if(initialize_directions & dir)
+ return ..()
+ if((NORTH|EAST) & dir)
+ user.ventcrawl_layer = Clamp(user.ventcrawl_layer + 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
+ if((SOUTH|WEST) & dir)
+ user.ventcrawl_layer = Clamp(user.ventcrawl_layer - 1, PIPING_LAYER_MIN, PIPING_LAYER_MAX)
+ to_chat(user, "You align yourself with the [user.ventcrawl_layer]\th output.")
diff --git a/code/modules/atmospherics/machinery/pipes/manifold.dm b/code/modules/atmospherics/machinery/pipes/manifold.dm
index 66b831c477..8560addc3a 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold.dm
@@ -6,13 +6,16 @@
icon_state = "manifold"
name = "pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
dir = SOUTH
initialize_directions = EAST|NORTH|WEST
device_type = TRINARY
+ construction_type = /obj/item/pipe/trinary
+ pipe_state = "manifold"
+
/obj/machinery/atmospherics/pipe/manifold/SetInitDirections()
switch(dir)
if(NORTH)
@@ -125,7 +128,7 @@
/obj/machinery/atmospherics/pipe/manifold/orange/hidden
level = PIPE_HIDDEN_LEVEL
-
+
/obj/machinery/atmospherics/pipe/manifold/purple
pipe_color=rgb(128,0,182)
color=rgb(128,0,182)
@@ -168,4 +171,4 @@
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/pipes/manifold4w.dm b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
index 1c969caa28..f368c6bb0f 100644
--- a/code/modules/atmospherics/machinery/pipes/manifold4w.dm
+++ b/code/modules/atmospherics/machinery/pipes/manifold4w.dm
@@ -6,12 +6,15 @@
icon_state = "manifold4w"
name = "4-way pipe manifold"
- desc = "A manifold composed of regular pipes"
+ desc = "A manifold composed of regular pipes."
initialize_directions = NORTH|SOUTH|EAST|WEST
device_type = QUATERNARY
+ construction_type = /obj/item/pipe/quaternary
+ pipe_state = "manifold4w"
+
/obj/machinery/atmospherics/pipe/manifold4w/SetInitDirections()
initialize_directions = initial(initialize_directions)
@@ -160,4 +163,4 @@
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/manifold4w/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/pipes/pipes.dm b/code/modules/atmospherics/machinery/pipes/pipes.dm
index 49383a74cb..cc01e6c4bd 100644
--- a/code/modules/atmospherics/machinery/pipes/pipes.dm
+++ b/code/modules/atmospherics/machinery/pipes/pipes.dm
@@ -24,6 +24,14 @@
if(oldN)
oldN.build_network()
+/obj/machinery/atmospherics/pipe/destroy_network()
+ QDEL_NULL(parent)
+
+/obj/machinery/atmospherics/pipe/build_network()
+ if(QDELETED(parent))
+ parent = new
+ parent.build_pipeline(src)
+
/obj/machinery/atmospherics/pipe/update_icon() //overridden by manifolds
if(NODE1&&NODE2)
icon_state = "intact[invisibility ? "-f" : "" ]"
@@ -51,14 +59,13 @@
/obj/machinery/atmospherics/pipe/return_air()
return parent.air
-/obj/machinery/atmospherics/pipe/build_network()
- if(!parent)
- parent = new /datum/pipeline()
- parent.build_pipeline(src)
-
/obj/machinery/atmospherics/pipe/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/analyzer))
atmosanalyzer_scan(parent.air, user)
+ if(istype(W, /obj/item/pipe_meter))
+ var/obj/item/pipe_meter/meter = W
+ user.dropItemToGround(meter)
+ meter.setAttachLayer(piping_layer)
else
return ..()
@@ -81,9 +88,7 @@
qdel(meter)
. = ..()
- if(parent && !QDELETED(parent))
- qdel(parent)
- parent = null
+ QDEL_NULL(parent)
/obj/machinery/atmospherics/pipe/proc/update_node_icon()
for(DEVICE_TYPE_LOOP)
diff --git a/code/modules/atmospherics/machinery/pipes/simple.dm b/code/modules/atmospherics/machinery/pipes/simple.dm
index 5ac9ac31e6..0d6537b3d1 100644
--- a/code/modules/atmospherics/machinery/pipes/simple.dm
+++ b/code/modules/atmospherics/machinery/pipes/simple.dm
@@ -12,10 +12,15 @@ The regular pipe you see everywhere, including bent ones.
dir = SOUTH
initialize_directions = SOUTH|NORTH
+ pipe_flags = PIPING_CARDINAL_AUTONORMALIZE
device_type = BINARY
+ construction_type = /obj/item/pipe/binary/bendable
+ pipe_state = "simple"
+
/obj/machinery/atmospherics/pipe/simple/SetInitDirections()
+ normalize_cardinal_directions()
if(dir in GLOB.diagonals)
initialize_directions = dir
switch(dir)
@@ -24,20 +29,6 @@ The regular pipe you see everywhere, including bent ones.
if(EAST,WEST)
initialize_directions = EAST|WEST
-/obj/machinery/atmospherics/pipe/simple/atmosinit()
- normalize_dir()
- ..()
-
-/obj/machinery/atmospherics/pipe/simple/proc/normalize_dir()
- if(dir==SOUTH)
- setDir(NORTH)
- else if(dir==WEST)
- setDir(EAST)
-
-/obj/machinery/atmospherics/pipe/simple/update_icon()
- normalize_dir()
- ..()
-
//Colored pipes, use these for mapping
/obj/machinery/atmospherics/pipe/simple/general
@@ -170,4 +161,4 @@ The regular pipe you see everywhere, including bent ones.
layer = GAS_PIPE_VISIBLE_LAYER
/obj/machinery/atmospherics/pipe/simple/brown/hidden
- level = PIPE_HIDDEN_LEVEL
\ No newline at end of file
+ level = PIPE_HIDDEN_LEVEL
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index c08ef25b61..585b6e896a 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -12,7 +12,7 @@
volume = 1000
var/filled = 0.5
- var/gas_type = ""
+ var/gas_type
var/release_pressure = ONE_ATMOSPHERE
var/can_max_release_pressure = (ONE_ATMOSPHERE * 10)
var/can_min_release_pressure = (ONE_ATMOSPHERE / 10)
@@ -41,10 +41,14 @@
"co2" = /obj/machinery/portable_atmospherics/canister/carbon_dioxide,
"plasma" = /obj/machinery/portable_atmospherics/canister/toxins,
"n2o" = /obj/machinery/portable_atmospherics/canister/nitrous_oxide,
+ "no2" = /obj/machinery/portable_atmospherics/canister/nitryl,
"bz" = /obj/machinery/portable_atmospherics/canister/bz,
"air" = /obj/machinery/portable_atmospherics/canister/air,
- "freon" = /obj/machinery/portable_atmospherics/canister/freon,
"water vapor" = /obj/machinery/portable_atmospherics/canister/water_vapor,
+ "tritium" = /obj/machinery/portable_atmospherics/canister/tritium,
+ "hyper-noblium" = /obj/machinery/portable_atmospherics/canister/nob,
+ "stimulum" = /obj/machinery/portable_atmospherics/canister/stimulum,
+ "pluoxium" = /obj/machinery/portable_atmospherics/canister/pluoxium,
"caution" = /obj/machinery/portable_atmospherics/canister,
)
@@ -59,60 +63,78 @@
name = "n2 canister"
desc = "Nitrogen gas. Reportedly useful for something."
icon_state = "red"
- gas_type = "n2"
+ gas_type = /datum/gas/nitrogen
/obj/machinery/portable_atmospherics/canister/oxygen
name = "o2 canister"
desc = "Oxygen. Necessary for human life."
icon_state = "blue"
- gas_type = "o2"
+ gas_type = /datum/gas/oxygen
/obj/machinery/portable_atmospherics/canister/carbon_dioxide
name = "co2 canister"
desc = "Carbon dioxide. What the fuck is carbon dioxide?"
icon_state = "black"
- gas_type = "co2"
+ gas_type = /datum/gas/carbon_dioxide
/obj/machinery/portable_atmospherics/canister/toxins
name = "plasma canister"
desc = "Plasma gas. The reason YOU are here. Highly toxic."
icon_state = "orange"
- gas_type = "plasma"
-
-/obj/machinery/portable_atmospherics/canister/agent_b
- name = "agent b canister"
- desc = "Oxygen Agent B. You're not quite sure what it does."
- gas_type = "agent_b"
+ gas_type = /datum/gas/plasma
/obj/machinery/portable_atmospherics/canister/bz
name = "BZ canister"
desc = "BZ, a powerful hallucinogenic nerve agent."
icon_state = "purple"
- gas_type = "bz"
+ gas_type = /datum/gas/bz
/obj/machinery/portable_atmospherics/canister/nitrous_oxide
name = "n2o canister"
desc = "Nitrous oxide gas. Known to cause drowsiness."
icon_state = "redws"
- gas_type = "n2o"
+ gas_type = /datum/gas/nitrous_oxide
/obj/machinery/portable_atmospherics/canister/air
name = "air canister"
desc = "Pre-mixed air."
icon_state = "grey"
-/obj/machinery/portable_atmospherics/canister/freon
- name = "freon canister"
- desc = "Freon. Great for the atmosphere!"
+/obj/machinery/portable_atmospherics/canister/tritium
+ name = "tritium canister"
+ desc = "Tritium. Inhalation might cause irradiation."
+ icon_state = "green"
+ gas_type = /datum/gas/tritium
+
+/obj/machinery/portable_atmospherics/canister/nob
+ name = "hyper-noblium canister"
+ desc = "Hyper-Noblium. More noble than all other gases."
icon_state = "freon"
- gas_type = "freon"
- starter_temp = 120
+ gas_type = /datum/gas/hypernoblium
+
+/obj/machinery/portable_atmospherics/canister/nitryl
+ name = "nitryl canister"
+ desc = "Nitryl gas. Feels great 'til the acid eats your lungs."
+ icon_state = "brown"
+ gas_type = /datum/gas/nitryl
+
+/obj/machinery/portable_atmospherics/canister/stimulum
+ name = "stimulum canister"
+ desc = "Stimulum. High energy gas, high energy people."
+ icon_state = "darkpurple"
+ gas_type = /datum/gas/stimulum
+
+/obj/machinery/portable_atmospherics/canister/pluoxium
+ name = "pluoxium canister"
+ desc = "Pluoxium. Like oxygen, but more bang for your buck."
+ icon_state = "darkblue"
+ gas_type = /datum/gas/pluoxium
/obj/machinery/portable_atmospherics/canister/water_vapor
name = "water vapor canister"
desc = "Water Vapor. We get it, you vape."
icon_state = "water_vapor"
- gas_type = "water_vapor"
+ gas_type = /datum/gas/water_vapor
filled = 1
/obj/machinery/portable_atmospherics/canister/proc/get_time_left()
@@ -148,7 +170,7 @@
name = "prototype canister"
desc = "A prototype canister for a prototype bike, what could go wrong?"
icon_state = "proto"
- gas_type = "o2"
+ gas_type = /datum/gas/oxygen
filled = 1
release_pressure = ONE_ATMOSPHERE*2
@@ -181,9 +203,9 @@
if(starter_temp)
air_contents.temperature = starter_temp
/obj/machinery/portable_atmospherics/canister/air/create_gas()
- air_contents.add_gases("o2","n2")
- air_contents.gases["o2"][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
- air_contents.gases["n2"][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
+ air_contents.add_gases(/datum/gas/oxygen, /datum/gas/nitrogen)
+ air_contents.gases[/datum/gas/oxygen][MOLES] = (O2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
+ air_contents.gases[/datum/gas/nitrogen][MOLES] = (N2STANDARD * maximum_pressure * filled) * air_contents.volume / (R_IDEAL_GAS_EQUATION * air_contents.temperature)
#define HOLDING 1
#define CONNECTED 2
@@ -273,7 +295,7 @@
return ..()
/obj/machinery/portable_atmospherics/canister/obj_break(damage_flag)
- if((flags_1 & BROKEN) || (flags_1 & NODECONSTRUCT_1))
+ if((stat & BROKEN) || (flags_1 & NODECONSTRUCT_1))
return
canister_break()
@@ -402,7 +424,7 @@
var/gas = air_contents.gases[id]
if(!gas[GAS_META][META_GAS_DANGER])
continue
- if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_PLASMA_VISIBLE)) //if moles_visible is undefined, default to plasma visibility
+ if(gas[MOLES] > (gas[GAS_META][META_GAS_MOLES_VISIBLE] || MOLES_GAS_VISIBLE)) //if moles_visible is undefined, default to default visibility
danger[gas[GAS_META][META_GAS_NAME]] = gas[MOLES] //ex. "plasma" = 20
if(danger.len)
diff --git a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
index 96a5b8e489..590297820e 100644
--- a/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
+++ b/code/modules/atmospherics/machinery/portable/portable_atmospherics.dm
@@ -45,11 +45,11 @@
/obj/machinery/portable_atmospherics/proc/connect(obj/machinery/atmospherics/components/unary/portables_connector/new_port)
//Make sure not already connected to something else
if(connected_port || !new_port || new_port.connected_device)
- return 0
+ return FALSE
//Make sure are close enough for a valid connection
if(new_port.loc != get_turf(src))
- return 0
+ return FALSE
//Perform the connection
connected_port = new_port
@@ -58,7 +58,9 @@
connected_port_parent.reconcile_air()
anchored = TRUE //Prevent movement
- return 1
+ pixel_x = new_port.pixel_x
+ pixel_y = new_port.pixel_y
+ return TRUE
/obj/machinery/portable_atmospherics/Move()
. = ..()
@@ -67,11 +69,11 @@
/obj/machinery/portable_atmospherics/proc/disconnect()
if(!connected_port)
- return 0
+ return FALSE
anchored = FALSE
connected_port.connected_device = null
connected_port = null
- return 1
+ return TRUE
/obj/machinery/portable_atmospherics/portableConnectorReturnAir()
return air_contents
diff --git a/code/modules/atmospherics/machinery/portable/pump.dm b/code/modules/atmospherics/machinery/portable/pump.dm
index cca108757a..3f2bceaa04 100644
--- a/code/modules/atmospherics/machinery/portable/pump.dm
+++ b/code/modules/atmospherics/machinery/portable/pump.dm
@@ -1,6 +1,6 @@
#define PUMP_OUT "out"
#define PUMP_IN "in"
-#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 10)
+#define PUMP_MAX_PRESSURE (ONE_ATMOSPHERE * 25)
#define PUMP_MIN_PRESSURE (ONE_ATMOSPHERE / 10)
#define PUMP_DEFAULT_PRESSURE (ONE_ATMOSPHERE)
@@ -99,8 +99,8 @@
if("power")
on = !on
if(on && !holding)
- var/plasma = air_contents.gases["plasma"]
- var/n2o = air_contents.gases["n2o"]
+ var/plasma = air_contents.gases[/datum/gas/plasma]
+ var/n2o = air_contents.gases[/datum/gas/nitrous_oxide]
if(n2o || plasma)
var/area/A = get_area(src)
message_admins("[ADMIN_LOOKUPFLW(usr)] turned on a pump that contains [n2o ? "N2O" : ""][n2o && plasma ? " & " : ""][plasma ? "Plasma" : ""] at [A][ADMIN_JMP(src)]")
@@ -138,4 +138,4 @@
holding.loc = get_turf(src)
holding = null
. = TRUE
- update_icon()
\ No newline at end of file
+ update_icon()
diff --git a/code/modules/atmospherics/machinery/portable/scrubber.dm b/code/modules/atmospherics/machinery/portable/scrubber.dm
index 7a76405a90..4fdd94c8e8 100644
--- a/code/modules/atmospherics/machinery/portable/scrubber.dm
+++ b/code/modules/atmospherics/machinery/portable/scrubber.dm
@@ -7,7 +7,7 @@
var/volume_rate = 1000
volume = 1000
- var/list/scrubbing = list("plasma", "co2", "n2o", "agent_b", "bz", "freon", "water_vapor")
+ var/list/scrubbing = list(/datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitryl, /datum/gas/tritium, /datum/gas/hypernoblium, /datum/gas/water_vapor)
/obj/machinery/portable_atmospherics/scrubber/Destroy()
var/turf/T = get_turf(src)
diff --git a/code/modules/awaymissions/corpse.dm b/code/modules/awaymissions/corpse.dm
index 0014f92378..105fc9f570 100644
--- a/code/modules/awaymissions/corpse.dm
+++ b/code/modules/awaymissions/corpse.dm
@@ -130,6 +130,10 @@
var/backpack_contents = -1
var/suit_store = -1
+ var/hair_style
+ var/facial_hair_style
+ var/skin_tone
+
/obj/effect/mob_spawn/human/Initialize()
if(ispath(outfit))
outfit = new outfit()
@@ -147,6 +151,20 @@
H.underwear = "Nude"
H.undershirt = "Nude"
H.socks = "Nude"
+ if(hair_style)
+ H.hair_style = hair_style
+ else
+ H.hair_style = random_hair_style(gender)
+ if(facial_hair_style)
+ H.facial_hair_style = facial_hair_style
+ else
+ H.facial_hair_style = random_facial_hair_style(gender)
+ if(skin_tone)
+ H.skin_tone = skin_tone
+ else
+ H.skin_tone = random_skin_tone()
+ H.update_hair()
+ H.update_body()
if(outfit)
var/static/list/slots = list("uniform", "r_hand", "l_hand", "suit", "shoes", "gloves", "ears", "glasses", "mask", "head", "belt", "r_pocket", "l_pocket", "back", "id", "neck", "backpack_contents", "suit_store")
for(var/slot in slots)
diff --git a/code/modules/awaymissions/gateway.dm b/code/modules/awaymissions/gateway.dm
index a46b32f853..15c5deb4cb 100644
--- a/code/modules/awaymissions/gateway.dm
+++ b/code/modules/awaymissions/gateway.dm
@@ -170,7 +170,7 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
density = TRUE
icon_state = "offcenter"
use_power = NO_POWER_USE
- var/obj/machinery/gateway/centeraway/stationgate = null
+ var/obj/machinery/gateway/centerstation/stationgate = null
can_link = TRUE
@@ -233,6 +233,18 @@ GLOBAL_DATUM(the_gateway, /obj/machinery/gateway/centerstation)
M.client.move_delay = max(world.time + 5, M.client.move_delay)
+/obj/machinery/gateway/centeraway/admin
+ desc = "A mysterious gateway built by unknown hands, this one seems more compact."
+
+/obj/machinery/gateway/centeraway/admin/Initialize()
+ . = ..()
+ if(stationgate && !stationgate.awaygate)
+ stationgate.awaygate = src
+
+/obj/machinery/gateway/centeraway/admin/detect()
+ return TRUE
+
+
/obj/item/paper/fluff/gateway
info = "Congratulations,
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.
--Nanotrasen Blue Space Research"
name = "Confidential Correspondence, Pg 1"
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/Academy.dm b/code/modules/awaymissions/mission_code/Academy.dm
index 87583ebea1..5720f1779f 100644
--- a/code/modules/awaymissions/mission_code/Academy.dm
+++ b/code/modules/awaymissions/mission_code/Academy.dm
@@ -1,4 +1,34 @@
+//Academy Areas
+
+/area/awaymission/academy
+ name = "Academy Asteroids"
+ icon_state = "away"
+
+/area/awaymission/academy/headmaster
+ name = "Academy Fore Block"
+ icon_state = "away1"
+
+/area/awaymission/academy/classrooms
+ name = "Academy Classroom Block"
+ icon_state = "away2"
+
+/area/awaymission/academy/academyaft
+ name = "Academy Ship Aft Block"
+ icon_state = "away3"
+
+/area/awaymission/academy/academygate
+ name = "Academy Gateway"
+ icon_state = "away4"
+
+/area/awaymission/academy/academycellar
+ name = "Academy Cellar"
+ icon_state = "away4"
+
+/area/awaymission/academy/academyengine
+ name = "Academy Engine"
+ icon_state = "away4"
+
//Academy Items
/obj/item/paper/fluff/awaymissions/academy/console_maint
@@ -54,7 +84,7 @@
/obj/structure/academy_wizard_spawner
name = "Academy Defensive System"
- desc = "Made by Abjuration Inc"
+ desc = "Made by Abjuration, Inc."
icon = 'icons/obj/cult.dmi'
icon_state = "forge"
anchored = TRUE
@@ -108,27 +138,12 @@
/obj/structure/academy_wizard_spawner/proc/summon_wizard()
var/turf/T = src.loc
-
var/mob/living/carbon/human/wizbody = new(T)
- wizbody.equipOutfit(/datum/outfit/wizard/academy)
- var/obj/item/implant/exile/Implant = new/obj/item/implant/exile(wizbody)
- Implant.implant(wizbody)
- wizbody.faction |= "wizard"
- wizbody.real_name = "Academy Teacher"
- wizbody.name = "Academy Teacher"
-
- var/datum/mind/wizmind = new /datum/mind()
- wizmind.name = "Wizard Defender"
+ wizbody.fully_replace_character_name("Academy Teacher")
+ wizbody.mind_initialize()
+ var/datum/mind/wizmind = wizbody.mind
wizmind.special_role = "Academy Defender"
- var/datum/objective/O = new("Protect Wizard Academy from the intruders")
- wizmind.objectives += O
- wizmind.transfer_to(wizbody)
- SSticker.mode.wizards |= wizmind
-
- wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/ethereal_jaunt)
- wizmind.AddSpell(new /obj/effect/proc_holder/spell/targeted/projectile/magic_missile)
- wizmind.AddSpell(new /obj/effect/proc_holder/spell/aimed/fireball)
-
+ wizmind.add_antag_datum(/datum/antagonist/wizard/academy)
current_wizard = wizbody
give_control()
diff --git a/code/modules/awaymissions/mission_code/Cabin.dm b/code/modules/awaymissions/mission_code/Cabin.dm
index 18a936728b..c43330d0e6 100644
--- a/code/modules/awaymissions/mission_code/Cabin.dm
+++ b/code/modules/awaymissions/mission_code/Cabin.dm
@@ -1,7 +1,24 @@
+/*Cabin areas*/
+/area/awaymission/snowforest
+ name = "Snow Forest"
+ icon_state = "away"
+ requires_power = FALSE
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/cabin
+ name = "Cabin"
+ icon_state = "away2"
+ requires_power = TRUE
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/snowforest/lumbermill
+ name = "Lumbermill"
+ icon_state = "away3"
+
/obj/structure/firepit
name = "firepit"
- desc = "warm and toasty"
+ desc = "Warm and toasty."
icon = 'icons/obj/fireplace.dmi'
icon_state = "firepit-active"
density = FALSE
diff --git a/code/modules/awaymissions/mission_code/caves.dm b/code/modules/awaymissions/mission_code/caves.dm
index 5300014cc9..05885fbe19 100644
--- a/code/modules/awaymissions/mission_code/caves.dm
+++ b/code/modules/awaymissions/mission_code/caves.dm
@@ -1,3 +1,33 @@
+//Areas
+
+/area/awaymission/caves/BMP_asteroid
+ name = "\improper BMP Asteroid Level 1"
+ icon_state = "awaycontent1"
+
+/area/awaymission/caves/BMP_asteroid/level_two
+ name = "\improper BMP Asteroid Level 2"
+ icon_state = "awaycontent2"
+
+/area/awaymission/caves/BMP_asteroid/level_three
+ name = "\improper BMP Asteroid Level 3"
+ icon_state = "awaycontent3"
+
+/area/awaymission/caves/BMP_asteroid/level_four
+ name = "\improper BMP Asteroid Level 4"
+ icon_state = "awaycontent4"
+
+/area/awaymission/caves/research
+ name = "Research Outpost"
+ icon_state = "awaycontent5"
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/caves/northblock //engineering, bridge (not really north but it doesnt really need its own APC)
+
+/area/awaymission/caves/listeningpost
+ name = "Listening Post"
+ icon_state = "awaycontent6"
+ requires_power = FALSE
+
//caves papers
/obj/item/paper/crumpled/awaymissions/caves/unsafe_area
diff --git a/code/modules/awaymissions/mission_code/centcomAway.dm b/code/modules/awaymissions/mission_code/centcomAway.dm
index e5d45292bf..11c3f14012 100644
--- a/code/modules/awaymissions/mission_code/centcomAway.dm
+++ b/code/modules/awaymissions/mission_code/centcomAway.dm
@@ -1,29 +1,63 @@
-
-
-//centcomAway items
-
+//centcomAway areas
+
+/area/awaymission/centcomAway
+ name = "XCC-P5831"
+ icon_state = "away"
+ requires_power = FALSE
+
+/area/awaymission/centcomAway/general
+ name = "XCC-P5831"
+ music = 'sound/ambience/ambigen3.ogg'
+
+/area/awaymission/centcomAway/maint
+ name = "XCC-P5831 Maintenance"
+ icon_state = "away1"
+ music = 'sound/ambience/ambisin1.ogg'
+
+/area/awaymission/centcomAway/thunderdome
+ name = "XCC-P5831 Thunderdome"
+ icon_state = "away2"
+ music = 'sound/ambience/ambisin2.ogg'
+
+/area/awaymission/centcomAway/cafe
+ name = "XCC-P5831 Kitchen Arena"
+ icon_state = "away3"
+ music = 'sound/ambience/ambisin3.ogg'
+
+/area/awaymission/centcomAway/courtroom
+ name = "XCC-P5831 Courtroom"
+ icon_state = "away4"
+ music = 'sound/ambience/ambisin4.ogg'
+
+/area/awaymission/centcomAway/hangar
+ name = "XCC-P5831 Hangars"
+ icon_state = "away4"
+ music = 'sound/ambience/ambigen5.ogg'
+
+//centcomAway items
+
/obj/item/paper/pamphlet/centcom/visitor_info
- name = "Visitor Info Pamphlet"
- info = " XCC-P5831 Visitor Information \
- Greetings, visitor, to XCC-P5831! As you may know, this outpost was once \
- used as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \
- projects across the vastness of space. \
- Since the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \
- acts as NT's base of operations but still plays a very important role its corporate affairs; \
- serving as a supply and repair depot, as well as being host to its most important legal proceedings\
- and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE. \
- We hope you enjoy your stay!"
-
+ name = "Visitor Info Pamphlet"
+ info = " XCC-P5831 Visitor Information \
+ Greetings, visitor, to XCC-P5831! As you may know, this outpost was once \
+ used as Nanotrasen's CENTRAL COMMAND STATION, organizing and coordinating company \
+ projects across the vastness of space. \
+ Since the completion of the much more efficient CC-A5831 on March 8, 2553, XCC-P5831 no longer \
+ acts as NT's base of operations but still plays a very important role its corporate affairs; \
+ serving as a supply and repair depot, as well as being host to its most important legal proceedings\
+ and the thrilling pay-per-view broadcasts of PLASTEEL CHEF and THUNDERDOME LIVE. \
+ We hope you enjoy your stay!"
+
/obj/item/paper/fluff/awaymissions/centcom/gateway_memo
- name = "Memo to XCC-P5831 QM"
- info = "From: XCC-P5831 Management Office \
- To: Rolf Ingram, XCC-P5831 Quartermaster \
- Hey, Rolf, once you pack that gateway into the ferry hangar, make absolutely sure \
- to deactivate it! As you may know, SS13 has recently got its network up and running, \
- which means that until we get this gate shipped off to the next colonization staging \
- area, they'll be able to hop straight in here if its hooked up on our end. \
- Obviously, that's something I'd very much rather avoid. Our forensics and medical \
- teams never did figure out what happened that last time... and I can't wrap my head \
- around it myself. Why would a shuttle full of evacuees all snap and beat each other \
- to death the moment they reached safety? \
- - D. Cereza"
\ No newline at end of file
+ name = "Memo to XCC-P5831 QM"
+ info = "From: XCC-P5831 Management Office \
+ To: Rolf Ingram, XCC-P5831 Quartermaster \
+ Hey, Rolf, once you pack that gateway into the ferry hangar, make absolutely sure \
+ to deactivate it! As you may know, SS13 has recently got its network up and running, \
+ which means that until we get this gate shipped off to the next colonization staging \
+ area, they'll be able to hop straight in here if its hooked up on our end. \
+ Obviously, that's something I'd very much rather avoid. Our forensics and medical \
+ teams never did figure out what happened that last time... and I can't wrap my head \
+ around it myself. Why would a shuttle full of evacuees all snap and beat each other \
+ to death the moment they reached safety? \
+ - D. Cereza"
diff --git a/code/modules/awaymissions/mission_code/challenge.dm b/code/modules/awaymissions/mission_code/challenge.dm
index df8246c77f..0f28f6b3e0 100644
--- a/code/modules/awaymissions/mission_code/challenge.dm
+++ b/code/modules/awaymissions/mission_code/challenge.dm
@@ -1,7 +1,23 @@
+//Challenge Areas
+
+/area/awaymission/challenge/start
+ name = "Where Am I?"
+ icon_state = "away"
+
+/area/awaymission/challenge/main
+ name = "Danger Room"
+ icon_state = "away1"
+ requires_power = FALSE
+
+/area/awaymission/challenge/end
+ name = "Administration"
+ icon_state = "away2"
+ requires_power = FALSE
+
/obj/machinery/power/emitter/energycannon
name = "Energy Cannon"
- desc = "A heavy duty industrial laser"
+ desc = "A heavy duty industrial laser."
icon = 'icons/obj/singularity.dmi'
icon_state = "emitter"
anchored = TRUE
diff --git a/code/modules/awaymissions/mission_code/moonoutpost19.dm b/code/modules/awaymissions/mission_code/moonoutpost19.dm
index 1dfd68e06f..b66aa6e64d 100644
--- a/code/modules/awaymissions/mission_code/moonoutpost19.dm
+++ b/code/modules/awaymissions/mission_code/moonoutpost19.dm
@@ -1,4 +1,43 @@
-/////////// moonoutpost19 papers
+// moonoutpost19
+
+//Areas
+/area/awaymission/moonoutpost19
+ name = "space"
+ icon_state = "awaycontent1"
+
+/area/awaymission/moonoutpost19/arrivals
+ name = "MO19 Arrivals"
+ icon_state = "awaycontent2"
+
+/area/awaymission/moonoutpost19/research
+ name = "MO19 Research"
+ icon_state = "awaycontent3"
+
+/area/awaymission/moonoutpost19/syndicate
+ name = "Syndicate Outpost"
+ icon_state = "awaycontent4"
+
+/area/awaymission/moonoutpost19/main
+ name = "Khonsu 19"
+ always_unpowered = TRUE
+ power_environ = FALSE
+ power_equip = FALSE
+ power_light = FALSE
+ poweralm = FALSE
+ ambientsounds = list('sound/ambience/ambimine.ogg')
+ icon_state = "awaycontent5"
+
+/area/awaymission/moonoutpost19/hive
+ name = "The Hive"
+ always_unpowered = FALSE
+ has_gravity = FALSE
+ power_environ = FALSE
+ power_equip = FALSE
+ power_light = FALSE
+ poweralm = FALSE
+ icon_state = "awaycontent6"
+
+//Papers
/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note
name = "Hastily Written Note"
diff --git a/code/modules/awaymissions/mission_code/research.dm b/code/modules/awaymissions/mission_code/research.dm
index bfbb5ebb5e..666ee7909e 100644
--- a/code/modules/awaymissions/mission_code/research.dm
+++ b/code/modules/awaymissions/mission_code/research.dm
@@ -1,3 +1,67 @@
+//Research Base Areas//--
+
+/area/awaymission/research
+ name = "Research Outpost"
+ icon_state = "away"
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/research/interior
+ name = "Research Inside"
+ requires_power = TRUE
+ icon_state = "away2"
+
+/area/awaymission/research/interior/cryo
+ name = "Research Cryostasis Room"
+ icon_state = "medbay"
+
+/area/awaymission/research/interior/clonestorage
+ name = "Research Clone Storage"
+ icon_state = "cloning"
+
+/area/awaymission/research/interior/genetics
+ name = "Research Genetics Research"
+ icon_state = "genetics"
+
+/area/awaymission/research/interior/engineering
+ name = "Research Engineering"
+ icon_state = "engine"
+
+/area/awaymission/research/interior/security
+ name = "Research Security"
+ icon_state = "security"
+
+/area/awaymission/research/interior/secure
+ name = "Research Secure Vault"
+
+/area/awaymission/research/interior/maint
+ name = "Research Maintenance"
+ icon_state = "maintcentral"
+
+/area/awaymission/research/interior/dorm
+ name = "Research Dorms"
+ icon_state = "Sleep"
+
+/area/awaymission/research/interior/escapepods
+ name = "Research Escape Wing"
+ icon_state = "exit"
+
+/area/awaymission/research/interior/gateway
+ name = "Research Gateway"
+ icon_state = "start"
+
+/area/awaymission/research/interior/bathroom
+ name = "Research Bathrooms"
+ icon_state = "restrooms"
+
+/area/awaymission/research/interior/medbay
+ name = "Research Medbay"
+ icon_state = "medbay"
+
+/area/awaymission/research/exterior
+ name = "Research Exterior"
+ icon_state = "unknown"
+
+
//research papers
/obj/item/paper/crumpled/awaymissions/research/sensitive_info
diff --git a/code/modules/awaymissions/mission_code/snowdin.dm b/code/modules/awaymissions/mission_code/snowdin.dm
index b89883c286..c8658c677f 100644
--- a/code/modules/awaymissions/mission_code/snowdin.dm
+++ b/code/modules/awaymissions/mission_code/snowdin.dm
@@ -1,9 +1,46 @@
+//Snow Valley Areas//--
+
+/area/awaymission/snowdin
+ name = "Snowdin Tundra Plains"
+ icon_state = "awaycontent1"
+ requires_power = FALSE
+ dynamic_lighting = DYNAMIC_LIGHTING_ENABLED
+
+/area/awaymission/snowdin/post
+ name = "Snowdin Outpost"
+ requires_power = TRUE
+ icon_state = "awaycontent2"
+
+/area/awaymission/snowdin/igloo
+ name = "Snowdin Igloos"
+ icon_state = "awaycontent3"
+
+/area/awaymission/snowdin/cave
+ name = "Snowdin Caves"
+ icon_state = "awaycontent4"
+
+/area/awaymission/snowdin/base
+ name = "Snowdin Main Base"
+ icon_state = "awaycontent5"
+ requires_power = TRUE
+
+/area/awaymission/snowdin/dungeon1
+ name = "Snowdin Depths"
+ icon_state = "awaycontent6"
+
+/area/awaymission/snowdin/sekret
+ name = "Snowdin Operations"
+ icon_state = "awaycontent7"
+ requires_power = TRUE
+
+
+
/////////// papers
/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice
name = "scribbled note"
info = {"The gateway has been inactive for months, engineers think it's due to the recent drop in tempature fucking with the
- circuitry or something. Without a constant supply of resources from central command, our stock is getting awfully low. Some of the security members have taken to
+ circuitry or something. Without a constant supply of resources from Central Command, our stock is getting awfully low. Some of the security members have taken to
using the sparse rifle ammo left to hunting some of the wildlife to try and keep our food supply from emptying. God forbid if the heating goes out, I don't want to
die as a fucking popsicle down here."}
@@ -28,9 +65,9 @@
The colder months are finally hitting, some of the machinery seems to be having trouble starting up sometimes. Central sent some portable heaters to help keep the airlocks from
freezing shut along with a couple storage crates with supplies. Nothing on the radio so far, what the hell do they even expect to hear down here, anyway?
September 15th Another supply shipment through the gateway, they've sent some heavier sets of clothes for the coming winter months. Central said they might encounter issues with shipments
- during December to Feburary, so we should try to be frugal with the next shipment.
November 20th Final shipment from central for the next few months. Going outside
+ during December to Feburary, so we should try to be frugal with the next shipment.
November 20th Final shipment from Central for the next few months. Going outside
for more than 10-15 minutes without losing feeling in your fingers is difficult. We've finally gotten a signal on the radio, it's mostly some weird static though. One of the researchers is trying to decypher it.
-
December 10th Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from central before investigating.
+
December 10th Signal has gotten much stronger, it almost seems like it's coming from under us according to what the researcher managed to decypher. We're waiting from the go from Central before investigating.
The rest of the paper seems to be a mixture of scribbles and smudged ink."}
/obj/item/paper/fluff/awaymissions/snowdin/log2
@@ -48,7 +85,7 @@
info = {"You have been assigned a position on a listening outpost. Here you'll be watching over several crewmembers assigned to watching signals of the general area.
As not much is expected in terms of issues, we've only assigned one guard per outpost. Crewmembers are expected to keep to their regulated work schedules and may be
disciplined properly if found slacking. Food hoarding is heavily discouraged as all outposts will be sharing from the same shipment every 2-3 months. Hoarding of supplies
- should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to central and dealt with swiftly. You're here to secure and protect
+ should be punished severely as to prevent future incidients. Mutiny and/or rioting should be reported to Central and dealt with swiftly. You're here to secure and protect
Nanotrasen assets, not be a police officer. Do what you must, but make sure it's not messy."}
/obj/item/paper/fluff/awaymissions/snowdin/syndienotice
@@ -162,7 +199,7 @@
/obj/item/clothing/under/syndicate/coldres
name = "insulated tactical turtleneck"
- desc = "A non-descript and slightly suspicious looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection"
+ desc = "A non-descript and slightly suspicious-looking turtleneck with digital camouflage cargo pants. The interior has been padded with special insulation for both warmth and protection."
armor = list(melee = 20, bullet = 10, laser = 0,energy = 5, bomb = 0, bio = 0, rad = 0, fire = 25, acid = 25)
cold_protection = CHEST|GROIN|ARMS|LEGS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index e69de29bb2..5084663f5f 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -0,0 +1,42 @@
+//Spacebattle Areas
+
+/area/awaymission/spacebattle
+ name = "Space Battle"
+ icon_state = "awaycontent1"
+ requires_power = FALSE
+
+/area/awaymission/spacebattle/cruiser
+ name = "Nanotrasen Cruiser"
+ icon_state = "awaycontent2"
+
+/area/awaymission/spacebattle/syndicate1
+ name = "Syndicate Assault Ship 1"
+ icon_state = "awaycontent3"
+
+/area/awaymission/spacebattle/syndicate2
+ name = "Syndicate Assault Ship 2"
+ icon_state = "awaycontent4"
+
+/area/awaymission/spacebattle/syndicate3
+ name = "Syndicate Assault Ship 3"
+ icon_state = "awaycontent5"
+
+/area/awaymission/spacebattle/syndicate4
+ name = "Syndicate War Sphere 1"
+ icon_state = "awaycontent6"
+
+/area/awaymission/spacebattle/syndicate5
+ name = "Syndicate War Sphere 2"
+ icon_state = "awaycontent7"
+
+/area/awaymission/spacebattle/syndicate6
+ name = "Syndicate War Sphere 3"
+ icon_state = "awaycontent8"
+
+/area/awaymission/spacebattle/syndicate7
+ name = "Syndicate Fighter"
+ icon_state = "awaycontent9"
+
+/area/awaymission/spacebattle/secret
+ name = "Hidden Chamber"
+ icon_state = "awaycontent10"
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index 6e6ee2dc4a..4aa6e88249 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -136,18 +136,41 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
/*
* Modified Nar-Sie
*/
-/obj/singularity/narsie/mini
+/obj/singularity/narsie/sc_Narsie
desc = "Your body becomes weak and your feel your mind slipping away as you try to comprehend what you know can't be possible."
move_self = 0 //Contianed narsie does not move!
grav_pull = 0 //Contained narsie does not pull stuff in!
+ var/uneatable = list(/turf/open/space, /obj/effect/overlay, /mob/living/simple_animal/hostile/construct)
//Override this to prevent no adminlog runtimes and admin warnings about a singularity without containment
-/obj/singularity/narsie/mini/admin_investigate_setup()
+/obj/singularity/narsie/sc_Narsie/admin_investigate_setup()
return
-/obj/singularity/narsie/mini/process()
+/obj/singularity/narsie/sc_Narsie/process()
eat()
if(prob(25))
mezzer()
-/obj/singularity/narsie/mini/ex_act()
+/obj/singularity/narsie/sc_Narsie/consume(atom/A)
+ if(is_type_in_list(A, uneatable))
+ return 0
+ if(isliving(A))
+ var/mob/living/L = A
+ L.gib()
+ else if(istype(A, /obj/))
+ var/obj/O = A
+ O.ex_act(EXPLODE_DEVASTATE)
+ if(O)
+ qdel(O)
+ else if(isturf(A))
+ var/turf/T = A
+ if(T.intact)
+ for(var/obj/O in T.contents)
+ if(O.level != 1)
+ continue
+ if(O.invisibility == INVISIBILITY_MAXIMUM)
+ src.consume(O)
+ T.ChangeTurf(/turf/open/space)
return
+
+/obj/singularity/narsie/sc_Narsie/ex_act()
+ return
\ No newline at end of file
diff --git a/code/modules/awaymissions/mission_code/undergroundoutpost45.dm b/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
new file mode 100644
index 0000000000..4153032024
--- /dev/null
+++ b/code/modules/awaymissions/mission_code/undergroundoutpost45.dm
@@ -0,0 +1,39 @@
+// undergroundoutpost45
+
+//Areas
+/area/awaymission/undergroundoutpost45
+ name = "space"
+ icon_state = "awaycontent1"
+
+/area/awaymission/undergroundoutpost45/central
+ name = "UO45 Central Hall"
+ icon_state = "awaycontent2"
+
+/area/awaymission/undergroundoutpost45/crew_quarters
+ name = "UO45 Crew Quarters"
+ icon_state = "awaycontent3"
+
+/area/awaymission/undergroundoutpost45/engineering
+ name = "UO45 Engineering"
+ icon_state = "awaycontent4"
+
+/area/awaymission/undergroundoutpost45/mining
+ name = "UO45 Mining"
+ icon_state = "awaycontent5"
+
+/area/awaymission/undergroundoutpost45/research
+ name = "UO45 Research"
+ icon_state = "awaycontent6"
+
+/area/awaymission/undergroundoutpost45/gateway
+ name = "UO45 Gateway"
+ icon_state = "awaycontent7"
+
+/area/awaymission/undergroundoutpost45/caves
+ name = "UO45 Caves"
+ icon_state = "awaycontent8"
+ always_unpowered = TRUE
+ power_environ = FALSE
+ power_equip = FALSE
+ power_light = FALSE
+ poweralm = FALSE
diff --git a/code/modules/awaymissions/mission_code/wildwest.dm b/code/modules/awaymissions/mission_code/wildwest.dm
index 11d461e2af..dc5cc63ec3 100644
--- a/code/modules/awaymissions/mission_code/wildwest.dm
+++ b/code/modules/awaymissions/mission_code/wildwest.dm
@@ -4,6 +4,33 @@
* Meat Grinder
*/
+//Areas
+
+/area/awaymission/wildwest/mines
+ name = "Wild West Mines"
+ icon_state = "away1"
+ requires_power = FALSE
+
+/area/awaymission/wildwest/gov
+ name = "Wild West Mansion"
+ icon_state = "away2"
+ requires_power = FALSE
+
+/area/awaymission/wildwest/refine
+ name = "Wild West Refinery"
+ icon_state = "away3"
+ requires_power = FALSE
+
+/area/awaymission/wildwest/vault
+ name = "Wild West Vault"
+ icon_state = "away3"
+
+/area/awaymission/wildwest/vaultdoors
+ name = "Wild West Vault Doors" // this is to keep the vault area being entirely lit because of requires_power
+ icon_state = "away2"
+ requires_power = FALSE
+
+
////////// wildwest papers
/obj/item/paper/fluff/awaymissions/wildwest/grinder
@@ -126,7 +153,7 @@
var/mob/living/carbon/human/M = AM
if(M.stat != DEAD && M.ckey)
- visible_message("[M] triggered the [src]!")
+ visible_message("[M] triggered [src]!")
triggered = 1
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
diff --git a/code/modules/awaymissions/zlevel.dm b/code/modules/awaymissions/zlevel.dm
index bea67c994f..84e1977179 100644
--- a/code/modules/awaymissions/zlevel.dm
+++ b/code/modules/awaymissions/zlevel.dm
@@ -20,7 +20,7 @@ GLOBAL_LIST_INIT(potentialRandomZlevels, generateMapList(filename = "config/away
/obj/effect/landmark/awaystart
name = "away mission spawn"
- desc = "Randomly picked away mission spawn points"
+ desc = "Randomly picked away mission spawn points."
/obj/effect/landmark/awaystart/New()
GLOB.awaydestinations += src
diff --git a/code/modules/cargo/exports/seeds.dm b/code/modules/cargo/exports/seeds.dm
index 42f9d702e0..e73ef23ec4 100644
--- a/code/modules/cargo/exports/seeds.dm
+++ b/code/modules/cargo/exports/seeds.dm
@@ -26,12 +26,12 @@
export_types = list(/obj/item/seeds)
needs_discovery = TRUE // Only for already discovered species
-/datum/export/seed/potency.get_cost(obj/O)
+/datum/export/seed/potency/get_cost(obj/O)
var/obj/item/seeds/S = O
var/cost = ..()
if(!cost)
return 0
var/potDiff = (S.potency - discoveredPlants[S.type])
-
+
return round(..() * potDiff)
diff --git a/code/modules/cargo/packs.dm b/code/modules/cargo/packs.dm
index c5b180d8a1..4269de6069 100644
--- a/code/modules/cargo/packs.dm
+++ b/code/modules/cargo/packs.dm
@@ -937,23 +937,6 @@
crate_type = /obj/structure/closet/crate/secure/science
dangerous = TRUE
-/datum/supply_pack/science/bz_canister
- name = "BZ Canister"
- cost = 2000
- access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
- contains = list(/obj/machinery/portable_atmospherics/canister/bz)
- crate_name = "bz canister crate"
- crate_type = /obj/structure/closet/crate/secure/science
- dangerous = TRUE
-
-/datum/supply_pack/science/freon_canister
- name = "Freon Canister"
- cost = 6000
- access_any = list(ACCESS_RD, ACCESS_ATMOSPHERICS)
- contains = list(/obj/machinery/portable_atmospherics/canister/freon)
- crate_name = "freon canister crate"
- crate_type = /obj/structure/closet/crate/secure/science
- dangerous = TRUE
/datum/supply_pack/science/research
name = "Machine Prototype Crate"
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index 9b694d58b7..e14c48db3a 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -663,6 +663,7 @@ GLOBAL_LIST(external_rsc_urls)
return FALSE
if ("key")
return FALSE
+ . = ..()
/client/proc/change_view(new_size)
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index bcbeb55dd2..be4aa67113 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -45,7 +45,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
var/allow_midround_antag = 1
var/preferred_map = null
var/pda_style = MONO
-
+
var/uses_glasses_colour = 0
var/screenshake = 100
@@ -228,7 +228,7 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += ""
switch(current_tab)
- if (0) // Character Settings#
+ if (0) // Character Settings
if(path)
var/savefile/S = new /savefile(path)
if(S)
@@ -239,7 +239,8 @@ GLOBAL_LIST_EMPTY(preferences_datums)
S["real_name"] >> name
if(!name)
name = "Character[i]"
- //if(i!=1) dat += " | "
+ /*if(i!=1)
+ dat += " | " */
dat += "[name] "
dat += ""
@@ -278,166 +279,12 @@ GLOBAL_LIST_EMPTY(preferences_datums)
// dat += "Size:[character_size] "
dat += " "
- dat += "
"
-
- if(CONFIG_GET(flag/join_with_mutant_race)) //We don't allow mutant bodyparts for humans either unless this is true.
-
- if((MUTCOLORS in pref_species.species_traits) || (MUTCOLORS_PARTSONLY in pref_species.species_traits))
-
- dat += "
"
if (1) // Game Preferences
@@ -573,61 +420,60 @@ GLOBAL_LIST_EMPTY(preferences_datums)
dat += "[features["flavor_text"]]"
else
dat += "[TextPreview(features["flavor_text"])]... "
- if(CONFIG_GET(flag/join_with_mutant_race))//really don't need this check, but fuck un-tabbing all those lines
- dat += "
"
dat += "Prime Directive "
- dat += " [src.laws.zeroth] "
+ dat += " [laws.zeroth] "
dat += "Supplemental Directives "
for(var/slaws in laws.supplied)
dat += " [slaws] "
@@ -398,14 +399,14 @@
Frequency:
--
- [format_frequency(src.sradio.frequency)]
+ [format_frequency(sradio.frequency)]
++
Code:
--
- [src.sradio.code]
+ [sradio.code]
++
@@ -476,7 +477,7 @@
/mob/living/silicon/pai/proc/facialRecognition()
var/dat = {"
Facial Recognition Suite
When enabled, this package will scan all viewable faces and compare them against the known criminal database, providing real-time graphical data about any detected persons of interest.
- The package is currently [ (src.secHUD) ? "en" : "dis" ]abled.
+ The package is currently [ (secHUD) ? "en" : "dis" ]abled. Toggle Package
"}
return dat
@@ -484,16 +485,16 @@
// Medical HUD
/mob/living/silicon/pai/proc/medicalAnalysis()
var/dat = ""
- if(src.subscreen == 0)
+ if(subscreen == 0)
dat += {"
Medical Analysis Suite
Visual Status Overlay
When enabled, this package will scan all nearby crewmembers' vitals and provide real-time graphical data about their state of health.
- The suite is currently [ (src.medHUD) ? "en" : "dis" ]abled.
+ The suite is currently [ (medHUD) ? "en" : "dis" ]abled. Toggle Suite
"
if(inventory_head)
@@ -123,7 +124,8 @@
/mob/living/simple_animal/pet/dog/corgi/Topic(href, href_list)
- if(usr.stat) return
+ if(usr.stat)
+ return
//Removing from inventory
if(href_list["remove_inv"])
diff --git a/code/modules/mob/living/simple_animal/friendly/penguin.dm b/code/modules/mob/living/simple_animal/friendly/penguin.dm
index 6833ea83a6..07515808dd 100644
--- a/code/modules/mob/living/simple_animal/friendly/penguin.dm
+++ b/code/modules/mob/living/simple_animal/friendly/penguin.dm
@@ -26,7 +26,7 @@
gold_core_spawnable = 2
/mob/living/simple_animal/pet/penguin/emperor/shamebrero
- name = "Shamebrero penguin."
+ name = "Shamebrero penguin"
desc = "Shameful of all he surveys."
icon_state = "penguin_shamebrero"
icon_living = "penguin_shamebrero"
diff --git a/code/modules/mob/living/simple_animal/guardian/guardian.dm b/code/modules/mob/living/simple_animal/guardian/guardian.dm
index 592679d35b..1829a85344 100644
--- a/code/modules/mob/living/simple_animal/guardian/guardian.dm
+++ b/code/modules/mob/living/simple_animal/guardian/guardian.dm
@@ -143,7 +143,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
qdel(src)
else
to_chat(src, "Your summoner has died!")
- visible_message("The [src] dies along with its user!")
+ visible_message("[src] dies along with its user!")
death(TRUE)
qdel(src)
snapback()
@@ -320,6 +320,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
forceMove(summoner.loc)
new /obj/effect/temp_visual/guardian/phase(loc)
cooldown = world.time + 10
+ reset_perspective()
return TRUE
return FALSE
@@ -460,7 +461,7 @@ GLOBAL_LIST_EMPTY(parasites) //all currently existing/living guardians
/obj/item/guardiancreator
name = "deck of tarot cards"
- desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power. "
+ desc = "An enchanted deck of tarot cards, rumored to be a source of unimaginable power."
icon = 'icons/obj/toy.dmi'
icon_state = "deck_syndicate_full"
var/used = FALSE
diff --git a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
index c21b1474d8..1353293484 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/explosive.dm
@@ -70,7 +70,7 @@
/obj/guardian_bomb/proc/detonate(mob/living/user)
if(isliving(user))
if(user != spawner && user != spawner.summoner && !spawner.hasmatchingsummoner(user))
- to_chat(user, "The [src] was boobytrapped!")
+ to_chat(user, "[src] was boobytrapped!")
to_chat(spawner, "Success! Your trap caught [user]")
var/turf/T = get_turf(src)
stored_obj.forceMove(T)
diff --git a/code/modules/mob/living/simple_animal/guardian/types/standard.dm b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
index 72bb57513e..4edd9d9e41 100644
--- a/code/modules/mob/living/simple_animal/guardian/types/standard.dm
+++ b/code/modules/mob/living/simple_animal/guardian/types/standard.dm
@@ -24,7 +24,7 @@
/mob/living/simple_animal/hostile/guardian/punch/AttackingTarget()
. = ..()
if(isliving(target))
- src.say("[src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry][src.battlecry]!!")
+ say("[battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry][battlecry]!!", ignore_spam = TRUE)
playsound(loc, src.attack_sound, 50, 1, 1)
playsound(loc, src.attack_sound, 50, 1, 1)
playsound(loc, src.attack_sound, 50, 1, 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/bees.dm b/code/modules/mob/living/simple_animal/hostile/bees.dm
index 9f7a7d1bbf..0213a79e4a 100644
--- a/code/modules/mob/living/simple_animal/hostile/bees.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bees.dm
@@ -49,6 +49,8 @@
var/idle = 0
var/isqueen = FALSE
var/icon_base = "bee"
+ var/static/beehometypecache = typecacheof(/obj/structure/beebox)
+ var/static/hydroponicstypecache = typecacheof(/obj/machinery/hydroponics)
/mob/living/simple_animal/hostile/poison/bees/Process_Spacemove(movement_dir = 0)
@@ -118,7 +120,7 @@
if(istype(A, /obj/machinery/hydroponics))
var/obj/machinery/hydroponics/Hydro = A
if(Hydro.myseed && !Hydro.dead && !Hydro.recent_bee_visit)
- wanted_objects |= typecacheof(/obj/machinery/hydroponics) //so we only hunt them while they're alive/seeded/not visisted
+ wanted_objects |= hydroponicstypecache //so we only hunt them while they're alive/seeded/not visisted
return TRUE
return FALSE
@@ -132,8 +134,9 @@
if(target == beehome)
var/obj/structure/beebox/BB = target
forceMove(BB)
+ toggle_ai(AI_IDLE)
target = null
- wanted_objects -= typecacheof(/obj/structure/beebox) //so we don't attack beeboxes when not going home
+ wanted_objects -= beehometypecache //so we don't attack beeboxes when not going home
return //no don't attack the goddamm box
else
. = ..()
@@ -157,7 +160,7 @@
return
target = null //so we pick a new hydro tray next FindTarget(), instead of loving the same plant for eternity
- wanted_objects -= typecacheof(/obj/machinery/hydroponics) //so we only hunt them while they're alive/seeded/not visisted
+ wanted_objects -= hydroponicstypecache //so we only hunt them while they're alive/seeded/not visisted
Hydro.recent_bee_visit = TRUE
spawn(BEE_TRAY_RECENT_VISIT)
if(Hydro)
@@ -187,12 +190,13 @@
if(loc == beehome)
idle = min(100, ++idle)
if(idle >= BEE_IDLE_ROAMING && prob(BEE_PROB_GOROAM))
+ toggle_ai(AI_ON)
forceMove(beehome.drop_location())
else
idle = max(0, --idle)
if(idle <= BEE_IDLE_GOHOME && prob(BEE_PROB_GOHOME))
if(!FindTarget())
- wanted_objects |= typecacheof(/obj/structure/beebox) //so we don't attack beeboxes when not going home
+ wanted_objects |= beehometypecache //so we don't attack beeboxes when not going home
target = beehome
if(!beehome) //add outselves to a beebox (of the same reagent) if we have no home
for(var/obj/structure/beebox/BB in view(vision_range, src))
@@ -285,3 +289,11 @@
QDEL_NULL(queen)
return ..()
+/mob/living/simple_animal/hostile/poison/bees/consider_wakeup()
+ if (beehome && loc == beehome) // If bees are chilling in their nest, they're not actively looking for targets
+ idle = min(100, ++idle)
+ if(idle >= BEE_IDLE_ROAMING && prob(BEE_PROB_GOROAM))
+ toggle_ai(AI_ON)
+ forceMove(beehome.drop_location())
+ else
+ ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
index 2fa2101aa2..4a8e7ea455 100644
--- a/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
+++ b/code/modules/mob/living/simple_animal/hostile/bosses/paperwizard.dm
@@ -87,7 +87,7 @@
boss.atb.refund(boss_cost)
/mob/living/simple_animal/hostile/boss/paper_wizard/copy
- desc = "tis a ruse!"
+ desc = "'Tis a ruse!"
health = 1
maxHealth = 1
alpha = 200
diff --git a/code/modules/mob/living/simple_animal/hostile/carp.dm b/code/modules/mob/living/simple_animal/hostile/carp.dm
index fde10031d1..806a916421 100644
--- a/code/modules/mob/living/simple_animal/hostile/carp.dm
+++ b/code/modules/mob/living/simple_animal/hostile/carp.dm
@@ -1,81 +1,101 @@
-/mob/living/simple_animal/hostile/carp
- name = "space carp"
- desc = "A ferocious, fang-bearing creature that resembles a fish."
- icon_state = "carp"
- icon_living = "carp"
- icon_dead = "carp_dead"
- icon_gib = "carp_gib"
- speak_chance = 0
- turns_per_move = 5
- butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
- response_help = "pets"
- response_disarm = "gently pushes aside"
- response_harm = "hits"
- emote_taunt = list("gnashes")
- taunt_chance = 30
- speed = 0
- maxHealth = 25
- health = 25
- devourable = TRUE
- no_vore = FALSE
-
- harm_intent_damage = 8
- obj_damage = 50
- melee_damage_lower = 15
- melee_damage_upper = 15
- attacktext = "bites"
- attack_sound = 'sound/weapons/bite.ogg'
- speak_emote = list("gnashes")
-
- //Space carp aren't affected by cold.
- atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
- maxbodytemp = 1500
-
- faction = list("carp")
- movement_type = FLYING
- pressure_resistance = 200
- gold_core_spawnable = 1
-
-/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0)
- return 1 //No drifting in space for space carp! //original comments do not steal
-
-/mob/living/simple_animal/hostile/carp/AttackingTarget()
- . = ..()
- if(. && ishuman(target))
- var/mob/living/carbon/human/H = target
- H.adjustStaminaLoss(8)
-
-/mob/living/simple_animal/hostile/carp/holocarp
- icon_state = "holocarp"
- icon_living = "holocarp"
- maxbodytemp = INFINITY
- gold_core_spawnable = 0
- del_on_death = 1
-
-/mob/living/simple_animal/hostile/carp/megacarp
- icon = 'icons/mob/broadMobs.dmi'
- name = "Mega Space Carp"
- desc = "A ferocious, fang bearing creature that resembles a shark. This one seems especially ticked off."
- icon_state = "megacarp"
- icon_living = "megacarp"
- icon_dead = "megacarp_dead"
- icon_gib = "megacarp_gib"
- maxHealth = 65
- health = 65
- pixel_x = -16
- mob_size = MOB_SIZE_LARGE
-
- obj_damage = 80
- melee_damage_lower = 20
- melee_damage_upper = 20
-
-
-/mob/living/simple_animal/hostile/carp/cayenne
- name = "Cayenne"
- desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
- gender = FEMALE
- speak_emote = list("squeaks")
- gold_core_spawnable = 0
- faction = list("syndicate")
- AIStatus = AI_OFF
\ No newline at end of file
+#define REGENERATION_DELAY 60 // After taking damage, how long it takes for automatic regeneration to begin for megacarps (ty robustin!)
+
+/mob/living/simple_animal/hostile/carp
+ name = "space carp"
+ desc = "A ferocious, fang-bearing creature that resembles a fish."
+ icon_state = "carp"
+ icon_living = "carp"
+ icon_dead = "carp_dead"
+ icon_gib = "carp_gib"
+ speak_chance = 0
+ turns_per_move = 5
+ butcher_results = list(/obj/item/reagent_containers/food/snacks/carpmeat = 2)
+ response_help = "pets"
+ response_disarm = "gently pushes aside"
+ response_harm = "hits"
+ emote_taunt = list("gnashes")
+ taunt_chance = 30
+ speed = 0
+ maxHealth = 25
+ health = 25
+
+ harm_intent_damage = 8
+ obj_damage = 50
+ melee_damage_lower = 15
+ melee_damage_upper = 15
+ attacktext = "bites"
+ attack_sound = 'sound/weapons/bite.ogg'
+ speak_emote = list("gnashes")
+
+ //Space carp aren't affected by cold.
+ atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
+ minbodytemp = 0
+ maxbodytemp = 1500
+ faction = list("carp")
+ movement_type = FLYING
+ pressure_resistance = 200
+ gold_core_spawnable = 1
+
+/mob/living/simple_animal/hostile/carp/Process_Spacemove(movement_dir = 0)
+ return 1 //No drifting in space for space carp! //original comments do not steal
+
+/mob/living/simple_animal/hostile/carp/AttackingTarget()
+ . = ..()
+ if(. && ishuman(target))
+ var/mob/living/carbon/human/H = target
+ H.adjustStaminaLoss(8)
+
+/mob/living/simple_animal/hostile/carp/holocarp
+ icon_state = "holocarp"
+ icon_living = "holocarp"
+ maxbodytemp = INFINITY
+ gold_core_spawnable = 0
+ del_on_death = 1
+
+/mob/living/simple_animal/hostile/carp/megacarp
+ icon = 'icons/mob/broadMobs.dmi'
+ name = "Mega Space Carp"
+ desc = "A ferocious, fang bearing creature that resembles a shark. This one seems especially ticked off."
+ icon_state = "megacarp"
+ icon_living = "megacarp"
+ icon_dead = "megacarp_dead"
+ icon_gib = "megacarp_gib"
+ maxHealth = 20
+ health = 20
+ pixel_x = -16
+ mob_size = MOB_SIZE_LARGE
+
+ obj_damage = 80
+ melee_damage_lower = 20
+ melee_damage_upper = 20
+
+ var/regen_cooldown = 0
+
+/mob/living/simple_animal/hostile/carp/megacarp/Initialize()
+ . = ..()
+ name = "[pick(GLOB.megacarp_first_names)] [pick(GLOB.megacarp_last_names)]"
+ melee_damage_lower += rand(2, 10)
+ melee_damage_upper += rand(10,20)
+ maxHealth += rand(30,60)
+ move_to_delay = rand(3,7)
+
+/mob/living/simple_animal/hostile/carp/megacarp/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(.)
+ regen_cooldown = world.time + REGENERATION_DELAY
+
+/mob/living/simple_animal/hostile/carp/megacarp/Life()
+ . = ..()
+ if(regen_cooldown < world.time)
+ heal_overall_damage(4)
+
+/mob/living/simple_animal/hostile/carp/cayenne
+ name = "Cayenne"
+ desc = "A failed Syndicate experiment in weaponized space carp technology, it now serves as a lovable mascot."
+ gender = FEMALE
+ speak_emote = list("squeaks")
+ gold_core_spawnable = 0
+ faction = list("syndicate")
+ AIStatus = AI_OFF
+
+#undef REGENERATION_DELAY
diff --git a/code/modules/mob/living/simple_animal/hostile/faithless.dm b/code/modules/mob/living/simple_animal/hostile/faithless.dm
index 68e6745c8d..1807e39a71 100644
--- a/code/modules/mob/living/simple_animal/hostile/faithless.dm
+++ b/code/modules/mob/living/simple_animal/hostile/faithless.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/faithless
name = "The Faithless"
- desc = "The Wish Granter's faith in humanity, incarnate"
+ desc = "The Wish Granter's faith in humanity, incarnate."
icon_state = "faithless"
icon_living = "faithless"
icon_dead = "faithless_dead"
@@ -41,4 +41,4 @@
var/mob/living/carbon/C = target
C.Knockdown(60)
C.visible_message("\The [src] knocks down \the [C]!", \
- "\The [src] knocks you down!")
\ No newline at end of file
+ "\The [src] knocks you down!")
diff --git a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
index aa288e52d7..3ea1be6f03 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -206,6 +206,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
+ poison_type = "frost_oil"
color = rgb(114,228,250)
gold_core_spawnable = 0
@@ -214,6 +215,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
+ poison_type = "frost_oil"
color = rgb(114,228,250)
gold_core_spawnable = 0
@@ -222,6 +224,7 @@
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = 1500
+ poison_type = "frost_oil"
color = rgb(114,228,250)
gold_core_spawnable = 0
diff --git a/code/modules/mob/living/simple_animal/hostile/hostile.dm b/code/modules/mob/living/simple_animal/hostile/hostile.dm
index d4c9632a03..f1b3043447 100644
--- a/code/modules/mob/living/simple_animal/hostile/hostile.dm
+++ b/code/modules/mob/living/simple_animal/hostile/hostile.dm
@@ -49,7 +49,6 @@
var/stat_attack = CONSCIOUS //Mobs with stat_attack to UNCONSCIOUS will attempt to attack things that are unconscious, Mobs with stat_attack set to DEAD will attempt to attack the dead.
var/stat_exclusive = FALSE //Mobs with this set to TRUE will exclusively attack things defined by stat_attack, stat_attack DEAD means they will only attack corpses
var/attack_same = 0 //Set us to 1 to allow us to attack our own faction
- var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
var/atom/targets_from = null //all range/attack/etc. calculations should be done from this atom, defaults to the mob itself, useful for Vehicles and such
var/attack_all_objects = FALSE //if true, equivalent to having a wanted_objects list containing ALL objects.
@@ -88,7 +87,7 @@
DestroySurroundings()
if(!MoveToTarget(possible_targets)) //if we lose our target
if(AIShouldSleep(possible_targets)) // we try to acquire a new one
- AIStatus = AI_IDLE // otherwise we go idle
+ toggle_ai(AI_IDLE) // otherwise we go idle
return 1
/mob/living/simple_animal/hostile/attacked_by(obj/item/I, mob/living/user)
@@ -289,7 +288,7 @@
target = null
LoseSearchObjects()
if(AIStatus == AI_IDLE)
- AIStatus = AI_ON
+ toggle_ai(AI_ON)
FindTarget()
else if(target != null && prob(40))//No more pulling a mob forever and having a second player attack it, it can switch targets now if it finds a more suitable one
FindTarget()
@@ -362,7 +361,6 @@
else if(projectiletype)
var/obj/item/projectile/P = new projectiletype(startloc)
playsound(src, projectilesound, 100, 1)
- P.current = startloc
P.starting = startloc
P.firer = src
P.yo = targeted_atom.y - startloc.y
@@ -370,6 +368,7 @@
if(AIStatus != AI_ON)//Don't want mindless mobs to have their movement screwed up firing in space
newtonian_move(get_dir(targeted_atom, targets_from))
P.original = targeted_atom
+ P.preparePixelProjectile(targeted_atom, src)
P.fire()
return P
@@ -424,7 +423,7 @@
if(AI_IDLE)
if(FindTarget(possible_targets, 1))
. = 1
- AIStatus = AI_ON //Wake up for more than one Life() cycle.
+ toggle_ai(AI_ON) //Wake up for more than one Life() cycle.
else
. = 0
@@ -455,3 +454,9 @@
if(!value)
value = initial(search_objects)
search_objects = value
+
+/mob/living/simple_animal/hostile/consider_wakeup()
+ ..()
+ if(AIStatus == AI_IDLE && FindTarget(ListTargets(), 1))
+ toggle_ai(AI_ON)
+
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
index 05896c80b5..7aabc37679 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/mook.dm
@@ -209,7 +209,7 @@
/obj/effect/temp_visual/mook_dust
name = "dust"
- desc = "it's just a dust cloud!"
+ desc = "It's just a dust cloud!"
icon = 'icons/mob/jungle/mook.dmi'
icon_state = "mook_leap_cloud"
layer = BELOW_MOB_LAYER
diff --git a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
index 3e28a789ad..5b634f8ae1 100644
--- a/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
+++ b/code/modules/mob/living/simple_animal/hostile/jungle/seedling.dm
@@ -182,12 +182,7 @@
return
var/turf/our_turf = get_turf(src)
var/obj/item/projectile/seedling/readied_shot = new /obj/item/projectile/seedling(our_turf)
- readied_shot.current = our_turf
- readied_shot.starting = our_turf
- readied_shot.firer = src
- readied_shot.original = target
- readied_shot.yo = target.y - our_turf.y + rand(-1,1)
- readied_shot.xo = target.x - our_turf.x + rand(-1,1)
+ readied_shot.preparePixelProjectile(target, src, null, rand(-10, 10))
readied_shot.fire()
playsound(src, projectilesound, 100, 1)
diff --git a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
index 378b5d9b8e..f9868771ac 100644
--- a/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mecha_pilot.dm
@@ -41,7 +41,7 @@
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/no_mech/Initialize()
. = ..()
- wanted_objects = typecacheof(/obj/mecha/combat, ignore_root_path=TRUE)
+ wanted_objects = typecacheof(/obj/mecha/combat, TRUE)
/mob/living/simple_animal/hostile/syndicate/mecha_pilot/nanotrasen //nanotrasen are syndies! no it's just a weird path.
name = "Nanotrasen Mecha Pilot"
@@ -101,7 +101,7 @@
targets_from = src
//Find a new mecha
- wanted_objects = typecacheof(/obj/mecha/combat, ignore_root_path=TRUE)
+ wanted_objects = typecacheof(/obj/mecha/combat, TRUE)
var/search_aggressiveness = 2
for(var/obj/mecha/combat/C in range(vision_range,src))
if(is_valid_mecha(C))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 1980e57dbe..03f466ddfd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -93,7 +93,7 @@ Difficulty: Medium
return ..()
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Move(atom/newloc)
- if(dashing || (newloc && newloc.z == z && (istype(newloc, /turf/open/lava) || istype(newloc, /turf/open/chasm)))) //we're not stupid!
+ if(dashing || (newloc && newloc.z == z && (islava(newloc) || ischasm(newloc)))) //we're not stupid!
return FALSE
return ..()
@@ -159,18 +159,18 @@ Difficulty: Medium
Shoot(target)
changeNext_move(CLICK_CD_RANGE)
+//I'm still of the belief that this entire proc needs to be wiped from existence.
+// do not take my touching of it to be endorsement of it. ~mso
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/proc/quick_attack_loop()
- if(next_move <= world.time)
- stoplag(1)
- .() //retry
- return
- sleep((next_move - world.time) * 1.5)
+ while(!QDELETED(target) && next_move <= world.time) //this is done this way because next_move can change to be sooner while we sleep.
+ stoplag(1)
+ sleep((next_move - world.time) * 1.5) //but don't ask me what the fuck this is about
if(QDELETED(target))
return
if(dashing || next_move > world.time || !Adjacent(target))
if(dashing && next_move <= world.time)
next_move = world.time + 1
- .() //recurse
+ INVOKE_ASYNC(src, .proc/quick_attack_loop) //lets try that again.
return
AttackingTarget()
@@ -186,7 +186,7 @@ Difficulty: Medium
var/turf_dist_to_target = 0
if(!QDELETED(dash_target))
turf_dist_to_target += get_dist(dash_target, O)
- if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !istype(O, /turf/open/lava) && !istype(O, /turf/open/chasm))
+ if(get_dist(src, O) >= MINER_DASH_RANGE && turf_dist_to_target <= self_dist_to_target && !islava(O) && !ischasm(O))
var/valid = TRUE
for(var/turf/T in getline(own_turf, O))
if(is_blocked_turf(T, TRUE))
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 8b97fe5354..a214895b83 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -164,7 +164,6 @@ Difficulty: Very Hard
return
var/turf/startloc = get_turf(src)
var/obj/item/projectile/P = new /obj/item/projectile/colossus(startloc)
- P.current = startloc
P.starting = startloc
P.firer = src
if(marker)
@@ -617,7 +616,7 @@ Difficulty: Very Hard
pass_flags = PASSTABLE | PASSGRILLE | PASSMOB
ventcrawler = VENTCRAWLER_ALWAYS
mob_size = MOB_SIZE_TINY
- gold_core_spawnable = 0
+ gold_core_spawnable = TRUE
verb_say = "warps"
verb_ask = "floats inquisitively"
verb_exclaim = "zaps"
@@ -635,7 +634,6 @@ Difficulty: Very Hard
environment_smash = ENVIRONMENT_SMASH_NONE
AIStatus = AI_OFF
stop_automated_movement = 1
- gold_core_spawnable = TRUE
var/heal_power = 5
/mob/living/simple_animal/hostile/lightgeist/Initialize()
@@ -664,12 +662,7 @@ Difficulty: Very Hard
activation_method = ACTIVATE_TOUCH
cooldown_add = 50
activation_sound = 'sound/magic/timeparadox2.ogg'
- var/list/banned_items_typecache = list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook)
-
-/obj/machinery/anomalous_crystal/refresher/Initialize()
- . = ..()
- banned_items_typecache = typecacheof(banned_items_typecache)
-
+ var/static/list/banned_items_typecache = typecacheof(list(/obj/item/storage, /obj/item/implant, /obj/item/implanter, /obj/item/disk/nuclear, /obj/item/projectile, /obj/item/spellbook))
/obj/machinery/anomalous_crystal/refresher/ActivationReaction(mob/user, method)
if(..())
@@ -758,7 +751,7 @@ Difficulty: Very Hard
/obj/effect/proc_holder/spell/targeted/exit_possession
name = "Exit Possession"
- desc = "Exits the body you are possessing"
+ desc = "Exits the body you are possessing."
charge_max = 60
clothes_req = 0
invocation_type = "none"
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
index b81d58b329..791021d42b 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm
@@ -385,6 +385,7 @@ Difficulty: Medium
melee_damage_lower = 30
damage_coeff = list(BRUTE = 1, BURN = 1, TOX = 1, CLONE = 1, STAMINA = 0, OXY = 1)
loot = list()
+ crusher_loot = list()
butcher_results = list(/obj/item/ore/diamond = 5, /obj/item/stack/sheet/sinew = 5, /obj/item/stack/sheet/bone = 30)
/mob/living/simple_animal/hostile/megafauna/dragon/lesser/grant_achievement(medaltype,scoretype)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 084aa3a08a..02fb81a1ed 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -129,7 +129,7 @@ Difficulty: Hard
/mob/living/simple_animal/hostile/megafauna/hierophant/CanAttack(atom/the_target)
. = ..()
- if(istype(the_target, /mob/living/simple_animal/hostile/asteroid/hivelordbrood)) //ignore temporary targets in favor of more permenant targets
+ if(istype(the_target, /mob/living/simple_animal/hostile/asteroid/hivelordbrood)) //ignore temporary targets in favor of more permanent targets
return FALSE
/mob/living/simple_animal/hostile/megafauna/hierophant/GiveTarget(new_target)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index 0630c9cc2c..4c803d6c00 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -137,14 +137,14 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
/mob/living/simple_animal/hostile/swarmer/ai/Move(atom/newloc)
if(newloc)
if(newloc.z == z) //so these actions are Z-specific
- if(istype(newloc, /turf/open/lava))
+ if(islava(newloc))
var/turf/open/lava/L = newloc
if(!L.is_safe())
StartAction(20)
new /obj/structure/lattice/catwalk/swarmer_catwalk(newloc)
return FALSE
- if(istype(newloc, /turf/open/chasm) && !throwing)
+ if(ischasm(newloc) && !throwing)
throw_at(get_edge_target_turf(src, get_dir(src, newloc)), 7 , 3, spin = FALSE) //my planet needs me
return FALSE
@@ -172,16 +172,9 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
search_objects = 1
attack_all_objects = TRUE //attempt to nibble everything
lose_patience_timeout = 150
- var/static/list/sharedWanted = list(/turf/closed/mineral, /turf/closed/wall) //eat rocks and walls
+ var/static/list/sharedWanted = typecacheof(list(/turf/closed/mineral, /turf/closed/wall)) //eat rocks and walls
var/static/list/sharedIgnore = list()
-
-/mob/living/simple_animal/hostile/swarmer/ai/resource/Initialize()
- . = ..()
- sharedWanted = typecacheof(sharedWanted)
- sharedIgnore = typecacheof(sharedIgnore)
-
-
//This handles viable things to eat/attack
//Place specific cases of AI derpiness here
//Most can be left to the automatic Gain/LosePatience() system
@@ -239,18 +232,15 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
//So swarmers can learn what is and isn't food
/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_wanted(typepath)
- LAZYINITLIST(sharedWanted)
if(!sharedWanted[typepath])// this and += is faster than |=
sharedWanted += typecacheof(typepath)
/mob/living/simple_animal/hostile/swarmer/ai/resource/proc/add_type_to_ignore(typepath)
- LAZYINITLIST(sharedIgnore)
if(!sharedIgnore[typepath])
sharedIgnore += typecacheof(typepath)
-
//RANGED SWARMER
/mob/living/simple_animal/hostile/swarmer/ai/ranged_combat
icon_state = "swarmer_ranged"
@@ -299,7 +289,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
//Used so they can survive lavaland better
/obj/structure/lattice/catwalk/swarmer_catwalk
name = "swarmer catwalk"
- desc = "a catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
+ desc = "A catwalk-like mesh, produced by swarmers to allow them to navigate hostile terrain."
icon = 'icons/obj/smooth_structures/swarmer_catwalk.dmi'
icon_state = "swarmer_catwalk"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
index 6a96c06978..d75e4acbc5 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/bat.dm
@@ -34,4 +34,7 @@
//Space bats need no air to fly in.
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
- minbodytemp = 0
\ No newline at end of file
+ minbodytemp = 0
+
+/mob/living/simple_animal/hostile/retaliate/bat/Process_Spacemove(movement_dir = 0)
+ return 1
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
index d53b741301..b22d3fc135 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
@@ -1,6 +1,6 @@
/mob/living/simple_animal/hostile/retaliate/clown
name = "Clown"
- desc = "A denizen of clown planet"
+ desc = "A denizen of clown planet."
icon = 'icons/mob/simple_human.dmi'
icon_state = "clown"
icon_living = "clown"
diff --git a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
index d6d46b1a46..d050b4143d 100644
--- a/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
+++ b/code/modules/mob/living/simple_animal/hostile/retaliate/spaceman.dm
@@ -23,7 +23,7 @@
environment_smash = ENVIRONMENT_SMASH_NONE
del_on_death = 0
-/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace
+/mob/living/simple_animal/hostile/retaliate/nanotrasenpeace //this should be in a different file
name = "Nanotrasen Private Security Officer"
desc = "An officer part of Nanotrasen's private security force."
icon = 'icons/mob/simple_human.dmi'
diff --git a/code/modules/mob/living/simple_animal/hostile/statue.dm b/code/modules/mob/living/simple_animal/hostile/statue.dm
index b4dc7c8fac..8fc327702b 100644
--- a/code/modules/mob/living/simple_animal/hostile/statue.dm
+++ b/code/modules/mob/living/simple_animal/hostile/statue.dm
@@ -2,7 +2,7 @@
/mob/living/simple_animal/hostile/statue
name = "statue" // matches the name of the statue with the flesh-to-stone spell
- desc = "An incredibly lifelike marble carving. Its eyes seems to follow you.." // same as an ordinary statue with the added "eye following you" description
+ desc = "An incredibly lifelike marble carving. Its eyes seem to follow you.." // same as an ordinary statue with the added "eye following you" description
icon = 'icons/obj/statue.dmi'
icon_state = "human_male"
icon_living = "human_male"
@@ -45,8 +45,6 @@
sight = SEE_SELF|SEE_MOBS|SEE_OBJS|SEE_TURFS
anchored = TRUE
- gold_core_spawnable = 1
-
var/cannot_be_seen = 1
var/mob/living/creator = null
diff --git a/code/modules/mob/living/simple_animal/hostile/tree.dm b/code/modules/mob/living/simple_animal/hostile/tree.dm
index 47fa2a8010..ced75cb076 100644
--- a/code/modules/mob/living/simple_animal/hostile/tree.dm
+++ b/code/modules/mob/living/simple_animal/hostile/tree.dm
@@ -43,12 +43,12 @@
..()
if(isopenturf(loc))
var/turf/open/T = src.loc
- if(T.air && T.air.gases["co2"])
- var/co2 = T.air.gases["co2"][MOLES]
+ if(T.air && T.air.gases[/datum/gas/carbon_dioxide])
+ var/co2 = T.air.gases[/datum/gas/carbon_dioxide][MOLES]
if(co2 > 0)
if(prob(25))
var/amt = min(co2, 9)
- T.air.gases["co2"][MOLES] -= amt
+ T.air.gases[/datum/gas/carbon_dioxide][MOLES] -= amt
T.atmos_spawn_air("o2=[amt]")
/mob/living/simple_animal/hostile/tree/AttackingTarget()
@@ -62,7 +62,7 @@
/mob/living/simple_animal/hostile/tree/festivus
name = "festivus pole"
- desc = "serenity now... SERENITY NOW!"
+ desc = "Serenity now... SERENITY NOW!"
icon_state = "festivus_pole"
icon_living = "festivus_pole"
icon_dead = "festivus_pole"
diff --git a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
index d348660143..881215e97b 100644
--- a/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
+++ b/code/modules/mob/living/simple_animal/hostile/wumborian_fugu.dm
@@ -109,13 +109,13 @@
w_class = WEIGHT_CLASS_NORMAL
layer = MOB_LAYER
origin_tech = "biotech=6"
- var/list/banned_mobs()
+ var/list/banned_mobs
/obj/item/asteroid/fugu_gland/afterattack(atom/target, mob/user, proximity_flag)
if(proximity_flag && isanimal(target))
var/mob/living/simple_animal/A = target
if(A.buffed || (A.type in banned_mobs) || A.stat)
- to_chat(user, "Something's interfering with the [src]'s effects. It's no use.")
+ to_chat(user, "Something's interfering with [src]'s effects. It's no use.")
return
A.buffed++
A.maxHealth *= 1.5
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index 16e09b59c8..085a95540f 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -514,7 +514,8 @@
return
walk_to(src, parrot_interest, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -534,7 +535,8 @@
return
walk_to(src, parrot_perch, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -547,7 +549,8 @@
walk_away(src, parrot_interest, 1, parrot_speed)
/*if(parrot_been_shot > 0)
parrot_been_shot-- didn't work anyways, and besides, any bullet poly survives isn't worth the speed boost.*/
- if(isStuck()) return
+ if(isStuck())
+ return
return
@@ -586,7 +589,8 @@
//Otherwise, fly towards the mob!
else
walk_to(src, parrot_interest, 1, parrot_speed)
- if(isStuck()) return
+ if(isStuck())
+ return
return
//-----STATE MISHAP
@@ -901,9 +905,6 @@
/mob/living/simple_animal/parrot/Poly/Life()
if(!stat && SSticker.current_state == GAME_STATE_FINISHED && !memory_saved)
- rounds_survived = max(++rounds_survived,1)
- if(rounds_survived > longest_survival)
- longest_survival = rounds_survived
Write_Memory(FALSE)
memory_saved = TRUE
..()
@@ -969,7 +970,7 @@
/mob/living/simple_animal/parrot/Poly/ghost
name = "The Ghost of Poly"
- desc = "Doomed to squawk the earth."
+ desc = "Doomed to squawk the Earth."
color = "#FFFFFF77"
speak_chance = 20
status_flags = GODMODE
@@ -1004,7 +1005,6 @@
parrot_interest = null
H.visible_message("[src] dive bombs into [H]'s chest and vanishes!", "[src] dive bombs into your chest, vanishing! This can't be good!")
-
/mob/living/simple_animal/parrot/clock_hawk
name = "clock hawk"
desc = "Cbyl jnaan penpxre! Fdhnnnjx!"
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 809e8b80d4..d7c4f0cb03 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -1,7 +1,7 @@
/mob/living/simple_animal/shade
name = "Shade"
real_name = "Shade"
- desc = "A bound spirit"
+ desc = "A bound spirit."
gender = PLURAL
icon = 'icons/mob/mob.dmi'
icon_state = "shade"
diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm
index d4b2c8f7c6..fffc05ccf9 100644
--- a/code/modules/mob/living/simple_animal/simple_animal.dm
+++ b/code/modules/mob/living/simple_animal/simple_animal.dm
@@ -82,6 +82,10 @@
var/dextrous_hud_type = /datum/hud/dextrous
var/datum/personal_crafting/handcrafting
+ var/AIStatus = AI_ON //The Status of our AI, can be set to AI_ON (On, usual processing), AI_IDLE (Will not process, but will return to AI_ON if an enemy comes near), AI_OFF (Off, Not processing ever)
+
+ var/shouldwakeup = FALSE //convenience var for forcibly waking up an idling AI on next check.
+
//domestication
var/tame = 0
@@ -89,7 +93,7 @@
/mob/living/simple_animal/Initialize()
. = ..()
- GLOB.simple_animals += src
+ GLOB.simple_animals[AIStatus] += src
handcrafting = new()
if(gender == PLURAL)
gender = pick(MALE,FEMALE)
@@ -101,6 +105,10 @@
init_belly()
verbs |= /mob/living/proc/animal_nom
+/mob/living/simple_animal/Destroy()
+ GLOB.simple_animals[AIStatus] -= src
+ return ..()
+
/mob/living/simple_animal/updatehealth()
..()
health = Clamp(health, 0, maxHealth)
@@ -186,10 +194,10 @@
var/ST_gases = ST.air.gases
ST.air.assert_gases(arglist(GLOB.hardcoded_gases))
- var/tox = ST_gases["plasma"][MOLES]
- var/oxy = ST_gases["o2"][MOLES]
- var/n2 = ST_gases["n2"][MOLES]
- var/co2 = ST_gases["co2"][MOLES]
+ var/tox = ST_gases[/datum/gas/plasma][MOLES]
+ var/oxy = ST_gases[/datum/gas/oxygen][MOLES]
+ var/n2 = ST_gases[/datum/gas/nitrogen][MOLES]
+ var/co2 = ST_gases[/datum/gas/carbon_dioxide][MOLES]
ST.air.garbage_collect()
@@ -277,6 +285,7 @@
return 1
/mob/living/simple_animal/death(gibbed)
+ movement_type &= ~FLYING
if(nest)
nest.spawned_mobs -= src
nest = null
@@ -332,6 +341,7 @@
density = initial(density)
lying = 0
. = 1
+ movement_type = initial(movement_type)
/mob/living/simple_animal/proc/make_babies() // <3 <3 <3
if(gender != FEMALE || stat || next_scan_time > world.time || !childtype || !animal_species || !SSticker.IsRoundInProgress())
@@ -418,7 +428,7 @@
/mob/living/simple_animal/proc/sentience_act() //Called when a simple animal gains sentience via gold slime potion
- return
+ toggle_ai(AI_OFF) // To prevent any weirdness.
/mob/living/simple_animal/update_sight()
if(!client)
@@ -541,3 +551,23 @@
/mob/living/simple_animal/buckle_mob(mob/living/buckled_mob, force = 0, check_loc = 1)
. = ..()
riding_datum = new/datum/riding/animal
+
+
+/mob/living/simple_animal/proc/toggle_ai(togglestatus)
+ if (AIStatus != togglestatus)
+ if (togglestatus > 0 && togglestatus < 4)
+ GLOB.simple_animals[AIStatus] -= src
+ GLOB.simple_animals[togglestatus] += src
+ AIStatus = togglestatus
+ else
+ stack_trace("Something attempted to set simple animals AI to an invalid state: [togglestatus]")
+
+/mob/living/simple_animal/proc/consider_wakeup()
+ if (pulledby || shouldwakeup)
+ toggle_ai(AI_ON)
+
+/mob/living/simple_animal/adjustHealth(amount, updating_health = TRUE, forced = FALSE)
+ . = ..()
+ if(!ckey && !stat)//Not unconscious
+ if(AIStatus == AI_IDLE)
+ toggle_ai(AI_ON)
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/slime/life.dm b/code/modules/mob/living/simple_animal/slime/life.dm
index a3c37e9889..0ec41119dc 100644
--- a/code/modules/mob/living/simple_animal/slime/life.dm
+++ b/code/modules/mob/living/simple_animal/slime/life.dm
@@ -134,8 +134,8 @@
if(stat != DEAD)
var/bz_percentage =0
- if("bz" in environment.gases)
- bz_percentage = environment.gases["bz"][MOLES] / environment.total_moles()
+ if(environment.gases[/datum/gas/bz])
+ bz_percentage = environment.gases[/datum/gas/bz][MOLES] / environment.total_moles()
var/stasis = (bz_percentage >= 0.05 && bodytemperature < (T0C + 100)) || force_stasis
if(stat == CONSCIOUS && stasis)
diff --git a/code/modules/mob/living/simple_animal/slime/slime.dm b/code/modules/mob/living/simple_animal/slime/slime.dm
index 92d64702bb..f9fee7369e 100644
--- a/code/modules/mob/living/simple_animal/slime/slime.dm
+++ b/code/modules/mob/living/simple_animal/slime/slime.dm
@@ -94,6 +94,12 @@
set_colour(new_colour)
. = ..()
+/mob/living/simple_animal/slime/Destroy()
+ for (var/A in actions)
+ var/datum/action/AC = A
+ AC.Remove(src)
+ return ..()
+
/mob/living/simple_animal/slime/proc/set_colour(new_colour)
colour = new_colour
update_name()
diff --git a/code/modules/mob/living/simple_animal/spawner.dm b/code/modules/mob/living/simple_animal/spawner.dm
index a8ff6be4ba..33eade6014 100644
--- a/code/modules/mob/living/simple_animal/spawner.dm
+++ b/code/modules/mob/living/simple_animal/spawner.dm
@@ -30,7 +30,7 @@
spawned_mobs = null
return ..()
-/mob/living/simple_animal/hostile/spawner/handle_automated_action()
+/mob/living/simple_animal/hostile/spawner/Life()
. = ..()
spawn_mob()
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index 45fdf55fb4..c66168cee4 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -8,7 +8,7 @@
return DEFAULT_TASTE_SENSITIVITY
/mob/living/carbon/get_taste_sensitivity()
- var/obj/item/organ/tongue/tongue = getorganslot("tongue")
+ var/obj/item/organ/tongue/tongue = getorganslot(ORGAN_SLOT_TONGUE)
if(istype(tongue))
. = tongue.taste_sensitivity
else
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 02c1fa4b44..43f7724af5 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -4,6 +4,8 @@
GLOB.living_mob_list -= src
GLOB.all_clockwork_mobs -= src
GLOB.mob_directory -= tag
+ for (var/alert in alerts)
+ clear_alert(alert, TRUE)
if(observers && observers.len)
for(var/M in observers)
var/mob/dead/observe = M
@@ -26,13 +28,12 @@
else
GLOB.living_mob_list += src
prepare_huds()
- can_ride_typecache = typecacheof(can_ride_typecache)
- hook_vr("mob_new",list(src))
for(var/v in GLOB.active_alternate_appearances)
if(!v)
continue
var/datum/atom_hud/alternate_appearance/AA = v
AA.onNewMob(src)
+ hook_vr("mob_new",list(src))
. = ..()
/atom/proc/prepare_huds()
@@ -46,7 +47,8 @@
set category = "Admin"
set hidden = 1
- if(!loc) return 0
+ if(!loc)
+ return 0
var/datum/gas_mixture/environment = loc.return_air()
@@ -197,7 +199,8 @@
//set disable_warning to disable the 'you are unable to equip that' warning.
//unset redraw_mob to prevent the mob from being redrawn at the end.
/mob/proc/equip_to_slot_if_possible(obj/item/W, slot, qdel_on_fail = FALSE, disable_warning = FALSE, redraw_mob = TRUE, bypass_equip_delay_self = FALSE)
- if(!istype(W)) return 0
+ if(!istype(W))
+ return 0
if(!W.mob_can_equip(src, null, slot, disable_warning, bypass_equip_delay_self))
if(qdel_on_fail)
qdel(W)
@@ -221,7 +224,8 @@
//puts the item "W" into an appropriate slot in a human's inventory
//returns 0 if it cannot, 1 if successful
/mob/proc/equip_to_appropriate_slot(obj/item/W)
- if(!istype(W)) return 0
+ if(!istype(W))
+ return 0
var/slot_priority = W.slot_equipment_priority
if(!slot_priority)
@@ -356,6 +360,9 @@
else
M.LAssailant = usr
+/mob/proc/can_resist()
+ return FALSE //overridden in living.dm
+
/mob/proc/spin(spintime, speed)
set waitfor = 0
var/D = dir
@@ -381,13 +388,15 @@
if(pulling)
pulling.pulledby = null
- if(isliving(pulling))
- var/mob/living/L = pulling
- L.update_canmove()// mob gets up if it was lyng down in a chokehold
+ var/mob/living/ex_pulled = pulling
pulling = null
grab_state = 0
update_pull_hud_icon()
+ if(isliving(ex_pulled))
+ var/mob/living/L = ex_pulled
+ L.update_canmove()// mob gets up if it was lyng down in a chokehold
+
/mob/proc/update_pull_hud_icon()
if(hud_used)
if(hud_used.pull_icon)
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index cf0a786cae..5260ace246 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -27,8 +27,9 @@
var/damageoverlaytemp = 0
var/computer_id = null
var/lastattacker = null
- var/lastattacked = null
- var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG, INDIVIDUAL_LOOC_LOG)
+ var/lastattackerckey = null
+ var/list/logging = list(INDIVIDUAL_ATTACK_LOG, INDIVIDUAL_SAY_LOG, INDIVIDUAL_EMOTE_LOG, INDIVIDUAL_OOC_LOG)
+
var/obj/machinery/machine = null
var/other_mobs = null
var/disabilities = 0 //Carbon
@@ -140,6 +141,7 @@
var/list/observers = null //The list of people observing this mob.
var/list/progressbars = null //for stacking do_after bars
- var/list/can_ride_typecache = list()
var/list/mousemove_intercept_objects
+
+ var/ventcrawl_layer = PIPING_LAYER_DEFAULT
diff --git a/code/modules/mob/mob_helpers.dm b/code/modules/mob/mob_helpers.dm
index 457376990e..af12b87eec 100644
--- a/code/modules/mob/mob_helpers.dm
+++ b/code/modules/mob/mob_helpers.dm
@@ -6,8 +6,13 @@
/mob/living/carbon/isloyal()
for(var/obj/item/implant/mindshield/L in implants)
- return 1
+ return TRUE
+/mob/proc/lowest_buckled_mob()
+ . = src
+ if(buckled && ismob(buckled))
+ var/mob/Buckled = buckled
+ . = Buckled.lowest_buckled_mob()
/proc/check_zone(zone)
if(!zone)
@@ -330,9 +335,9 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
/proc/is_special_character(mob/M) // returns 1 for special characters and 2 for heroes of gamemode //moved out of admins.dm because things other than admin procs were calling this.
if(!SSticker.HasRoundStarted())
- return 0
+ return FALSE
if(!istype(M))
- return 0
+ return FALSE
if(issilicon(M))
if(iscyborg(M)) //For cyborgs, returns 1 if the cyborg has a law 0 and special_role. Returns 0 if the borg is merely slaved to an AI traitor.
var/mob/living/silicon/robot/R = M
@@ -341,17 +346,17 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(R.connected_ai)
if(is_special_character(R.connected_ai) && R.connected_ai.laws && (R.connected_ai.laws.zeroth_borg == R.laws.zeroth || R.connected_ai.laws.zeroth == R.laws.zeroth))
return 0 //AI is the real traitor here, so the borg itself is not a traitor
- return 1 //Slaved but also a traitor
- return 1 //Unslaved, traitor
+ return TRUE//Slaved but also a traitor
+ return TRUE //Unslaved, traitor
else if(isAI(M))
var/mob/living/silicon/ai/A = M
if(A.laws && A.laws.zeroth && A.mind && A.mind.special_role)
- return 1
- return 0
+ return TRUE
+ return FALSE
if(M.mind && M.mind.special_role)//If they have a mind and special role, they are some type of traitor or antagonist.
switch(SSticker.mode.config_tag)
if("revolution")
- if((M.mind in SSticker.mode.head_revolutionaries) || (M.mind in SSticker.mode.revolutionaries))
+ if(is_revolutionary(M))
return 2
if("cult")
if(M.mind in SSticker.mode.cult)
@@ -363,7 +368,7 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if(M.mind in SSticker.mode.changelings)
return 2
if("wizard")
- if(M.mind in SSticker.mode.wizards)
+ if(iswizard(M))
return 2
if("apprentice")
if(M.mind in SSticker.mode.apprentices)
@@ -374,8 +379,10 @@ It's fairly easy to fix if dealing with single letters but not so much with comp
if("abductor")
if(M.mind in SSticker.mode.abductors)
return 2
- return 1
- return 0
+ return TRUE
+ if(M.mind && LAZYLEN(M.mind.antag_datums)) //they have an antag datum!
+ return TRUE
+ return FALSE
/mob/proc/reagent_check(datum/reagent/R) // utilized in the species code
return 1
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index a66b45d4a2..e99a4e0ae8 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -192,10 +192,10 @@
return .
-/mob/Moved(oldLoc, dir)
+/mob/Moved(oldLoc, dir, Forced = FALSE)
. = ..()
for(var/obj/O in contents)
- O.on_mob_move(dir, src, oldLoc)
+ O.on_mob_move(dir, src, oldLoc, Forced)
/mob/setDir(newDir)
. = ..()
diff --git a/code/modules/mob/transform_procs.dm b/code/modules/mob/transform_procs.dm
index dc87736e5d..18ca605965 100644
--- a/code/modules/mob/transform_procs.dm
+++ b/code/modules/mob/transform_procs.dm
@@ -376,8 +376,6 @@
if(!transfer_after)
mind.active = FALSE
mind.transfer_to(R)
- if(mind.special_role)
- R.mind.store_memory("In case you look at this after being borged, the objectives are only here until I find a way to make them not show up for you, as I can't simply delete them without screwing up round-end reporting. --NeoFite")
else if(transfer_after)
R.key = key
@@ -462,12 +460,13 @@
. = new_slime
qdel(src)
-/mob/proc/become_overmind(mode_made, starting_points = 60)
- var/mob/camera/blob/B = new /mob/camera/blob(loc, 0, mode_made, starting_points)
- if(mind)
- mind.transfer_to(B)
- else
- B.key = key
+/mob/proc/become_overmind(starting_points = 60)
+ var/turf/T = get_turf(loc) //just to avoid messing up in lockers
+ var/area/A = get_area(T)
+ if(((A && !A.blob_allowed) || !(T.z in GLOB.station_z_levels)) && LAZYLEN(GLOB.blobstart))
+ T = get_turf(pick(GLOB.blobstart))
+ var/mob/camera/blob/B = new /mob/camera/blob(T, starting_points)
+ B.key = key
. = B
qdel(src)
diff --git a/code/modules/modular_computers/file_system/programs/ntdownloader.dm b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
index 4396e0e544..41dce90997 100644
--- a/code/modules/modular_computers/file_system/programs/ntdownloader.dm
+++ b/code/modules/modular_computers/file_system/programs/ntdownloader.dm
@@ -130,7 +130,7 @@
for(var/A in GLOB.ntnet_global.available_station_software)
var/datum/computer_file/program/P = A
// Only those programs our user can run will show in the list
- if(!P.can_run(user,transfer = 1))
+ if(!P.can_run(user,transfer = 1) || hard_drive.find_file_by_name(P.filename))
continue
all_entries.Add(list(list(
"filename" = P.filename,
@@ -144,6 +144,8 @@
var/list/hacked_programs[0]
for(var/S in GLOB.ntnet_global.available_antag_software)
var/datum/computer_file/program/P = S
+ if(hard_drive.find_file_by_name(P.filename))
+ continue
data["hackedavailable"] = 1
hacked_programs.Add(list(list(
"filename" = P.filename,
diff --git a/code/modules/modular_computers/hardware/card_slot.dm b/code/modules/modular_computers/hardware/card_slot.dm
index b08fab8465..caebfb447b 100644
--- a/code/modules/modular_computers/hardware/card_slot.dm
+++ b/code/modules/modular_computers/hardware/card_slot.dm
@@ -57,6 +57,7 @@
else
stored_card2 = I
to_chat(user, "You insert \the [I] into \the [src].")
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
return TRUE
@@ -93,6 +94,7 @@
P.event_idremoved(1, slot)
to_chat(user, "You remove the card[ejected>1 ? "s" : ""] from \the [src].")
+ playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0)
return TRUE
return FALSE
diff --git a/code/modules/modular_computers/laptop_vendor.dm b/code/modules/modular_computers/laptop_vendor.dm
index 99eb6f1a23..12f7d403c2 100644
--- a/code/modules/modular_computers/laptop_vendor.dm
+++ b/code/modules/modular_computers/laptop_vendor.dm
@@ -247,7 +247,7 @@
if(!user.temporarilyRemoveItemFromInventory(c))
return
credits += c.value
- visible_message("[usr] inserts [c.value] credits into the [src].")
+ visible_message("[usr] inserts [c.value] credits into [src].")
qdel(c)
return
diff --git a/code/modules/ninja/energy_katana.dm b/code/modules/ninja/energy_katana.dm
index 5a65a58d76..29552c8a47 100644
--- a/code/modules/ninja/energy_katana.dm
+++ b/code/modules/ninja/energy_katana.dm
@@ -28,6 +28,10 @@
spark_system.set_up(5, 0, src)
spark_system.attach(src)
+/obj/item/energy_katana/attack_self(mob/user)
+ dash_toggled = !dash_toggled
+ to_chat(user, "You [dash_toggled ? "enable" : "disable"] the dash function on [src].")
+
/obj/item/energy_katana/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(dash_toggled)
jaunt.Teleport(user, target)
@@ -99,5 +103,3 @@
max_charges = 3
charge_rate = 30
recharge_sound = null
-
-
diff --git a/code/modules/ninja/suit/ninjaDrainAct.dm b/code/modules/ninja/suit/ninjaDrainAct.dm
index 31e6161e4e..4679b5ffbd 100644
--- a/code/modules/ninja/suit/ninjaDrainAct.dm
+++ b/code/modules/ninja/suit/ninjaDrainAct.dm
@@ -114,6 +114,11 @@ They *could* go in their appropriate files, but this is supposed to be modular
corrupt()
update_icon()
+/obj/machinery/proc/AI_notify_hack()
+ var/turf/location = get_turf(src)
+ var/alertstr = "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"]."
+ for(var/mob/living/silicon/ai/AI in GLOB.player_list)
+ to_chat(AI, alertstr)
//RDCONSOLE//
/obj/machinery/computer/rdconsole/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G)
@@ -123,10 +128,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
. = DRAIN_RD_HACK_FAILED
to_chat(H, "Hacking \the [src]...")
- spawn(0)
- var/turf/location = get_turf(H)
- for(var/mob/living/silicon/ai/AI in GLOB.player_list)
- to_chat(AI, "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"].")
+ AI_notify_hack()
if(files && files.known_tech.len)
for(var/datum/tech/current_data in S.stored_research)
@@ -145,7 +147,6 @@ They *could* go in their appropriate files, but this is supposed to be modular
to_chat(H, "Data analyzed. Process finished.")
-
//RD SERVER//
//Shamelessly copypasted from above, since these two used to be the same proc, but with MANY colon operators
/obj/machinery/r_n_d/server/ninjadrain_act(obj/item/clothing/suit/space/space_ninja/S, mob/living/carbon/human/H, obj/item/clothing/gloves/space_ninja/G)
@@ -155,10 +156,7 @@ They *could* go in their appropriate files, but this is supposed to be modular
. = DRAIN_RD_HACK_FAILED
to_chat(H, "Hacking \the [src]...")
- spawn(0)
- var/turf/location = get_turf(H)
- for(var/mob/living/silicon/ai/AI in GLOB.player_list)
- to_chat(AI, "Network Alert: Hacking attempt detected[location?" in [location]":". Unable to pinpoint location"].")
+ AI_notify_hack()
if(files && files.known_tech.len)
for(var/datum/tech/current_data in S.stored_research)
diff --git a/code/modules/orbit/orbit.dm b/code/modules/orbit/orbit.dm
index 27fc2d86df..e4df15efaf 100644
--- a/code/modules/orbit/orbit.dm
+++ b/code/modules/orbit/orbit.dm
@@ -1,112 +1,114 @@
-/datum/orbit
- var/atom/movable/orbiter
- var/atom/orbiting
- var/lock = TRUE
- var/turf/lastloc
- var/lastprocess
-
-/datum/orbit/New(_orbiter, _orbiting, _lock)
- orbiter = _orbiter
- orbiting = _orbiting
- SSorbit.processing += src
- if (!orbiting.orbiters)
- orbiting.orbiters = list()
- orbiting.orbiters += src
-
- if (orbiter.orbiting)
- orbiter.stop_orbit()
- orbiter.orbiting = src
- Check()
- lock = _lock
-
-
-
-//do not qdel directly, use stop_orbit on the orbiter. (This way the orbiter can bind to the orbit stopping)
-/datum/orbit/Destroy(force = FALSE)
- SSorbit.processing -= src
- if (orbiter)
- orbiter.orbiting = null
- orbiter = null
- if (orbiting)
- if (orbiting.orbiters)
- orbiting.orbiters -= src
- if (!orbiting.orbiters.len)//we are the last orbit, delete the list
- orbiting.orbiters = null
- orbiting = null
- return ..()
-
-/datum/orbit/proc/Check(turf/targetloc)
- if (!orbiter)
- qdel(src)
- return
- if (!orbiting)
- orbiter.stop_orbit()
- return
- if (!orbiter.orbiting) //admin wants to stop the orbit.
- orbiter.orbiting = src //set it back to us first
- orbiter.stop_orbit()
- lastprocess = world.time
- if (!targetloc)
- targetloc = get_turf(orbiting)
- if (!targetloc || (!lock && orbiter.loc != lastloc && orbiter.loc != targetloc))
- orbiter.stop_orbit()
- return
- orbiter.loc = targetloc
- orbiter.update_parallax_contents()
- lastloc = orbiter.loc
-
-
-/atom/movable/var/datum/orbit/orbiting = null
-/atom/var/list/orbiters = null
-
-//A: atom to orbit
-//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
-//clockwise: whether you orbit clockwise or anti clockwise
-//rotation_speed: how fast to rotate (how many ds should it take for a rotation to complete)
-//rotation_segments: the resolution of the orbit circle, less = a more block circle, this can be used to produce hexagons (6 segments) triangles (3 segments), and so on, 36 is the best default.
-//pre_rotation: Chooses to rotate src 90 degress towards the orbit dir (clockwise/anticlockwise), useful for things to go "head first" like ghosts
-//lockinorbit: Forces src to always be on A's turf, otherwise the orbit cancels when src gets too far away (eg: ghosts)
-
-/atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE, lockinorbit = FALSE)
- if (!istype(A))
- return
-
- new/datum/orbit(src, A, lockinorbit)
- if (!orbiting) //something failed, and our orbit datum deleted itself
- return
- var/matrix/initial_transform = matrix(transform)
-
- //Head first!
- if (pre_rotation)
- var/matrix/M = matrix(transform)
- var/pre_rot = 90
- if(!clockwise)
- pre_rot = -90
- M.Turn(pre_rot)
- transform = M
-
- var/matrix/shift = matrix(transform)
- shift.Translate(0,radius)
- transform = shift
-
- SpinAnimation(rotation_speed, -1, clockwise, rotation_segments)
-
- //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit
- transform = initial_transform
-
-/atom/movable/proc/stop_orbit()
- SpinAnimation(0,0)
- qdel(orbiting)
-
-/atom/Destroy(force = FALSE)
- . = ..()
- if (orbiters)
- for (var/thing in orbiters)
- var/datum/orbit/O = thing
- if (O.orbiter)
- O.orbiter.stop_orbit()
-
-/atom/movable/Destroy(force = FALSE)
- . = ..()
- if (orbiting)
- stop_orbit()
+/datum/orbit
+ var/atom/movable/orbiter
+ var/atom/orbiting
+ var/lock = TRUE
+ var/turf/lastloc
+ var/lastprocess
+
+/datum/orbit/New(_orbiter, _orbiting, _lock)
+ orbiter = _orbiter
+ orbiting = _orbiting
+ SSorbit.processing += src
+ if (!orbiting.orbiters)
+ orbiting.orbiters = list()
+ orbiting.orbiters += src
+
+ if (orbiter.orbiting)
+ orbiter.stop_orbit()
+ orbiter.orbiting = src
+ Check()
+ lock = _lock
+
+//do not qdel directly, use stop_orbit on the orbiter. (This way the orbiter can bind to the orbit stopping)
+/datum/orbit/Destroy(force = FALSE)
+ SSorbit.processing -= src
+ if (orbiter)
+ orbiter.orbiting = null
+ orbiter = null
+ if (orbiting)
+ if (orbiting.orbiters)
+ orbiting.orbiters -= src
+ if (!orbiting.orbiters.len)//we are the last orbit, delete the list
+ orbiting.orbiters = null
+ orbiting = null
+ return ..()
+
+/datum/orbit/proc/Check(turf/targetloc)
+ if (!orbiter)
+ qdel(src)
+ return
+ if (!orbiting)
+ orbiter.stop_orbit()
+ return
+ if (!orbiter.orbiting) //admin wants to stop the orbit.
+ orbiter.orbiting = src //set it back to us first
+ orbiter.stop_orbit()
+ lastprocess = world.time
+ if (!targetloc)
+ targetloc = get_turf(orbiting)
+ if (!targetloc || (!lock && orbiter.loc != lastloc && orbiter.loc != targetloc))
+ orbiter.stop_orbit()
+ return
+ orbiter.loc = targetloc
+ orbiter.update_parallax_contents()
+ lastloc = orbiter.loc
+ for(var/other_orbit in orbiter.orbiters)
+ var/datum/orbit/OO = other_orbit
+ if(OO == src)
+ continue
+ OO.Check(targetloc)
+
+/atom/movable/var/datum/orbit/orbiting = null
+/atom/var/list/orbiters = null
+
+//A: atom to orbit
+//radius: range to orbit at, radius of the circle formed by orbiting (in pixels)
+//clockwise: whether you orbit clockwise or anti clockwise
+//rotation_speed: how fast to rotate (how many ds should it take for a rotation to complete)
+//rotation_segments: the resolution of the orbit circle, less = a more block circle, this can be used to produce hexagons (6 segments) triangles (3 segments), and so on, 36 is the best default.
+//pre_rotation: Chooses to rotate src 90 degress towards the orbit dir (clockwise/anticlockwise), useful for things to go "head first" like ghosts
+//lockinorbit: Forces src to always be on A's turf, otherwise the orbit cancels when src gets too far away (eg: ghosts)
+
+/atom/movable/proc/orbit(atom/A, radius = 10, clockwise = FALSE, rotation_speed = 20, rotation_segments = 36, pre_rotation = TRUE, lockinorbit = FALSE)
+ if (!istype(A))
+ return
+
+ new/datum/orbit(src, A, lockinorbit)
+ if (!orbiting) //something failed, and our orbit datum deleted itself
+ return
+ var/matrix/initial_transform = matrix(transform)
+
+ //Head first!
+ if (pre_rotation)
+ var/matrix/M = matrix(transform)
+ var/pre_rot = 90
+ if(!clockwise)
+ pre_rot = -90
+ M.Turn(pre_rot)
+ transform = M
+
+ var/matrix/shift = matrix(transform)
+ shift.Translate(0,radius)
+ transform = shift
+
+ SpinAnimation(rotation_speed, -1, clockwise, rotation_segments)
+
+ //we stack the orbits up client side, so we can assign this back to normal server side without it breaking the orbit
+ transform = initial_transform
+
+/atom/movable/proc/stop_orbit()
+ SpinAnimation(0,0)
+ qdel(orbiting)
+
+/atom/Destroy(force = FALSE)
+ . = ..()
+ if (orbiters)
+ for (var/thing in orbiters)
+ var/datum/orbit/O = thing
+ if (O.orbiter)
+ O.orbiter.stop_orbit()
+
+/atom/movable/Destroy(force = FALSE)
+ . = ..()
+ if (orbiting)
+ stop_orbit()
diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm
index 22c89dfda0..a02e98ed2b 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -179,7 +179,7 @@
else if(istype(P, /obj/item/stamp))
to_chat(user, "You stamp the paper with your rubber stamp, however the ink ignites as you release the stamp.")
else if(P.is_hot())
- user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "The [src] refuses to ignite!")
+ user.visible_message("[user] brings [P] next to [src], but [src] does not catch fire!", "[src] refuses to ignite!")
else
return ..()
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index 8b4be79e99..f9d0faa16e 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -216,4 +216,4 @@ GLOBAL_LIST_EMPTY(employmentCabinets)
sleep(100) // prevents the devil from just instantly emptying the cabinet, ensuring an easy win.
cooldown = 0
else
- to_chat(user, "The [src] is jammed, give it a few seconds.")
+ to_chat(user, "[src] is jammed, give it a few seconds.")
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index bfad2c9c83..d63474e357 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -36,7 +36,8 @@
return OXYLOSS
/obj/item/hand_labeler/afterattack(atom/A, mob/user,proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(!mode) //if it's off, give up.
return
@@ -112,6 +113,6 @@
desc = "A roll of paper. Use it on a hand labeler to refill it."
icon_state = "labeler_refill"
item_state = "electropack"
- lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/misc/devices_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/misc/devices_righthand.dmi'
w_class = WEIGHT_CLASS_TINY
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 5abf1b7998..ae6751f526 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -108,15 +108,16 @@
user.visible_message("[user] scratches a grid on [user.p_their()] wrist with the paper! It looks like [user.p_theyre()] trying to commit sudoku...")
return (BRUTELOSS)
+/obj/item/paper/proc/reset_spamflag()
+ spam_flag = FALSE
/obj/item/paper/attack_self(mob/user)
user.examinate(src)
if(rigged && (SSevents.holidays && SSevents.holidays[APRIL_FOOLS]))
- if(spam_flag == 0)
- spam_flag = 1
+ if(!spam_flag)
+ spam_flag = TRUE
playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
- spawn(20)
- spam_flag = 0
+ addtimer(CALLBACK(src, .proc/reset_spamflag), 20)
/obj/item/paper/attack_ai(mob/living/silicon/ai/user)
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 55a0875b62..962802aa6d 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -25,10 +25,6 @@
P.loc = src
bin_pen = P
update_icon()
- var/static/warned = FALSE
- if(P.type == /obj/item/pen && !warned)
- warning("one or more paperbins ate a pen duing initialize()")
- warned = TRUE
/obj/item/paper_bin/fire_act(exposed_temperature, exposed_volume)
if(!total_paper)
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 3e4d3ba3be..2d5fcc6e3a 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -1,6 +1,6 @@
/obj/item/paperplane
name = "paper plane"
- desc = "Paper, folded in the shape of a plane"
+ desc = "Paper, folded in the shape of a plane."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "paperplane"
throw_range = 7
@@ -33,7 +33,7 @@
/obj/item/paperplane/suicide_act(mob/living/user)
user.Stun(200)
- user.visible_message("[user] jams the [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")
+ user.visible_message("[user] jams [src] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")
user.adjust_blurriness(6)
user.adjust_eye_damage(rand(6,8))
sleep(10)
@@ -67,7 +67,7 @@
else if(P.is_hot())
if(user.disabilities & CLUMSY && prob(10))
user.visible_message("[user] accidentally ignites themselves!", \
- "You miss the [src] and accidentally light yourself on fire!")
+ "You miss [src] and accidentally light yourself on fire!")
user.dropItemToGround(P)
user.adjust_fire_stacks(1)
user.IgniteMob()
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index 2693b5e5cf..48b045f680 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -443,9 +443,12 @@
to_chat(user, "[pictures_left] photos left.")
icon_state = "camera_off"
on = FALSE
- spawn(64)
- icon_state = "camera"
- on = TRUE
+ addtimer(CALLBACK(src, .proc/cooldown), 64)
+
+/obj/item/device/camera/proc/cooldown()
+ set waitfor = FALSE
+ icon_state = "camera"
+ on = TRUE
/obj/item/device/camera/siliconcam/proc/toggle_camera_mode()
if(in_camera_mode)
diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm
index 7863f6a52f..29e7b53cd2 100644
--- a/code/modules/power/antimatter/control.dm
+++ b/code/modules/power/antimatter/control.dm
@@ -260,17 +260,15 @@
if(AMS.processing)
AMS.shutdown_core()
AMS.control_unit = null
- spawn(10)
- AMS.controllerscan()
+ addtimer(CALLBACK(AMS, /obj/machinery/am_shielding.proc/controllerscan), 10)
linked_shielding = list()
-
else
for(var/obj/machinery/am_shielding/AMS in linked_shielding)
AMS.update_icon()
- spawn(20)
- shield_icon_delay = 0
- return
+ addtimer(CALLBACK(src, .proc/reset_shield_icon_delay), 20)
+/obj/machinery/power/am_control_unit/proc/reset_shield_icon_delay()
+ shield_icon_delay = 0
/obj/machinery/power/am_control_unit/proc/check_core_stability()
if(stored_core_stability_delay || linked_cores.len <= 0)
@@ -280,10 +278,10 @@
for(var/obj/machinery/am_shielding/AMS in linked_cores)
stored_core_stability += AMS.stability
stored_core_stability/=linked_cores.len
- spawn(40)
- stored_core_stability_delay = 0
- return
+ addtimer(CALLBACK(src, .proc/reset_stored_core_stability_delay), 40)
+/obj/machinery/power/am_control_unit/proc/reset_stored_core_stability_delay()
+ stored_core_stability_delay = 0
/obj/machinery/power/am_control_unit/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
diff --git a/code/modules/power/antimatter/shielding.dm b/code/modules/power/antimatter/shielding.dm
index 39353737bb..f0bcf5e9f1 100644
--- a/code/modules/power/antimatter/shielding.dm
+++ b/code/modules/power/antimatter/shielding.dm
@@ -3,7 +3,8 @@
var/list/things = list()
for(var/direction in GLOB.cardinals)
var/turf/T = get_step(center, direction)
- if(!T) continue
+ if(!T)
+ continue
things += T.contents
return things
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index ad3e2c9d33..cab682857a 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -78,7 +78,6 @@
powernet = 0 // set so that APCs aren't found as powernet nodes //Hackish, Horrible, was like this before I changed it :(
var/malfhack = 0 //New var for my changes to AI malf. --NeoFite
var/mob/living/silicon/ai/malfai = null //See above --NeoFite
-// luminosity = 1
var/has_electronics = 0 // 0 - none, 1 - plugged in, 2 - secured by screwdriver
var/overload = 1 //used for the Blackout malf module
var/beenhit = 0 // used for counting how many times it has been hit, used for Aliens at the moment
@@ -600,7 +599,8 @@
"You hear welding.")
playsound(src.loc, WT.usesound, 50, 1)
if(do_after(user, 50*W.toolspeed, target = src))
- if(!src || !WT.remove_fuel(3, user)) return
+ if(!src || !WT.remove_fuel(3, user))
+ return
if ((stat & BROKEN) || opened==2)
new /obj/item/stack/sheet/metal(loc)
user.visible_message(\
@@ -737,7 +737,7 @@
/obj/machinery/power/apc/ui_data(mob/user)
var/list/data = list(
- "locked" = integration_cog ? !is_servant_of_ratvar(user) : locked,
+ "locked" = locked && !(integration_cog && is_servant_of_ratvar(user)),
"failTime" = failure_timer,
"isOperating" = operating,
"externalPower" = main_status,
@@ -833,7 +833,7 @@
return TRUE
/obj/machinery/power/apc/ui_act(action, params)
- if(..() || !can_use(usr, 1) || (locked && !usr.has_unlimited_silicon_privilege && !failure_timer))
+ if(..() || !can_use(usr, 1) || (locked && !usr.has_unlimited_silicon_privilege && !failure_timer && !(integration_cog && (is_servant_of_ratvar(usr)))))
return
switch(action)
if("lock")
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 503eb88cd2..dc63253681 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -1,3 +1,14 @@
+GLOBAL_LIST_INIT(cable_colors, list(
+ "yellow" = "#ffff00",
+ "green" = "#00aa00",
+ "blue" = "#1919c8",
+ "pink" = "#ff3cc8",
+ "orange" = "#ff8000",
+ "cyan" = "#00ffff",
+ "white" = "#ffffff",
+ "red" = "#ff0000"
+ ))
+
///////////////////////////////
//CABLE STRUCTURE
///////////////////////////////
@@ -23,62 +34,61 @@ By design, d1 is the smallest direction and d2 is the highest
*/
/obj/structure/cable
- level = 1 //is underfloor
- anchored =1
- on_blueprints = TRUE
- var/datum/powernet/powernet
name = "power cable"
desc = "A flexible, superconducting insulated cable for heavy-duty power transfer."
- icon = 'icons/obj/power_cond/power_cond_red.dmi'
+ icon = 'icons/obj/power_cond/cables.dmi'
icon_state = "0-1"
+ level = 1 //is underfloor
+ layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
+ anchored = TRUE
+ on_blueprints = TRUE
var/d1 = 0 // cable direction 1 (see above)
var/d2 = 1 // cable direction 2 (see above)
- layer = WIRE_LAYER //Above hidden pipes, GAS_PIPE_HIDDEN_LAYER
- var/cable_color = "red"
+ var/datum/powernet/powernet
var/obj/item/stack/cable_coil/stored
+ var/cable_color = "red"
+ color = "#ff0000"
+
/obj/structure/cable/yellow
cable_color = "yellow"
- icon = 'icons/obj/power_cond/power_cond_yellow.dmi'
+ color = "#ffff00"
/obj/structure/cable/green
cable_color = "green"
- icon = 'icons/obj/power_cond/power_cond_green.dmi'
+ color = "#00aa00"
/obj/structure/cable/blue
cable_color = "blue"
- icon = 'icons/obj/power_cond/power_cond_blue.dmi'
+ color = "#1919c8"
/obj/structure/cable/pink
cable_color = "pink"
- icon = 'icons/obj/power_cond/power_cond_pink.dmi'
+ color = "#ff3cc8"
/obj/structure/cable/orange
cable_color = "orange"
- icon = 'icons/obj/power_cond/power_cond_orange.dmi'
+ color = "#ff8000"
/obj/structure/cable/cyan
cable_color = "cyan"
- icon = 'icons/obj/power_cond/power_cond_cyan.dmi'
+ color = "#00ffff"
/obj/structure/cable/white
cable_color = "white"
- icon = 'icons/obj/power_cond/power_cond_white.dmi'
// the power cable object
-/obj/structure/cable/Initialize()
+/obj/structure/cable/Initialize(mapload, param_color)
. = ..()
// ensure d1 & d2 reflect the icon_state for entering and exiting cable
var/dash = findtext(icon_state, "-")
-
d1 = text2num( copytext( icon_state, 1, dash ) )
-
d2 = text2num( copytext( icon_state, dash+1 ) )
var/turf/T = get_turf(src) // hide if turf is not intact
-
- if(level==1) hide(T.intact)
+ if(level==1)
+ hide(T.intact)
GLOB.cable_list += src //add it to the global cable list
if(d1)
@@ -86,6 +96,12 @@ By design, d1 is the smallest direction and d2 is the highest
else
stored = new/obj/item/stack/cable_coil(null,1,cable_color)
+ var/list/cable_colors = GLOB.cable_colors
+ cable_color = param_color || cable_color || pick(cable_colors)
+ if(cable_colors[cable_color])
+ cable_color = cable_colors[cable_color]
+ update_icon()
+
/obj/structure/cable/Destroy() // called when a cable is deleted
if(powernet)
cut_cable_from_powernet() // update the powernets
@@ -114,6 +130,8 @@ By design, d1 is the smallest direction and d2 is the highest
icon_state = "[d1]-[d2]-f"
else
icon_state = "[d1]-[d2]"
+ color = null
+ add_atom_colour(cable_color, FIXED_COLOUR_PRIORITY)
/obj/structure/cable/proc/handlecable(obj/item/W, mob/user, params)
var/turf/T = get_turf(src)
@@ -174,26 +192,6 @@ By design, d1 is the smallest direction and d2 is the highest
if(current_size >= STAGE_FIVE)
deconstruct()
-/obj/structure/cable/proc/cableColor(colorC = "red")
- cable_color = colorC
- switch(colorC)
- if("red")
- icon = 'icons/obj/power_cond/power_cond_red.dmi'
- if("yellow")
- icon = 'icons/obj/power_cond/power_cond_yellow.dmi'
- if("green")
- icon = 'icons/obj/power_cond/power_cond_green.dmi'
- if("blue")
- icon = 'icons/obj/power_cond/power_cond_blue.dmi'
- if("pink")
- icon = 'icons/obj/power_cond/power_cond_pink.dmi'
- if("orange")
- icon = 'icons/obj/power_cond/power_cond_orange.dmi'
- if("cyan")
- icon = 'icons/obj/power_cond/power_cond_cyan.dmi'
- if("white")
- icon = 'icons/obj/power_cond/power_cond_white.dmi'
-
/obj/structure/cable/proc/update_stored(length = 1, colorC = "red")
stored.amount = length
stored.item_color = colorC
@@ -389,7 +387,8 @@ By design, d1 is the smallest direction and d2 is the highest
//needed as this can, unlike other placements, disconnect cables
/obj/structure/cable/proc/denode()
var/turf/T1 = loc
- if(!T1) return
+ if(!T1)
+ return
var/list/powerlist = power_list(T1,src,0,0) //find the other cables that ended in the centre of the turf, with or without a powernet
if(powerlist.len>0)
@@ -399,6 +398,11 @@ By design, d1 is the smallest direction and d2 is the highest
if(PN.is_empty()) //can happen with machines made nodeless when smoothing cables
qdel(PN)
+/obj/structure/cable/proc/auto_propogate_cut_cable(obj/O)
+ if(O && !QDELETED(O))
+ var/datum/powernet/newPN = new()// creates a new powernet...
+ propagate_network(O, newPN)//... and propagates it to the other side of the cable
+
// cut the cable's powernet at this cable and updates the powergrid
/obj/structure/cable/proc/cut_cable_from_powernet(remove=TRUE)
var/turf/T1 = loc
@@ -426,10 +430,7 @@ By design, d1 is the smallest direction and d2 is the highest
loc = null
powernet.remove_cable(src) //remove the cut cable from its powernet
- spawn(0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
- if(O && !QDELETED(O))
- var/datum/powernet/newPN = new()// creates a new powernet...
- propagate_network(O, newPN)//... and propagates it to the other side of the cable
+ addtimer(CALLBACK(src, .proc/auto_propogate_cut_cable, O), 0) //so we don't rebuild the network X times when singulo/explosion destroys a line of X cables
// Disconnect machines connected to nodes
if(d1 == 0) // if we cut a node (O-X) cable
@@ -452,8 +453,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
name = "cable coil"
gender = NEUTER //That's a cable coil sounds better than that's some cable coils
icon = 'icons/obj/power.dmi'
- icon_state = "coil_red"
- item_state = "coil_red"
+ icon_state = "coil"
+ item_state = "coil"
lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
max_amount = MAXCOIL
@@ -493,8 +494,12 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
. = ..()
if(new_amount) // MAXCOIL by default
amount = new_amount
- if(param_color)
- item_color = param_color
+
+ var/list/cable_colors = GLOB.cable_colors
+ item_color = param_color || item_color || pick(cable_colors)
+ if(cable_colors[item_color])
+ item_color = cable_colors[item_color]
+
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
update_icon()
@@ -524,18 +529,10 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/update_icon()
- if(!item_color)
- item_color = pick("red", "yellow", "blue", "green")
- item_state = "coil_[item_color]"
- if(amount == 1)
- icon_state = "coil_[item_color]1"
- name = "cable piece"
- else if(amount == 2)
- icon_state = "coil_[item_color]2"
- name = "cable piece"
- else
- icon_state = "coil_[item_color]"
- name = "cable coil"
+ icon_state = "[initial(item_state)][amount < 3 ? amount : ""]"
+ name = "cable [amount < 3 ? "piece" : "coil"]"
+ color = null
+ add_atom_colour(item_color, FIXED_COLOUR_PRIORITY)
/obj/item/stack/cable_coil/attack_hand(mob/user)
var/obj/item/stack/cable_coil/new_cable = ..()
@@ -558,8 +555,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
//////////////////////////////////////////////
/obj/item/stack/cable_coil/proc/get_new_cable(location)
- var/path = "/obj/structure/cable" + (item_color == "red" ? "" : "/" + item_color)
- return new path (location)
+ var/path = /obj/structure/cable
+ return new path(location, item_color)
// called when cable_coil is clicked on a turf
/obj/item/stack/cable_coil/proc/place_turf(turf/T, mob/user, dirnew)
@@ -710,7 +707,7 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
return
- C.cableColor(item_color)
+ C.update_icon()
C.d1 = nd1
C.d2 = nd2
@@ -746,11 +743,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
// Misc.
/////////////////////////////
-/obj/item/stack/cable_coil/cut
- item_state = "coil_red2"
-
/obj/item/stack/cable_coil/cut/Initialize(mapload)
- . =..()
+ . = ..()
amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
@@ -758,42 +752,38 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe("cable restrai
/obj/item/stack/cable_coil/red
item_color = "red"
- icon_state = "coil_red"
+ color = "#ff0000"
/obj/item/stack/cable_coil/yellow
item_color = "yellow"
- icon_state = "coil_yellow"
+ color = "#ffff00"
/obj/item/stack/cable_coil/blue
item_color = "blue"
- icon_state = "coil_blue"
- item_state = "coil_blue"
+ color = "#1919c8"
/obj/item/stack/cable_coil/green
item_color = "green"
- icon_state = "coil_green"
+ color = "#00aa00"
/obj/item/stack/cable_coil/pink
item_color = "pink"
- icon_state = "coil_pink"
+ color = "#ff3ccd"
/obj/item/stack/cable_coil/orange
item_color = "orange"
- icon_state = "coil_orange"
+ color = "#ff8000"
/obj/item/stack/cable_coil/cyan
item_color = "cyan"
- icon_state = "coil_cyan"
+ color = "#00ffff"
/obj/item/stack/cable_coil/white
item_color = "white"
- icon_state = "coil_white"
-
-/obj/item/stack/cable_coil/random/Initialize(mapload)
- . = ..()
- item_color = pick("red","orange","yellow","green","cyan","blue","pink","white")
- icon_state = "coil_[item_color]"
+/obj/item/stack/cable_coil/random
+ item_color = null
+ color = "#ffffff"
/obj/item/stack/cable_coil/random/five
amount = 5
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 16e2ae92f2..5d1e2fa6d9 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -339,7 +339,7 @@
/obj/item/stock_parts/cell/beam_rifle
name = "beam rifle capacitor"
- desc = "A high powered capacitor that can provide huge amounts of energy in an instant"
+ desc = "A high powered capacitor that can provide huge amounts of energy in an instant."
maxcharge = 50000
chargerate = 5000 //Extremely energy intensive
rating = 4
@@ -348,4 +348,4 @@
return
/obj/item/stock_parts/cell/beam_rifle/emp_act(severity)
- charge = Clamp((charge-(10000/severity)),0,maxcharge)
\ No newline at end of file
+ charge = Clamp((charge-(10000/severity)),0,maxcharge)
diff --git a/code/modules/power/floodlight.dm b/code/modules/power/floodlight.dm
index 8d49f02eef..74cecf0b1d 100644
--- a/code/modules/power/floodlight.dm
+++ b/code/modules/power/floodlight.dm
@@ -10,21 +10,21 @@
/obj/structure/floodlight_frame/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/wrench) && (state == FLOODLIGHT_NEEDS_WRENCHING))
- to_chat(user, "You secure the [src].")
+ to_chat(user, "You secure [src].")
anchored = TRUE
state = FLOODLIGHT_NEEDS_WIRES
desc = "A bare metal frame looking vaguely like a floodlight. Requires wiring."
else if(istype(O, /obj/item/stack/cable_coil) && (state == FLOODLIGHT_NEEDS_WIRES))
var/obj/item/stack/S = O
if(S.use(5))
- to_chat(user, "You wire the [src].")
+ to_chat(user, "You wire [src].")
name = "wired [name]"
desc = "A bare metal frame looking vaguely like a floodlight. Requires securing with a screwdriver."
icon_state = "floodlight_c2"
state = FLOODLIGHT_NEEDS_SECURING
else if(istype(O, /obj/item/light/tube) && (state == FLOODLIGHT_NEEDS_LIGHTS))
if(user.transferItemToLoc(O))
- to_chat(user, "You put lights in the [src].")
+ to_chat(user, "You put lights in [src].")
new /obj/machinery/power/floodlight(src.loc)
qdel(src)
else if(istype(O, /obj/item/screwdriver) && (state == FLOODLIGHT_NEEDS_SECURING))
@@ -43,6 +43,8 @@
icon_state = "floodlight"
anchored = TRUE
density = TRUE
+ max_integrity = 100
+ integrity_failure = 80
idle_power_usage = 100
active_power_usage = 1000
var/list/light_setting_list = list(0, 5, 10, 15)
@@ -79,7 +81,7 @@
if(4)
setting_text = "high power"
if(user)
- to_chat(user, "You set the [src] to [setting_text].")
+ to_chat(user, "You set [src] to [setting_text].")
/obj/machinery/power/floodlight/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/wrench))
@@ -104,3 +106,14 @@
/obj/machinery/power/floodlight/attack_ai(mob/user)
attack_hand(user)
..()
+
+/obj/machinery/power/floodlight/obj_break(damage_flag)
+ if(!(flags_1 & NODECONSTRUCT_1))
+ playsound(loc, 'sound/effects/glassbr3.ogg', 100, 1)
+ var/obj/structure/floodlight_frame/F = new(loc)
+ F.state = FLOODLIGHT_NEEDS_LIGHTS
+ new /obj/item/light/tube/broken(loc)
+ qdel(src)
+
+/obj/machinery/power/floodlight/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
+ playsound(src, 'sound/effects/glasshit.ogg', 75, 1)
\ No newline at end of file
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 3ad3f6bc13..b98ea7f6c9 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -363,7 +363,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/main/proc/pulse_radiation()
- radiation_pulse(get_turf(src), 3, 7, 20)
+ radiation_pulse(src, 200)
// Shake everyone on the z level to let them know that gravity was enagaged/disenagaged.
/obj/machinery/gravity_generator/main/proc/shake_everyone()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index dc4296f262..98fb2ed233 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -190,11 +190,17 @@
break_light_tube(1)
return ..()
+/obj/machinery/light/built
+ icon_state = "tube-empty"
+
/obj/machinery/light/built/New()
status = LIGHT_EMPTY
update(0)
..()
+/obj/machinery/light/small/built
+ icon_state = "bulb-empty"
+
/obj/machinery/light/small/built/New()
status = LIGHT_EMPTY
update(0)
@@ -418,11 +424,13 @@
/obj/machinery/light/proc/flicker(var/amount = rand(10, 20))
set waitfor = 0
- if(flickering) return
+ if(flickering)
+ return
flickering = 1
if(on && status == LIGHT_OK)
for(var/i = 0; i < amount; i++)
- if(status != LIGHT_OK) break
+ if(status != LIGHT_OK)
+ break
on = !on
update(0)
sleep(rand(5, 15))
@@ -582,6 +590,9 @@
item_state = "c_tube"
brightness = 8
+/obj/item/light/tube/broken
+ status = LIGHT_BROKEN
+
/obj/item/light/bulb
name = "light bulb"
desc = "A replacement light bulb."
@@ -592,6 +603,9 @@
righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
brightness = 4
+/obj/item/light/bulb/broken
+ status = LIGHT_BROKEN
+
/obj/item/light/throw_impact(atom/hit_atom)
if(!..()) //not caught by a mob
shatter()
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 0f4a58e5ef..6031f6edab 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -15,6 +15,15 @@
var/power_output = 1
var/consumption = 0
var/base_icon = "portgen0"
+ var/datum/looping_sound/generator/soundloop
+
+/obj/machinery/power/port_gen/Initialize()
+ . = ..()
+ soundloop = new(list(src), active)
+
+/obj/machinery/power/port_gen/Destroy()
+ QDEL_NULL(soundloop)
+ return ..()
/obj/machinery/power/port_gen/proc/HasFuel() //Placeholder for fuel check.
return 1
@@ -36,11 +45,13 @@
add_avail(power_gen * power_output)
UseFuel()
src.updateDialog()
+ soundloop.start()
else
active = 0
handleInactive()
update_icon()
+ soundloop.stop()
/obj/machinery/power/port_gen/attack_hand(mob/user)
if(..())
@@ -94,7 +105,8 @@
/obj/machinery/power/port_gen/pacman/examine(mob/user)
..()
to_chat(user, "The generator has [sheets] units of [sheet_name] fuel left, producing [power_gen] per cycle.")
- if(crit_fail) to_chat(user, "The generator seems to have broken down.")
+ if(crit_fail)
+ to_chat(user, "The generator seems to have broken down.")
/obj/machinery/power/port_gen/pacman/HasFuel()
if(sheets >= 1 / (time_per_sheet / power_output) - sheet_left)
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index 3d87de4e62..d17071eeb3 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -278,7 +278,7 @@
//dist_check - set to only shock mobs within 1 of source (vendors, airlocks, etc.)
//No animations will be performed by this proc.
/proc/electrocute_mob(mob/living/carbon/M, power_source, obj/source, siemens_coeff = 1, dist_check = FALSE)
- if(ismecha(M.loc))
+ if(!M || ismecha(M.loc))
return 0 //feckin mechs are dumb
if(dist_check)
if(!in_range(source,M))
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index 5ec2c868ad..f88e713dda 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -28,7 +28,7 @@
..()
add_avail(power_gen)
if(panel_open && irradiate)
- radiation_pulse(get_turf(src), 2, 3, 6) // Weak but noticeable.
+ radiation_pulse(src, 60)
/obj/machinery/power/rtg/RefreshParts()
var/part_level = 0
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 9b5592af3b..2e92aa92aa 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -1,5 +1,7 @@
-
-GLOBAL_LIST_EMPTY(rad_collectors)
+// last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
+#define RAD_COLLECTOR_EFFICIENCY 80 // radiation needs to be over this amount to get power
+#define RAD_COLLECTOR_COEFFICIENT 100
+#define RAD_COLLECTOR_STORED_OUT 0.04 // (this*100)% of stored power outputted per tick. Doesn't actualy change output total, lower numbers just means collectors output for longer in absence of a source
/obj/machinery/power/rad_collector
name = "Radiation Collector Array"
@@ -21,24 +23,25 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/anchored
anchored = TRUE
-/obj/machinery/power/rad_collector/Initialize()
+/obj/machinery/power/rad_collector/ComponentInitialize()
. = ..()
- GLOB.rad_collectors += src
+ AddComponent(/datum/component/rad_insulation, RAD_EXTREME_INSULATION, FALSE, FALSE)
/obj/machinery/power/rad_collector/Destroy()
- GLOB.rad_collectors -= src
return ..()
/obj/machinery/power/rad_collector/process()
if(loaded_tank)
- if(!loaded_tank.air_contents.gases["plasma"])
+ if(!loaded_tank.air_contents.gases[/datum/gas/plasma])
investigate_log("out of fuel.", INVESTIGATE_SINGULO)
eject()
else
- loaded_tank.air_contents.gases["plasma"][MOLES] -= 0.001*drainratio
+ loaded_tank.air_contents.gases[/datum/gas/plasma][MOLES] -= 0.001*drainratio
loaded_tank.air_contents.garbage_collect()
- return
+ var/power_produced = min(last_power, (last_power*RAD_COLLECTOR_STORED_OUT)+1000) //Produces at least 1000 watts if it has more than that stored
+ add_avail(power_produced)
+ last_power-=power_produced
/obj/machinery/power/rad_collector/attack_hand(mob/user)
if(..())
@@ -50,14 +53,13 @@ GLOBAL_LIST_EMPTY(rad_collectors)
"You turn the [src.name] [active? "on":"off"].")
var/fuel
if(loaded_tank)
- fuel = loaded_tank.air_contents.gases["plasma"]
+ fuel = loaded_tank.air_contents.gases[/datum/gas/plasma]
fuel = fuel ? fuel[MOLES] : 0
investigate_log("turned [active?"on":"off"] by [user.key]. [loaded_tank?"Fuel: [round(fuel/0.29)]%":"It is empty"].", INVESTIGATE_SINGULO)
return
else
to_chat(user, "The controls are locked!")
return
-..()
/obj/machinery/power/rad_collector/can_be_unfasten_wrench(mob/user, silent)
if(loaded_tank)
@@ -76,13 +78,13 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/device/multitool))
- to_chat(user, "The [W.name] detects that [last_power]W were recently produced.")
+ to_chat(user, "[W] detects that [last_power]W is being processed.")
return TRUE
else if(istype(W, /obj/item/device/analyzer) && loaded_tank)
atmosanalyzer_scan(loaded_tank.air_contents, user)
else if(istype(W, /obj/item/tank/internals/plasma))
if(!anchored)
- to_chat(user, "The [src] needs to be secured to the floor first!")
+ to_chat(user, "[src] needs to be secured to the floor first!")
return TRUE
if(loaded_tank)
to_chat(user, "There's already a plasma tank loaded!")
@@ -137,15 +139,9 @@ GLOBAL_LIST_EMPTY(rad_collectors)
else
update_icons()
-/obj/machinery/power/rad_collector/proc/receive_pulse(pulse_strength)
- if(loaded_tank && active)
- var/power_produced = loaded_tank.air_contents.gases["plasma"] ? loaded_tank.air_contents.gases["plasma"][MOLES] : 0
- power_produced *= pulse_strength*10
- add_avail(power_produced)
- last_power = power_produced
- return
- return
-
+/obj/machinery/power/rad_collector/rad_act(pulse_strength)
+ if(loaded_tank && active && pulse_strength > RAD_COLLECTOR_EFFICIENCY)
+ last_power += (pulse_strength-RAD_COLLECTOR_EFFICIENCY)*RAD_COLLECTOR_COEFFICIENT
/obj/machinery/power/rad_collector/proc/update_icons()
cut_overlays()
@@ -167,3 +163,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
flick("ca_deactive", src)
update_icons()
return
+
+#undef RAD_COLLECTOR_EFFICIENCY
+#undef RAD_COLLECTOR_COEFFICIENT
+#undef RAD_COLLECTOR_STORED_OUT
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index f4d09167c8..c2610ebc44 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -9,7 +9,7 @@
density = FALSE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
use_power = NO_POWER_USE
- luminosity = 4
+ light_range = 4
layer = ABOVE_OBJ_LAYER
var/obj/machinery/field/generator/FG1 = null
var/obj/machinery/field/generator/FG2 = null
diff --git a/code/modules/power/singularity/emitter.dm b/code/modules/power/singularity/emitter.dm
index 70875741fd..fc06adfe78 100644
--- a/code/modules/power/singularity/emitter.dm
+++ b/code/modules/power/singularity/emitter.dm
@@ -33,7 +33,7 @@
// The following 3 vars are mostly for the prototype
var/manual = FALSE
var/charge = 0
- var/atom/target
+ var/last_projectile_params
/obj/machinery/power/emitter/anchored
anchored = TRUE
@@ -137,7 +137,7 @@
else
to_chat(user, "The controls are locked!")
else
- to_chat(user, "The [src] needs to be firmly secured to the floor first!")
+ to_chat(user, "[src] needs to be firmly secured to the floor first!")
return 1
/obj/machinery/power/emitter/attack_animal(mob/living/simple_animal/M)
@@ -185,7 +185,7 @@
charge+=5
if(!check_delay() || manual == TRUE)
return FALSE
- fire_beam(target)
+ fire_beam()
/obj/machinery/power/emitter/proc/check_delay()
if((src.last_shot + src.fire_delay) <= world.time)
@@ -201,46 +201,18 @@
add_load(active_power_usage)
fire_beam()
-/obj/machinery/power/emitter/proc/fire_beam(atom/targeted_atom, mob/user)
- var/turf/targets_from = get_turf(src)
- if(targeted_atom && (targeted_atom == user || targeted_atom == targets_from || targeted_atom == src))
- return
- var/obj/item/projectile/P = new projectile_type(targets_from)
- playsound(src.loc, projectile_sound, 50, 1)
+/obj/machinery/power/emitter/proc/fire_beam(mob/user)
+ var/obj/item/projectile/P = new projectile_type(get_turf(src))
+ playsound(get_turf(src), projectile_sound, 50, 1)
if(prob(35))
sparks.start()
- switch(dir)
- if(NORTH)
- P.yo = 20
- P.xo = 0
- if(NORTHEAST)
- P.yo = 20
- P.xo = 20
- if(EAST)
- P.yo = 0
- P.xo = 20
- if(SOUTHEAST)
- P.yo = -20
- P.xo = 20
- if(WEST)
- P.yo = 0
- P.xo = -20
- if(SOUTHWEST)
- P.yo = -20
- P.xo = -20
- if(NORTHWEST)
- P.yo = 20
- P.xo = -20
- else // Any other
- P.yo = -20
- P.xo = 0
- if(target)
- P.yo = targeted_atom.y - targets_from.y
- P.xo = targeted_atom.x - targets_from.x
- P.current = targets_from
- P.starting = targets_from
- P.firer = src
- P.original = targeted_atom
+ P.firer = user? user : src
+ if(last_projectile_params)
+ P.p_x = last_projectile_params[2]
+ P.p_y = last_projectile_params[3]
+ P.fire(last_projectile_params[1])
+ else
+ P.fire(dir2angle(dir))
if(!manual)
last_shot = world.time
if(shot_number < 3)
@@ -249,12 +221,6 @@
else
fire_delay = rand(minimum_fire_delay,maximum_fire_delay)
shot_number = 0
- if(!target)
- P.setDir(src.dir)
- P.starting = loc
- else
- if(QDELETED(target))
- target = null
P.fire()
return P
@@ -349,7 +315,7 @@
locked = FALSE
emagged = TRUE
if(user)
- user.visible_message("[user.name] emags the [src].","You short out the lock.")
+ user.visible_message("[user.name] emags [src].","You short out the lock.")
/obj/machinery/power/emitter/prototype
@@ -449,7 +415,7 @@
resistance_flags = FIRE_PROOF | UNACIDABLE | ACID_PROOF | NOBLUDGEON_1
var/delay = 0
-/obj/item/turret_control/afterattack(atom/targeted_atom, mob/user)
+/obj/item/turret_control/afterattack(atom/targeted_atom, mob/user, proxflag, clickparams)
..()
var/obj/machinery/power/emitter/E = user.buckled
E.setDir(get_dir(E,targeted_atom))
@@ -488,10 +454,11 @@
user.pixel_x = 8
user.pixel_y = -12
+ E.last_projectile_params = calculate_projectile_angle_and_pixel_offsets(user, clickparams)
+
if(E.charge >= 10 && world.time > delay)
E.charge -= 10
- E.target = targeted_atom
- E.fire_beam(targeted_atom, user)
+ E.fire_beam(user)
delay = world.time + 10
else if (E.charge < 10)
playsound(get_turf(user),'sound/machines/buzz-sigh.ogg', 50, 1)
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 5a0f096564..74aa140721 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -63,18 +63,18 @@ field_generator power level display
if(state == FG_WELDED)
if(get_dist(src, user) <= 1)//Need to actually touch the thing to turn it on
if(active >= FG_CHARGING)
- to_chat(user, "You are unable to turn off the [name] once it is online!")
+ to_chat(user, "You are unable to turn off [src] once it is online!")
return 1
else
- user.visible_message("[user.name] turns on the [name].", \
- "You turn on the [name].", \
+ user.visible_message("[user] turns on [src].", \
+ "You turn on [src].", \
"You hear heavy droning.")
turn_on()
investigate_log("activated by [user.key].", INVESTIGATE_SINGULO)
add_fingerprint(user)
else
- to_chat(user, "The [src] needs to be firmly secured to the floor first!")
+ to_chat(user, "[src] needs to be firmly secured to the floor first!")
/obj/machinery/field/generator/can_be_unfasten_wrench(mob/user, silent)
if(state == FG_WELDED)
@@ -102,12 +102,12 @@ field_generator power level display
var/obj/item/weldingtool/WT = W
switch(state)
if(FG_UNSECURED)
- to_chat(user, "The [name] needs to be wrenched to the floor!")
+ to_chat(user, "[src] needs to be wrenched to the floor!")
if(FG_SECURED)
if (WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 50, 1)
- user.visible_message("[user.name] starts to weld the [name] to the floor.", \
+ user.visible_message("[user] starts to weld [src] to the floor.", \
"You start to weld \the [src] to the floor...", \
"You hear welding.")
if(do_after(user,20*W.toolspeed, target = src) && state == FG_SECURED && WT.isOn())
@@ -117,7 +117,7 @@ field_generator power level display
if(FG_WELDED)
if (WT.remove_fuel(0,user))
playsound(loc, WT.usesound, 50, 1)
- user.visible_message("[user.name] starts to cut the [name] free from the floor.", \
+ user.visible_message("[user] starts to cut [src] free from the floor.", \
"You start to cut \the [src] free from the floor...", \
"You hear welding.")
if(do_after(user,20*W.toolspeed, target = src) && state == FG_WELDED && WT.isOn())
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index b566d65f49..81dcd573f5 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -142,7 +142,7 @@
for(var/mob/living/carbon/food in GLOB.living_mob_list) //we don't care about constructs or cult-Ians or whatever. cult-monkeys are fair game i guess
var/turf/pos = get_turf(food)
- if(pos.z != src.z)
+ if(!pos || (pos.z != z))
continue
if(iscultist(food))
@@ -163,7 +163,7 @@
if(!ghost.client)
continue
var/turf/pos = get_turf(ghost)
- if(pos.z != src.z)
+ if(!pos || (pos.z != z))
continue
cultists += ghost
if(cultists.len)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index e1c80913e9..b1b1856e37 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -187,13 +187,13 @@
/obj/structure/particle_accelerator/end_cap
name = "Alpha Particle Generation Array"
- desc = "This is where Alpha particles are generated from \[REDACTED\]"
+ desc = "This is where Alpha particles are generated from \[REDACTED\]."
icon_state = "end_cap"
reference = "end_cap"
/obj/structure/particle_accelerator/power_box
name = "Particle Focusing EM Lens"
- desc = "This uses electromagnetic waves to focus the Alpha-Particles."
+ desc = "This uses electromagnetic waves to focus the Alpha particles."
icon = 'icons/obj/machines/particle_accelerator.dmi'
icon_state = "power_box"
reference = "power_box"
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 5b7d70b7f0..681bb88c6b 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -8,7 +8,7 @@
anchored = TRUE
density = TRUE
layer = MASSIVE_OBJ_LAYER
- luminosity = 6
+ light_range = 6
appearance_flags = 0
var/current_size = 1
var/allowed_size = 1
@@ -21,7 +21,7 @@
var/move_self = 1 //Do we move on our own?
var/grav_pull = 4 //How many tiles out do we pull?
var/consume_range = 0 //How many tiles out do we eat
- var/event_chance = 15 //Prob for event each tick
+ var/event_chance = 10 //Prob for event each tick
var/target = null //its target. moves towards the target if it has one
var/last_failed_movement = 0//Will not move in the same dir if it couldnt before, will help with the getting stuck on fields thing
var/last_warning
@@ -114,7 +114,7 @@
/obj/singularity/process()
if(current_size >= STAGE_TWO)
move()
- pulse()
+ radiation_pulse(src, min(5000, (energy*3)+1000), RAD_DISTANCE_COEFFICIENT*0.5)
if(prob(event_chance))//Chance for it to run a special event TODO:Come up with one or two more that fit
event()
eat()
@@ -278,7 +278,7 @@
desc = "[initial(desc)] It glows fiercely with inner fire."
name = "supermatter-charged [initial(name)]"
consumedSupermatter = 1
- luminosity = 10
+ set_light(10)
return
@@ -367,15 +367,13 @@
/obj/singularity/proc/event()
- var/numb = pick(1,2,3,4,5,6)
+ var/numb = rand(1,4)
switch(numb)
if(1)//EMP
emp_area()
- if(2,3)//tox damage all carbon mobs in area
- toxmob()
- if(4)//Stun mobs who lack optic scanners
+ if(2)//Stun mobs who lack optic scanners
mezzer()
- if(5,6) //Sets all nearby mobs on fire
+ if(3,4) //Sets all nearby mobs on fire
if(current_size < STAGE_SIX)
return 0
combust_mobs()
@@ -384,17 +382,6 @@
return 1
-/obj/singularity/proc/toxmob()
- var/toxrange = 10
- var/radiation = 15
- var/radiationmin = 3
- if (energy>200)
- radiation += round((energy-150)/10,1)
- radiationmin = round((radiation/5),1)
- for(var/mob/living/M in view(toxrange, src.loc))
- M.rad_act(rand(radiationmin,radiation))
-
-
/obj/singularity/proc/combust_mobs()
for(var/mob/living/carbon/C in urange(20, src, 1))
C.visible_message("[C]'s skin bursts into flame!", \
@@ -428,12 +415,6 @@
empulse(src, 8, 10)
return
-
-/obj/singularity/proc/pulse()
- for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
- if(R.z == z && get_dist(R, src) <= 15) // Better than using orange() every process
- R.receive_pulse(energy)
-
/obj/singularity/singularity_act()
var/gain = (energy/2)
var/dist = max((current_size - 2),1)
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index b6f7d20fbc..7ce459a712 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -9,7 +9,6 @@
#define OXYGEN_TRANSMIT_MODIFIER 1.5 //Higher == Bigger bonus to power generation.
#define PLASMA_TRANSMIT_MODIFIER 4
-#define FREON_TRANSMIT_PENALTY 0.75 // Scales how much freon reduces total power transmission. 1 equals 1% per 1% of freon in the mix.
#define N2O_HEAT_RESISTANCE 6 //Higher == Gas makes the crystal more resistant against heat damage.
@@ -30,7 +29,7 @@
#define THERMAL_RELEASE_MODIFIER 5 //Higher == less heat released during reaction, not to be confused with the above values
#define PLASMA_RELEASE_MODIFIER 750 //Higher == less plasma released by reaction
#define OXYGEN_RELEASE_MODIFIER 325 //Higher == less oxygen released at high temperature/power
-#define FREON_BREEDING_MODIFIER 100 //Higher == less freon created
+
#define REACTION_POWER_MODIFIER 0.55 //Higher == more overall power
#define MATTER_POWER_CONVERSION 10 //Crystal converts 1/this value of stored matter into energy.
@@ -92,7 +91,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/power = 0
var/n2comp = 0 // raw composition of each gas in the chamber, ranges from 0 to 1
- var/freoncomp = 0
var/plasmacomp = 0
var/o2comp = 0
@@ -107,7 +105,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/powerloss_dynamic_scaling= 0
var/power_transmission_bonus = 0
var/mole_heat_penalty = 0
- var/freon_transmit_modifier = 1
+
var/matter_power = 0
@@ -135,6 +133,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
var/is_main_engine = FALSE
+ var/datum/looping_sound/supermatter/soundloop
+
/obj/machinery/power/supermatter_shard/Initialize()
. = ..()
SSair.atmos_machinery += src
@@ -149,6 +149,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(is_main_engine)
GLOB.main_supermatter_engine = src
+ soundloop = new(list(src), TRUE)
+
/obj/machinery/power/supermatter_shard/Destroy()
investigate_log("has been destroyed.", INVESTIGATE_SUPERMATTER)
SSair.atmos_machinery -= src
@@ -157,7 +159,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
QDEL_NULL(countdown)
if(is_main_engine && GLOB.main_supermatter_engine == src)
GLOB.main_supermatter_engine = null
- . = ..()
+ QDEL_NULL(soundloop)
+ return ..()
/obj/machinery/power/supermatter_shard/examine(mob/user)
..()
@@ -251,6 +254,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(!istype(T)) //We are in a crate or somewhere that isn't turf, if we return to turf resume processing but for now.
return //Yeah just stop.
+ if(power)
+ soundloop.volume = min(50, (round(power, 50)/50)+1) // 5 +1 volume per 20 power. 2500 power is max
+
//Ok, get the air from the turf
var/datum/gas_mixture/env = T.return_air()
@@ -284,26 +290,25 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
if(damage > damage_archived && prob(10))
playsound(get_turf(src), 'sound/effects/empulse.ogg', 50, 1)
- removed.assert_gases("o2", "plasma", "co2", "n2o", "n2", "freon")
+ removed.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/nitrogen)
//calculating gas related values
combined_gas = max(removed.total_moles(), 0)
- plasmacomp = max(removed.gases["plasma"][MOLES]/combined_gas, 0)
- o2comp = max(removed.gases["o2"][MOLES]/combined_gas, 0)
- co2comp = max(removed.gases["co2"][MOLES]/combined_gas, 0)
+ plasmacomp = max(removed.gases[/datum/gas/plasma][MOLES]/combined_gas, 0)
+ o2comp = max(removed.gases[/datum/gas/oxygen][MOLES]/combined_gas, 0)
+ co2comp = max(removed.gases[/datum/gas/carbon_dioxide][MOLES]/combined_gas, 0)
- n2ocomp = max(removed.gases["n2o"][MOLES]/combined_gas, 0)
- n2comp = max(removed.gases["n2"][MOLES]/combined_gas, 0)
- freoncomp = max(removed.gases["freon"][MOLES]/combined_gas, 0)
+ n2ocomp = max(removed.gases[/datum/gas/nitrous_oxide][MOLES]/combined_gas, 0)
+ n2comp = max(removed.gases[/datum/gas/nitrogen][MOLES]/combined_gas, 0)
- gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp - freoncomp, 0), 1)
+ gasmix_power_ratio = min(max(plasmacomp + o2comp + co2comp - n2comp, 0), 1)
dynamic_heat_modifier = max((plasmacomp * PLASMA_HEAT_PENALTY)+(o2comp * OXYGEN_HEAT_PENALTY)+(co2comp * CO2_HEAT_PENALTY)+(n2comp * NITROGEN_HEAT_MODIFIER), 0.5)
dynamic_heat_resistance = max(n2ocomp * N2O_HEAT_RESISTANCE, 1)
power_transmission_bonus = max((plasmacomp * PLASMA_TRANSMIT_MODIFIER) + (o2comp * OXYGEN_TRANSMIT_MODIFIER), 0)
- freon_transmit_modifier = max(1-(freoncomp * FREON_TRANSMIT_PENALTY), 0)
+
//more moles of gases are harder to heat than fewer, so let's scale heat damage around them
mole_heat_penalty = max(combined_gas / MOLE_HEAT_PENALTY, 0.25)
@@ -331,8 +336,8 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
power = max( (removed.temperature * temp_factor / T0C) * gasmix_power_ratio + power, 0) //Total laser power plus an overload
- //We've generated power, now let's transfer it to the collectors for storing/usage
- transfer_energy()
+ if(prob(50))
+ radiation_pulse(src, power * (1 + power_transmission_bonus/10))
var/device_energy = power * REACTION_POWER_MODIFIER
@@ -348,12 +353,9 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
removed.temperature = max(0, min(removed.temperature, 2500 * dynamic_heat_modifier))
//Calculate how much gas to release
- removed.gases["plasma"][MOLES] += max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)
+ removed.gases[/datum/gas/plasma][MOLES] += max((device_energy * dynamic_heat_modifier) / PLASMA_RELEASE_MODIFIER, 0)
- removed.gases["o2"][MOLES] += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
-
- if(combined_gas < 50)
- removed.gases["freon"][MOLES] = max((removed.gases["freon"][MOLES] + device_energy) * freoncomp / FREON_BREEDING_MODIFIER, 0)
+ removed.gases[/datum/gas/oxygen][MOLES] += max(((device_energy + removed.temperature * dynamic_heat_modifier) - T0C) / OXYGEN_RELEASE_MODIFIER, 0)
if(produces_gas)
env.merge(removed)
@@ -527,11 +529,6 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
Consume(nom)
-/obj/machinery/power/supermatter_shard/proc/transfer_energy()
- for(var/obj/machinery/power/rad_collector/R in GLOB.rad_collectors)
- if(R.z == z && get_dist(R, src) <= 15) //Better than using orange() every process
- R.receive_pulse(power * (1 + power_transmission_bonus)/10 * freon_transmit_modifier)
-
/obj/machinery/power/supermatter_shard/attackby(obj/item/W, mob/living/user, params)
if(!istype(W) || (W.flags_1 & ABSTRACT_1) || !istype(user))
return
@@ -550,7 +547,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
Consume(W)
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
- radiation_pulse(get_turf(src), 1, 1, 150, 1)
+ radiation_pulse(src, 150, 4)
/obj/machinery/power/supermatter_shard/CollidedWith(atom/movable/AM)
@@ -584,7 +581,7 @@ GLOBAL_DATUM(main_supermatter_engine, /obj/machinery/power/supermatter_shard)
matter_power += 200
//Some poor sod got eaten, go ahead and irradiate people nearby.
- radiation_pulse(get_turf(src), 4, 10, 500, 1)
+ radiation_pulse(src, 3000, 2, TRUE)
for(var/mob/living/L in range(10))
investigate_log("has irradiated [L] after consuming [AM].", INVESTIGATE_SUPERMATTER)
if(L in view())
diff --git a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
index 6fdcccd43f..4f761412f7 100644
--- a/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
+++ b/code/modules/procedural_mapping/mapGeneratorModules/helpers.dm
@@ -32,7 +32,7 @@
/datum/mapGeneratorModule/bottomLayer/massdelete/no_delete_mobs/New()
..()
- ignore_typecache = typecacheof(list(/mob))
+ ignore_typecache = GLOB.typecache_mob
/datum/mapGeneratorModule/bottomLayer/massdelete/leave_turfs
deleteturfs = FALSE
@@ -42,7 +42,7 @@
/datum/mapGeneratorModule/bottomLayer/massdelete/regeneration_delete/New()
..()
- ignore_typecache = typecacheof(list(/mob))
+ ignore_typecache = GLOB.typecache_mob
//Only places atoms/turfs on area borders
/datum/mapGeneratorModule/border
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index cf8c30baf2..d51ea36e15 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -170,7 +170,7 @@
/obj/item/ammo_casing/mm195x129/incen
name = "1.95x129mm incendiary bullet casing"
- desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames. "
+ desc = "A 1.95x129mm bullet casing designed with a chemical-filled capsule on the tip that when bursted, reacts with the atmosphere to produce a fireball, engulfing the target in flames."
projectile_type = /obj/item/projectile/bullet/incendiary/mm195x129
// Shotgun
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 1ff6a9d611..dcd9d356ad 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -1,6 +1,6 @@
/obj/item/ammo_casing/energy
name = "energy weapon lens"
- desc = "The part of the gun that makes the laser go pew"
+ desc = "The part of the gun that makes the laser go pew."
caliber = "energy"
projectile_type = /obj/item/projectile/energy
var/e_cost = 100 //The amount of energy a cell needs to expend to create this shot.
diff --git a/code/modules/projectiles/boxes_magazines/external_mag.dm b/code/modules/projectiles/boxes_magazines/external_mag.dm
index 5ffe1b475a..f288482349 100644
--- a/code/modules/projectiles/boxes_magazines/external_mag.dm
+++ b/code/modules/projectiles/boxes_magazines/external_mag.dm
@@ -42,7 +42,7 @@
/obj/item/ammo_box/magazine/m10mm/ap
name = "pistol magazine (10mm AP)"
icon_state = "9x19pA"
- desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets"
+ desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
ammo_type = /obj/item/ammo_casing/c10mm/ap
/obj/item/ammo_box/magazine/m45
diff --git a/code/modules/projectiles/firing.dm b/code/modules/projectiles/firing.dm
index cce5c7e7c1..dd5cf0fa04 100644
--- a/code/modules/projectiles/firing.dm
+++ b/code/modules/projectiles/firing.dm
@@ -1,62 +1,62 @@
-/obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
- distro += variance
- for (var/i = max(1, pellets), i > 0, i--)
- var/targloc = get_turf(target)
- ready_proj(target, user, quiet, zone_override)
- if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now...
- if(randomspread)
- spread = round((rand() - 0.5) * distro)
- else //Smart spread
- spread = round((i / pellets - 0.5) * distro)
- if(!throw_proj(target, targloc, user, params, spread))
- return 0
- if(i > 1)
- newshot()
- if(click_cooldown_override)
- user.changeNext_move(click_cooldown_override)
- else
- user.changeNext_move(CLICK_CD_RANGE)
- user.newtonian_move(get_dir(target, user))
- update_icon()
- return 1
-
-/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override)
- if (!BB)
- return
- BB.original = target
- BB.firer = user
- if (zone_override)
- BB.def_zone = zone_override
- else
- BB.def_zone = user.zone_selected
- BB.suppressed = quiet
-
- if(reagents && BB.reagents)
- reagents.trans_to(BB, reagents.total_volume) //For chemical darts/bullets
- qdel(reagents)
-
-/obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread)
- var/turf/curloc = get_turf(user)
- if (!istype(targloc) || !istype(curloc) || !BB)
- return 0
-
- var/firing_dir
- if(BB.firer)
- firing_dir = BB.firer.dir
- if(!BB.suppressed && firing_effect_type)
- new firing_effect_type(get_turf(src), firing_dir)
-
- var/direct_target
- if(targloc == curloc)
- if(target) //if the target is right on our location we'll skip the travelling code in the proj's fire()
- direct_target = target
- if(!direct_target)
- BB.preparePixelProjectile(target, targloc, user, params, spread)
- BB.fire(null, direct_target)
- BB = null
- return 1
-
-/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro)
- var/dx = abs(target.x - current.x)
- var/dy = abs(target.y - current.y)
- return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z)
+/obj/item/ammo_casing/proc/fire_casing(atom/target, mob/living/user, params, distro, quiet, zone_override, spread)
+ distro += variance
+ for (var/i = max(1, pellets), i > 0, i--)
+ var/targloc = get_turf(target)
+ ready_proj(target, user, quiet, zone_override)
+ if(distro) //We have to spread a pixel-precision bullet. throw_proj was called before so angles should exist by now...
+ if(randomspread)
+ spread = round((rand() - 0.5) * distro)
+ else //Smart spread
+ spread = round((i / pellets - 0.5) * distro)
+ if(!throw_proj(target, targloc, user, params, spread))
+ return 0
+ if(i > 1)
+ newshot()
+ if(click_cooldown_override)
+ user.changeNext_move(click_cooldown_override)
+ else
+ user.changeNext_move(CLICK_CD_RANGE)
+ user.newtonian_move(get_dir(target, user))
+ update_icon()
+ return 1
+
+/obj/item/ammo_casing/proc/ready_proj(atom/target, mob/living/user, quiet, zone_override)
+ if (!BB)
+ return
+ BB.original = target
+ BB.firer = user
+ if (zone_override)
+ BB.def_zone = zone_override
+ else
+ BB.def_zone = user.zone_selected
+ BB.suppressed = quiet
+
+ if(reagents && BB.reagents)
+ reagents.trans_to(BB, reagents.total_volume) //For chemical darts/bullets
+ qdel(reagents)
+
+/obj/item/ammo_casing/proc/throw_proj(atom/target, turf/targloc, mob/living/user, params, spread)
+ var/turf/curloc = get_turf(user)
+ if (!istype(targloc) || !istype(curloc) || !BB)
+ return 0
+
+ var/firing_dir
+ if(BB.firer)
+ firing_dir = BB.firer.dir
+ if(!BB.suppressed && firing_effect_type)
+ new firing_effect_type(get_turf(src), firing_dir)
+
+ var/direct_target
+ if(targloc == curloc)
+ if(target) //if the target is right on our location we'll skip the travelling code in the proj's fire()
+ direct_target = target
+ if(!direct_target)
+ BB.preparePixelProjectile(target, user, params, spread)
+ BB.fire(null, direct_target)
+ BB = null
+ return 1
+
+/obj/item/ammo_casing/proc/spread(turf/target, turf/current, distro)
+ var/dx = abs(target.x - current.x)
+ var/dy = abs(target.y - current.y)
+ return locate(target.x + round(gaussian(0, distro) * (dy+2)/8, 1), target.y + round(gaussian(0, distro) * (dx+2)/8, 1), target.z)
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 5933046064..e694eea11f 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -207,7 +207,40 @@
/obj/item/gun/proc/recharge_newshot()
return
-/obj/item/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0)
+/obj/item/gun/proc/process_burst(mob/living/user, atom/target, message = TRUE, params, zone_override, sprd = 0, randomized_gun_spread = 0, randomized_bonus_spread = 0, rand_spr = 0, iteration = 0)
+ if(!user || !firing_burst)
+ firing_burst = FALSE
+ return FALSE
+ if(!issilicon(user))
+ if(iteration > 1 && !(user.is_holding(src))) //for burst firing
+ firing_burst = FALSE
+ return FALSE
+ if(chambered && chambered.BB)
+ if(randomspread)
+ sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
+ else //Smart spread
+ sprd = round((((rand_spr/burst_size) * iteration) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread))
+
+ if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, sprd))
+ shoot_with_empty_chamber(user)
+ firing_burst = FALSE
+ return FALSE
+ else
+ if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
+ shoot_live_shot(user, 1, target, message)
+ else
+ shoot_live_shot(user, 0, target, message)
+ if (iteration >= burst_size)
+ firing_burst = FALSE
+ else
+ shoot_with_empty_chamber(user)
+ firing_burst = FALSE
+ return FALSE
+ process_chamber()
+ update_icon()
+ return TRUE
+
+/obj/item/gun/proc/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = TRUE, params, zone_override, bonus_spread = 0)
add_fingerprint(user)
if(semicd)
@@ -221,34 +254,9 @@
var/randomized_bonus_spread = rand(0, bonus_spread)
if(burst_size > 1)
- firing_burst = 1
+ firing_burst = TRUE
for(var/i = 1 to burst_size)
- if(!user)
- break
- if(!issilicon(user))
- if( i>1 && !(user.is_holding(src))) //for burst firing
- break
- if(chambered && chambered.BB)
- if(randomspread)
- sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
- else //Smart spread
- sprd = round((((rand_spr/burst_size) * i) - (0.5 + (rand_spr * 0.25))) * (randomized_gun_spread + randomized_bonus_spread))
-
- if(!chambered.fire_casing(target, user, params, ,suppressed, zone_override, sprd))
- shoot_with_empty_chamber(user)
- break
- else
- if(get_dist(user, target) <= 1) //Making sure whether the target is in vicinity for the pointblank shot
- shoot_live_shot(user, 1, target, message)
- else
- shoot_live_shot(user, 0, target, message)
- else
- shoot_with_empty_chamber(user)
- break
- process_chamber()
- update_icon()
- sleep(fire_delay)
- firing_burst = 0
+ addtimer(CALLBACK(src, .proc/process_burst, user, target, message, params, zone_override, sprd, randomized_gun_spread, randomized_bonus_spread, rand_spr, i), fire_delay * (i - 1))
else
if(chambered)
sprd = round((rand() - 0.5) * DUALWIELD_PENALTY_EXTRA_MULTIPLIER * (randomized_gun_spread + randomized_bonus_spread))
@@ -265,14 +273,16 @@
return
process_chamber()
update_icon()
- semicd = 1
- spawn(fire_delay)
- semicd = 0
+ semicd = TRUE
+ addtimer(CALLBACK(src, .proc/reset_semicd), fire_delay)
if(user)
user.update_inv_hands()
SSblackbox.add_details("gun_fired","[src.type]")
- return 1
+ return TRUE
+
+/obj/item/gun/proc/reset_semicd()
+ semicd = FALSE
/obj/item/gun/update_icon()
..()
diff --git a/code/modules/projectiles/guns/ballistic.dm b/code/modules/projectiles/guns/ballistic.dm
index 0b6a9f1de7..b7db29084a 100644
--- a/code/modules/projectiles/guns/ballistic.dm
+++ b/code/modules/projectiles/guns/ballistic.dm
@@ -1,5 +1,5 @@
/obj/item/gun/ballistic
- desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason"
+ desc = "Now comes in flavors like GUN. Uses 10mm ammo, for some reason."
name = "projectile gun"
icon_state = "pistol"
origin_tech = "combat=2;materials=2"
@@ -139,7 +139,7 @@
#define BRAINS_BLOWN_THROW_RANGE 3
#define BRAINS_BLOWN_THROW_SPEED 1
/obj/item/gun/ballistic/suicide_act(mob/user)
- var/obj/item/organ/brain/B = user.getorganslot("brain")
+ var/obj/item/organ/brain/B = user.getorganslot(ORGAN_SLOT_BRAIN)
if (B && chambered && chambered.BB && can_trigger_gun(user) && !chambered.BB.nodamage)
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
diff --git a/code/modules/projectiles/guns/ballistic/laser_gatling.dm b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
index 9621c5294d..f7b5b4cd61 100644
--- a/code/modules/projectiles/guns/ballistic/laser_gatling.dm
+++ b/code/modules/projectiles/guns/ballistic/laser_gatling.dm
@@ -3,7 +3,7 @@
//The ammo/gun is stored in a back slot item
/obj/item/minigunpack
name = "backpack power source"
- desc = "The massive external power source for the laser gatling gun"
+ desc = "The massive external power source for the laser gatling gun."
icon = 'icons/obj/guns/minigun.dmi'
icon_state = "holstered"
item_state = "backpack"
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
index 7c0ec28a44..584445a573 100644
--- a/code/modules/projectiles/guns/ballistic/revolver.dm
+++ b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -341,7 +341,7 @@
/obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn
name = "sawn-off improvised shotgun"
- desc = "A single-shot shotgun, better not miss"
+ desc = "A single-shot shotgun. Better not miss."
icon_state = "ishotgun"
item_state = "gun"
w_class = WEIGHT_CLASS_NORMAL
diff --git a/code/modules/projectiles/guns/ballistic/shotgun.dm b/code/modules/projectiles/guns/ballistic/shotgun.dm
index 6cd603c8d1..105e170429 100644
--- a/code/modules/projectiles/guns/ballistic/shotgun.dm
+++ b/code/modules/projectiles/guns/ballistic/shotgun.dm
@@ -137,7 +137,7 @@
/obj/item/gun/ballistic/shotgun/boltaction/enchanted/arcane_barrage
name = "arcane barrage"
- desc = "Pew Pew Pew"
+ desc = "Pew Pew Pew."
fire_sound = 'sound/weapons/emitter.ogg'
pin = /obj/item/device/firing_pin/magic
icon_state = "arcane_barrage"
diff --git a/code/modules/projectiles/guns/beam_rifle.dm b/code/modules/projectiles/guns/beam_rifle.dm
index 93e8ab6799..f2d99bc849 100644
--- a/code/modules/projectiles/guns/beam_rifle.dm
+++ b/code/modules/projectiles/guns/beam_rifle.dm
@@ -38,9 +38,10 @@
var/aiming_time = 12
var/aiming_time_fire_threshold = 5
var/aiming_time_left = 12
- var/aiming_time_increase_user_movement = 6
+ var/aiming_time_increase_user_movement = 3
var/scoped_slow = 1
var/aiming_time_increase_angle_multiplier = 0.3
+ var/last_process = 0
var/lastangle = 0
var/aiming_lastangle = 0
@@ -204,7 +205,7 @@
/obj/item/gun/energy/beam_rifle/Initialize()
. = ..()
- START_PROCESSING(SSfastprocess, src)
+ START_PROCESSING(SSprojectiles, src)
zoom_speed_action = new(src)
zoom_lock_action = new(src)
@@ -240,7 +241,7 @@
if(!istype(curloc))
return
targloc = get_turf_in_angle(lastangle, curloc, 10)
- P.preparePixelProjectile(targloc, targloc, current_user, current_user.client.mouseParams, 0)
+ P.preparePixelProjectile(targloc, current_user, current_user.client.mouseParams, 0)
P.fire(lastangle)
/obj/item/gun/energy/beam_rifle/process()
@@ -248,9 +249,9 @@
return
check_user()
handle_zooming()
- aiming_time_left = min(0, aiming_time_left - (world.time - lastprocess))
+ aiming_time_left = max(0, aiming_time_left - (world.time - last_process))
aiming_beam(TRUE)
- lastprocess = world.time
+ last_process = world.time
/obj/item/gun/energy/beam_rifle/proc/check_user(automatic_cleanup = TRUE)
if(!istype(current_user) || !isturf(current_user.loc) || !(src in current_user.held_items) || current_user.incapacitated()) //Doesn't work if you're not holding it!
@@ -442,7 +443,7 @@
firing_dir = BB.firer.dir
if(!BB.suppressed && firing_effect_type)
new firing_effect_type(get_turf(src), firing_dir)
- BB.preparePixelProjectile(target, targloc, user, params, spread)
+ BB.preparePixelProjectile(target, user, params, spread)
BB.fire(gun? gun.lastangle : null, null)
BB = null
return TRUE
@@ -508,7 +509,7 @@
if(wall_pierce++ < wall_pierce_amount)
loc = target
if(prob(wall_devastate))
- if(istype(target, /turf/closed/wall))
+ if(iswallturf(target))
var/turf/closed/wall/W = target
W.dismantle_wall(TRUE, TRUE)
else
@@ -638,10 +639,6 @@
while(loc)
if(++safety > (range * 3)) //If it's looping for way, way too long...
return //Kill!
- if((!( current ) || loc == current))
- current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
- if(!Angle)
- Angle=round(Get_Angle(src,current))
if(spread)
Angle += (rand() - 0.5) * spread
var/matrix/M = new
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index d73c978ed7..06fa4f6f8a 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -150,7 +150,7 @@
toggle_gunlight()
/obj/item/gun/energy/suicide_act(mob/user)
- if (src.can_shoot() && can_trigger_gun(user))
+ if (can_shoot() && can_trigger_gun(user))
user.visible_message("[user] is putting the barrel of [src] in [user.p_their()] mouth. It looks like [user.p_theyre()] trying to commit suicide!")
sleep(25)
if(user.is_holding(src))
diff --git a/code/modules/projectiles/guns/energy/energy_gun.dm b/code/modules/projectiles/guns/energy/energy_gun.dm
index 1ce94796fc..c9ec6077aa 100644
--- a/code/modules/projectiles/guns/energy/energy_gun.dm
+++ b/code/modules/projectiles/guns/energy/energy_gun.dm
@@ -75,7 +75,7 @@
/obj/item/gun/energy/e_gun/dragnet/snare
name = "Energy Snare Launcher"
- desc = "Fires an energy snare that slows the target down"
+ desc = "Fires an energy snare that slows the target down."
ammo_type = list(/obj/item/ammo_casing/energy/trap)
/obj/item/gun/energy/e_gun/turret
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index bdcf1fb1c9..6f916a5709 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -108,7 +108,7 @@
/obj/item/gun/energy/xray
name = "x-ray laser gun"
- desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials"
+ desc = "A high-power laser gun capable of expelling concentrated x-ray blasts that pass through multiple soft targets and heavier materials."
icon_state = "xray"
item_state = null
origin_tech = "combat=6;materials=4;magnets=4;syndicate=1"
diff --git a/code/modules/projectiles/guns/grenade_launcher.dm b/code/modules/projectiles/guns/grenade_launcher.dm
index e63bf7938c..d87a657710 100644
--- a/code/modules/projectiles/guns/grenade_launcher.dm
+++ b/code/modules/projectiles/guns/grenade_launcher.dm
@@ -1,6 +1,6 @@
/obj/item/gun/grenadelauncher
name = "grenade launcher"
- desc = "a terrible, terrible thing. it's really awful!"
+ desc = "A terrible, terrible thing. It's really awful!"
icon = 'icons/obj/guns/projectile.dmi'
icon_state = "riotgun"
item_state = "riotgun"
diff --git a/code/modules/projectiles/guns/magic/staff.dm b/code/modules/projectiles/guns/magic/staff.dm
index 3c8460b57d..ee0826f677 100644
--- a/code/modules/projectiles/guns/magic/staff.dm
+++ b/code/modules/projectiles/guns/magic/staff.dm
@@ -6,7 +6,7 @@
/obj/item/gun/magic/staff/change
name = "staff of change"
- desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself"
+ desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself."
fire_sound = 'sound/magic/staff_change.ogg'
ammo_type = /obj/item/ammo_casing/magic/change
icon_state = "staffofchange"
@@ -62,7 +62,7 @@
/obj/item/gun/magic/staff/honk
name = "staff of the honkmother"
- desc = "Honk"
+ desc = "Honk."
fire_sound = 'sound/items/airhorn.ogg'
ammo_type = /obj/item/ammo_casing/magic/honk
icon_state = "honker"
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index 8772ae05c0..dfbcc61f37 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -28,7 +28,7 @@
if(bomb)
bomb.forceMove(user.loc)
user.put_in_hands(bomb)
- user.visible_message("[user] detaches the [bomb] from the [src]")
+ user.visible_message("[user] detaches [bomb] from [src].")
bomb = null
update_icon()
return ..()
@@ -50,9 +50,9 @@
to_chat(user, "What good would an incomplete bomb do?")
return FALSE
if(!user.transferItemToLoc(O, src))
- to_chat(user, "The [O] seems to be stuck to your hand!")
+ to_chat(user, "[O] seems to be stuck to your hand!")
return FALSE
- user.visible_message("[user] attaches the [O] to the [src]!")
+ user.visible_message("[user] attaches [O] to [src]!")
bomb = O
update_icon()
return TRUE
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index f79b59fe7d..17d2ea7cbe 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -41,7 +41,8 @@
var/obj/item/reagent_containers/syringe/S = syringes[syringes.len]
- if(!S) return 0
+ if(!S)
+ return 0
S.loc = user.loc
syringes.Remove(S)
@@ -78,16 +79,16 @@
force = 2 //Also very weak because it's smaller
suppressed = TRUE //Softer fire sound
can_unsuppress = FALSE //Permanently silenced
-
+
/obj/item/gun/syringe/dna
name = "modified syringe gun"
desc = "A syringe gun that has been modified to fit DNA injectors instead of normal syringes."
origin_tech = "combat=2;syndicate=2;biotech=3"
-
+
/obj/item/gun/syringe/dna/Initialize()
. = ..()
chambered = new /obj/item/ammo_casing/dnainjector(src)
-
+
/obj/item/gun/syringe/dna/attackby(obj/item/A, mob/user, params, show_msg = TRUE)
if(istype(A, /obj/item/dnainjector))
var/obj/item/dnainjector/D = A
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index 5a6116bf66..d89da3e37b 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -1,3 +1,6 @@
+
+#define MOVES_HITSCAN -1 //Not actually hitscan but close as we get.
+
/obj/item/projectile
name = "projectile"
icon = 'icons/obj/projectiles.dmi'
@@ -16,18 +19,31 @@
var/suppressed = FALSE //Attack message
var/yo = null
var/xo = null
- var/current = null
var/atom/original = null // the original target clicked
var/turf/starting = null // the projectile's starting turf
var/list/permutated = list() // we've passed through these atoms, don't try to hit them again
- var/paused = FALSE //for suspending the projectile midair
var/p_x = 16
var/p_y = 16 // the pixel location of the tile that the player clicked. Default is the center
+
+ //Fired processing vars
+ var/fired = FALSE //Have we been fired yet
+ var/paused = FALSE //for suspending the projectile midair
+ var/last_projectile_move = 0
+ var/last_process = 0
+ var/time_offset = 0
+ var/old_pixel_x = 0
+ var/old_pixel_y = 0
+ var/pixel_x_increment = 0
+ var/pixel_y_increment = 0
+ var/pixel_x_offset = 0
+ var/pixel_y_offset = 0
+ var/new_x = 0
+ var/new_y = 0
+
var/speed = 0.8 //Amount of deciseconds it takes for projectile to travel
var/Angle = 0
var/nondirectional_sprite = FALSE //Set TRUE to prevent projectiles from having their sprites rotated based on firing angle
var/spread = 0 //amount (in degrees) of projectile spread
- var/legacy = 0 //legacy projectile system
animate_movement = 0 //Use SLIDE_STEPS in conjunction with legacy
var/ricochets = 0
var/ricochets_max = 2
@@ -85,11 +101,32 @@
/obj/item/projectile/proc/on_hit(atom/target, blocked = FALSE)
var/turf/target_loca = get_turf(target)
+
+ var/hitx
+ var/hity
+ if(target == original)
+ hitx = target.pixel_x + p_x - 16
+ hity = target.pixel_y + p_y - 16
+ else
+ hitx = target.pixel_x + rand(-8, 8)
+ hity = target.pixel_y + rand(-8, 8)
+
+ if(!nodamage && (damage_type == BRUTE || damage_type == BURN) && iswallturf(target_loca) && prob(75))
+ var/turf/closed/wall/W = target_loca
+ if(impact_effect_type)
+ new impact_effect_type(target_loca, hitx, hity)
+
+ W.add_dent(WALL_DENT_SHOT, hitx, hity)
+
+ return 0
+
if(!isliving(target))
if(impact_effect_type)
- new impact_effect_type(target_loca, target, src)
+ new impact_effect_type(target_loca, hitx, hity)
return 0
+
var/mob/living/L = target
+
if(blocked != 100) // not completely blocked
if(damage && L.blood_volume && damage_type == BRUTE)
var/splatter_dir = dir
@@ -102,7 +139,7 @@
if(prob(33))
L.add_splatter_floor(target_loca)
else if(impact_effect_type)
- new impact_effect_type(target_loca, target, src)
+ new impact_effect_type(target_loca, hitx, hity)
var/organ_hit_text = ""
var/limb_hit = L.check_limb_hit(def_zone)//to get the correct message info.
@@ -136,7 +173,7 @@
return 50 //if the projectile doesn't do damage, play its hitsound at 50% volume
/obj/item/projectile/Collide(atom/A)
- if(check_ricochet() && check_ricochet_flag(A) && ricochets < ricochets_max)
+ if(check_ricochet(A) && check_ricochet_flag(A) && ricochets < ricochets_max)
ricochets++
if(A.handle_ricochet(src))
ignore_source_check = TRUE
@@ -161,41 +198,42 @@
if(forcedodge)
loc = target_turf
return FALSE
- var/permutation = select_target(A,target_turf) // searches for return value, could be deleted after run so check A isn't null
+
+ var/permutation = A.bullet_act(src, def_zone) // searches for return value, could be deleted after run so check A isn't null
if(permutation == -1 || forcedodge)// the bullet passes through a dense object!
loc = target_turf
if(A)
permutated.Add(A)
return FALSE
+ else
+ var/atom/alt = select_target(A)
+ if(alt)
+ if(!prehit(alt))
+ return FALSE
+ alt.bullet_act(src, def_zone)
qdel(src)
return TRUE
-/obj/item/projectile/proc/select_target(atom/A,target_turf)
- if((A && A.density && !(A.flags_1 & ON_BORDER_1)) && (istype(A,/obj/machinery) || isturf(A))) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs on that tile.
- var/list/mobs_list = list()
- var/list/machine_list = list()
- for(var/mob/living/L in target_turf)
- mobs_list += L
- for(var/obj/machinery/m in target_turf)
- if(m.density)
- machine_list += m
- var/permutationbackup
- if(isturf(A))
- permutationbackup = A.bullet_act(src, def_zone) // Just in case the turf can deflect bullets
- if(mobs_list.len || machine_list.len)
- var/atom/movable/selected_target
- if(mobs_list.Find(original) || machine_list.Find(original))
- selected_target = original
- else if(mobs_list.len)
- selected_target = pick(mobs_list)
- else
- selected_target = pick(machine_list)
- if(!prehit(selected_target))
- return FALSE
- return selected_target.bullet_act(src, def_zone)
- return permutationbackup
- else
- return A.bullet_act(src, def_zone)
+
+/obj/item/projectile/proc/select_target(atom/A) //Selects another target from a wall if we hit a wall.
+ if(!A || !A.density || (A.flags_1 & ON_BORDER_1) || ismob(A) || A == original) //if we hit a dense non-border obj or dense turf then we also hit one of the mobs or machines/structures on that tile.
+ return
+ var/turf/T = get_turf(A)
+ if(original in T)
+ return original
+ var/list/mob/possible_mobs = typecache_filter_list(T, GLOB.typecache_mob) - A
+ var/list/mob/mobs = list()
+ for(var/i in possible_mobs)
+ var/mob/M = i
+ if(M.lying)
+ continue
+ mobs += M
+ var/mob/M = safepick(mobs)
+ if(M)
+ return M.lowest_buckled_mob()
+ var/obj/O = safepick(typecache_filter_list(T, GLOB.typecache_machine_or_structure) - A)
+ if(O)
+ return O
/obj/item/projectile/proc/check_ricochet()
if(prob(ricochet_chance))
@@ -208,94 +246,104 @@
return FALSE
/obj/item/projectile/Process_Spacemove(var/movement_dir = 0)
- return 1 //Bullets don't drift in space
+ return TRUE //Bullets don't drift in space
-/obj/item/projectile/proc/fire(setAngle, atom/direct_target)
+/obj/item/projectile/process()
+ last_process = world.time
+ if(!loc || !fired)
+ fired = FALSE
+ return PROCESS_KILL
+ if(paused || !isturf(loc))
+ last_projectile_move += world.time - last_process //Compensates for pausing, so it doesn't become a hitscan projectile when unpaused from charged up ticks.
+ return
+ var/elapsed_time_deciseconds = (world.time - last_projectile_move) + time_offset
+ time_offset = 0
+ var/required_moves = speed > 0? Floor(elapsed_time_deciseconds / speed) : MOVES_HITSCAN //Would be better if a 0 speed made hitscan but everyone hates those so I can't make it a universal system :<
+ if(required_moves == MOVES_HITSCAN)
+ required_moves = SSprojectiles.global_max_tick_moves
+ else
+ if(required_moves > SSprojectiles.global_max_tick_moves)
+ var/overrun = required_moves - SSprojectiles.global_max_tick_moves
+ required_moves = SSprojectiles.global_max_tick_moves
+ time_offset += overrun * speed
+ time_offset += Modulus(elapsed_time_deciseconds, speed)
+
+ for(var/i in 1 to required_moves)
+ pixel_move(required_moves)
+
+/obj/item/projectile/proc/fire(angle, atom/direct_target)
+ //If no angle needs to resolve it from xo/yo!
if(!log_override && firer && original)
add_logs(firer, original, "fired at", src, " [get_area(src)]")
if(direct_target)
- prehit(direct_target)
- direct_target.bullet_act(src, def_zone)
- qdel(src)
- return
- if(isnum(setAngle))
- Angle = setAngle
- var/old_pixel_x = pixel_x
- var/old_pixel_y = pixel_y
- if(!legacy) //new projectiles
- set waitfor = 0
- var/next_run = world.time
- while(loc)
- if(paused)
- next_run = world.time
- stoplag(1)
- continue
+ if(prehit(direct_target))
+ direct_target.bullet_act(src, def_zone)
+ qdel(src)
+ return
+ if(isnum(angle))
+ setAngle(angle)
+ if(spread)
+ setAngle(Angle + ((rand() - 0.5) * spread))
+ if(isnull(Angle)) //Try to resolve through offsets if there's no angle set.
+ var/turf/starting = get_turf(src)
+ var/turf/target = locate(Clamp(starting + xo, 1, world.maxx), Clamp(starting + yo, 1, world.maxy), starting.z)
+ setAngle(Get_Angle(src, target))
+ if(!nondirectional_sprite)
+ var/matrix/M = new
+ M.Turn(Angle)
+ transform = M
+ old_pixel_x = pixel_x
+ old_pixel_y = pixel_y
+ last_projectile_move = world.time
+ fired = TRUE
+ if(!isprocessing)
+ START_PROCESSING(SSprojectiles, src)
- if((!( current ) || loc == current))
- current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
+/obj/item/projectile/proc/setAngle(new_angle) //wrapper for overrides.
+ Angle = new_angle
+ return TRUE
- if(!Angle)
- Angle=round(Get_Angle(src,current))
- if(spread)
- Angle += (rand() - 0.5) * spread
- if(!nondirectional_sprite)
- var/matrix/M = new
- M.Turn(Angle)
- transform = M
+/obj/item/projectile/proc/pixel_move(moves)
+ if(!nondirectional_sprite)
+ var/matrix/M = new
+ M.Turn(Angle)
+ transform = M
- var/Pixel_x=round((sin(Angle)+16*sin(Angle)*2), 1) //round() is a floor operation when only one argument is supplied, we don't want that here
- var/Pixel_y=round((cos(Angle)+16*cos(Angle)*2), 1)
- var/pixel_x_offset = old_pixel_x + Pixel_x
- var/pixel_y_offset = old_pixel_y + Pixel_y
- var/new_x = x
- var/new_y = y
+ pixel_x_increment=round((sin(Angle)+16*sin(Angle)*2), 1) //round() is a floor operation when only one argument is supplied, we don't want that here
+ pixel_y_increment=round((cos(Angle)+16*cos(Angle)*2), 1)
+ pixel_x_offset = old_pixel_x + pixel_x_increment
+ pixel_y_offset = old_pixel_y + pixel_y_increment
+ new_x = x
+ new_y = y
- while(pixel_x_offset > 16)
- pixel_x_offset -= 32
- old_pixel_x -= 32
- new_x++// x++
- while(pixel_x_offset < -16)
- pixel_x_offset += 32
- old_pixel_x += 32
- new_x--
- while(pixel_y_offset > 16)
- pixel_y_offset -= 32
- old_pixel_y -= 32
- new_y++
- while(pixel_y_offset < -16)
- pixel_y_offset += 32
- old_pixel_y += 32
- new_y--
+ while(pixel_x_offset > 16)
+ pixel_x_offset -= 32
+ old_pixel_x -= 32
+ new_x++// x++
+ while(pixel_x_offset < -16)
+ pixel_x_offset += 32
+ old_pixel_x += 32
+ new_x--
+ while(pixel_y_offset > 16)
+ pixel_y_offset -= 32
+ old_pixel_y -= 32
+ new_y++
+ while(pixel_y_offset < -16)
+ pixel_y_offset += 32
+ old_pixel_y += 32
+ new_y--
- pixel_x = old_pixel_x
- pixel_y = old_pixel_y
- step_towards(src, locate(new_x, new_y, z))
- next_run += max(world.tick_lag, speed)
- var/delay = next_run - world.time
- if(delay <= world.tick_lag*2)
- pixel_x = pixel_x_offset
- pixel_y = pixel_y_offset
- else
- animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = max(1, (delay <= 3 ? delay - 1 : delay)), flags = ANIMATION_END_NOW)
- old_pixel_x = pixel_x_offset
- old_pixel_y = pixel_y_offset
- if(can_hit_target(original, permutated))
- Collide(original)
- Range()
- if (delay > 0)
- sleep(delay)
-
- else //old projectile system
- set waitfor = 0
- while(loc)
- if(!paused)
- if((!( current ) || loc == current))
- current = locate(Clamp(x+xo,1,world.maxx),Clamp(y+yo,1,world.maxy),z)
- step_towards(src, current)
- if(can_hit_target(original, permutated))
- Collide(original)
- Range()
- sleep(CONFIG_GET(number/run_delay) * 0.9)
+ step_towards(src, locate(new_x, new_y, z))
+ pixel_x = old_pixel_x
+ pixel_y = old_pixel_y
+ //var/animation_time = ((SSprojectiles.flags & SS_TICKER? (SSprojectiles.wait * world.tick_lag) : SSprojectiles.wait) / moves)
+ animate(src, pixel_x = pixel_x_offset, pixel_y = pixel_y_offset, time = 1, flags = ANIMATION_END_NOW)
+ old_pixel_x = pixel_x_offset
+ old_pixel_y = pixel_y_offset
+ if(can_hit_target(original, permutated))
+ Collide(original)
+ Range()
+ last_projectile_move = world.time
//Returns true if the target atom is on our current turf and above the right layer
/obj/item/projectile/proc/can_hit_target(atom/target, var/list/passthrough)
@@ -305,21 +353,26 @@
return TRUE
return FALSE
-/obj/item/projectile/proc/preparePixelProjectile(atom/target, var/turf/targloc, mob/living/user, params, spread)
- var/turf/curloc = get_turf(user)
- forceMove(get_turf(user))
- starting = get_turf(user)
- current = curloc
+/obj/item/projectile/proc/preparePixelProjectile(atom/target, atom/source, params, spread = 0)
+ var/turf/curloc = get_turf(source)
+ var/turf/targloc = get_turf(target)
+ forceMove(get_turf(source))
+ starting = get_turf(source)
+ original = target
yo = targloc.y - curloc.y
xo = targloc.x - curloc.x
- var/list/calculated = calculate_projectile_angle_and_pixel_offsets(user, params)
- Angle = calculated[1]
- p_x = calculated[2]
- p_y = calculated[3]
+ if(isliving(source) && params)
+ var/list/calculated = calculate_projectile_angle_and_pixel_offsets(source, params)
+ p_x = calculated[2]
+ p_y = calculated[3]
- if(spread)
- src.Angle += spread
+ if(spread)
+ setAngle(calculated[1] + spread)
+ else
+ setAngle(calculated[1])
+ else
+ setAngle(Get_Angle(src, targloc))
/proc/calculate_projectile_angle_and_pixel_offsets(mob/user, params)
var/list/mouse_control = params2list(params)
@@ -352,10 +405,11 @@
/obj/item/projectile/Crossed(atom/movable/AM) //A mob moving on a tile with a projectile is hit by it.
..()
- if(isliving(AM) && AM.density && !checkpass(PASSMOB))
+ if(isliving(AM) && (AM.density || AM == original) && !checkpass(PASSMOB))
Collide(AM)
/obj/item/projectile/Destroy()
+ STOP_PROCESSING(SSprojectiles, src)
return ..()
/obj/item/projectile/experience_pressure_difference()
diff --git a/code/modules/projectiles/projectile/beams.dm b/code/modules/projectiles/projectile/beams.dm
index d1d7b50cf5..2fa90152d8 100644
--- a/code/modules/projectiles/projectile/beams.dm
+++ b/code/modules/projectiles/projectile/beams.dm
@@ -95,8 +95,6 @@
name = "emitter beam"
icon_state = "emitter"
damage = 30
- legacy = 1
- animate_movement = SLIDE_STEPS
impact_effect_type = /obj/effect/temp_visual/impact_effect/green_laser
light_color = LIGHT_COLOR_GREEN
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 179ce9ab6c..323960c7f3 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -8,12 +8,6 @@
hitsound_wall = "ricochet"
impact_effect_type = /obj/effect/temp_visual/impact_effect
-/obj/item/projectile/bullet/pellet/shotgun_buckshot/Range()
- ..()
- damage -= 0.75
- if(damage < 0)
- qdel(src)
-
/obj/item/projectile/bullet/incendiary
damage = 20
var/fire_stacks = 4
@@ -39,7 +33,7 @@
damage = 60
// 7.62 (Nagant Rifle)
-
+
/obj/item/projectile/bullet/a762
name = "7.62 bullet"
damage = 60
@@ -109,7 +103,7 @@
// 4.6x30mm (Autorifles)
/obj/item/projectile/bullet/c46x30mm
- desc = "4.6x30mm bullet"
+ name = "4.6x30mm bullet"
damage = 20
/obj/item/projectile/bullet/c46x30mm_ap
@@ -156,7 +150,7 @@
/obj/item/projectile/bullet/p50
name =".50 bullet"
- speed = 0 //360 alwaysscope.
+ speed = 0.4
damage = 70
knockdown = 100
dismemberment = 50
@@ -272,15 +266,30 @@
explosion(target, -1, 0, 1)
return TRUE
+/obj/item/projectile/bullet/pellet
+ var/tile_dropoff = 0.75
+ var/tile_dropoff_s = 1.25
+
/obj/item/projectile/bullet/pellet/shotgun_buckshot
name = "buckshot pellet"
damage = 12.5
/obj/item/projectile/bullet/pellet/shotgun_rubbershot
+ name = "rubbershot pellet"
damage = 3
stamina = 25
+/obj/item/projectile/bullet/pellet/Range()
+ ..()
+ if(damage > 0)
+ damage -= tile_dropoff
+ if(stamina > 0)
+ stamina -= tile_dropoff_s
+ if(damage < 0 && stamina < 0)
+ qdel(src)
+
/obj/item/projectile/bullet/pellet/shotgun_improvised
+ tile_dropoff = 0.55 //Come on it does 6 damage don't be like that.
damage = 6
/obj/item/projectile/bullet/pellet/shotgun_improvised/Initialize()
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 5665b365a1..57960fcea7 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -76,7 +76,7 @@
OpenDoor(target)
else
var/turf/T = get_turf(target)
- if(isclosedturf(T) && !istype(T, /turf/closed/indestructible))
+ if(isclosedturf(T) && !isindestructiblewall(T))
CreateDoor(T)
/obj/item/projectile/magic/door/proc/CreateDoor(turf/T)
@@ -132,16 +132,14 @@
if("monkey")
new_mob = new /mob/living/carbon/monkey(M.loc)
if("robot")
- var/robot = pick("cyborg","syndiborg","drone")
+ var/robot = pick("random_cyborg","syndiborg","drone")
+ var/path
switch(robot)
- if("cyborg")
- new_mob = new /mob/living/silicon/robot(M.loc)
+ if("random_cyborg")
+ path = pick(typesof(/mob/living/silicon/robot/modules) - typesof(/mob/living/silicon/robot/modules/syndicate))
+ new_mob = new path(M.loc)
if("syndiborg")
- var/path
- if(prob(50))
- path = /mob/living/silicon/robot/modules/syndicate
- else
- path = /mob/living/silicon/robot/modules/syndicate/medical
+ path = pick(typesof(/mob/living/silicon/robot/modules/syndicate))
new_mob = new path(M.loc)
if("drone")
new_mob = new /mob/living/simple_animal/drone/polymorphed(M.loc)
@@ -158,9 +156,15 @@
new_mob = new /mob/living/simple_animal/slime/random(M.loc)
if("xeno")
if(prob(50))
- new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
+ if(!M.ckey) //spawn an AI alien if it isn't a player controlled mob.
+ new_mob = new /mob/living/simple_animal/hostile/alien(M.loc)
+ else
+ new_mob = new /mob/living/carbon/alien/humanoid/hunter(M.loc)
else
- new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
+ if(!M.ckey)
+ new_mob = new /mob/living/simple_animal/hostile/alien/sentinel(M.loc)
+ else
+ new_mob = new /mob/living/carbon/alien/humanoid/sentinel(M.loc)
if("animal")
var/path
diff --git a/code/modules/projectiles/projectile/special.dm b/code/modules/projectiles/projectile/special.dm
index a5ba7c15a4..5a650ff2c3 100644
--- a/code/modules/projectiles/projectile/special.dm
+++ b/code/modules/projectiles/projectile/special.dm
@@ -55,7 +55,7 @@
/obj/item/projectile/bullet/srmrocket
name ="SRM-8 Rocket"
- desc = "Boom"
+ desc = "Boom."
icon_state = "missile"
damage = 30
ricochets_max = 0 //it's a MISSILE
@@ -469,7 +469,9 @@
layer = ABOVE_MOB_LAYER
hal_target.client.images += blood
animate(blood, pixel_x = target_pixel_x, pixel_y = target_pixel_y, alpha = 0, time = 5)
- sleep(5)
+ addtimer(CALLBACK(src, .proc/cleanup_blood), 5)
+
+/obj/item/projectile/hallucination/proc/cleanup_blood(image/blood)
hal_target.client.images -= blood
qdel(blood)
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index eeb5016445..b16d0bc2e7 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -626,7 +626,8 @@
return jointext(names, ",")
/datum/reagents/proc/remove_all_type(reagent_type, amount, strict = 0, safety = 1) // Removes all reagent of X type. @strict set to 1 determines whether the childs of the type are included.
- if(!isnum(amount)) return 1
+ if(!isnum(amount))
+ return 1
var/list/cached_reagents = reagent_list
var/has_removed_reagent = 0
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 6acc9926c6..af5597d790 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -68,7 +68,8 @@
recharged -= 1
/obj/machinery/chem_dispenser/proc/recharge()
- if(stat & (BROKEN|NOPOWER)) return
+ if(stat & (BROKEN|NOPOWER))
+ return
var/usedpower = cell.give( 1 / powerefficiency) //Should always be a gain of one on the UI.
if(usedpower)
use_power(2500)
@@ -217,7 +218,7 @@
beaker.reagents.remove_all()
cell.use(total/powerefficiency)
cell.emp_act()
- visible_message(" The [src] malfunctions, spraying chemicals everywhere!")
+ visible_message("[src] malfunctions, spraying chemicals everywhere!")
..()
/obj/machinery/chem_dispenser/constructable
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index c6a01bc45f..7c764e26cb 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -57,17 +57,18 @@
if(powered())
stat &= ~NOPOWER
else
- spawn(rand(0, 15))
- stat |= NOPOWER
+ stat |= NOPOWER
/obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
if(default_deconstruction_screwdriver(user, "mixer0_nopower", "mixer0", I))
if(beaker)
- beaker.loc = src.loc
+ beaker.forceMove(drop_location())
+ adjust_item_drop_location(beaker)
beaker = null
reagents.clear_reagents()
if(bottle)
- bottle.loc = src.loc
+ bottle.forceMove(drop_location())
+ adjust_item_drop_location(bottle)
bottle = null
return
@@ -154,7 +155,8 @@
switch(action)
if("eject")
if(beaker)
- beaker.loc = src.loc
+ beaker.forceMove(drop_location())
+ adjust_item_drop_location(beaker)
beaker = null
reagents.clear_reagents()
icon_state = "mixer0"
@@ -162,7 +164,8 @@
if("ejectp")
if(bottle)
- bottle.loc = src.loc
+ bottle.forceMove(drop_location())
+ adjust_item_drop_location(bottle)
bottle = null
. = TRUE
@@ -215,16 +218,15 @@
if(bottle && bottle.contents.len < bottle.storage_slots)
P = new/obj/item/reagent_containers/pill(bottle)
else
- P = new/obj/item/reagent_containers/pill(src.loc)
+ P = new/obj/item/reagent_containers/pill(drop_location())
P.name = trim("[name] pill")
- P.pixel_x = rand(-7, 7) //random position
- P.pixel_y = rand(-7, 7)
+ adjust_item_drop_location(P)
reagents.trans_to(P,vol_each)
else
var/name = stripped_input(usr, "Name:", "Name your pack!", reagents.get_master_reagent_name(), MAX_NAME_LEN)
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, be_close=TRUE))
return
- var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(src.loc)
+ var/obj/item/reagent_containers/food/condiment/pack/P = new/obj/item/reagent_containers/food/condiment/pack(drop_location())
P.originalname = name
P.name = trim("[name] pack")
@@ -249,10 +251,9 @@
var/obj/item/reagent_containers/pill/P
for(var/i = 0; i < amount; i++)
- P = new/obj/item/reagent_containers/pill/patch(src.loc)
+ P = new/obj/item/reagent_containers/pill/patch(drop_location())
P.name = trim("[name] patch")
- P.pixel_x = rand(-7, 7) //random position
- P.pixel_y = rand(-7, 7)
+ adjust_item_drop_location(P)
reagents.trans_to(P,vol_each)
. = TRUE
@@ -265,7 +266,7 @@
var/name = stripped_input(usr, "Name:","Name your bottle!", (reagents.total_volume ? reagents.get_master_reagent_name() : " "), MAX_NAME_LEN)
if(!name || !reagents.total_volume || !src || QDELETED(src) || !usr.canUseTopic(src, be_close=TRUE))
return
- var/obj/item/reagent_containers/food/condiment/P = new(src.loc)
+ var/obj/item/reagent_containers/food/condiment/P = new(drop_location())
P.originalname = name
P.name = trim("[name] bottle")
reagents.trans_to(P, P.volume)
@@ -281,15 +282,15 @@
var/obj/item/reagent_containers/glass/bottle/P
for(var/i = 0; i < amount_full; i++)
- P = new/obj/item/reagent_containers/glass/bottle(src.loc)
- P.pixel_x = rand(-7, 7) //random position
- P.pixel_y = rand(-7, 7)
+ P = new/obj/item/reagent_containers/glass/bottle(drop_location())
P.name = trim("[name] bottle")
+ adjust_item_drop_location(P)
reagents.trans_to(P, 30)
if(vol_part)
- P = new/obj/item/reagent_containers/glass/bottle(src.loc)
+ P = new/obj/item/reagent_containers/glass/bottle(drop_location())
P.name = trim("[name] bottle")
+ adjust_item_drop_location(P)
reagents.trans_to(P, vol_part)
. = TRUE
@@ -329,6 +330,29 @@
return 0
+/obj/machinery/chem_master/adjust_item_drop_location(atom/movable/AM) // Special version for chemmasters and condimasters
+ if (AM == beaker)
+ AM.pixel_x = -8
+ AM.pixel_y = 8
+ return null
+ else if (AM == bottle)
+ if (length(bottle.contents))
+ AM.pixel_x = -13
+ else
+ AM.pixel_x = -7
+ AM.pixel_y = -8
+ return null
+ else
+ var/md5 = md5(AM.name)
+#if DM_VERSION > 511
+#warn Refactor the loop in /obj/machinery/chem_master/adjust_item_drop_location() to make use of 512's list-like access to characters in a string
+#endif
+ for (var/i in 1 to 32)
+ . += hex2num(copytext(md5,i,i+1))
+ . = . % 9
+ AM.pixel_x = ((.%3)*6)
+ AM.pixel_y = -8 + (round( . / 3)*8)
+
/obj/machinery/chem_master/condimaster
name = "CondiMaster 3000"
desc = "Used to create condiments and other cooking supplies."
diff --git a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
index a341121390..eb1ee87df9 100644
--- a/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
+++ b/code/modules/reagents/chemistry/machinery/reagentgrinder.dm
@@ -30,11 +30,13 @@
/obj/item/stack/sheet/mineral/silver = list("silver" = 20),
/obj/item/stack/sheet/mineral/gold = list("gold" = 20),
/obj/item/stack/sheet/bluespace_crystal = list("bluespace" = 20),
+ /obj/item/stack/cable_coil = list ("copper" = 5),
/obj/item/ore/bluespace_crystal = list("bluespace" = 20),
/obj/item/grown/nettle/basic = list("sacid" = 0),
/obj/item/grown/nettle/death = list("facid" = 0, "sacid" = 0),
/obj/item/grown/novaflower = list("capsaicin" = 0, "condensedcapsaicin" = 0),
//Blender Stuff
+ /obj/item/reagent_containers/food/snacks/donkpocket/warm = list("omnizine" = 3),
/obj/item/reagent_containers/food/snacks/grown/soybeans = list("soymilk" = 0),
/obj/item/reagent_containers/food/snacks/grown/tomato = list("ketchup" = 0),
/obj/item/reagent_containers/food/snacks/grown/wheat = list("flour" = -5),
@@ -44,17 +46,39 @@
/obj/item/reagent_containers/food/snacks/grown/cherries = list("cherryjelly" = 0),
/obj/item/reagent_containers/food/snacks/grown/bluecherries = list("bluecherryjelly" = 0),
/obj/item/reagent_containers/food/snacks/egg = list("eggyolk" = -5),
+ /obj/item/reagent_containers/food/snacks/deadmouse = list ("blood" = 20, "gibs" = 5), // You monster
//Grinder stuff, but only if dry
/obj/item/reagent_containers/food/snacks/grown/coffee/robusta = list("coffeepowder" = 0, "morphine" = 0),
/obj/item/reagent_containers/food/snacks/grown/coffee = list("coffeepowder" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea/astra = list("teapowder" = 0, "salglu_solution" = 0),
/obj/item/reagent_containers/food/snacks/grown/tea = list("teapowder" = 0),
+ //Stuff that doesn't quite fit in the other categories
+ /obj/item/electronics = list ("iron" = 10, "silicon" = 10),
+ /obj/item/circuitboard = list ("silicon" = 20, "sacid" = 0.5), // Retrieving acid this way is extremely inefficient
+ /obj/item/match = list ("phosphorus" = 2),
+ /obj/item/device/toner = list ("iodine" = 40, "iron" = 10),
+ /obj/item/photo = list ("iodine" = 4),
+ /obj/item/pen = list ("iodine" = 2, "iron" = 1),
+ /obj/item/reagent_containers/food/drinks/soda_cans = list ("aluminium" = 10),
+ /obj/item/trash/can = list ("aluminium" = 10),
+ /obj/item/device/flashlight/flare = list ("sulfur" = 15),
+ /obj/item/device/flashlight/glowstick = list ("phenol" = 15, "hydrodgen" = 10, "oxygen" = 5),
+ /obj/item/stock_parts/cell = list ("lithium" = 15, "iron" = 5, "silicon" = 5),
+ /obj/item/soap = list ("lye" = 10),
+ /obj/item/device/analyzer = list ("mercury" = 5, "iron" = 5, "silicon" = 5),
+ /obj/item/lighter = list ("iron" = 1, "weldingfuel" = 5, "oil" = 5),
+ /obj/item/light = list ("silicon" = 5, "nitrogen" = 10), //Nitrogen is used as a cheaper alternative to argon in incandescent lighbulbs
+ /obj/item/cigbutt/ = list ("carbon" = 2),
+ /obj/item/trash/coal = list ("carbon" = 20),
+ /obj/item/stack/medical/bruise_pack = list ("styptic_powder" = 5),
+ /obj/item/stack/medical/ointment = list ("silver_sulfadiazine" = 5),
//All types that you can put into the grinder to transfer the reagents to the beaker. !Put all recipes above this.!
/obj/item/slime_extract = list(),
/obj/item/reagent_containers/pill = list(),
/obj/item/reagent_containers/food = list(),
/obj/item/reagent_containers/honeycomb = list(),
- /obj/item/toy/crayon = list())
+ /obj/item/toy/crayon = list(),
+ /obj/item/clothing/mask/cigarette = list())
var/static/list/juice_items = list(
//Juicer Stuff
@@ -284,7 +308,9 @@
updateUsrDialog()
/obj/machinery/reagentgrinder/proc/get_allowed_by_obj(obj/item/O)
- return blend_items[O.type]
+ for (var/i in blend_items)
+ if (istype(O, i))
+ return blend_items[i]
/obj/machinery/reagentgrinder/proc/get_allowed_juice_by_obj(obj/item/reagent_containers/food/snacks/O)
for(var/i in juice_items)
@@ -432,7 +458,7 @@
if (O.Uses > 0)
beaker.reagents.add_reagent("slimejelly",min(20, space))
remove_object(O)
- else if(istype(I, /obj/item/reagent_containers))
+ if(istype(I, /obj/item/reagent_containers))
var/obj/item/reagent_containers/O = I
var/amount = O.reagents.total_volume
O.reagents.trans_to(beaker, amount)
diff --git a/code/modules/reagents/chemistry/machinery/smoke_machine.dm b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
index 381487450c..dc92dd3b52 100644
--- a/code/modules/reagents/chemistry/machinery/smoke_machine.dm
+++ b/code/modules/reagents/chemistry/machinery/smoke_machine.dm
@@ -1,5 +1,6 @@
/obj/machinery/smoke_machine
- name = "Smoke Machine"
+ name = "smoke machine"
+ desc = "A machine with a centrifuge installed into it. It produces smoke with any reagents you put into the machine."
icon = 'icons/obj/chemical.dmi'
icon_state = "smoke0"
density = TRUE
@@ -10,9 +11,9 @@
var/cooldown = 0
var/screen = "home"
var/useramount = 30 // Last used amount
- var/volume = 1000
+ var/volume = 300
var/setting = 3
- var/list/possible_settings = list(3,6,9,12,15)
+ var/list/possible_settings = list(3,6,9)
/datum/effect_system/smoke_spread/chem/smoke_machine/set_up(datum/reagents/carry, setting = 3, efficiency = 10, loc)
amount = setting
@@ -20,6 +21,14 @@
carry.remove_any(setting * 16 / efficiency)
location = loc
+/datum/effect_system/smoke_spread/chem/smoke_machine
+ effect_type = /obj/effect/particle_effect/smoke/chem/smoke_machine
+
+/obj/effect/particle_effect/smoke/chem/smoke_machine
+ opaque = FALSE
+ alpha = 100
+
+
/obj/machinery/smoke_machine/Initialize()
. = ..()
create_reagents(volume)
@@ -57,14 +66,15 @@
/obj/machinery/smoke_machine/attackby(obj/item/I, mob/user, params)
add_fingerprint(user)
- if(istype(I, /obj/item/reagent_containers))
+ if(istype(I, /obj/item/reagent_containers) && I.is_open_container())
var/obj/item/reagent_containers/RC = I
var/units = RC.reagents.trans_to(src, RC.amount_per_transfer_from_this)
if(units)
to_chat(user, "You transfer [units] units of the solution to [src].")
add_logs(usr, src, "has added [english_list(RC.reagents.reagent_list)] to [src]")
return
- if(default_unfasten_wrench(user, I))
+ if(default_unfasten_wrench(user, I, 40))
+ on = FALSE
return
return ..()
@@ -106,7 +116,8 @@
if("power")
on = !on
if(on)
- log_admin("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [COORD(src)].")
+ message_admins("[key_name_admin(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [ADMIN_COORDJMP(src)].")
+ log_game("[key_name(usr)] activated a smoke machine that contains [english_list(reagents.reagent_list)] at [COORD(src)].")
add_logs(usr, src, "has activated [src] which contains [english_list(reagents.reagent_list)].")
if("goScreen")
screen = params["screen"]
diff --git a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
index c114f7017b..cc91819611 100644
--- a/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/alcohol_reagents.dm
@@ -38,7 +38,7 @@ All effects don't start immediately, but rather get worse over time; the rate is
var/mob/living/carbon/human/H = M
if(H.drunkenness < volume * boozepwr * ALCOHOL_THRESHOLD_MODIFIER)
H.drunkenness = max((H.drunkenness + (sqrt(volume) * boozepwr * ALCOHOL_RATE)), 0) //Volume, power, and server alcohol rate effect how quickly one gets drunk
- var/obj/item/organ/liver/L = H.getorganslot("liver")
+ var/obj/item/organ/liver/L = H.getorganslot(ORGAN_SLOT_LIVER)
H.applyLiverDamage((max(sqrt(volume) * boozepwr * L.alcohol_tolerance, 0))/10)
return ..() || .
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 054e9a84cf..de96631bc9 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -78,7 +78,7 @@
/datum/reagent/blob/networked_fibers
name = "Networked Fibers"
id = "networked_fibers"
- description = "will do high brute and burn damage but non-manual expansion will only generate resources."
+ description = "will do high brute and burn damage and will generate resources quicker, but can only expand manually."
shortdesc = "will do high brute and burn damage."
effectdesc = "will move your core when manually expanding near it."
analyzerdescdamage = "Does high brute and burn damage."
diff --git a/code/modules/reagents/chemistry/reagents/drug_reagents.dm b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
index a6f6782d30..60d1f64754 100644
--- a/code/modules/reagents/chemistry/reagents/drug_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/drug_reagents.dm
@@ -15,7 +15,8 @@
M.set_drugginess(15)
if(isturf(M.loc) && !isspaceturf(M.loc))
if(M.canmove)
- if(prob(10)) step(M, pick(GLOB.cardinals))
+ if(prob(10))
+ step(M, pick(GLOB.cardinals))
if(prob(7))
M.emote(pick("twitch","drool","moan","giggle"))
..()
diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm
index f1b076ca68..d25df998e3 100644
--- a/code/modules/reagents/chemistry/reagents/food_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm
@@ -550,7 +550,7 @@
if(!M.is_mouth_covered() && !M.is_eyes_covered())
unprotected = TRUE
if(unprotected)
- if(!M.getorganslot("eye_sight")) //can't blind somebody with no eyes
+ if(!M.getorganslot(ORGAN_SLOT_EYES)) //can't blind somebody with no eyes
to_chat(M, "Your eye sockets feel wet.")
else
if(!M.eye_blurry)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index 06f77361c3..095db17c7f 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -454,7 +454,7 @@
/datum/reagent/medicine/potass_iodide/on_mob_life(mob/living/M)
if(M.radiation > 0)
- M.radiation--
+ M.radiation -= min(M.radiation, 8)
..()
/datum/reagent/medicine/pen_acid
@@ -466,11 +466,8 @@
metabolization_rate = 0.5 * REAGENTS_METABOLISM
/datum/reagent/medicine/pen_acid/on_mob_life(mob/living/M)
- if(M.radiation > 0)
- M.radiation -= 4
+ M.radiation -= max(M.radiation-RAD_MOB_SAFE, 0)/50
M.adjustToxLoss(-2*REM, 0)
- if(M.radiation < 0)
- M.radiation = 0
for(var/datum/reagent/R in M.reagents.reagent_list)
if(R != src)
M.reagents.remove_reagent(R.id,2)
@@ -674,7 +671,7 @@
taste_description = "dull toxin"
/datum/reagent/medicine/oculine/on_mob_life(mob/living/M)
- var/obj/item/organ/eyes/eyes = M.getorganslot("eyes_sight")
+ var/obj/item/organ/eyes/eyes = M.getorganslot(ORGAN_SLOT_EYES)
if (!eyes)
return
if(M.disabilities & BLIND)
@@ -817,7 +814,8 @@
M.jitteriness = 0
if(M.has_dna())
M.dna.remove_all_mutations()
- ..()
+ if(!QDELETED(M)) //We were a monkey, now a human
+ ..()
/datum/reagent/medicine/antihol
name = "Antihol"
diff --git a/code/modules/reagents/chemistry/reagents/other_reagents.dm b/code/modules/reagents/chemistry/reagents/other_reagents.dm
index 8ce843e26b..e2be37f46f 100644
--- a/code/modules/reagents/chemistry/reagents/other_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/other_reagents.dm
@@ -24,9 +24,9 @@
else //ingest, patch or inject
M.ForceContractDisease(D)
- if(method == INJECT && iscarbon(M))
+ if(iscarbon(M))
var/mob/living/carbon/C = M
- if(C.get_blood_id() == "blood")
+ if(C.get_blood_id() == "blood" && (method == INJECT || (method == INGEST && C.dna && C.dna.species && (DRINKSBLOOD in C.dna.species.species_traits))))
if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))
C.reagents.add_reagent("toxin", reac_volume * 0.5)
else
@@ -197,7 +197,8 @@
..()
/datum/reagent/water/holywater/on_mob_life(mob/living/M)
- if(!data) data = 1
+ if(!data)
+ data = 1
data++
M.jitteriness = min(M.jitteriness+4,10)
if(data >= 30) // 12 units, 54 seconds @ metabolism 0.4 units & tick rate 1.8 sec
@@ -230,7 +231,8 @@
/datum/reagent/water/holywater/reaction_turf(turf/T, reac_volume)
..()
- if(!istype(T)) return
+ if(!istype(T))
+ return
if(reac_volume>=10)
for(var/obj/effect/rune/R in T)
qdel(R)
@@ -367,8 +369,6 @@
if(method == INGEST)
if(show_message)
to_chat(M, "That tasted horrible.")
- M.AdjustStun(40)
- M.AdjustKnockdown(40)
..()
@@ -1159,6 +1159,34 @@
M.confused = min(M.confused + 2, 5)
..()
+/datum/reagent/stimulum
+ name = "Stimulum"
+ id = "stimulum"
+ description = "An unstable experimental gas that greatly increases the energy of those that inhale it"
+ reagent_state = GAS
+ metabolization_rate = 1.5 * REAGENTS_METABOLISM
+ color = "E1A116"
+ taste_description = "sourness"
+
+/datum/reagent/stimulum/on_mob_life(mob/living/M) // Has a speedup, and the anti-stun effects of nicotine.
+ M.status_flags |= GOTTAGOFAST
+ M.AdjustStun(-20, 0)
+ M.AdjustKnockdown(-20, 0)
+ M.AdjustUnconscious(-20, 0)
+ M.adjustStaminaLoss(-0.5*REM, 0)
+
+/datum/reagent/nitryl
+ name = "Nitryl"
+ id = "no2"
+ description = "A highly reactive gas that makes you feel faster"
+ reagent_state = GAS
+ metabolization_rate = REAGENTS_METABOLISM
+ color = "90560B"
+ taste_description = "burning"
+
+/datum/reagent/browngas/on_mob_life(mob/living/M) //Has just a speedup
+ M.status_flags |= GOTTAGOFAST
+
/////////////////////////Coloured Crayon Powder////////////////////////////
//For colouring in /proc/mix_color_from_reagents
@@ -1330,7 +1358,7 @@
taste_description = "carpet" // Your tounge feels furry.
/datum/reagent/carpet/reaction_turf(turf/T, reac_volume)
- if(istype(T, /turf/open/floor/plating) || istype(T, /turf/open/floor/plasteel))
+ if(isplatingturf(T) || istype(T, /turf/open/floor/plasteel))
var/turf/open/floor/F = T
F.ChangeTurf(/turf/open/floor/carpet)
..()
@@ -1568,7 +1596,7 @@
/datum/reagent/romerol/on_mob_life(mob/living/carbon/human/H)
// Silently add the zombie infection organ to be activated upon death
- if(!H.getorganslot("zombie_infection"))
+ if(!H.getorganslot(ORGAN_SLOT_ZOMBIE))
var/obj/item/organ/zombie_infection/ZI = new()
ZI.Insert(H)
..()
@@ -1583,7 +1611,7 @@
/datum/reagent/magillitis/on_mob_life(mob/living/carbon/M)
..()
if((ismonkey(M) || ishuman(M)) && current_cycle >= 10)
- return M.gorillize()
+ M.gorillize()
/datum/reagent/growthserum
name = "Growth Serum"
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
index 4c1965058c..b41d61be84 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
@@ -8,14 +8,8 @@
taste_description = "sweet tasting metal"
/datum/reagent/thermite/reaction_turf(turf/T, reac_volume)
- if(reac_volume >= 1 && iswallturf(T))
- var/turf/closed/wall/Wall = T
- if(istype(Wall, /turf/closed/wall/r_wall))
- Wall.thermite = Wall.thermite+(reac_volume*2.5)
- else
- Wall.thermite = Wall.thermite+(reac_volume*10)
- Wall.overlays = list()
- Wall.add_overlay(mutable_appearance('icons/effects/effects.dmi', "thermite"))
+ if(reac_volume >= 1)
+ T.AddComponent(/datum/component/thermite, reac_volume)
/datum/reagent/thermite/on_mob_life(mob/living/M)
M.adjustFireLoss(1, 0)
@@ -54,7 +48,7 @@
. = 1
/datum/reagent/clf3/reaction_turf(turf/T, reac_volume)
- if(istype(T, /turf/open/floor/plating))
+ if(isplatingturf(T))
var/turf/open/floor/plating/F = T
if(prob(10 + F.burnt + 5*F.broken)) //broken or burnt plating is more susceptible to being destroyed
F.ChangeTurf(F.baseturf)
diff --git a/code/modules/reagents/chemistry/recipes/slime_extracts.dm b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
index 62e5fd723d..27bf596df0 100644
--- a/code/modules/reagents/chemistry/recipes/slime_extracts.dm
+++ b/code/modules/reagents/chemistry/recipes/slime_extracts.dm
@@ -243,7 +243,7 @@
if(holder && holder.my_atom)
var/turf/open/T = get_turf(holder.my_atom)
if(istype(T))
- T.atmos_spawn_air("freon=50;TEMP=120")
+ T.atmos_spawn_air("nitrogen=50;TEMP=2.7")
/datum/chemical_reaction/slime/slimefireproof
name = "Slime Fireproof"
diff --git a/code/modules/reagents/reagent_containers.dm b/code/modules/reagents/reagent_containers.dm
index afcc0b8197..f87df197fc 100644
--- a/code/modules/reagents/reagent_containers.dm
+++ b/code/modules/reagents/reagent_containers.dm
@@ -54,7 +54,8 @@
for (var/datum/reagent/R in snack.reagents.reagent_list) //no reagents will be left behind
data += "[R.id]([R.volume] units); " //Using IDs because SOME chemicals(I'm looking at you, chlorhydrate-beer) have the same names as other chemicals.
return data
- else return "No reagents"
+ else
+ return "No reagents"
/obj/item/reagent_containers/proc/canconsume(mob/eater, mob/user)
if(!iscarbon(eater))
diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm
index 2f2ef108ea..d4b8e165ee 100644
--- a/code/modules/reagents/reagent_containers/blood_pack.dm
+++ b/code/modules/reagents/reagent_containers/blood_pack.dm
@@ -65,6 +65,9 @@
/obj/item/reagent_containers/blood/lizard
blood_type = "L"
+/obj/item/reagent_containers/blood/universal
+ blood_type = "U"
+
/obj/item/reagent_containers/blood/empty
name = "blood pack"
icon_state = "empty"
diff --git a/code/modules/reagents/reagent_containers/borghydro.dm b/code/modules/reagents/reagent_containers/borghydro.dm
index a7f8fc9195..28a07d5862 100644
--- a/code/modules/reagents/reagent_containers/borghydro.dm
+++ b/code/modules/reagents/reagent_containers/borghydro.dm
@@ -170,7 +170,8 @@ Borg Shaker
RG.add_reagent(reagent_ids[valueofi], 5)
/obj/item/reagent_containers/borghypo/borgshaker/afterattack(obj/target, mob/user, proximity)
- if(!proximity) return
+ if(!proximity)
+ return
else if(target.is_open_container() && target.reagents)
var/datum/reagents/R = reagent_list[mode]
@@ -198,7 +199,6 @@ Borg Shaker
to_chat(usr, "It is currently empty! Please allow some time for the synthesizer to produce more.")
/obj/item/reagent_containers/borghypo/borgshaker/hacked
- ..()
name = "cyborg shaker"
desc = "Will mix drinks that knock them dead."
icon = 'icons/obj/drinks.dmi'
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 2fd728d546..c0cd009104 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -43,32 +43,27 @@
/obj/item/reagent_containers/glass/bottle/epinephrine
name = "epinephrine bottle"
desc = "A small bottle. Contains epinephrine - used to stabilize patients."
- icon_state = "bottle16"
list_reagents = list("epinephrine" = 30)
/obj/item/reagent_containers/glass/bottle/toxin
name = "toxin bottle"
desc = "A small bottle of toxins. Do not drink, it is poisonous."
- icon_state = "bottle12"
list_reagents = list("toxin" = 30)
/obj/item/reagent_containers/glass/bottle/cyanide
name = "cyanide bottle"
desc = "A small bottle of cyanide. Bitter almonds?"
- icon_state = "bottle12"
list_reagents = list("cyanide" = 30)
/obj/item/reagent_containers/glass/bottle/spewium
name = "spewium bottle"
desc = "A small bottle of spewium."
- icon_state = "bottle12"
list_reagents = list("spewium" = 30)
/obj/item/reagent_containers/glass/bottle/morphine
name = "morphine bottle"
desc = "A small bottle of morphine."
icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle20"
list_reagents = list("morphine" = 30)
/obj/item/reagent_containers/glass/bottle/chloralhydrate
@@ -80,49 +75,41 @@
/obj/item/reagent_containers/glass/bottle/charcoal
name = "antitoxin bottle"
desc = "A small bottle of charcoal."
- icon_state = "bottle17"
list_reagents = list("charcoal" = 30)
/obj/item/reagent_containers/glass/bottle/mutagen
name = "unstable mutagen bottle"
desc = "A small bottle of unstable mutagen. Randomly changes the DNA structure of whoever comes in contact."
- icon_state = "bottle20"
list_reagents = list("mutagen" = 30)
/obj/item/reagent_containers/glass/bottle/plasma
name = "liquid plasma bottle"
desc = "A small bottle of liquid plasma. Extremely toxic and reacts with micro-organisms inside blood."
- icon_state = "bottle8"
list_reagents = list("plasma" = 30)
/obj/item/reagent_containers/glass/bottle/synaptizine
name = "synaptizine bottle"
desc = "A small bottle of synaptizine."
- icon_state = "bottle20"
list_reagents = list("synaptizine" = 30)
/obj/item/reagent_containers/glass/bottle/formaldehyde
name = "formaldehyde bottle"
desc = "A small bottle of formaldehyde."
- icon_state = "bottle20"
list_reagents = list("formaldehyde" = 30)
/obj/item/reagent_containers/glass/bottle/ammonia
name = "ammonia bottle"
desc = "A small bottle of ammonia."
- icon_state = "bottle20"
list_reagents = list("ammonia" = 30)
/obj/item/reagent_containers/glass/bottle/diethylamine
name = "diethylamine bottle"
desc = "A small bottle of diethylamine."
- icon_state = "bottle17"
list_reagents = list("diethylamine" = 30)
/obj/item/reagent_containers/glass/bottle/facid
name = "Fluorosulfuric Acid Bottle"
- desc = "A small bottle. Contains a small amount of Fluorosulfuric Acid"
- icon_state = "bottle17"
+ desc = "A small bottle. Contains a small amount of fluorosulfuric acid."
list_reagents = list("facid" = 30)
/obj/item/reagent_containers/glass/bottle/adminordrazine
@@ -135,20 +122,17 @@
/obj/item/reagent_containers/glass/bottle/capsaicin
name = "Capsaicin Bottle"
desc = "A small bottle. Contains hot sauce."
- icon_state = "bottle3"
list_reagents = list("capsaicin" = 30)
/obj/item/reagent_containers/glass/bottle/frostoil
name = "Frost Oil Bottle"
desc = "A small bottle. Contains cold sauce."
- icon_state = "bottle17"
list_reagents = list("frostoil" = 30)
/obj/item/reagent_containers/glass/bottle/traitor
name = "syndicate bottle"
desc = "A small bottle. Contains a random nasty chemical."
icon = 'icons/obj/chemical.dmi'
- icon_state = "bottle16"
var/extra_reagent = null
/obj/item/reagent_containers/glass/bottle/traitor/Initialize()
@@ -159,85 +143,71 @@
/obj/item/reagent_containers/glass/bottle/polonium
name = "polonium bottle"
desc = "A small bottle. Contains Polonium."
- icon_state = "bottle16"
list_reagents = list("polonium" = 30)
/obj/item/reagent_containers/glass/bottle/magillitis
name = "magillitis bottle"
desc = "A small bottle. Contains a serum known only as 'magillitis'."
- icon_state = "bottle16"
list_reagents = list("magillitis" = 5)
/obj/item/reagent_containers/glass/bottle/venom
name = "venom bottle"
desc = "A small bottle. Contains Venom."
- icon_state = "bottle16"
list_reagents = list("venom" = 30)
/obj/item/reagent_containers/glass/bottle/neurotoxin2
name = "neurotoxin bottle"
desc = "A small bottle. Contains Neurotoxin."
- icon_state = "bottle16"
list_reagents = list("neurotoxin2" = 30)
/obj/item/reagent_containers/glass/bottle/formaldehyde
name = "formaldehyde bottle"
desc = "A small bottle. Contains Formaldehyde."
- icon_state = "bottle16"
list_reagents = list("formaldehyde" = 30)
/obj/item/reagent_containers/glass/bottle/initropidril
name = "initropidril bottle"
desc = "A small bottle. Contains initropidril."
- icon_state = "bottle16"
list_reagents = list("initropidril" = 30)
/obj/item/reagent_containers/glass/bottle/pancuronium
name = "pancuronium bottle"
desc = "A small bottle. Contains pancuronium."
- icon_state = "bottle16"
list_reagents = list("pancuronium" = 30)
/obj/item/reagent_containers/glass/bottle/sodium_thiopental
name = "sodium thiopental bottle"
desc = "A small bottle. Contains sodium thiopental."
- icon_state = "bottle16"
list_reagents = list("sodium_thiopental" = 30)
/obj/item/reagent_containers/glass/bottle/coniine
name = "coniine bottle"
desc = "A small bottle. Contains coniine."
- icon_state = "bottle16"
list_reagents = list("coniine" = 30)
/obj/item/reagent_containers/glass/bottle/curare
name = "curare bottle"
desc = "A small bottle. Contains curare."
- icon_state = "bottle16"
list_reagents = list("curare" = 30)
/obj/item/reagent_containers/glass/bottle/amanitin
name = "amanitin bottle"
desc = "A small bottle. Contains amanitin."
- icon_state = "bottle16"
list_reagents = list("amanitin" = 30)
/obj/item/reagent_containers/glass/bottle/histamine
name = "histamine bottle"
desc = "A small bottle. Contains Histamine."
- icon_state = "bottle16"
list_reagents = list("histamine" = 30)
/obj/item/reagent_containers/glass/bottle/diphenhydramine
name = "antihistamine bottle"
desc = "A small bottle of diphenhydramine."
- icon_state = "bottle20"
list_reagents = list("diphenhydramine" = 30)
/obj/item/reagent_containers/glass/bottle/potass_iodide
name = "anti-radiation bottle"
desc = "A small bottle of potassium iodide."
- icon_state = "bottle11"
list_reagents = list("potass_iodide" = 30)
/obj/item/reagent_containers/glass/bottle/salglu_solution
@@ -249,68 +219,57 @@
/obj/item/reagent_containers/glass/bottle/atropine
name = "atropine bottle"
desc = "A small bottle of atropine."
- icon_state = "bottle12"
list_reagents = list("atropine" = 30)
/obj/item/reagent_containers/glass/bottle/romerol
name = "romerol bottle"
desc = "A small bottle of Romerol. The REAL zombie powder."
- icon_state = "bottle12"
list_reagents = list("romerol" = 30)
/obj/item/reagent_containers/glass/bottle/flu_virion
name = "Flu virion culture bottle"
desc = "A small bottle. Contains H13N1 flu virion culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/advance/flu
/obj/item/reagent_containers/glass/bottle/epiglottis_virion
name = "Epiglottis virion culture bottle"
desc = "A small bottle. Contains Epiglottis virion culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/advance/voice_change
/obj/item/reagent_containers/glass/bottle/liver_enhance_virion
name = "Liver enhancement virion culture bottle"
desc = "A small bottle. Contains liver enhancement virion culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/advance/heal
/obj/item/reagent_containers/glass/bottle/hallucigen_virion
name = "Hallucigen virion culture bottle"
desc = "A small bottle. Contains hallucigen virion culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/advance/hallucigen
/obj/item/reagent_containers/glass/bottle/pierrot_throat
name = "Pierrot's Throat culture bottle"
desc = "A small bottle. Contains H0NI<42 virion culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/pierrot_throat
/obj/item/reagent_containers/glass/bottle/cold
name = "Rhinovirus culture bottle"
desc = "A small bottle. Contains XY-rhinovirus culture in synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/advance/cold
/obj/item/reagent_containers/glass/bottle/retrovirus
name = "Retrovirus culture bottle"
desc = "A small bottle. Contains a retrovirus culture in a synthblood medium."
- icon_state = "bottle3"
spawned_disease = /datum/disease/dna_retrovirus
/obj/item/reagent_containers/glass/bottle/gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS+ culture in synthblood medium."//Or simply - General BullShit
- icon_state = "bottle3"
amount_per_transfer_from_this = 5
spawned_disease = /datum/disease/gbs
/obj/item/reagent_containers/glass/bottle/fake_gbs
name = "GBS culture bottle"
desc = "A small bottle. Contains Gravitokinetic Bipotential SADS- culture in synthblood medium."//Or simply - General BullShit
- icon_state = "bottle3"
spawned_disease = /datum/disease/fake_gbs
/obj/item/reagent_containers/glass/bottle/brainrot
@@ -322,41 +281,34 @@
/obj/item/reagent_containers/glass/bottle/magnitis
name = "Magnitis culture bottle"
desc = "A small bottle. Contains a small dosage of Fukkos Miracos."
- icon_state = "bottle3"
spawned_disease = /datum/disease/magnitis
/obj/item/reagent_containers/glass/bottle/wizarditis
name = "Wizarditis culture bottle"
desc = "A small bottle. Contains a sample of Rincewindus Vulgaris."
- icon_state = "bottle3"
spawned_disease = /datum/disease/wizarditis
/obj/item/reagent_containers/glass/bottle/anxiety
name = "Severe Anxiety culture bottle"
desc = "A small bottle. Contains a sample of Lepidopticides."
- icon_state = "bottle3"
spawned_disease = /datum/disease/anxiety
/obj/item/reagent_containers/glass/bottle/beesease
name = "Beesease culture bottle"
desc = "A small bottle. Contains a sample of invasive Apidae."
- icon_state = "bottle3"
spawned_disease = /datum/disease/beesease
/obj/item/reagent_containers/glass/bottle/fluspanish
name = "Spanish flu culture bottle"
desc = "A small bottle. Contains a sample of Inquisitius."
- icon_state = "bottle3"
spawned_disease = /datum/disease/fluspanish
/obj/item/reagent_containers/glass/bottle/tuberculosis
name = "Fungal Tuberculosis culture bottle"
desc = "A small bottle. Contains a sample of Fungal Tubercle bacillus."
- icon_state = "bottle3"
spawned_disease = /datum/disease/tuberculosis
/obj/item/reagent_containers/glass/bottle/tuberculosiscure
name = "BVAK bottle"
desc = "A small bottle containing Bio Virus Antidote Kit."
- icon_state = "bottle5"
- list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
+ list_reagents = list("atropine" = 5, "epinephrine" = 5, "salbutamol" = 10, "spaceacillin" = 10)
\ No newline at end of file
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 346f246045..30aa67e91a 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -9,8 +9,10 @@
container_type = TRANSPARENT_1
/obj/item/reagent_containers/dropper/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
- if(!target.reagents) return
+ if(!proximity)
+ return
+ if(!target.reagents)
+ return
if(reagents.total_volume > 0)
if(target.reagents.total_volume >= target.reagents.maximum_volume)
diff --git a/code/modules/reagents/reagent_containers/glass.dm b/code/modules/reagents/reagent_containers/glass.dm
index 54058b5a52..4b7ba22574 100644
--- a/code/modules/reagents/reagent_containers/glass.dm
+++ b/code/modules/reagents/reagent_containers/glass.dm
@@ -49,12 +49,12 @@
to_chat(user, "You swallow a gulp of [src].")
var/fraction = min(5/reagents.total_volume, 1)
reagents.reaction(M, INGEST, fraction)
- spawn(5)
- reagents.trans_to(M, 5)
+ addtimer(CALLBACK(reagents, /datum/reagents.proc/trans_to, M, 5), 5)
playsound(M.loc,'sound/items/drink.ogg', rand(10,50), 1)
/obj/item/reagent_containers/glass/afterattack(obj/target, mob/user, proximity)
- if((!proximity) || !check_allowed_items(target,target_self=1)) return
+ if((!proximity) || !check_allowed_items(target,target_self=1))
+ return
else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us.
@@ -290,7 +290,7 @@
/obj/item/reagent_containers/glass/beaker/waterbottle
name = "bottle of water"
- desc = "A bottle of water filled at an old Earth bottling facility,"
+ desc = "A bottle of water filled at an old Earth bottling facility."
icon = 'icons/obj/drinks.dmi'
icon_state = "smallbottle"
item_state = "bottle"
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index f236b83fa3..dff0869322 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -101,13 +101,14 @@
reagents.maximum_volume = 0 //Makes them useless afterwards
container_type = NONE
update_icon()
- spawn(80)
- if(iscyborg(user) && !reagents.total_volume)
- var/mob/living/silicon/robot/R = user
- if(R.cell.use(100))
- reagents.add_reagent_list(list_reagents)
- update_icon()
- return
+ addtimer(CALLBACK(src, .proc/cyborg_recharge, user), 80)
+
+/obj/item/reagent_containers/hypospray/medipen/proc/cyborg_recharge(mob/living/silicon/robot/user)
+ if(!reagents.total_volume && iscyborg(user))
+ var/mob/living/silicon/robot/R = user
+ if(R.cell.use(100))
+ reagents.add_reagent_list(list_reagents)
+ update_icon()
/obj/item/reagent_containers/hypospray/medipen/update_icon()
if(reagents.total_volume > 0)
diff --git a/code/modules/reagents/reagent_containers/pill.dm b/code/modules/reagents/reagent_containers/pill.dm
index 8c19d105de..324623edbd 100644
--- a/code/modules/reagents/reagent_containers/pill.dm
+++ b/code/modules/reagents/reagent_containers/pill.dm
@@ -4,8 +4,8 @@
icon = 'icons/obj/chemical.dmi'
icon_state = "pill"
item_state = "pill"
- lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
- righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
+ lefthand_file = 'icons/mob/inhands/equipment/medical_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/medical_righthand.dmi'
possible_transfer_amounts = list()
volume = 50
var/apply_type = INGEST
@@ -54,7 +54,8 @@
/obj/item/reagent_containers/pill/afterattack(obj/target, mob/user , proximity)
- if(!proximity) return
+ if(!proximity)
+ return
if(target.is_open_container() != 0 && target.reagents)
if(!target.reagents.total_volume)
to_chat(user, "[target] is empty! There's nothing to dissolve [src] in.")
@@ -150,4 +151,4 @@
desc = "I wouldn't eat this if I were you."
icon_state = "pill9"
color = "#454545"
- list_reagents = list("shadowmutationtoxin" = 1)
\ No newline at end of file
+ list_reagents = list("shadowmutationtoxin" = 1)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index daf955d0ef..b6c4180d76 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -238,7 +238,7 @@
/obj/item/reagent_containers/syringe/bluespace
name = "bluespace syringe"
- desc = "An advanced syringe that can hold 60 units of chemicals"
+ desc = "An advanced syringe that can hold 60 units of chemicals."
amount_per_transfer_from_this = 20
volume = 60
origin_tech = "bluespace=4;materials=4;biotech=4"
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index 2a194ee95c..1ab1a46723 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -7,6 +7,7 @@
name = "conveyor belt"
desc = "A conveyor belt."
anchored = TRUE
+ layer = BELOW_OPEN_DOOR_LAYER
var/operating = FALSE // 1 if running forward, -1 if backwards, 0 if off
var/operable = 1 // true if can operate (no broken segments in this belt run)
var/forwards // this is the default (forward) direction, set by the map dir
diff --git a/code/modules/recycling/disposal-structures.dm b/code/modules/recycling/disposal-structures.dm
index 9b57c41826..5a7428d1d1 100644
--- a/code/modules/recycling/disposal-structures.dm
+++ b/code/modules/recycling/disposal-structures.dm
@@ -15,6 +15,10 @@
var/tomail = 0 //changes if contains wrapped package
var/hasmob = 0 //If it contains a mob
+/obj/structure/disposalholder/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION)
+
/obj/structure/disposalholder/Destroy()
qdel(gas)
active = 0
@@ -176,6 +180,9 @@
if("pipe-j2s")
stored.ptype = DISP_SORTJUNCTION_FLIP
+/obj/structure/disposalpipe/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION)
// pipe is deleted
// ensure if holder is present, it is expelled
@@ -304,7 +311,8 @@
to_chat(user, "You start slicing the disposal pipe...")
// check if anything changed over 2 seconds
if(do_after(user,30, target = src))
- if(!src || !W.isOn()) return
+ if(!src || !W.isOn())
+ return
deconstruct()
to_chat(user, "You slice the disposal pipe.")
else
@@ -639,6 +647,7 @@
/obj/structure/disposaloutlet/Initialize(mapload, obj/structure/disposalconstruct/make_from)
. = ..()
+
if(make_from)
setDir(make_from.dir)
make_from.loc = src
@@ -652,6 +661,10 @@
if(trunk)
trunk.linked = src // link the pipe trunk to self
+/obj/structure/disposaloutlet/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION)
+
/obj/structure/disposaloutlet/Destroy()
if(trunk)
trunk.linked = null
@@ -697,7 +710,8 @@
playsound(src.loc, 'sound/items/welder2.ogg', 100, 1)
to_chat(user, "You start slicing the floorweld off \the [src]...")
if(do_after(user,20*I.toolspeed, target = src))
- if(!src || !W.isOn()) return
+ if(!src || !W.isOn())
+ return
to_chat(user, "You slice the floorweld off \the [src].")
stored.loc = loc
src.transfer_fingerprints_to(stored)
diff --git a/code/modules/recycling/disposal-unit.dm b/code/modules/recycling/disposal-unit.dm
index 9fdc62c8d2..926e6326ad 100644
--- a/code/modules/recycling/disposal-unit.dm
+++ b/code/modules/recycling/disposal-unit.dm
@@ -27,6 +27,7 @@
/obj/machinery/disposal/Initialize(mapload, obj/structure/disposalconstruct/make_from)
. = ..()
+
if(make_from)
setDir(make_from.dir)
make_from.loc = 0
@@ -40,6 +41,12 @@
//gas.volume = 1.05 * CELLSTANDARD
update_icon()
+ return INITIALIZE_HINT_LATELOAD //we need turfs to have air
+
+/obj/machinery/disposal/ComponentInitialize()
+ . = ..()
+ AddComponent(/datum/component/rad_insulation, RAD_NO_INSULATION)
+
/obj/machinery/disposal/proc/trunk_check()
trunk = locate() in loc
if(!trunk)
@@ -62,10 +69,6 @@
if(current_size >= STAGE_FIVE)
deconstruct()
-/obj/machinery/disposal/Initialize(mapload)
- ..()
- return INITIALIZE_HINT_LATELOAD //we need turfs to have air
-
/obj/machinery/disposal/LateInitialize()
//this will get a copy of the air turf and take a SEND PRESSURE amount of air from it
var/atom/L = loc
@@ -465,13 +468,17 @@
return
switch(dir)
if(NORTH)
- if(AM.loc.y != loc.y+1) return
+ if(AM.loc.y != loc.y+1)
+ return
if(EAST)
- if(AM.loc.x != loc.x+1) return
+ if(AM.loc.x != loc.x+1)
+ return
if(SOUTH)
- if(AM.loc.y != loc.y-1) return
+ if(AM.loc.y != loc.y-1)
+ return
if(WEST)
- if(AM.loc.x != loc.x-1) return
+ if(AM.loc.x != loc.x-1)
+ return
if(isobj(AM))
var/obj/O = AM
diff --git a/code/modules/research/designs/machine_designs.dm b/code/modules/research/designs/machine_designs.dm
index 2fe94933d7..14346ee13b 100644
--- a/code/modules/research/designs/machine_designs.dm
+++ b/code/modules/research/designs/machine_designs.dm
@@ -315,13 +315,21 @@
category = list ("Misc. Machinery")
/datum/design/board/processor
- name = "Machine Design (Processor Board)"
- desc = "The circuit board for a processor."
+ name = "Machine Design (Food Processor Board)"
+ desc = "The circuit board for a food processor."
id = "processor"
req_tech = list("programming" = 1)
build_path = /obj/item/circuitboard/machine/processor
category = list ("Misc. Machinery")
+/datum/design/board/slimeprocessor
+ name = "Machine Design (Slime Processor Board)"
+ desc = "The circuit board for a slime processor."
+ id = "slimeprocessor"
+ req_tech = list("programming" = 1, "plasmatech" = 1)
+ build_path = /obj/item/circuitboard/machine/processor/slime
+ category = list ("Misc. Machinery")
+
/datum/design/board/recycler
name = "Machine Design (Recycler Board)"
desc = "The circuit board for a recycler."
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index 3a2b1f6b7f..4ba8925df6 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -113,7 +113,7 @@
if(!is_insertion_ready(user))
return
if(!checkCircumstances(O))
- to_chat(user, "The [O] is not yet valid for the [src] and must be completed!")
+ to_chat(user, "[O] is not yet valid for [src] and must be completed!")
return
if(!O.origin_tech)
to_chat(user, "This doesn't seem to have a tech origin!")
@@ -125,7 +125,7 @@
if(!user.transferItemToLoc(O, src))
return
loaded_item = O
- to_chat(user, "You add the [O.name] to the machine.")
+ to_chat(user, "You add [O] to the machine.")
flick("h_lathe_load", src)
@@ -255,7 +255,7 @@
ejectItem()
else if(prob(EFFECT_PROB_VERYLOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and leaking radiation!")
- radiation_pulse(get_turf(src), 1, 1, 25, 1)
+ radiation_pulse(src, 500)
ejectItem(TRUE)
else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, spewing toxic waste!")
@@ -337,10 +337,7 @@
visible_message("[src] dangerously overheats, launching a flaming fuel orb!")
investigate_log("Experimentor has launched a fireball at [M]!", INVESTIGATE_EXPERIMENTOR)
var/obj/item/projectile/magic/aoe/fireball/FB = new /obj/item/projectile/magic/aoe/fireball(start)
- FB.original = MT
- FB.current = start
- FB.yo = MT.y - start.y
- FB.xo = MT.x - start.x
+ FB.preparePixelProjectile(MT, start)
FB.fire()
else if(prob(EFFECT_PROB_LOW-badThingCoeff))
visible_message("[src] malfunctions, melting [exp_on] and releasing a burst of flame!")
@@ -687,13 +684,13 @@
qdel(src) //Comment this line to produce a light grenade (the bomb that keeps on exploding when used)!!
/obj/item/relic/proc/teleport(mob/user)
- to_chat(user, "The [src] begins to vibrate!")
+ to_chat(user, "[src] begins to vibrate!")
addtimer(CALLBACK(src, .proc/do_teleport, user), rand(10, 30))
/obj/item/relic/proc/do_teleport(mob/user)
var/turf/userturf = get_turf(user)
if(loc == user && userturf.z != ZLEVEL_CENTCOM) //Because Nuke Ops bringing this back on their shuttle, then looting the ERT area is 2fun4you!
- visible_message("The [src] twists and bends, relocating itself!")
+ visible_message("[src] twists and bends, relocating itself!")
throwSmoke(userturf)
do_teleport(user, userturf, 8, asoundin = 'sound/effects/phasein.ogg')
throwSmoke(get_turf(user))
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index efb64c6623..d912bc908e 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -168,12 +168,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(href_list["menu"]) //Switches menu screens. Converts a sent text string into a number. Saves a LOT of code.
var/temp_screen = text2num(href_list["menu"])
screen = temp_screen
-
-
+
+
var/datum/component/material_container/linked_materials
if(linked_lathe)
linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-
+
var/datum/component/material_container/imprinter_materials
if(linked_imprinter)
imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
@@ -303,7 +303,8 @@ won't update every console in existence) but it's more of a hassle to do. Also,
break
if(!cancontinue)
var/choice = input("This item does not raise tech levels. Proceed destroying loaded item anyway?") in list("Proceed", "Cancel")
- if(choice == "Cancel" || !linked_destroy || !linked_destroy.loaded_item) return
+ if(choice == "Cancel" || !linked_destroy || !linked_destroy.loaded_item)
+ return
linked_destroy.busy = TRUE
screen = 0.1
updateUsrDialog()
@@ -642,20 +643,22 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_imprinter == null)
screen = 4.0
-
+
var/datum/component/material_container/linked_materials
if(linked_lathe)
linked_materials = linked_lathe.GetComponent(/datum/component/material_container)
-
+
var/datum/component/material_container/imprinter_materials
if(linked_imprinter)
imprinter_materials = linked_imprinter.GetComponent(/datum/component/material_container)
switch(screen)
//////////////////////R&D CONSOLE SCREENS//////////////////
- if(0.0) dat += "
Updating Database....
"
+ if(0.0)
+ dat += "
Updating Database....
"
- if(0.1) dat += "
Processing and Updating Database...
"
+ if(0.1)
+ dat += "
Processing and Updating Database...
"
if(0.2)
dat += "
SYSTEM LOCKED
"
@@ -740,13 +743,20 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Name: [D.name] "
if(D.build_type)
dat += "Lathe Types: "
- if(D.build_type & IMPRINTER) dat += "Circuit Imprinter "
- if(D.build_type & PROTOLATHE) dat += "Protolathe "
- if(D.build_type & AUTOLATHE) dat += "Autolathe "
- if(D.build_type & MECHFAB) dat += "Exosuit Fabricator "
- if(D.build_type & BIOGENERATOR) dat += "Biogenerator "
- if(D.build_type & LIMBGROWER) dat += "Limbgrower "
- if(D.build_type & SMELTER) dat += "Smelter "
+ if(D.build_type & IMPRINTER)
+ dat += "Circuit Imprinter "
+ if(D.build_type & PROTOLATHE)
+ dat += "Protolathe "
+ if(D.build_type & AUTOLATHE)
+ dat += "Autolathe "
+ if(D.build_type & MECHFAB)
+ dat += "Exosuit Fabricator "
+ if(D.build_type & BIOGENERATOR)
+ dat += "Biogenerator "
+ if(D.build_type & LIMBGROWER)
+ dat += "Limbgrower "
+ if(D.build_type & SMELTER)
+ dat += "Smelter "
dat += "Required Materials: "
var/all_mats = D.materials + D.reagents_list
for(var/M in all_mats)
@@ -935,9 +945,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/mat_id in linked_materials.materials)
var/datum/material/M = linked_materials.materials[mat_id]
dat += "* [M.amount] of [M.name]: "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "Eject "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "5x "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "All"
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "Eject "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT*5)
+ dat += "5x "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "All"
dat += " "
dat += ""
@@ -1047,9 +1060,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
for(var/mat_id in imprinter_materials.materials)
var/datum/material/M = imprinter_materials.materials[mat_id]
dat += "* [M.amount] of [M.name]: "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "Eject "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT*5) dat += "5x "
- if(M.amount >= MINERAL_MATERIAL_AMOUNT) dat += "All"
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "Eject "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT*5)
+ dat += "5x "
+ if(M.amount >= MINERAL_MATERIAL_AMOUNT)
+ dat += "All"
dat += " "
dat += ""
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 0ea18b2ff9..973a496254 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -74,7 +74,7 @@
//whether the machine can have an item inserted in its current state.
/obj/machinery/r_n_d/proc/is_insertion_ready(mob/user)
if(panel_open)
- to_chat(user, "You can't load the [src.name] while it's opened!")
+ to_chat(user, "You can't load [src] while it's opened!")
return
if (disabled)
return
@@ -84,19 +84,19 @@
console.SyncRDevices()
if(!linked_console)
- to_chat(user, "The [name] must be linked to an R&D console first!")
+ to_chat(user, "[src] must be linked to an R&D console first!")
return
if (busy)
- to_chat(user, "The [src.name] is busy right now.")
+ to_chat(user, "[src] is busy right now.")
return
if(stat & BROKEN)
- to_chat(user, "The [src.name] is broken.")
+ to_chat(user, "[src] is broken.")
return
if(stat & NOPOWER)
- to_chat(user, "The [src.name] has no power.")
+ to_chat(user, "[src] has no power.")
return
if(loaded_item)
- to_chat(user, "The [src] is already loaded.")
+ to_chat(user, "[src] is already loaded.")
return
return 1
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index 917df417b3..89c0607060 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -349,8 +349,8 @@ research holder datum.
max_tech_stored = 10
/obj/item/disk/tech_disk/debug
- name = "centcom technology disk"
- desc = "A debug item for research"
+ name = "\improper CentCom technology disk"
+ desc = "A debug item for research."
materials = list()
max_tech_stored = 0
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 0f30347c74..98f5fef616 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -31,7 +31,8 @@
/obj/machinery/r_n_d/server/Initialize(mapload)
. = ..()
- if(!files) files = new /datum/research(src)
+ if(!files)
+ files = new /datum/research(src)
var/list/temp_list
if(!id_with_upload.len)
temp_list = list()
@@ -254,7 +255,8 @@
dat += "[S.name] || "
dat += "Access Rights | "
dat += "Data Management"
- if(badmin) dat += " | Server-to-Server Transfer"
+ if(badmin)
+ dat += " | Server-to-Server Transfer"
dat += " "
if(1) //Access rights menu
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 6eedd257d0..cca88a0dda 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -194,7 +194,7 @@
SM.mind.enslave_mind_to_creator(user)
SM.sentience_act()
to_chat(SM, "All at once it makes sense: you know what you are and who you are! Self awareness is yours!")
- to_chat(SM, "You are grateful to be self aware and owe [user] a great debt. Serve [user], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
+ to_chat(SM, "You are grateful to be self aware and owe [user.real_name] a great debt. Serve [user.real_name], and assist [user.p_them()] in completing [user.p_their()] goals at any cost.")
to_chat(user, "[SM] accepts [src] and suddenly becomes attentive and aware. It worked!")
qdel(src)
else
@@ -415,7 +415,7 @@
/obj/item/clothing/under/golem
name = "adamantine skin"
- desc = "a golem's skin"
+ desc = "A golem's skin."
icon_state = "golem"
item_state = "golem"
item_color = "golem"
@@ -425,7 +425,7 @@
/obj/item/clothing/suit/golem
name = "adamantine shell"
- desc = "a golem's thick outer shell"
+ desc = "A golem's thick outer shell."
icon_state = "golem"
item_state = "golem"
w_class = WEIGHT_CLASS_BULKY
@@ -438,7 +438,7 @@
/obj/item/clothing/shoes/golem
name = "golem's feet"
- desc = "sturdy adamantine feet"
+ desc = "Sturdy adamantine feet."
icon_state = "golem"
item_state = null
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
@@ -447,7 +447,7 @@
/obj/item/clothing/mask/breath/golem
name = "golem's face"
- desc = "the imposing face of an adamantine golem"
+ desc = "The imposing face of an adamantine golem."
icon_state = "golem"
item_state = "golem"
siemens_coefficient = 0
@@ -457,7 +457,7 @@
/obj/item/clothing/gloves/golem
name = "golem's hands"
- desc = "strong adamantine hands"
+ desc = "Strong adamantine hands."
icon_state = "golem"
item_state = null
siemens_coefficient = 0
@@ -470,82 +470,14 @@
item_state = "dermal"
item_color = "dermal"
name = "golem's head"
- desc = "a golem's head"
+ desc = "A golem's head."
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
flags_1 = ABSTRACT_1 | NODROP_1
-
-/obj/effect/golemrune
- anchored = TRUE
- desc = "a strange rune used to create golems. It glows when spirits are nearby."
- name = "rune"
- icon = 'icons/obj/rune.dmi'
- icon_state = "golem"
- resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
- layer = TURF_LAYER
-
-/obj/effect/golemrune/Initialize()
- . = ..()
- START_PROCESSING(SSobj, src)
- notify_ghosts("Golem rune created in [get_area(src)].", 'sound/misc/server-ready.ogg', source = src)
-
-/obj/effect/golemrune/Destroy()
- STOP_PROCESSING(SSobj, src)
- return ..()
-
-/obj/effect/golemrune/process()
- var/mob/dead/observer/ghost
- for(var/mob/dead/observer/O in src.loc)
- if(!O.client)
- continue
- if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
- continue
- if (O.orbiting)
- continue
- ghost = O
- break
- if(ghost)
- icon_state = "golem2"
- else
- icon_state = "golem"
-
-/obj/effect/golemrune/attack_hand(mob/living/user)
- var/mob/dead/observer/ghost
- for(var/mob/dead/observer/O in src.loc)
- if(!O.client)
- continue
- if(O.mind && O.mind.current && O.mind.current.stat != DEAD)
- continue
- if (O.orbiting)
- continue
- ghost = O
- break
- if(!ghost)
- to_chat(user, "The rune fizzles uselessly! There is no spirit nearby.")
- return
- var/mob/living/carbon/human/G = new /mob/living/carbon/human
- G.set_species(/datum/species/golem/adamantine)
- G.set_cloned_appearance()
- G.real_name = G.dna.species.random_name()
- G.name = G.real_name
- G.dna.unique_enzymes = G.dna.generate_unique_enzymes()
- G.dna.species.auto_equip(G)
- G.loc = src.loc
- G.key = ghost.key
- to_chat(G, "You are an adamantine golem. You move slowly, but are highly resistant to heat and cold as well as blunt trauma. You are unable to wear clothes, but can still use most tools. \
- Serve [user], and assist [user.p_them()] in completing their goals at any cost.")
- G.mind.store_memory("Serve [user.real_name], your creator.")
- G.mind.assigned_role = "Servant Golem"
-
- G.mind.enslave_mind_to_creator(user)
-
- log_game("[key_name(G)] was made a golem by [key_name(user)].")
- log_admin("[key_name(G)] was made a golem by [key_name(user)].")
- qdel(src)
-
+
/obj/item/stack/tile/bluespace
name = "bluespace floor tile"
singular_name = "floor tile"
- desc = "Through a series of micro-teleports these tiles let people move at incredible speeds"
+ desc = "Through a series of micro-teleports these tiles let people move at incredible speeds."
icon_state = "tile-bluespace"
w_class = WEIGHT_CLASS_NORMAL
force = 6
@@ -561,7 +493,7 @@
/obj/item/stack/tile/sepia
name = "sepia floor tile"
singular_name = "floor tile"
- desc = "Time seems to flow very slowly around these tiles"
+ desc = "Time seems to flow very slowly around these tiles."
icon_state = "tile-sepia"
w_class = WEIGHT_CLASS_NORMAL
force = 6
diff --git a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
index 1cc5b482f0..7f301bf8b9 100644
--- a/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
+++ b/code/modules/ruins/objects_and_mobs/ash_walker_den.dm
@@ -16,7 +16,7 @@
new /obj/item/device/assembly/signaler/anomaly (get_step(loc, pick(GLOB.alldirs)))
return ..()
-/mob/living/simple_animal/hostile/spawner/lavaland/ash_walker/handle_automated_action()
+/mob/living/simple_animal/hostile/spawner/lavaland/ash_walker/Life()
consume()
return ..()
diff --git a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
index c18f2c3174..ce467a1181 100644
--- a/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
+++ b/code/modules/ruins/objects_and_mobs/necropolis_gate.dm
@@ -263,7 +263,7 @@ GLOBAL_DATUM(necropolis_gate, /obj/structure/necropolis_gate/legion_gate)
if(falling || fallen)
return
var/turf/T = get_turf(src)
- if(!istype(T, /turf/open/lava) && !istype(T, /turf/open/chasm)) //nothing to sink or fall into
+ if(!islava(T) && !ischasm(T)) //nothing to sink or fall into
return
var/obj/item/I
if(istype(AM, /obj/item))
diff --git a/code/modules/ruins/objects_and_mobs/sin_ruins.dm b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
index a01a144bc3..f00c90bb25 100644
--- a/code/modules/ruins/objects_and_mobs/sin_ruins.dm
+++ b/code/modules/ruins/objects_and_mobs/sin_ruins.dm
@@ -24,7 +24,9 @@
know it'll be worth it.
")
icon_state = "slots2"
playsound(src, 'sound/lavaland/cursed_slot_machine.ogg', 50, 0)
- sleep(50)
+ addtimer(CALLBACK(src, .proc/determine_victor, user), 50)
+
+/obj/structure/cursed_slot_machine/proc/determine_victor(mob/living/user)
icon_state = "slots1"
in_use = FALSE
if(prob(win_prob))
@@ -37,6 +39,7 @@
if(user)
to_chat(user, "Fucking machine! Must be rigged. Still... one more try couldn't hurt, right?")
+
/obj/structure/cursed_money
name = "bag of money"
desc = "RICH! YES! YOU KNEW IT WAS WORTH IT! YOU'RE RICH! RICH! RICH!"
@@ -65,8 +68,6 @@
user.put_in_hands(critical_fail)
qdel(src)
-
-
/obj/effect/gluttony //Gluttony's wall: Used in the Gluttony ruin. Only lets the overweight through.
name = "gluttony's wall"
desc = "Only those who truly indulge may pass."
diff --git a/code/modules/ruins/spaceruin_code/caravanambush.dm b/code/modules/ruins/spaceruin_code/caravanambush.dm
new file mode 100644
index 0000000000..8877a693cd
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/caravanambush.dm
@@ -0,0 +1,27 @@
+//caravan ambush
+
+/obj/item/wrench/caravan
+ color = "#ff0000"
+ desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster."
+ name = "experimental wrench"
+ toolspeed = 0.3
+
+/obj/item/screwdriver/caravan
+ color = "#ff0000"
+ desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster."
+ name = "experimental screwdriver"
+ toolspeed = 0.3
+ random_color = FALSE
+
+/obj/item/wirecutters/caravan
+ color = "#ff0000"
+ desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster."
+ name = "experimental wirecutters"
+ toolspeed = 0.3
+ random_color = FALSE
+
+/obj/item/crowbar/red/caravan
+ color = "#ff0000"
+ desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."
+ name = "experimental crowbar"
+ toolspeed = 0.3
diff --git a/code/modules/ruins/spaceruin_code/crashedship.dm b/code/modules/ruins/spaceruin_code/crashedship.dm
index ffa1db1522..e125109168 100644
--- a/code/modules/ruins/spaceruin_code/crashedship.dm
+++ b/code/modules/ruins/spaceruin_code/crashedship.dm
@@ -1,15 +1,40 @@
-/////////// crashedship items
+// crashedship / packer ship
+
+//Areas
+
+/area/awaymission/BMPship
+ name = "BMP Asteroids"
+ icon_state = "away"
+
+
+/area/awaymission/BMPship/Aft
+ name = "Aft Block"
+ icon_state = "away1"
+ requires_power = TRUE
+
+/area/awaymission/BMPship/Midship
+ name = "Midship Block"
+ icon_state = "away2"
+ requires_power = TRUE
+
+/area/awaymission/BMPship/Fore
+ name = "Fore Block"
+ icon_state = "away3"
+ requires_power = TRUE
+
+
+// crashedship items
/obj/item/paper/fluff/ruins/crashedship/scribbled
name = "scribbled note"
info = "The next person who takes one of my screwdrivers gets stabbed with one. They are MINE. - Love, Madsen"
-
-
+
+
/obj/item/paper/fluff/ruins/crashedship/captains_log
name = "Captain's log entry"
info = "I'm no scientist, but judging from the design and components, it seems to be some kind of teleporter. This thing is gonna be worth a lot of cash to the right man. The boys are excited, as they have every right to be, and I've let them crack into that case of beer we got. I normally wouldn't allow such a thing, but this is a time for celebration! It's not like a couple drinks will hurt anything."
/obj/item/paper/fluff/ruins/crashedship/old_diary
name = "Old Diary"
- info = "DEAR DAIRY: So we was doing our typpical route when the captain says we've been picking up weird signals on some backwatter planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."
+ info = "DEAR DIARY: So we was doing our typical route when the captain says we've been picking up weird signals on some backwater planet. Madsen wanted to stay on course but he ain't the captain, so we went out of the way to check it out. There was lots of rocks on the way, but we got to the planet fine. Found a big fancy camp with nobody around and this big metal donut thing with NT stamps all over it right in the middle. Case of beer too. Captain reckons we can pass it off to some buyer in the Syndicate. Ingram says it's bad luck and that someone is going to come look for it but it sounds like better money than selling bad meat to jerky companies."
diff --git a/code/modules/ruins/spaceruin_code/listeningstation.dm b/code/modules/ruins/spaceruin_code/listeningstation.dm
index 39ef5e12e7..0c2ec7817d 100644
--- a/code/modules/ruins/spaceruin_code/listeningstation.dm
+++ b/code/modules/ruins/spaceruin_code/listeningstation.dm
@@ -1,5 +1,9 @@
/////////// listening station
+/area/ruin/space/has_grav/powered/listeningstation
+ name = "Listening Post"
+ icon_state = "away"
+
/obj/item/paper/fluff/ruins/listeningstation/reports
info = "Nothing of interest to report."
@@ -36,7 +40,7 @@
/obj/item/paper/fluff/ruins/listeningstation/odd_report
name = "odd report"
- info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilised your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear it's ugly head again. -Donk Co. Operative #451"
+ info = "I wonder how much longer they will accept my empty reports. They will cancel the case soon without results. When the pickup comes, I will tell them I have lost faith in our cause, and beg them to consider a diplomatic solution. How many nuclear teams have been dispatched with those nukes? I must try and prevent more from ever being sent. If they will not listen to reason, I will detonate the warehouse myself. Maybe some day in the immediate future, space will be peaceful, though I don't intend to live to see it. And that is why I write this down- it is my sacrifice that stabilized your worlds, traveller. Spare a thought for me, and please attempt to prevent nuclear proliferation, should it ever rear its ugly head again. -Donk Co. Operative #451"
/obj/item/paper/fluff/ruins/listeningstation/briefing
name = "mission briefing"
diff --git a/code/modules/ruins/spaceruin_code/oldstation.dm b/code/modules/ruins/spaceruin_code/oldstation.dm
index 192552d71b..edea4fe0c1 100644
--- a/code/modules/ruins/spaceruin_code/oldstation.dm
+++ b/code/modules/ruins/spaceruin_code/oldstation.dm
@@ -10,7 +10,7 @@
/obj/item/paper/fluff/ruins/oldstation/protosuit
name = "B01-RIG Hardsuit Report"
- info = "*Prototype Hardsuit*
The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united earth government powered military \
+ info = "*Prototype Hardsuit*
The B01-RIG Hardsuit is a prototype powered exoskeleton. Based off of a recovered pre-void war era united Earth government powered military \
exosuit, the RIG Hardsuit is a breakthrough in Hardsuit technology, and is the first post-void war era Hardsuit that can be safely used by an operator.
The B01 however suffers \
a myriad of constraints. It is slow and bulky to move around, it lacks any significant armor plating against direct attacks and its internal heads up display is unfinished, \
resulting in the user being unable to see long distances.
The B01 is unlikely to see any form of mass production, but will serve as a base for future Hardsuit developments."
@@ -39,7 +39,7 @@
/obj/item/paper/fluff/ruins/oldstation/protoinv
name = "Laboratory Inventory"
info = "*Inventory*
(1) Prototype Hardsuit
(1)Health Analyser
(1)Prototype Energy Gun
(1)Singularity Generation Disk
DO NOT REMOVE WITHOUT \
- THE CAPTAIN AND RESEARCH DIRECTOR'S AUTHORISATION"
+ THE CAPTAIN AND RESEARCH DIRECTOR'S AUTHORISATION"
/obj/item/paper/fluff/ruins/oldstation/report
name = "Crew Reawakening Report"
diff --git a/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
new file mode 100644
index 0000000000..56b572b11a
--- /dev/null
+++ b/code/modules/ruins/spaceruin_code/whiteshipruin_box.dm
@@ -0,0 +1,8 @@
+/////////// ruined whiteship
+
+/obj/machinery/computer/shuttle/white_ship/ruin
+ shuttleId = "whiteship_ruin"
+
+/obj/machinery/computer/camera_advanced/shuttle_docker/whiteship/ruin
+ shuttleId = "whiteship_ruin"
+
diff --git a/code/modules/server_tools/nudge.py b/code/modules/server_tools/nudge.py
deleted file mode 100644
index 3d94ccdad7..0000000000
--- a/code/modules/server_tools/nudge.py
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env python3
-import sys
-import pickle
-import socket
-
-
-def pack():
- data = sys.argv[1]
-
- nudge(str.encode(data))
-
-
-def nudge(data):
- s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
- with open('config/server_to_tool_bridge_port.txt', 'r') as myfile:
- portstr=myfile.read().replace('\n', '').strip()
- s.connect(("localhost", int(portstr)))
- s.send(data)
- s.close()
-
-if __name__ == "__main__" and len(sys.argv) > 1:
- pack()
diff --git a/code/modules/server_tools/server_tools.dm b/code/modules/server_tools/server_tools.dm
deleted file mode 100644
index 9cacb4542f..0000000000
--- a/code/modules/server_tools/server_tools.dm
+++ /dev/null
@@ -1,93 +0,0 @@
-GLOBAL_VAR_INIT(reboot_mode, REBOOT_MODE_NORMAL) //if the world should request the service to kill it at reboot
-GLOBAL_PROTECT(reboot_mode)
-
-/world/proc/RunningService()
- return params[SERVICE_WORLD_PARAM]
-
-/proc/ServiceVersion()
- if(world.RunningService())
- return world.params[SERVICE_VERSION_PARAM]
-
-/world/proc/ExportService(command)
- return RunningService() && shell("python code/modules/server_tools/nudge.py \"[command]\"") == 0
-
-/world/proc/IRCBroadcast(msg)
- ExportService("[SERVICE_REQUEST_IRC_BROADCAST] [msg]")
-
-/world/proc/ServiceEndProcess()
- log_world("Sending shutdown request!");
- sleep(1) //flush the buffers
- ExportService(SERVICE_REQUEST_KILL_PROCESS)
-
-//called at the exact moment the world is supposed to reboot
-/world/proc/ServiceReboot()
- switch(GLOB.reboot_mode)
- if(REBOOT_MODE_HARD)
- to_chat(src, "Hard reboot triggered, you will automatically reconnect...")
- ServiceEndProcess()
- if(REBOOT_MODE_SHUTDOWN)
- to_chat(src, "The server is shutting down...")
- ServiceEndProcess()
- else
- ExportService(SERVICE_REQUEST_WORLD_REBOOT) //just let em know
-
-/world/proc/ServiceCommand(list/params)
- var/sCK = RunningService()
- var/their_sCK = params[SERVICE_CMD_PARAM_KEY]
-
- if(!their_sCK || their_sCK != sCK)
- return "Invalid comms key!";
-
- var/command = params[SERVICE_CMD_PARAM_COMMAND]
- if(!command)
- return "No command!"
-
- var/static/last_irc_status = 0
- switch(command)
- if(SERVICE_CMD_HARD_REBOOT)
- if(GLOB.reboot_mode != REBOOT_MODE_HARD)
- GLOB.reboot_mode = REBOOT_MODE_HARD
- log_world("Hard reboot requested by service")
- message_admins("The world will hard reboot at the end of the game. Requested by service.")
- SSblackbox.set_val("service_hard_restart", TRUE)
- if(SERVICE_CMD_GRACEFUL_SHUTDOWN)
- if(GLOB.reboot_mode != REBOOT_MODE_SHUTDOWN)
- GLOB.reboot_mode = REBOOT_MODE_SHUTDOWN
- log_world("Shutdown requested by service")
- message_admins("The world will shutdown at the end of the game. Requested by service.")
- SSblackbox.set_val("service_shutdown", TRUE)
- if(SERVICE_CMD_WORLD_ANNOUNCE)
- var/msg = params["message"]
- if(!istext(msg) || !msg)
- return "No message set!"
- to_chat(src, "[html_encode(msg)]")
- return "SUCCESS"
- if(SERVICE_CMD_IRC_STATUS)
- var/rtod = REALTIMEOFDAY
- if(rtod - last_irc_status < IRC_STATUS_THROTTLE)
- return
- last_irc_status = rtod
- var/list/adm = get_admin_counts()
- var/list/allmins = adm["total"]
- var/status = "Admins: [allmins.len] (Active: [english_list(adm["present"])] AFK: [english_list(adm["afk"])] Stealth: [english_list(adm["stealth"])] Skipped: [english_list(adm["noflags"])]). "
- status += "Players: [GLOB.clients.len] (Active: [get_active_player_count(0,1,0)]). Mode: [SSticker.mode ? SSticker.mode.name : "Not started"]."
- return status
- if(SERVICE_CMD_IRC_CHECK)
- var/rtod = REALTIMEOFDAY
- if(rtod - last_irc_status < IRC_STATUS_THROTTLE)
- return
- last_irc_status = rtod
- var/config_server = CONFIG_GET(string/server)
- return "[GLOB.round_id ? "Round #[GLOB.round_id]: " : ""][GLOB.clients.len] players on [SSmapping.config.map_name], Mode: [GLOB.master_mode]; Round [SSticker.HasRoundStarted() ? (SSticker.IsRoundInProgress() ? "Active" : "Finishing") : "Starting"] -- [config_server ? config_server : "[world.internet_address]:[world.port]"]"
- if(SERVICE_CMD_ADMIN_MSG)
- return IrcPm(params[SERVICE_CMD_PARAM_TARGET], params[SERVICE_CMD_PARAM_MESSAGE], params[SERVICE_CMD_PARAM_SENDER])
-
- if(SERVICE_CMD_NAME_CHECK)
- log_admin("IRC Name Check: [params[SERVICE_CMD_PARAM_SENDER]] on [params[SERVICE_CMD_PARAM_TARGET]]")
- message_admins("IRC name checking on [params[SERVICE_CMD_PARAM_TARGET]] from [params[SERVICE_CMD_PARAM_SENDER]]")
- return keywords_lookup(params[SERVICE_CMD_PARAM_TARGET], 1)
- if(SERVICE_CMD_ADMIN_WHO)
- return ircadminwho()
- else
- return "Unknown command: [command]"
-
diff --git a/code/modules/shuttle/navigation_computer.dm b/code/modules/shuttle/navigation_computer.dm
index 65669d8251..6af111506d 100644
--- a/code/modules/shuttle/navigation_computer.dm
+++ b/code/modules/shuttle/navigation_computer.dm
@@ -8,8 +8,9 @@
var/shuttlePortId = ""
var/shuttlePortName = ""
var/list/jumpto_ports = list() //hashset of ports to jump to and ignore for collision purposes
- var/list/blacklisted_turfs
- var/obj/docking_port/stationary/my_port
+ var/list/blacklisted_turfs //turfs we cannot go on, by default, any turf covered by a docking port that we did not place and cannot jump to
+ var/obj/docking_port/stationary/my_port //the custom docking port placed by this console
+ var/obj/docking_port/mobile/shuttle_port //the mobile docking port of the connected shuttle
var/view_range = 7
var/x_offset = 0
var/y_offset = 0
@@ -31,29 +32,30 @@
actions += place_action
/obj/machinery/computer/camera_advanced/shuttle_docker/CreateEye()
- var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
- if(QDELETED(M))
+ shuttle_port = SSshuttle.getShuttle(shuttleId)
+ if(QDELETED(shuttle_port))
+ shuttle_port = null
return
+
eyeobj = new /mob/camera/aiEye/remote/shuttle_docker()
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
the_eye.origin = src
- the_eye.dir = M.dir
- var/area/A = get_area(M)
- if(QDELETED(A))
- return
- var/turf/origin = locate(M.x + x_offset, M.y + y_offset, M.z)
- for(var/turf/T in A)
- if(T.z != origin.z)
- continue
- var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
- I.layer = ABOVE_NORMAL_TURF_LAYER
- I.plane = 0
- I.mouse_opacity = 0
- var/x_off = T.x - origin.x
- var/y_off = T.y - origin.y
- I.pixel_x = x_off * 32
- I.pixel_y = y_off * 32
- the_eye.placement_images[I] = list(x_off, y_off)
+ the_eye.dir = shuttle_port.dir
+ var/turf/origin = locate(shuttle_port.x + x_offset, shuttle_port.y + y_offset, shuttle_port.z)
+ for(var/V in shuttle_port.shuttle_areas)
+ var/area/A = V
+ for(var/turf/T in A)
+ if(T.z != origin.z)
+ continue
+ var/image/I = image('icons/effects/alphacolors.dmi', origin, "red")
+ I.layer = ABOVE_NORMAL_TURF_LAYER
+ I.plane = 0
+ I.mouse_opacity = 0
+ var/x_off = T.x - origin.x
+ var/y_off = T.y - origin.y
+ I.pixel_x = x_off * 32
+ I.pixel_y = y_off * 32
+ the_eye.placement_images[I] = list(x_off, y_off)
generateBlacklistedTurfs()
/obj/machinery/computer/camera_advanced/shuttle_docker/give_eye_control(mob/user)
@@ -77,7 +79,7 @@
return FALSE
var/mob/camera/aiEye/remote/shuttle_docker/the_eye = eyeobj
if(!my_port)
- my_port = new /obj/docking_port/stationary
+ my_port = new /obj/docking_port/stationary()
my_port.name = shuttlePortName
my_port.id = shuttlePortId
var/obj/docking_port/mobile/M = SSshuttle.getShuttle(shuttleId)
@@ -124,7 +126,7 @@
checkLandingSpot()
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/checkLandingTurf(turf/T)
- return T && (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T))
+ return T && (shuttle_port.shuttle_areas[T.loc] || (!blacklisted_turfs || !blacklisted_turfs[T]) && (!space_turfs_only || isspaceturf(T)) ) && (T.x > 1 && T.y > 1 && T.x < world.maxx && T.y < world.maxy)
/obj/machinery/computer/camera_advanced/shuttle_docker/proc/generateBlacklistedTurfs()
blacklisted_turfs = list()
diff --git a/code/modules/shuttle/on_move.dm b/code/modules/shuttle/on_move.dm
index 1135a91704..a67434ea5f 100644
--- a/code/modules/shuttle/on_move.dm
+++ b/code/modules/shuttle/on_move.dm
@@ -44,37 +44,46 @@ All ShuttleMove procs go here
return move_mode
// Called on the old turf to move the turf data
-/turf/proc/onShuttleMove(turf/newT, turf_type, baseturf_type, rotation, list/movement_force, move_dir)
+/turf/proc/onShuttleMove(turf/newT, list/movement_force, move_dir)
if(newT == src) // In case of in place shuttle rotation shenanigans.
return
-
//Destination turf changes
var/destination_turf_type = newT.type
- copyTurf(newT)
+ newT = copyTurf(newT)
newT.baseturf = destination_turf_type
-
+ //Air stuff
+ newT.blocks_air = TRUE
+ newT.air_update_turf(TRUE)
+ blocks_air = TRUE
+ air_update_turf(TRUE)
if(isopenturf(newT))
var/turf/open/new_open = newT
new_open.copy_air_with_tile(src)
- //Source turf changes
- ChangeTurf(turf_type, baseturf_type, FALSE, TRUE)
-
return TRUE
// Called on the new turf after everything has been moved
-/turf/proc/afterShuttleMove(turf/oldT)
+/turf/proc/afterShuttleMove(turf/oldT, turf_type, baseturf_type, rotation)
+ //Dealing with the turf we left behind
+ oldT.TransferComponents(src)
+ oldT.ChangeTurf(turf_type, baseturf_type, FALSE, TRUE)
+
+ // Rotate and let the air move again
+ if(rotation)
+ shuttleRotate(rotation) //see shuttle_rotate.dm
+
return TRUE
/////////////////////////////////////////////////////////////////////////////////////
// Called on every atom in shuttle turf contents before anything has been moved
// returns the new move_mode (based on the old)
+// WARNING: Do not leave turf contents in beforeShuttleMove or dock() will runtime
/atom/movable/proc/beforeShuttleMove(turf/newT, rotation, move_mode)
return move_mode
// Called on atoms to move the atom to the new location
-/atom/movable/proc/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/atom/movable/proc/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
if(newT == oldT) // In case of in place shuttle rotation shenanigans.
return
@@ -82,17 +91,18 @@ All ShuttleMove procs go here
if(loc != oldT)
return
- if(rotation)
- shuttleRotate(rotation) //see shuttle_rotate.dm
loc = newT
- if(length(client_mobs_in_contents))
- update_parallax_contents()
return TRUE
// Called on atoms after everything has been moved
-/atom/movable/proc/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/atom/movable/proc/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
if(light)
update_light()
+ if(rotation)
+ shuttleRotate(rotation)
+
+ update_parallax_contents()
+
return TRUE
/////////////////////////////////////////////////////////////////////////////////////
@@ -123,22 +133,12 @@ All ShuttleMove procs go here
return TRUE
// Called on areas after everything has been moved
-/area/proc/afterShuttleMove()
+/area/proc/afterShuttleMove(new_parallax_dir)
+ parallax_movedir = new_parallax_dir
return TRUE
/************************************Turf move procs************************************/
-/turf/open/afterShuttleMove(turf/oldT) //Recalculates SSair stuff for turfs on both sides
- . = ..()
- SSair.remove_from_active(src)
- SSair.remove_from_active(oldT)
-
- src.CalculateAdjacentTurfs()
- oldT.CalculateAdjacentTurfs()
-
- SSair.add_to_active(src, TRUE)
- SSair.add_to_active(oldT, TRUE)
-
/************************************Area move procs************************************/
/************************************Machinery move procs************************************/
@@ -151,7 +151,7 @@ All ShuttleMove procs go here
A.air_tight = TRUE
INVOKE_ASYNC(A, /obj/machinery/door/.proc/close)
-/obj/machinery/door/airlock/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/door/airlock/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
shuttledocked = 1
for(var/obj/machinery/door/airlock/A in range(1, src))
@@ -159,14 +159,15 @@ All ShuttleMove procs go here
/obj/machinery/camera/beforeShuttleMove(turf/newT, rotation, move_mode)
. = ..()
- GLOB.cameranet.removeCamera(src)
- . |= MOVE_CONTENTS
+ if(. & MOVE_AREA)
+ . |= MOVE_CONTENTS
+ GLOB.cameranet.removeCamera(src)
-/obj/machinery/camera/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/camera/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
GLOB.cameranet.addCamera(src)
-/obj/machinery/telecomms/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/telecomms/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
listening_level = z // Update listening Z, just in case you have telecomm relay on a shuttle
@@ -174,12 +175,12 @@ All ShuttleMove procs go here
. = ..()
recharging_turf = get_step(loc, dir)
-/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
if(pipe_vision_img)
pipe_vision_img.loc = loc
-/obj/machinery/computer/auxillary_base/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/computer/auxillary_base/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
if(z == ZLEVEL_MINING) //Avoids double logging and landing on other Z-levels due to badminnery
SSblackbox.add_details("colonies_dropped", "[x]|[y]|[z]") //Number of times a base has been dropped!
@@ -189,7 +190,7 @@ All ShuttleMove procs go here
on = FALSE
update_list()
-/obj/machinery/gravity_generator/main/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/gravity_generator/main/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
if(charge_count != 0 && charging_state != POWER_UP)
on = TRUE
@@ -197,9 +198,10 @@ All ShuttleMove procs go here
/obj/machinery/thruster/beforeShuttleMove(turf/newT, rotation, move_mode)
. = ..()
- . |= MOVE_CONTENTS
+ if(. & MOVE_AREA)
+ . |= MOVE_CONTENTS
-/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/atmospherics/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/missing_nodes = FALSE
for(DEVICE_TYPE_LOOP)
@@ -228,7 +230,7 @@ All ShuttleMove procs go here
// atmosinit() calls update_icon(), so we don't need to call it
update_icon()
-/obj/machinery/atmospherics/pipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/atmospherics/pipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/turf/T = loc
hide(T.intact)
@@ -238,7 +240,7 @@ All ShuttleMove procs go here
GLOB.navbeacons["[z]"] -= src
GLOB.deliverybeacons -= src
-/obj/machinery/navbeacon/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/navbeacon/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/turf/T = loc
hide(T.intact)
@@ -250,7 +252,7 @@ All ShuttleMove procs go here
GLOB.deliverybeacons += src
GLOB.deliverybeacontags += location
-/obj/machinery/power/terminal/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/machinery/power/terminal/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/turf/T = src.loc
if(level==1)
@@ -258,19 +260,19 @@ All ShuttleMove procs go here
/************************************Item move procs************************************/
-/obj/item/storage/pod/afterShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/obj/item/storage/pod/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
unlocked = TRUE
// If the pod was launched, the storage will always open.
/************************************Mob move procs************************************/
-/mob/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/mob/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
if(!move_on_shuttle)
return
. = ..()
-/mob/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/mob/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
if(client && movement_force)
var/shake_force = max(movement_force["THROW"], movement_force["KNOCKDOWN"])
@@ -278,7 +280,7 @@ All ShuttleMove procs go here
shake_force *= 0.25
shake_camera(src, shake_force, 1)
-/mob/living/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/mob/living/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
if(movement_force && !buckled)
if(movement_force["THROW"])
@@ -290,7 +292,7 @@ All ShuttleMove procs go here
if(movement_force["KNOCKDOWN"])
Knockdown(movement_force["KNOCKDOWN"])
-/mob/living/simple_animal/hostile/megafauna/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/mob/living/simple_animal/hostile/megafauna/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
. = ..()
message_admins("Megafauna [src] [ADMIN_FLW(src)] moved via shuttle from [ADMIN_COORDJMP(oldT)] to [ADMIN_COORDJMP(loc)]")
@@ -298,17 +300,19 @@ All ShuttleMove procs go here
/obj/structure/grille/beforeShuttleMove(turf/newT, rotation, move_mode)
. = ..()
- . |= MOVE_CONTENTS
+ if(. & MOVE_AREA)
+ . |= MOVE_CONTENTS
/obj/structure/lattice/beforeShuttleMove(turf/newT, rotation, move_mode)
. = ..()
- . |= MOVE_CONTENTS
+ if(. & MOVE_AREA)
+ . |= MOVE_CONTENTS
-/obj/structure/disposalpipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/structure/disposalpipe/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
update()
-/obj/structure/cable/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir)
+/obj/structure/cable/afterShuttleMove(list/movement_force, shuttle_dir, shuttle_preferred_direction, move_dir, rotation)
. = ..()
var/turf/T = loc
if(level==1)
@@ -316,26 +320,26 @@ All ShuttleMove procs go here
/obj/structure/shuttle/beforeShuttleMove(turf/newT, rotation, move_mode)
. = ..()
- . |= MOVE_CONTENTS
+ if(. & MOVE_AREA)
+ . |= MOVE_CONTENTS
/************************************Misc move procs************************************/
-/atom/movable/lighting_object/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/atom/movable/lighting_object/onShuttleMove()
return FALSE
-/atom/movable/light/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/atom/movable/light/onShuttleMove()
return FALSE
-/obj/docking_port/stationary/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
- if(old_dock == src) //Don't move the dock we're leaving
+/obj/docking_port/stationary/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
+ if(!moving_dock.can_move_docking_ports || old_dock == src)
return FALSE
-
. = ..()
-/obj/docking_port/stationary/public_mining_dock/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/obj/docking_port/stationary/public_mining_dock/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
id = "mining_public" //It will not move with the base, but will become enabled as a docking point.
-/obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, rotation, list/movement_force, move_dir, old_dock)
+/obj/effect/abstract/proximity_checker/onShuttleMove(turf/newT, turf/oldT, list/movement_force, move_dir, obj/docking_port/stationary/old_dock, obj/docking_port/mobile/moving_dock)
//timer so it only happens once
addtimer(CALLBACK(monitor, /datum/proximity_monitor/proc/SetRange, monitor.current_range, TRUE), 0, TIMER_UNIQUE)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index 22368c92fb..4061994cce 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -179,7 +179,8 @@
/obj/docking_port/proc/getDockedId()
var/obj/docking_port/P = get_docked()
- if(P) return P.id
+ if(P)
+ return P.id
/obj/docking_port/stationary
name = "dock"
@@ -192,7 +193,7 @@
var/last_dock_time
-/obj/docking_port/stationary/Initialize()
+/obj/docking_port/stationary/Initialize(mapload)
. = ..()
SSshuttle.stationary += src
if(!id)
@@ -201,6 +202,10 @@
name = "dock[SSshuttle.stationary.len]"
baseturf_cache = typecacheof(baseturf_type)
+ if(mapload)
+ for(var/turf/T in return_turfs())
+ T.flags_1 |= NO_RUINS_1
+
#ifdef DOCKING_PORT_HIGHLIGHT
highlight("#f00")
#endif
@@ -279,6 +284,7 @@
var/engine_coeff = 1 //current engine coeff
var/current_engines = 0 //current engine power
var/initial_engines = 0 //initial engine power
+ var/can_move_docking_ports = FALSE //if this shuttle can move docking ports other than the one it is docked at
/obj/docking_port/mobile/proc/register()
SSshuttle.mobile += src
@@ -410,7 +416,8 @@
mode = SHUTTLE_RECALL
/obj/docking_port/mobile/proc/enterTransit()
- if(SSshuttle.lockdown && (z in GLOB.station_z_levels)) //emp went off, no escape
+ if((SSshuttle.lockdown && (z in GLOB.station_z_levels)) || !canMove()) //emp went off, no escape
+ mode = SHUTTLE_IDLE
return
previous = null
// if(!destination)
@@ -507,9 +514,17 @@
return DOCKING_IMMOBILIZED
var/obj/docking_port/stationary/old_dock = get_docked()
- var/underlying_turf_type = /turf/open/space //The turf that gets placed under where the shuttle moved from
- var/underlying_baseturf_type = /turf/open/space //The baseturf that the gets assigned to the turf_type above
- var/underlying_area_type = /area/space //The area that gets placed under where the shuttle moved from
+
+ // The turf that gets placed under where the shuttle moved from
+ var/underlying_turf_type = /turf/open/space
+
+ // The baseturf that the gets assigned to the turf_type above
+ var/underlying_baseturf_type = /turf/open/space
+
+ // The area that gets placed under where the shuttle moved from
+ var/underlying_area_type = /area/space
+
+ // The baseturf cache is a typecache of what counts as a baseturf to be left behind
var/list/baseturf_cache
if(old_dock) //Dock overwrites
if(old_dock.turf_type)
@@ -521,7 +536,6 @@
if(old_dock.baseturf_cache)
baseturf_cache = old_dock.baseturf_cache
if(!baseturf_cache)
- //Don't want to call this needlessly
baseturf_cache = typecacheof(underlying_baseturf_type)
/**************************************************************************************************************
@@ -534,6 +548,8 @@
var/list/new_turfs = return_ordered_turfs(new_dock.x, new_dock.y, new_dock.z, new_dock.dir)
/**************************************************************************************************************/
+ // The underlying old area is the area assumed to be under the shuttle's starting location
+ // If it no longer/has never existed it will be created
var/area/underlying_old_area = locate(underlying_area_type) in GLOB.sortedAreas
if(!underlying_old_area)
underlying_old_area = new underlying_area_type(null)
@@ -556,19 +572,22 @@
CHECK_TICK
/****************************************All beforeShuttleMove procs*****************************************/
- var/index = 0
- for(var/place in old_turfs)
- index++
- var/turf/oldT = place
- var/turf/newT = new_turfs[index]
- if(!newT || !oldT)
- continue
+
+ for(var/i in 1 to old_turfs.len)
+ CHECK_TICK
+ var/turf/oldT = old_turfs[i]
+ var/turf/newT = new_turfs[i]
+ if(!newT)
+ return DOCKING_NULL_DESTINATION
+ if(!oldT)
+ return DOCKING_NULL_SOURCE
var/area/old_area = oldT.loc
var/move_mode = old_area.beforeShuttleMove(shuttle_areas) //areas
- for(var/i in 1 to oldT.contents.len)
- var/atom/movable/moving_atom = oldT.contents[i]
+ var/list/old_contents = oldT.contents
+ for(var/k in 1 to old_contents.len)
+ var/atom/movable/moving_atom = old_contents[k]
if(moving_atom.loc != oldT) //fix for multi-tile objects
continue
move_mode = moving_atom.beforeShuttleMove(newT, rotation, move_mode) //atoms
@@ -579,60 +598,68 @@
if(move_mode & MOVE_AREA)
areas_to_move[old_area] = TRUE
- old_turfs[place] = move_mode
- CHECK_TICK
+ old_turfs[oldT] = move_mode
/*******************************************All onShuttleMove procs******************************************/
- index = 0
- for(var/place in old_turfs)
- index++
- var/turf/oldT = place
- var/turf/newT = new_turfs[index]
- var/move_mode = old_turfs[place]
+ for(var/i in 1 to old_turfs.len)
+ var/turf/oldT = old_turfs[i]
+ var/turf/newT = new_turfs[i]
+ var/move_mode = old_turfs[oldT]
if(move_mode & MOVE_CONTENTS)
- for(var/thing in oldT)
- var/atom/movable/moving_atom = thing
+ for(var/k in oldT)
+ var/atom/movable/moving_atom = k
if(moving_atom.loc != oldT) //fix for multi-tile objects
continue
- moving_atom.onShuttleMove(newT, oldT, rotation, movement_force, movement_direction, old_dock)//atoms
+ moving_atom.onShuttleMove(newT, oldT, movement_force, movement_direction, old_dock, src) //atoms
moved_atoms += moving_atom
+
if(move_mode & MOVE_TURF)
- oldT.onShuttleMove(newT, underlying_turf_type, underlying_baseturf_type, rotation, movement_force, movement_direction)//turfs
+ oldT.onShuttleMove(newT, movement_force, movement_direction) //turfs
+
if(move_mode & MOVE_AREA)
var/area/shuttle_area = oldT.loc
shuttle_area.onShuttleMove(oldT, newT, underlying_old_area) //areas
/******************************************All afterShuttleMove procs****************************************/
- index = 0
- for(var/thing in old_turfs)
- index++
- var/turf/oldT = thing
- var/turf/newT = new_turfs[index]
- newT.afterShuttleMove(oldT) //turfs
- CHECK_TICK
-
- for(var/i in 1 to moved_atoms.len)
- var/atom/movable/moved_object = moved_atoms[i]
- moved_object.afterShuttleMove(movement_force, dir, preferred_direction, movement_direction) //atoms
- CHECK_TICK
-
underlying_old_area.afterShuttleMove()
- for(var/thing in areas_to_move)
- var/area/internal_area = thing
- internal_area.afterShuttleMove() //areas
- CHECK_TICK
-
// Parallax handling
+ // This needs to be done before the atom after move
var/new_parallax_dir = FALSE
if(istype(new_dock, /obj/docking_port/stationary/transit))
new_parallax_dir = preferred_direction
- for(var/i in shuttle_areas)
- var/area/place = i
- place.parallax_movedir = new_parallax_dir
+ for(var/i in 1 to areas_to_move.len)
CHECK_TICK
+ var/area/internal_area = areas_to_move[i]
+ internal_area.afterShuttleMove(new_parallax_dir) //areas
+
+ for(var/i in 1 to old_turfs.len)
+ CHECK_TICK
+ if(!(old_turfs[old_turfs[i]] & MOVE_TURF))
+ continue
+ var/turf/oldT = old_turfs[i]
+ var/turf/newT = new_turfs[i]
+ newT.afterShuttleMove(oldT, underlying_turf_type, underlying_baseturf_type, rotation) //turfs
+
+ for(var/i in 1 to moved_atoms.len)
+ CHECK_TICK
+ var/atom/movable/moved_object = moved_atoms[i]
+ moved_object.afterShuttleMove(movement_force, dir, preferred_direction, movement_direction, rotation)//atoms
+
+ for(var/i in 1 to old_turfs.len)
+ CHECK_TICK
+ // Objects can block air so either turf or content changes means an air update is needed
+ if(!(old_turfs[old_turfs[i]] & MOVE_CONTENTS | MOVE_TURF))
+ continue
+ var/turf/oldT = old_turfs[i]
+ var/turf/newT = new_turfs[i]
+ oldT.blocks_air = initial(oldT.blocks_air)
+ oldT.air_update_turf(TRUE)
+ newT.blocks_air = initial(newT.blocks_air)
+ newT.air_update_turf(TRUE)
+
check_poddoors()
new_dock.last_dock_time = world.time
setDir(new_dock.dir)
@@ -668,7 +695,14 @@
// then try again
switch(mode)
if(SHUTTLE_CALL)
- if(dock(destination, preferred_direction) != DOCKING_SUCCESS)
+ var/error = dock(destination, preferred_direction)
+ if(error && error & (DOCKING_NULL_DESTINATION | DOCKING_NULL_SOURCE))
+ var/msg = "A mobile dock in transit exited dock() with an error. This is most likely a mapping problem: Error: [error], ([src]) ([previous])"
+ WARNING(msg)
+ message_admins(msg)
+ mode = SHUTTLE_IDLE
+ return
+ else if(error)
setTimer(20)
return
if(SHUTTLE_RECALL)
diff --git a/code/modules/shuttle/shuttle_rotate.dm b/code/modules/shuttle/shuttle_rotate.dm
index d7e5f5eee7..d322f2cd32 100644
--- a/code/modules/shuttle/shuttle_rotate.dm
+++ b/code/modules/shuttle/shuttle_rotate.dm
@@ -6,50 +6,55 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
/************************************Base proc************************************/
-/atom/proc/shuttleRotate(rotation)
- //rotate our direction
- setDir(angle2dir(rotation+dir2angle(dir)))
+/atom/proc/shuttleRotate(rotation, params=ROTATE_DIR|ROTATE_SMOOTH|ROTATE_OFFSET)
+ if(params & ROTATE_DIR)
+ //rotate our direction
+ setDir(angle2dir(rotation+dir2angle(dir)))
//resmooth if need be.
- if(smooth)
+ if(smooth && (params & ROTATE_SMOOTH))
queue_smooth(src)
//rotate the pixel offsets too.
- if (pixel_x || pixel_y)
- if (rotation < 0)
+ if((pixel_x || pixel_y) && (params & ROTATE_OFFSET))
+ if(rotation < 0)
rotation += 360
- for (var/turntimes=rotation/90;turntimes>0;turntimes--)
+ for(var/turntimes=rotation/90;turntimes>0;turntimes--)
var/oldPX = pixel_x
var/oldPY = pixel_y
pixel_x = oldPY
pixel_y = (oldPX*(-1))
+ SendSignal(COMSIG_ATOM_ROTATE, rotation, params)
+
/************************************Turf rotate procs************************************/
-/turf/closed/mineral/shuttleRotate(rotation)
- setDir(angle2dir(rotation+dir2angle(dir)))
- queue_smooth(src)
+/turf/closed/mineral/shuttleRotate(rotation, params)
+ params &= ~ROTATE_OFFSET
+ return ..()
/************************************Mob rotate procs************************************/
//override to avoid rotating pixel_xy on mobs
-/mob/shuttleRotate(rotation)
+/mob/shuttleRotate(rotation, params)
+ params = NONE
+ . = ..()
if(!buckled)
setDir(angle2dir(rotation+dir2angle(dir)))
-/mob/dead/observer/shuttleRotate(rotation)
+/mob/dead/observer/shuttleRotate(rotation, params)
. = ..()
update_icon()
/************************************Structure rotate procs************************************/
-/obj/structure/door_assembly/door_assembly_pod/shuttleRotate(rotation)
+/obj/structure/door_assembly/door_assembly_pod/shuttleRotate(rotation, params)
. = ..()
expected_dir = angle2dir(rotation+dir2angle(dir))
-/obj/structure/cable/shuttleRotate(rotation)
- //..() is not called because wires are not supposed to have a non-default direction
- //Rotate connections
+/obj/structure/cable/shuttleRotate(rotation, params)
+ params &= ~ROTATE_DIR
+ . = ..()
if(d1)
d1 = angle2dir(rotation+dir2angle(d1))
if(d2)
@@ -63,7 +68,7 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
update_icon()
//Fixes dpdir on shuttle rotation
-/obj/structure/disposalpipe/shuttleRotate(rotation)
+/obj/structure/disposalpipe/shuttleRotate(rotation, params)
. = ..()
var/new_dpdir = 0
for(var/D in GLOB.cardinals)
@@ -71,16 +76,17 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
new_dpdir = new_dpdir | angle2dir(rotation+dir2angle(D))
dpdir = new_dpdir
-/obj/structure/table/wood/bar/shuttleRotate(rotation)
+/obj/structure/table/wood/bar/shuttleRotate(rotation, params)
. = ..()
boot_dir = angle2dir(rotation + dir2angle(boot_dir))
-/obj/structure/alien/weeds/shuttleRotate(rotation)
- return
+/obj/structure/alien/weeds/shuttleRotate(rotation, params)
+ params &= ~ROTATE_OFFSET
+ return ..()
/************************************Machine rotate procs************************************/
-/obj/machinery/atmospherics/shuttleRotate(rotation)
+/obj/machinery/atmospherics/shuttleRotate(rotation, params)
var/list/real_node_connect = getNodeConnects()
for(DEVICE_TYPE_LOOP)
real_node_connect[I] = angle2dir(rotation+dir2angle(real_node_connect[I]))
@@ -95,13 +101,15 @@ If ever any of these procs are useful for non-shuttles, rename it to proc/rotate
nodes[new_pos] = nodes_copy[I]
//prevents shuttles attempting to rotate this since it messes up sprites
-/obj/machinery/gateway/shuttleRotate()
- return
+/obj/machinery/gateway/shuttleRotate(rotation, params)
+ params = NONE
+ return ..()
-/obj/machinery/door/airlock/survival_pod/shuttleRotate(rotation)
+/obj/machinery/door/airlock/survival_pod/shuttleRotate(rotation, params)
expected_dir = angle2dir(rotation+dir2angle(dir))
return ..()
//prevents shuttles attempting to rotate this since it messes up sprites
-/obj/machinery/gravity_generator/shuttleRotate()
- return
\ No newline at end of file
+/obj/machinery/gravity_generator/shuttleRotate(rotation, params)
+ params = NONE
+ return ..()
\ No newline at end of file
diff --git a/code/modules/spells/spell.dm b/code/modules/spells/spell.dm
index d3008625cf..e8d65cae9f 100644
--- a/code/modules/spells/spell.dm
+++ b/code/modules/spells/spell.dm
@@ -90,7 +90,7 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
/obj/effect/proc_holder/spell
name = "Spell"
- desc = "A wizard spell"
+ desc = "A wizard spell."
panel = "Spells"
var/sound = null //The sound the spell makes when it is cast
anchored = TRUE // Crap like fireball projectiles are proc_holders, this is needed so fireballs don't get blown back into your face via atmos etc.
@@ -429,7 +429,8 @@ GLOBAL_LIST_INIT(spells, typesof(/obj/effect/proc_holder/spell)) //needed for th
else
if(los_check(user,L))
M = L
- if(M in view_or_range(range, user, selection_type)) targets += M
+ if(M in view_or_range(range, user, selection_type))
+ targets += M
else
var/list/possible_targets = list()
diff --git a/code/modules/spells/spell_types/aimed.dm b/code/modules/spells/spell_types/aimed.dm
index 94597de40f..997c83249a 100644
--- a/code/modules/spells/spell_types/aimed.dm
+++ b/code/modules/spells/spell_types/aimed.dm
@@ -65,9 +65,8 @@
/obj/effect/proc_holder/spell/aimed/proc/fire_projectile(mob/living/user, atom/target)
current_amount--
var/obj/item/projectile/P = new projectile_type(user.loc)
- P.current = get_turf(user)
P.firer = user
- P.preparePixelProjectile(target, get_turf(target), user)
+ P.preparePixelProjectile(target, user)
for(var/V in projectile_var_overrides)
if(P.vars[V])
P.vars[V] = projectile_var_overrides[V]
diff --git a/code/modules/spells/spell_types/construct_spells.dm b/code/modules/spells/spell_types/construct_spells.dm
index 5c28ff5029..ca6a534ee0 100644
--- a/code/modules/spells/spell_types/construct_spells.dm
+++ b/code/modules/spells/spell_types/construct_spells.dm
@@ -33,7 +33,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/floor
name = "Summon Cult Floor"
- desc = "This spell constructs a cult floor"
+ desc = "This spell constructs a cult floor."
school = "conjuration"
charge_max = 20
@@ -49,7 +49,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall
name = "Summon Cult Wall"
- desc = "This spell constructs a cult wall"
+ desc = "This spell constructs a cult wall."
school = "conjuration"
charge_max = 100
@@ -66,7 +66,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/wall/reinforced
name = "Greater Construction"
- desc = "This spell constructs a reinforced metal wall"
+ desc = "This spell constructs a reinforced metal wall."
school = "conjuration"
charge_max = 300
@@ -79,7 +79,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/soulstone
name = "Summon Soulstone"
- desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space"
+ desc = "This spell reaches into Nar-Sie's realm, summoning one of the legendary fragments across time and space."
school = "conjuration"
charge_max = 3000
@@ -104,7 +104,7 @@
/obj/effect/proc_holder/spell/aoe_turf/conjure/lesserforcewall
name = "Shield"
- desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire"
+ desc = "This spell creates a temporary forcefield to shield yourself and allies from incoming fire."
school = "transmutation"
charge_max = 300
@@ -121,7 +121,7 @@
/obj/effect/proc_holder/spell/targeted/ethereal_jaunt/shift
name = "Phase Shift"
- desc = "This spell allows you to pass through walls"
+ desc = "This spell allows you to pass through walls."
school = "transmutation"
charge_max = 250
diff --git a/code/modules/spells/spell_types/ethereal_jaunt.dm b/code/modules/spells/spell_types/ethereal_jaunt.dm
index c98a2ef3ee..0754ddb230 100644
--- a/code/modules/spells/spell_types/ethereal_jaunt.dm
+++ b/code/modules/spells/spell_types/ethereal_jaunt.dm
@@ -80,7 +80,8 @@
return ..()
/obj/effect/dummy/spell_jaunt/relaymove(var/mob/user, direction)
- if ((movedelay > world.time) || reappearing || !direction) return
+ if ((movedelay > world.time) || reappearing || !direction)
+ return
var/turf/newLoc = get_step(src,direction)
setDir(direction)
if(!(newLoc.flags_1 & NOJAUNT_1))
diff --git a/code/modules/spells/spell_types/godhand.dm b/code/modules/spells/spell_types/godhand.dm
index 33f947408a..5ddfb704bf 100644
--- a/code/modules/spells/spell_types/godhand.dm
+++ b/code/modules/spells/spell_types/godhand.dm
@@ -54,6 +54,9 @@
return
var/mob/M = target
do_sparks(4, FALSE, M.loc)
+ for(var/mob/living/L in view(src, 7))
+ if(L != user)
+ L.flash_act(affect_silicon = FALSE)
M.gib()
..()
diff --git a/code/modules/spells/spell_types/rightandwrong.dm b/code/modules/spells/spell_types/rightandwrong.dm
index 1d657117c3..b992871004 100644
--- a/code/modules/spells/spell_types/rightandwrong.dm
+++ b/code/modules/spells/spell_types/rightandwrong.dm
@@ -1,219 +1,221 @@
-//In this file: Summon Magic/Summon Guns/Summon Events
-
-/proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic
- var/list/gunslist = list("taser","gravgun","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi","alienpistol","dragnet","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","bulldog","grenadelauncher","goldenrevolver","sniper","medibeam","scatterbeam")
- var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor","voodoo", "whistle", "battlemage", "immortality", "ghostsword", "special")
- var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic", "bloodcontract")
-
- if(user) //in this case either someone holding a spellbook or a badmin
- to_chat(user, "You summoned [summon_type ? "magic" : "guns"]!")
- message_admins("[key_name_admin(user, 1)] summoned [summon_type ? "magic" : "guns"]!")
- log_game("[key_name(user)] summoned [summon_type ? "magic" : "guns"]!")
- for(var/mob/living/carbon/human/H in GLOB.player_list)
- if(H.stat == DEAD || !(H.client)) continue
- if(H.mind)
- if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice" || H.mind.special_role == "survivalist") continue
- if(prob(survivor_probability) && !(H.mind in SSticker.mode.traitors))
- SSticker.mode.traitors += H.mind
- if(!summon_type)
- var/datum/objective/steal_five_of_type/summon_guns/guns = new
- guns.owner = H.mind
- H.mind.objectives += guns
- H.mind.special_role = "survivalist"
- to_chat(H, "You are the survivalist! Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way.")
- else
- var/datum/objective/steal_five_of_type/summon_magic/magic = new
- magic.owner = H.mind
- H.mind.objectives += magic
- H.mind.special_role = "amateur magician"
- to_chat(H, "You are the amateur magician! Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way.")
- var/datum/objective/survive/survive = new
- survive.owner = H.mind
- H.mind.objectives += survive
- H.log_message("Was made into a survivalist, and trusts no one!", INDIVIDUAL_ATTACK_LOG)
- H.mind.announce_objectives()
- var/randomizeguns = pick(gunslist)
- var/randomizemagic = pick(magiclist)
- var/randomizemagicspecial = pick(magicspeciallist)
- if(!summon_type)
- var/obj/item/gun/G
- switch (randomizeguns)
- if("taser")
- G = new /obj/item/gun/energy/e_gun/advtaser(get_turf(H))
- if("egun")
- G = new /obj/item/gun/energy/e_gun(get_turf(H))
- if("laser")
- G = new /obj/item/gun/energy/laser(get_turf(H))
- if("revolver")
- G = new /obj/item/gun/ballistic/revolver(get_turf(H))
- if("detective")
- G = new /obj/item/gun/ballistic/revolver/detective(get_turf(H))
- if("deagle")
- G = new /obj/item/gun/ballistic/automatic/pistol/deagle/camo(get_turf(H))
- if("gyrojet")
- G = new /obj/item/gun/ballistic/automatic/gyropistol(get_turf(H))
- if("pulse")
- G = new /obj/item/gun/energy/pulse(get_turf(H))
- if("suppressed")
- G = new /obj/item/gun/ballistic/automatic/pistol(get_turf(H))
- new /obj/item/suppressor(get_turf(H))
- if("doublebarrel")
- G = new /obj/item/gun/ballistic/revolver/doublebarrel(get_turf(H))
- if("shotgun")
- G = new /obj/item/gun/ballistic/shotgun(get_turf(H))
- if("combatshotgun")
- G = new /obj/item/gun/ballistic/shotgun/automatic/combat(get_turf(H))
- if("arg")
- G = new /obj/item/gun/ballistic/automatic/ar(get_turf(H))
- if("mateba")
- G = new /obj/item/gun/ballistic/revolver/mateba(get_turf(H))
- if("boltaction")
- G = new /obj/item/gun/ballistic/shotgun/boltaction(get_turf(H))
- if("speargun")
- G = new /obj/item/gun/ballistic/automatic/speargun(get_turf(H))
- if("uzi")
- G = new /obj/item/gun/ballistic/automatic/mini_uzi(get_turf(H))
- if("cannon")
- G = new /obj/item/gun/energy/lasercannon(get_turf(H))
- if("crossbow")
- G = new /obj/item/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H))
- if("nuclear")
- G = new /obj/item/gun/energy/e_gun/nuclear(get_turf(H))
- if("sabr")
- G = new /obj/item/gun/ballistic/automatic/proto(get_turf(H))
- if("bulldog")
- G = new /obj/item/gun/ballistic/automatic/shotgun/bulldog(get_turf(H))
- if("c20r")
- G = new /obj/item/gun/ballistic/automatic/c20r(get_turf(H))
- if("saw")
- G = new /obj/item/gun/ballistic/automatic/l6_saw(get_turf(H))
- if("car")
- G = new /obj/item/gun/ballistic/automatic/m90(get_turf(H))
- if("alienpistol")
- G = new /obj/item/gun/energy/alien(get_turf(H))
- if("dragnet")
- G = new /obj/item/gun/energy/e_gun/dragnet(get_turf(H))
- if("turret")
- G = new /obj/item/gun/energy/e_gun/turret(get_turf(H))
- if("pulsecarbine")
- G = new /obj/item/gun/energy/pulse/carbine(get_turf(H))
- if("decloner")
- G = new /obj/item/gun/energy/decloner(get_turf(H))
- if("mindflayer")
- G = new /obj/item/gun/energy/mindflayer(get_turf(H))
- if("hyperkinetic")
- G = new /obj/item/gun/energy/kinetic_accelerator(get_turf(H))
- if("advplasmacutter")
- G = new /obj/item/gun/energy/plasmacutter/adv(get_turf(H))
- if("wormhole")
- G = new /obj/item/gun/energy/wormhole_projector(get_turf(H))
- if("wt550")
- G = new /obj/item/gun/ballistic/automatic/wt550(get_turf(H))
- if("bulldog")
- G = new /obj/item/gun/ballistic/automatic/shotgun(get_turf(H))
- if("grenadelauncher")
- G = new /obj/item/gun/ballistic/revolver/grenadelauncher(get_turf(H))
- if("goldenrevolver")
- G = new /obj/item/gun/ballistic/revolver/golden(get_turf(H))
- if("sniper")
- G = new /obj/item/gun/ballistic/automatic/sniper_rifle(get_turf(H))
- if("medibeam")
- G = new /obj/item/gun/medbeam(get_turf(H))
- if("scatterbeam")
- G = new /obj/item/gun/energy/laser/scatter(get_turf(H))
- if("gravgun")
- G = new /obj/item/gun/energy/gravity_gun(get_turf(H))
- G.unlock()
- playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1)
-
- else
- switch (randomizemagic)
- if("fireball")
- new /obj/item/spellbook/oneuse/fireball(get_turf(H))
- if("smoke")
- new /obj/item/spellbook/oneuse/smoke(get_turf(H))
- if("blind")
- new /obj/item/spellbook/oneuse/blind(get_turf(H))
- if("mindswap")
- new /obj/item/spellbook/oneuse/mindswap(get_turf(H))
- if("forcewall")
- new /obj/item/spellbook/oneuse/forcewall(get_turf(H))
- if("knock")
- new /obj/item/spellbook/oneuse/knock(get_turf(H))
- if("horsemask")
- new /obj/item/spellbook/oneuse/barnyard(get_turf(H))
- if("charge")
- new /obj/item/spellbook/oneuse/charge(get_turf(H))
- if("summonitem")
- new /obj/item/spellbook/oneuse/summonitem(get_turf(H))
- if("wandnothing")
- new /obj/item/gun/magic/wand(get_turf(H))
- if("wanddeath")
- new /obj/item/gun/magic/wand/death(get_turf(H))
- if("wandresurrection")
- new /obj/item/gun/magic/wand/resurrection(get_turf(H))
- if("wandpolymorph")
- new /obj/item/gun/magic/wand/polymorph(get_turf(H))
- if("wandteleport")
- new /obj/item/gun/magic/wand/teleport(get_turf(H))
- if("wanddoor")
- new /obj/item/gun/magic/wand/door(get_turf(H))
- if("wandfireball")
- new /obj/item/gun/magic/wand/fireball(get_turf(H))
- if("staffhealing")
- new /obj/item/gun/magic/staff/healing(get_turf(H))
- if("staffdoor")
- new /obj/item/gun/magic/staff/door(get_turf(H))
- if("armor")
- new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H))
- if("scrying")
- new /obj/item/scrying(get_turf(H))
- if (!(H.dna.check_mutation(XRAY)))
- H.dna.add_mutation(XRAY)
- to_chat(H, "The walls suddenly disappear.")
- if("voodoo")
- new /obj/item/voodoo(get_turf(H))
- if("whistle")
- new /obj/item/warpwhistle(get_turf(H))
- if("battlemage")
- new /obj/item/clothing/suit/space/hardsuit/shielded/wizard(get_turf(H))
- if("immortality")
- new /obj/item/device/immortality_talisman(get_turf(H))
- if("ghostsword")
- new /obj/item/melee/ghost_sword(get_turf(H))
- if("special")
- magiclist -= "special" //only one super OP item per summoning max
- switch (randomizemagicspecial)
- if("staffchange")
- new /obj/item/gun/magic/staff/change(get_turf(H))
- if("staffanimation")
- new /obj/item/gun/magic/staff/animate(get_turf(H))
- if("wandbelt")
- new /obj/item/storage/belt/wands/full(get_turf(H))
- if("contract")
- new /obj/item/antag_spawner/contract(get_turf(H))
- if("staffchaos")
- new /obj/item/gun/magic/staff/chaos(get_turf(H))
- if("necromantic")
- new /obj/item/device/necromantic_stone(get_turf(H))
- if("bloodcontract")
- new /obj/item/blood_contract(get_turf(H))
- to_chat(H, "You suddenly feel lucky.")
- playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)
-
-
-/proc/summonevents()
- if(!SSevents.wizardmode)
- SSevents.frequency_lower = 600 //1 minute lower bound
- SSevents.frequency_upper = 3000 //5 minutes upper bound
- SSevents.toggleWizardmode()
- SSevents.reschedule()
-
- else //Speed it up
- SSevents.frequency_upper -= 600 //The upper bound falls a minute each time, making the AVERAGE time between events lessen
- if(SSevents.frequency_upper < SSevents.frequency_lower) //Sanity
- SSevents.frequency_upper = SSevents.frequency_lower
-
- SSevents.reschedule()
- message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
- log_game("Summon Events was increased!")
+//In this file: Summon Magic/Summon Guns/Summon Events
+
+/proc/rightandwrong(summon_type, mob/user, survivor_probability) //0 = Summon Guns, 1 = Summon Magic
+ var/list/gunslist = list("taser","gravgun","egun","laser","revolver","detective","c20r","nuclear","deagle","gyrojet","pulse","suppressed","cannon","doublebarrel","shotgun","combatshotgun","bulldog","mateba","sabr","crossbow","saw","car","boltaction","speargun","arg","uzi","alienpistol","dragnet","turret","pulsecarbine","decloner","mindflayer","hyperkinetic","advplasmacutter","wormhole","wt550","bulldog","grenadelauncher","goldenrevolver","sniper","medibeam","scatterbeam")
+ var/list/magiclist = list("fireball","smoke","blind","mindswap","forcewall","knock","horsemask","charge", "summonitem", "wandnothing", "wanddeath", "wandresurrection", "wandpolymorph", "wandteleport", "wanddoor", "wandfireball", "staffchange", "staffhealing", "armor", "scrying","staffdoor","voodoo", "whistle", "battlemage", "immortality", "ghostsword", "special")
+ var/list/magicspeciallist = list("staffchange","staffanimation", "wandbelt", "contract", "staffchaos", "necromantic", "bloodcontract")
+
+ if(user) //in this case either someone holding a spellbook or a badmin
+ to_chat(user, "You summoned [summon_type ? "magic" : "guns"]!")
+ message_admins("[key_name_admin(user, 1)] summoned [summon_type ? "magic" : "guns"]!")
+ log_game("[key_name(user)] summoned [summon_type ? "magic" : "guns"]!")
+ for(var/mob/living/carbon/human/H in GLOB.player_list)
+ if(H.stat == DEAD || !(H.client))
+ continue
+ if(H.mind)
+ if(H.mind.special_role == "Wizard" || H.mind.special_role == "apprentice" || H.mind.special_role == "survivalist")
+ continue
+ if(prob(survivor_probability) && !(H.mind in SSticker.mode.traitors))
+ SSticker.mode.traitors += H.mind
+ if(!summon_type)
+ var/datum/objective/steal_five_of_type/summon_guns/guns = new
+ guns.owner = H.mind
+ H.mind.objectives += guns
+ H.mind.special_role = "survivalist"
+ to_chat(H, "You are the survivalist! Your own safety matters above all else, and the only way to ensure your safety is to stockpile weapons! Grab as many guns as possible, by any means necessary. Kill anyone who gets in your way.")
+ else
+ var/datum/objective/steal_five_of_type/summon_magic/magic = new
+ magic.owner = H.mind
+ H.mind.objectives += magic
+ H.mind.special_role = "amateur magician"
+ to_chat(H, "You are the amateur magician! Grow your newfound talent! Grab as many magical artefacts as possible, by any means necessary. Kill anyone who gets in your way.")
+ var/datum/objective/survive/survive = new
+ survive.owner = H.mind
+ H.mind.objectives += survive
+ H.log_message("Was made into a survivalist, and trusts no one!", INDIVIDUAL_ATTACK_LOG)
+ H.mind.announce_objectives()
+ var/randomizeguns = pick(gunslist)
+ var/randomizemagic = pick(magiclist)
+ var/randomizemagicspecial = pick(magicspeciallist)
+ if(!summon_type)
+ var/obj/item/gun/G
+ switch (randomizeguns)
+ if("taser")
+ G = new /obj/item/gun/energy/e_gun/advtaser(get_turf(H))
+ if("egun")
+ G = new /obj/item/gun/energy/e_gun(get_turf(H))
+ if("laser")
+ G = new /obj/item/gun/energy/laser(get_turf(H))
+ if("revolver")
+ G = new /obj/item/gun/ballistic/revolver(get_turf(H))
+ if("detective")
+ G = new /obj/item/gun/ballistic/revolver/detective(get_turf(H))
+ if("deagle")
+ G = new /obj/item/gun/ballistic/automatic/pistol/deagle/camo(get_turf(H))
+ if("gyrojet")
+ G = new /obj/item/gun/ballistic/automatic/gyropistol(get_turf(H))
+ if("pulse")
+ G = new /obj/item/gun/energy/pulse(get_turf(H))
+ if("suppressed")
+ G = new /obj/item/gun/ballistic/automatic/pistol(get_turf(H))
+ new /obj/item/suppressor(get_turf(H))
+ if("doublebarrel")
+ G = new /obj/item/gun/ballistic/revolver/doublebarrel(get_turf(H))
+ if("shotgun")
+ G = new /obj/item/gun/ballistic/shotgun(get_turf(H))
+ if("combatshotgun")
+ G = new /obj/item/gun/ballistic/shotgun/automatic/combat(get_turf(H))
+ if("arg")
+ G = new /obj/item/gun/ballistic/automatic/ar(get_turf(H))
+ if("mateba")
+ G = new /obj/item/gun/ballistic/revolver/mateba(get_turf(H))
+ if("boltaction")
+ G = new /obj/item/gun/ballistic/shotgun/boltaction(get_turf(H))
+ if("speargun")
+ G = new /obj/item/gun/ballistic/automatic/speargun(get_turf(H))
+ if("uzi")
+ G = new /obj/item/gun/ballistic/automatic/mini_uzi(get_turf(H))
+ if("cannon")
+ G = new /obj/item/gun/energy/lasercannon(get_turf(H))
+ if("crossbow")
+ G = new /obj/item/gun/energy/kinetic_accelerator/crossbow/large(get_turf(H))
+ if("nuclear")
+ G = new /obj/item/gun/energy/e_gun/nuclear(get_turf(H))
+ if("sabr")
+ G = new /obj/item/gun/ballistic/automatic/proto(get_turf(H))
+ if("bulldog")
+ G = new /obj/item/gun/ballistic/automatic/shotgun/bulldog(get_turf(H))
+ if("c20r")
+ G = new /obj/item/gun/ballistic/automatic/c20r(get_turf(H))
+ if("saw")
+ G = new /obj/item/gun/ballistic/automatic/l6_saw(get_turf(H))
+ if("car")
+ G = new /obj/item/gun/ballistic/automatic/m90(get_turf(H))
+ if("alienpistol")
+ G = new /obj/item/gun/energy/alien(get_turf(H))
+ if("dragnet")
+ G = new /obj/item/gun/energy/e_gun/dragnet(get_turf(H))
+ if("turret")
+ G = new /obj/item/gun/energy/e_gun/turret(get_turf(H))
+ if("pulsecarbine")
+ G = new /obj/item/gun/energy/pulse/carbine(get_turf(H))
+ if("decloner")
+ G = new /obj/item/gun/energy/decloner(get_turf(H))
+ if("mindflayer")
+ G = new /obj/item/gun/energy/mindflayer(get_turf(H))
+ if("hyperkinetic")
+ G = new /obj/item/gun/energy/kinetic_accelerator(get_turf(H))
+ if("advplasmacutter")
+ G = new /obj/item/gun/energy/plasmacutter/adv(get_turf(H))
+ if("wormhole")
+ G = new /obj/item/gun/energy/wormhole_projector(get_turf(H))
+ if("wt550")
+ G = new /obj/item/gun/ballistic/automatic/wt550(get_turf(H))
+ if("bulldog")
+ G = new /obj/item/gun/ballistic/automatic/shotgun(get_turf(H))
+ if("grenadelauncher")
+ G = new /obj/item/gun/ballistic/revolver/grenadelauncher(get_turf(H))
+ if("goldenrevolver")
+ G = new /obj/item/gun/ballistic/revolver/golden(get_turf(H))
+ if("sniper")
+ G = new /obj/item/gun/ballistic/automatic/sniper_rifle(get_turf(H))
+ if("medibeam")
+ G = new /obj/item/gun/medbeam(get_turf(H))
+ if("scatterbeam")
+ G = new /obj/item/gun/energy/laser/scatter(get_turf(H))
+ if("gravgun")
+ G = new /obj/item/gun/energy/gravity_gun(get_turf(H))
+ G.unlock()
+ playsound(get_turf(H),'sound/magic/summon_guns.ogg', 50, 1)
+
+ else
+ switch (randomizemagic)
+ if("fireball")
+ new /obj/item/spellbook/oneuse/fireball(get_turf(H))
+ if("smoke")
+ new /obj/item/spellbook/oneuse/smoke(get_turf(H))
+ if("blind")
+ new /obj/item/spellbook/oneuse/blind(get_turf(H))
+ if("mindswap")
+ new /obj/item/spellbook/oneuse/mindswap(get_turf(H))
+ if("forcewall")
+ new /obj/item/spellbook/oneuse/forcewall(get_turf(H))
+ if("knock")
+ new /obj/item/spellbook/oneuse/knock(get_turf(H))
+ if("horsemask")
+ new /obj/item/spellbook/oneuse/barnyard(get_turf(H))
+ if("charge")
+ new /obj/item/spellbook/oneuse/charge(get_turf(H))
+ if("summonitem")
+ new /obj/item/spellbook/oneuse/summonitem(get_turf(H))
+ if("wandnothing")
+ new /obj/item/gun/magic/wand(get_turf(H))
+ if("wanddeath")
+ new /obj/item/gun/magic/wand/death(get_turf(H))
+ if("wandresurrection")
+ new /obj/item/gun/magic/wand/resurrection(get_turf(H))
+ if("wandpolymorph")
+ new /obj/item/gun/magic/wand/polymorph(get_turf(H))
+ if("wandteleport")
+ new /obj/item/gun/magic/wand/teleport(get_turf(H))
+ if("wanddoor")
+ new /obj/item/gun/magic/wand/door(get_turf(H))
+ if("wandfireball")
+ new /obj/item/gun/magic/wand/fireball(get_turf(H))
+ if("staffhealing")
+ new /obj/item/gun/magic/staff/healing(get_turf(H))
+ if("staffdoor")
+ new /obj/item/gun/magic/staff/door(get_turf(H))
+ if("armor")
+ new /obj/item/clothing/suit/space/hardsuit/wizard(get_turf(H))
+ if("scrying")
+ new /obj/item/scrying(get_turf(H))
+ if (!(H.dna.check_mutation(XRAY)))
+ H.dna.add_mutation(XRAY)
+ to_chat(H, "The walls suddenly disappear.")
+ if("voodoo")
+ new /obj/item/voodoo(get_turf(H))
+ if("whistle")
+ new /obj/item/warpwhistle(get_turf(H))
+ if("battlemage")
+ new /obj/item/clothing/suit/space/hardsuit/shielded/wizard(get_turf(H))
+ if("immortality")
+ new /obj/item/device/immortality_talisman(get_turf(H))
+ if("ghostsword")
+ new /obj/item/melee/ghost_sword(get_turf(H))
+ if("special")
+ magiclist -= "special" //only one super OP item per summoning max
+ switch (randomizemagicspecial)
+ if("staffchange")
+ new /obj/item/gun/magic/staff/change(get_turf(H))
+ if("staffanimation")
+ new /obj/item/gun/magic/staff/animate(get_turf(H))
+ if("wandbelt")
+ new /obj/item/storage/belt/wands/full(get_turf(H))
+ if("contract")
+ new /obj/item/antag_spawner/contract(get_turf(H))
+ if("staffchaos")
+ new /obj/item/gun/magic/staff/chaos(get_turf(H))
+ if("necromantic")
+ new /obj/item/device/necromantic_stone(get_turf(H))
+ if("bloodcontract")
+ new /obj/item/blood_contract(get_turf(H))
+ to_chat(H, "You suddenly feel lucky.")
+ playsound(get_turf(H),'sound/magic/summon_magic.ogg', 50, 1)
+
+
+/proc/summonevents()
+ if(!SSevents.wizardmode)
+ SSevents.frequency_lower = 600 //1 minute lower bound
+ SSevents.frequency_upper = 3000 //5 minutes upper bound
+ SSevents.toggleWizardmode()
+ SSevents.reschedule()
+
+ else //Speed it up
+ SSevents.frequency_upper -= 600 //The upper bound falls a minute each time, making the AVERAGE time between events lessen
+ if(SSevents.frequency_upper < SSevents.frequency_lower) //Sanity
+ SSevents.frequency_upper = SSevents.frequency_lower
+
+ SSevents.reschedule()
+ message_admins("Summon Events intensifies, events will now occur every [SSevents.frequency_lower / 600] to [SSevents.frequency_upper / 600] minutes.")
+ log_game("Summon Events was increased!")
\ No newline at end of file
diff --git a/code/modules/spells/spell_types/shapeshift.dm b/code/modules/spells/spell_types/shapeshift.dm
index 4f56918e66..4ee1b678f0 100644
--- a/code/modules/spells/spell_types/shapeshift.dm
+++ b/code/modules/spells/spell_types/shapeshift.dm
@@ -11,16 +11,23 @@
invocation_type = "shout"
action_icon_state = "shapeshift"
+ var/revert_on_death = TRUE
+ var/die_with_shapeshifted_form = TRUE
+
var/shapeshift_type
- var/list/current_shapes = list()
- var/list/current_casters = list()
var/list/possible_shapes = list(/mob/living/simple_animal/mouse,\
/mob/living/simple_animal/pet/dog/corgi,\
/mob/living/simple_animal/hostile/carp/ranged/chaos,\
/mob/living/simple_animal/bot/ed209,\
+ /mob/living/simple_animal/hostile/poison/giant_spider/hunter/viper,\
/mob/living/simple_animal/hostile/construct/armored)
/obj/effect/proc_holder/spell/targeted/shapeshift/cast(list/targets,mob/user = usr)
+ if(src in user.mob_spell_list)
+ user.mob_spell_list.Remove(src)
+ user.mind.AddSpell(src)
+ if(user.buckled)
+ user.buckled.unbuckle_mob(src,force=TRUE)
for(var/mob/living/M in targets)
if(!shapeshift_type)
var/list/animal_list = list()
@@ -34,46 +41,33 @@
if(!shapeshift_type) //If you aren't gonna decide I am!
shapeshift_type = pick(animal_list)
shapeshift_type = animal_list[shapeshift_type]
- if(M in current_shapes)
+
+ var/obj/shapeshift_holder/S = locate() in M
+ if(S)
Restore(M)
else
Shapeshift(M)
+
/obj/effect/proc_holder/spell/targeted/shapeshift/proc/Shapeshift(mob/living/caster)
- for(var/mob/living/M in caster)
- if(M.status_flags & GODMODE)
- to_chat(caster, "You're already shapeshifted!")
- return
+ var/obj/shapeshift_holder/H = locate() in caster
+ if(H)
+ to_chat(caster, "You're already shapeshifted!")
+ return
var/mob/living/shape = new shapeshift_type(caster.loc)
- caster.forceMove(shape)
- caster.status_flags |= GODMODE
-
- current_shapes |= shape
- current_casters |= caster
+ H = new(shape,src,caster)
clothes_req = 0
human_req = 0
- caster.mind.transfer_to(shape)
-
/obj/effect/proc_holder/spell/targeted/shapeshift/proc/Restore(mob/living/shape)
- var/mob/living/caster
- for(var/mob/living/M in shape)
- if(M in current_casters)
- caster = M
- break
- if(!caster)
- return
- caster.forceMove(shape.loc)
- caster.status_flags &= ~GODMODE
+ var/obj/shapeshift_holder/H = locate() in shape
+ if(!H)
+ return
+ H.restore()
clothes_req = initial(clothes_req)
human_req = initial(human_req)
- current_casters.Remove(caster)
- current_shapes.Remove(shape)
-
- shape.mind.transfer_to(caster)
- qdel(shape) //Gib it maybe ?
/obj/effect/proc_holder/spell/targeted/shapeshift/dragon
name = "Dragon Form"
@@ -81,6 +75,85 @@
invocation = "RAAAAAAAAWR!"
shapeshift_type = /mob/living/simple_animal/hostile/megafauna/dragon/lesser
- list/current_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)
- list/current_casters = list()
- list/possible_shapes = list(/mob/living/simple_animal/hostile/megafauna/dragon/lesser)
+
+
+/obj/shapeshift_holder
+ name = "Shapeshift holder"
+ resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ON_FIRE | UNACIDABLE | ACID_PROOF
+ var/mob/living/stored
+ var/mob/living/shape
+ var/restoring = FALSE
+ var/datum/soullink/shapeshift/slink
+ var/obj/effect/proc_holder/spell/targeted/shapeshift/source
+
+/obj/shapeshift_holder/Initialize(mapload,obj/effect/proc_holder/spell/targeted/shapeshift/source,mob/living/caster)
+ . = ..()
+ src.source = source
+ shape = loc
+ if(!istype(shape))
+ CRASH("shapeshift holder created outside mob/living")
+ stored = caster
+ if(stored.mind)
+ stored.mind.transfer_to(shape)
+ stored.forceMove(src)
+ stored.notransform = TRUE
+ slink = soullink(/datum/soullink/shapeshift, stored , shape)
+ slink.source = src
+
+/obj/shapeshift_holder/Destroy()
+ if(!restoring)
+ restore()
+ stored = null
+ shape = null
+ . = ..()
+
+/obj/shapeshift_holder/Moved()
+ . = ..()
+ if(!restoring || QDELETED(src))
+ restore()
+
+/obj/shapeshift_holder/handle_atom_del(atom/A)
+ if(A == stored && !restoring)
+ restore()
+
+/obj/shapeshift_holder/Exited(atom/movable/AM)
+ if(AM == stored && !restoring)
+ restore()
+
+/obj/shapeshift_holder/proc/casterDeath()
+ //Something kills the stored caster through direct damage.
+ if(source.revert_on_death)
+ restore(death=TRUE)
+ else
+ shape.death()
+
+/obj/shapeshift_holder/proc/shapeDeath()
+ //Shape dies.
+ if(source.die_with_shapeshifted_form)
+ if(source.revert_on_death)
+ restore(death=TRUE)
+ else
+ restore()
+
+/obj/shapeshift_holder/proc/restore(death=FALSE)
+ restoring = TRUE
+ qdel(slink)
+ stored.forceMove(get_turf(src))
+ stored.notransform = FALSE
+ if(shape.mind)
+ shape.mind.transfer_to(stored)
+ if(death)
+ stored.death()
+ qdel(shape)
+ qdel(src)
+
+/datum/soullink/shapeshift
+ var/obj/shapeshift_holder/source
+
+/datum/soullink/shapeshift/ownerDies(gibbed, mob/living/owner)
+ if(source)
+ source.casterDeath(gibbed)
+
+/datum/soullink/shapeshift/sharerDies(gibbed, mob/living/sharer)
+ if(source)
+ source.shapeDeath(gibbed)
diff --git a/code/modules/spells/spell_types/touch_attacks.dm b/code/modules/spells/spell_types/touch_attacks.dm
index 46563da53d..ffbee4789d 100644
--- a/code/modules/spells/spell_types/touch_attacks.dm
+++ b/code/modules/spells/spell_types/touch_attacks.dm
@@ -11,15 +11,15 @@
charge_counter = charge_max
attached_hand = null
to_chat(user, "You draw the power out of your hand.")
- return 0
+ return FALSE
..()
/obj/effect/proc_holder/spell/targeted/touch/cast(list/targets,mob/user = usr)
for(var/mob/living/carbon/C in targets)
if(!attached_hand)
if(!ChargeHand(C))
- return 0
- while(attached_hand) //hibernate untill the spell is actually used
+ return FALSE
+ while(attached_hand)
charge_counter = 0
stoplag(1)
@@ -30,9 +30,9 @@
charge_counter = charge_max
attached_hand = null
to_chat(user, "Your hands are full!")
- return 0
+ return FALSE
to_chat(user, "You channel the power of the spell to your hand.")
- return 1
+ return TRUE
/obj/effect/proc_holder/spell/targeted/touch/disintegrate
@@ -58,4 +58,4 @@
cooldown_min = 200 //100 deciseconds reduction per rank
action_icon_state = "statue"
- sound = 'sound/magic/fleshtostone.ogg'
\ No newline at end of file
+ sound = 'sound/magic/fleshtostone.ogg'
diff --git a/code/modules/spells/spell_types/turf_teleport.dm b/code/modules/spells/spell_types/turf_teleport.dm
index 3e3a982d4d..093285b74d 100644
--- a/code/modules/spells/spell_types/turf_teleport.dm
+++ b/code/modules/spells/spell_types/turf_teleport.dm
@@ -16,9 +16,12 @@
for(var/mob/living/target in targets)
var/list/turfs = new/list()
for(var/turf/T in range(target,outer_tele_radius))
- if(T in range(target,inner_tele_radius)) continue
- if(isspaceturf(T) && !include_space) continue
- if(T.density && !include_dense) continue
+ if(T in range(target,inner_tele_radius))
+ continue
+ if(isspaceturf(T) && !include_space)
+ continue
+ if(T.density && !include_dense)
+ continue
if(T.x>world.maxx-outer_tele_radius || T.xworld.maxy-outer_tele_radius || T.yYou feel resistant to airborne toxins.")
if(locate(/obj/item/organ/lungs) in H.internal_organs)
- var/obj/item/organ/lungs/L = H.internal_organs_slot["lungs"]
+ var/obj/item/organ/lungs/L = H.internal_organs_slot[ORGAN_SLOT_LUNGS]
L.tox_breath_dam_min = 0
L.tox_breath_dam_max = 0
S.species_traits |= VIRUSIMMUNE
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 6639297e23..b00dff2ef7 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -83,7 +83,7 @@
/obj/machinery/satellite
- name = "Defunct Satellite"
+ name = "\improper Defunct Satellite"
desc = ""
icon = 'icons/obj/machines/satellite.dmi'
icon_state = "sat_inactive"
@@ -104,10 +104,10 @@
/obj/machinery/satellite/proc/toggle(mob/user)
if(!active && !isinspace())
if(user)
- to_chat(user, "You can only active the [src] in space.")
+ to_chat(user, "You can only activate [src] in space.")
return FALSE
if(user)
- to_chat(user, "You [active ? "deactivate": "activate"] the [src]")
+ to_chat(user, "You [active ? "deactivate": "activate"] [src].")
active = !active
if(active)
animate(src, pixel_y = 2, time = 10, loop = -1)
@@ -127,8 +127,8 @@
return ..()
/obj/machinery/satellite/meteor_shield
- name = "Meteor Shield Satellite"
- desc = "Meteor Point Defense Satellite"
+ name = "\improper Meteor Shield Satellite"
+ desc = "A meteor point-defense satellite."
mode = "M-SHIELD"
speed_process = TRUE
var/kill_range = 14
diff --git a/code/modules/stock_market/industries.dm b/code/modules/stock_market/industries.dm
index 497d669549..1a90db874a 100644
--- a/code/modules/stock_market/industries.dm
+++ b/code/modules/stock_market/industries.dm
@@ -96,34 +96,62 @@
/datum/industry/it/proc/latin_number(n)
if (n < 20 || !(n % 10))
switch(n)
- if (0) return "Nihil"
- if (1) return "Unus"
- if (2) return "Duo"
- if (3) return "Tres"
- if (4) return "Quattour"
- if (5) return "Quinque"
- if (6) return "Sex"
- if (7) return "Septem"
- if (8) return "Octo"
- if (9) return "Novem"
- if (10) return "Decim"
- if (11) return "Undecim"
- if (12) return "Duodecim"
- if (13) return "Tredecim"
- if (14) return "Quattourdecim"
- if (15) return "Quindecim"
- if (16) return "Sedecim"
- if (17) return "Septdecim"
- if (18) return "Duodeviginti"
- if (19) return "Undeviginti"
- if (20) return "Viginti"
- if (30) return "Triginta"
- if (40) return "Quadriginta"
- if (50) return "Quinquaginta"
- if (60) return "Sexaginta"
- if (70) return "Septuaginta"
- if (80) return "Octoginta"
- if (90) return "Nonaginta"
+ if (0)
+ return "Nihil"
+ if (1)
+ return "Unus"
+ if (2)
+ return "Duo"
+ if (3)
+ return "Tres"
+ if (4)
+ return "Quattour"
+ if (5)
+ return "Quinque"
+ if (6)
+ return "Sex"
+ if (7)
+ return "Septem"
+ if (8)
+ return "Octo"
+ if (9)
+ return "Novem"
+ if (10)
+ return "Decim"
+ if (11)
+ return "Undecim"
+ if (12)
+ return "Duodecim"
+ if (13)
+ return "Tredecim"
+ if (14)
+ return "Quattourdecim"
+ if (15)
+ return "Quindecim"
+ if (16)
+ return "Sedecim"
+ if (17)
+ return "Septdecim"
+ if (18)
+ return "Duodeviginti"
+ if (19)
+ return "Undeviginti"
+ if (20)
+ return "Viginti"
+ if (30)
+ return "Triginta"
+ if (40)
+ return "Quadriginta"
+ if (50)
+ return "Quinquaginta"
+ if (60)
+ return "Sexaginta"
+ if (70)
+ return "Septuaginta"
+ if (80)
+ return "Octoginta"
+ if (90)
+ return "Nonaginta"
else
return "[latin_number(n - (n % 10))] [lowertext(latin_number(n % 10))]"
diff --git a/code/modules/surgery/amputation.dm b/code/modules/surgery/amputation.dm
index 7684484a42..f6a2c057d0 100644
--- a/code/modules/surgery/amputation.dm
+++ b/code/modules/surgery/amputation.dm
@@ -4,7 +4,7 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/sever_limb)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("r_arm", "l_arm", "l_leg", "r_leg", "head")
- requires_organic_bodypart = 0
+ requires_bodypart_type = 0
/datum/surgery_step/sever_limb
@@ -22,4 +22,4 @@
var/obj/item/bodypart/target_limb = surgery.operated_bodypart
target_limb.drop_limb()
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/surgery/bodyparts/bodyparts.dm b/code/modules/surgery/bodyparts/bodyparts.dm
index f05a3a7e42..adfcfd6b81 100644
--- a/code/modules/surgery/bodyparts/bodyparts.dm
+++ b/code/modules/surgery/bodyparts/bodyparts.dm
@@ -1,7 +1,7 @@
/obj/item/bodypart
name = "limb"
- desc = "why is it detached..."
+ desc = "Why is it detached..."
force = 3
throwforce = 3
icon = 'icons/mob/human_parts.dmi'
diff --git a/code/modules/surgery/bodyparts/dismemberment.dm b/code/modules/surgery/bodyparts/dismemberment.dm
index 57ab1b8f09..9784dd115c 100644
--- a/code/modules/surgery/bodyparts/dismemberment.dm
+++ b/code/modules/surgery/bodyparts/dismemberment.dm
@@ -121,14 +121,22 @@
O.transfer_to_limb(src, C)
update_icon_dropped()
- forceMove(T)
C.update_health_hud() //update the healthdoll
C.update_body()
C.update_hair()
C.update_canmove()
+
+ if(!T) // T = null happens when a "dummy human" used for rendering icons on prefs screen gets its limbs replaced.
+ qdel(src)
+ return
+
if(is_pseudopart)
drop_organs(C) //Psuedoparts shouldn't have organs, but just in case
qdel(src)
+ return
+
+ forceMove(T)
+
//when a limb is dropped, the internal organs are removed from the mob and put into the limb
@@ -219,6 +227,8 @@
var/obj/item/I = X
owner.dropItemToGround(I, TRUE)
+ owner.wash_cream() //clean creampie overlay
+
//Handle dental implants
for(var/datum/action/item_action/hands_free/activate_pill/AP in owner.actions)
AP.Remove(owner)
diff --git a/code/modules/surgery/bodyparts/head.dm b/code/modules/surgery/bodyparts/head.dm
index c0b69e658c..a4d317ad2a 100644
--- a/code/modules/surgery/bodyparts/head.dm
+++ b/code/modules/surgery/bodyparts/head.dm
@@ -124,39 +124,37 @@
cut_overlays()
. = ..()
if(dropped) //certain overlays only appear when the limb is being detached from its owner.
- var/datum/sprite_accessory/S
if(status != BODYPART_ROBOTIC) //having a robotic head hides certain features.
//facial hair
if(facial_hair_style)
- S = GLOB.facial_hair_styles_list[facial_hair_style]
+ var/datum/sprite_accessory/S = GLOB.facial_hair_styles_list[facial_hair_style]
if(S)
var/image/facial_overlay = image(S.icon, "[S.icon_state]", -HAIR_LAYER, SOUTH)
facial_overlay.color = "#" + facial_hair_color
facial_overlay.alpha = hair_alpha
. += facial_overlay
- var/image/hair_overlay = image(layer = -HAIR_LAYER, dir = SOUTH)
- . += hair_overlay
//Applies the debrained overlay if there is no brain
if(!brain)
+ var/image/debrain_overlay = image(layer = -HAIR_LAYER, dir = SOUTH)
if(animal_origin == ALIEN_BODYPART)
- hair_overlay.icon = 'icons/mob/animal_parts.dmi'
- hair_overlay.icon_state = "debrained_alien"
+ debrain_overlay.icon = 'icons/mob/animal_parts.dmi'
+ debrain_overlay.icon_state = "debrained_alien"
else if(animal_origin == LARVA_BODYPART)
- hair_overlay.icon = 'icons/mob/animal_parts.dmi'
- hair_overlay.icon_state = "debrained_larva"
+ debrain_overlay.icon = 'icons/mob/animal_parts.dmi'
+ debrain_overlay.icon_state = "debrained_larva"
else if(!(NOBLOOD in species_flags_list))
- hair_overlay.icon = 'icons/mob/human_face.dmi'
- hair_overlay.icon_state = "debrained"
+ debrain_overlay.icon = 'icons/mob/human_face.dmi'
+ debrain_overlay.icon_state = "debrained"
+ . += debrain_overlay
else
- if(hair_style)
- S = GLOB.hair_styles_list[hair_style]
- if(S)
- hair_overlay.icon = icon
- hair_overlay.icon_state = "[S.icon_state]"
- hair_overlay.color = "#" + hair_color
- hair_overlay.alpha = hair_alpha
+ var/datum/sprite_accessory/S2 = GLOB.hair_styles_list[hair_style]
+ if(S2)
+ var/image/hair_overlay = image(S2.icon, "[S2.icon_state]", -HAIR_LAYER, SOUTH)
+ hair_overlay.color = "#" + hair_color
+ hair_overlay.alpha = hair_alpha
+ . += hair_overlay
// lipstick
diff --git a/code/modules/surgery/bodyparts/robot_bodyparts.dm b/code/modules/surgery/bodyparts/robot_bodyparts.dm
index 0a8e98144d..8ec0172fad 100644
--- a/code/modules/surgery/bodyparts/robot_bodyparts.dm
+++ b/code/modules/surgery/bodyparts/robot_bodyparts.dm
@@ -135,7 +135,7 @@
flash2.forceMove(user.loc)
flash2 = null
else
- to_chat(user, "There are no flash to remove from [src].")
+ to_chat(user, "There is no flash to remove from [src].")
else
return ..()
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 2aeadffc65..9099489420 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -1,38 +1,38 @@
-/datum/surgery/eye_surgery
- name = "eye surgery"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
- species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- possible_locs = list("eyes")
- requires_organic_bodypart = 0
-
-//fix eyes
-/datum/surgery_step/fix_eyes
- name = "fix eyes"
- implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 45, /obj/item/pen = 25)
- time = 64
-
-/datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
- var/obj/item/organ/eyes/E = target.getorganslot("eye_sight")
- if(!E)
- to_chat(user, "It's hard to do surgery on someones eyes when they don't have any.")
- return FALSE
-
-/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to fix [target]'s eyes.", "You begin to fix [target]'s eyes...")
-
-/datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.")
- target.cure_blind()
- target.set_blindness(0)
- target.cure_nearsighted()
- target.blur_eyes(35) //this will fix itself slowly.
- target.set_eye_damage(0)
- return TRUE
-
-/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(target.getorgan(/obj/item/organ/brain))
- user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
- target.adjustBrainLoss(100)
- else
- user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.")
+/datum/surgery/eye_surgery
+ name = "eye surgery"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
+ species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list("eyes")
+ requires_bodypart_type = 0
+
+//fix eyes
+/datum/surgery_step/fix_eyes
+ name = "fix eyes"
+ implements = list(/obj/item/hemostat = 100, /obj/item/screwdriver = 45, /obj/item/pen = 25)
+ time = 64
+
+/datum/surgery/eye_surgery/can_start(mob/user, mob/living/carbon/target)
+ var/obj/item/organ/eyes/E = target.getorganslot(ORGAN_SLOT_EYES)
+ if(!E)
+ to_chat(user, "It's hard to do surgery on someones eyes when they don't have any.")
+ return FALSE
+
+/datum/surgery_step/fix_eyes/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to fix [target]'s eyes.", "You begin to fix [target]'s eyes...")
+
+/datum/surgery_step/fix_eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] successfully fixes [target]'s eyes!", "You succeed in fixing [target]'s eyes.")
+ target.cure_blind()
+ target.set_blindness(0)
+ target.cure_nearsighted()
+ target.blur_eyes(35) //this will fix itself slowly.
+ target.set_eye_damage(0)
+ return TRUE
+
+/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(target.getorgan(/obj/item/organ/brain))
+ user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
+ target.adjustBrainLoss(100)
+ else
+ user.visible_message("[user] accidentally stabs [target] right in the brain! Or would have, if [target] had a brain.", "You accidentally stab [target] right in the brain! Or would have, if [target] had a brain.")
return FALSE
\ No newline at end of file
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 97426305b5..a4e9b16989 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -29,7 +29,7 @@
if(affecting)
if(!S.requires_bodypart)
continue
- if(S.requires_organic_bodypart && affecting.status == BODYPART_ROBOTIC)
+ if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
continue
if(S.requires_real_bodypart && affecting.is_pseudopart)
continue
@@ -56,7 +56,7 @@
if(affecting)
if(!S.requires_bodypart)
return
- if(S.requires_organic_bodypart && affecting.status == BODYPART_ROBOTIC)
+ if(S.requires_bodypart_type && affecting.status == BODYPART_ROBOTIC)
return
else if(C && S.requires_bodypart)
return
@@ -78,13 +78,23 @@
user.visible_message("[user] removes the drapes from [M]'s [parse_zone(selected_zone)].", \
"You remove the drapes from [M]'s [parse_zone(selected_zone)].")
qdel(current_surgery)
- else if(istype(user.get_inactive_held_item(), /obj/item/cautery) && current_surgery.can_cancel)
- M.surgeries -= current_surgery
- user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
- "You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].")
- qdel(current_surgery)
else if(current_surgery.can_cancel)
- to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!")
+ if(current_surgery.requires_bodypart_type == BODYPART_ORGANIC)
+ if(istype(user.get_inactive_held_item(), /obj/item/cautery))
+ M.surgeries -= current_surgery
+ user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else
+ to_chat(user, "You need to hold a cautery in inactive hand to stop [M]'s surgery!")
+ else if(current_surgery.requires_bodypart_type == BODYPART_ROBOTIC)
+ if(istype(user.get_inactive_held_item(), /obj/item/screwdriver))
+ M.surgeries -= current_surgery
+ user.visible_message("[user] screw the shell and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You screw the shell and remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else
+ to_chat(user, "You need to hold a screwdriver in inactive hand to stop [M]'s surgery!")
return 1
@@ -161,4 +171,3 @@
return 0
return 1
-
diff --git a/code/modules/surgery/implant_removal.dm b/code/modules/surgery/implant_removal.dm
index c31198b5cf..b9881d0e37 100644
--- a/code/modules/surgery/implant_removal.dm
+++ b/code/modules/surgery/implant_removal.dm
@@ -3,7 +3,6 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/extract_implant, /datum/surgery_step/close)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("chest")
- requires_organic_bodypart = 0
//extract implant
@@ -35,7 +34,7 @@
case = locate(/obj/item/implantcase) in get_turf(target)
if(case && !case.imp)
case.imp = I
- I.forceMove(case)
+ I.loc = case
case.update_icon()
user.visible_message("[user] places [I] into [case]!", "You place [I] into [case].")
else
@@ -44,3 +43,14 @@
else
to_chat(user, "You can't find anything in [target]'s [target_zone]!")
return 1
+
+/datum/surgery/implant_removal/mechanic
+ name = "implant removal"
+ requires_bodypart_type = BODYPART_ROBOTIC
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/mechanic_unwrench,
+ /datum/surgery_step/extract_implant,
+ /datum/surgery_step/mechanic_wrench,
+ /datum/surgery_step/mechanic_close)
diff --git a/code/modules/surgery/limb_augmentation.dm b/code/modules/surgery/limb_augmentation.dm
index b5081370f0..25d914b0fb 100644
--- a/code/modules/surgery/limb_augmentation.dm
+++ b/code/modules/surgery/limb_augmentation.dm
@@ -15,15 +15,17 @@
/datum/surgery_step/add_limb
name = "replace limb"
- implements = list(/obj/item/bodypart = 100)
+ implements = list(/obj/item/bodypart = 100, /obj/item/organ_storage = 100)
time = 32
var/obj/item/bodypart/L = null // L because "limb"
/datum/surgery_step/add_limb/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(istype(tool, /obj/item/organ_storage) && istype(tool.contents[1], /obj/item/bodypart))
+ tool = tool.contents[1]
var/obj/item/bodypart/aug = tool
if(aug.status != BODYPART_ROBOTIC)
- to_chat(user, "that's not an augment silly!")
+ to_chat(user, "That's not an augment, silly!")
return -1
if(aug.body_zone != target_zone)
to_chat(user, "[tool] isn't the right type for [parse_zone(target_zone)].")
@@ -49,6 +51,11 @@
/datum/surgery_step/add_limb/success(mob/user, mob/living/carbon/target, target_zone, obj/item/bodypart/tool, datum/surgery/surgery)
if(L)
user.visible_message("[user] successfully augments [target]'s [parse_zone(target_zone)]!", "You successfully augment [target]'s [parse_zone(target_zone)].")
+ if(istype(tool, /obj/item/organ_storage))
+ tool.icon_state = initial(tool.icon_state)
+ tool.desc = initial(tool.desc)
+ tool.cut_overlays()
+ tool = tool.contents[1]
L.change_bodypart_status(BODYPART_ROBOTIC, TRUE)
L.icon = tool.icon
L.max_damage = tool.max_damage
diff --git a/code/modules/surgery/mechanic_steps.dm b/code/modules/surgery/mechanic_steps.dm
new file mode 100644
index 0000000000..657564f112
--- /dev/null
+++ b/code/modules/surgery/mechanic_steps.dm
@@ -0,0 +1,85 @@
+//open shell
+/datum/surgery_step/mechanic_open
+ name = "unscrew shell"
+ implements = list(
+ /obj/item/screwdriver = 100,
+ /obj/item/scalpel = 75, // med borgs could try to unskrew shell with scalpel
+ /obj/item/kitchen/knife = 50,
+ /obj/item = 10) // 10% success with any sharp item.
+ time = 24
+
+/datum/surgery_step/mechanic_open/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to unscrew the shell of [target]'s [parse_zone(target_zone)].",
+ "You begin to unscrew the shell of [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/mechanic_incise/tool_check(mob/user, obj/item/tool)
+ if(implement_type == /obj/item && !tool.is_sharp())
+ return FALSE
+
+ return TRUE
+
+//close shell
+/datum/surgery_step/mechanic_close
+ name = "screw shell"
+ implements = list(
+ /obj/item/screwdriver = 100,
+ /obj/item/scalpel = 75,
+ /obj/item/kitchen/knife = 50,
+ /obj/item = 10) // 10% success with any sharp item.
+ time = 24
+
+/datum/surgery_step/mechanic_close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to screw the shell of [target]'s [parse_zone(target_zone)].",
+ "You begin to screw the shell of [target]'s [parse_zone(target_zone)]...")
+
+/datum/surgery_step/mechanic_close/tool_check(mob/user, obj/item/tool)
+ if(implement_type == /obj/item && !tool.is_sharp())
+ return FALSE
+
+ return TRUE
+
+//prepare electronics
+/datum/surgery_step/prepare_electronics
+ name = "prepare electronics"
+ implements = list(
+ /obj/item/device/multitool = 100,
+ /obj/item/hemostat = 10) // try to reboot internal controllers via short circuit with some conductor
+ time = 24
+
+/datum/surgery_step/prepare_electronics/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to prepare electronics in [target]'s [parse_zone(target_zone)].",
+ "You begin to prepare electronics in [target]'s [parse_zone(target_zone)]...")
+
+//unwrench
+/datum/surgery_step/mechanic_unwrench
+ name = "unwrench bolts"
+ implements = list(
+ /obj/item/wrench = 100,
+ /obj/item/retractor = 10)
+ time = 24
+
+/datum/surgery_step/mechanic_unwrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to unwrench some bolts in [target]'s [parse_zone(target_zone)].",
+ "You begin to unwrench some bolts in [target]'s [parse_zone(target_zone)]...")
+
+//wrench
+/datum/surgery_step/mechanic_wrench
+ name = "wrench bolts"
+ implements = list(
+ /obj/item/wrench = 100,
+ /obj/item/retractor = 10)
+ time = 24
+
+/datum/surgery_step/mechanic_wrench/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to wrench some bolts in [target]'s [parse_zone(target_zone)].",
+ "You begin to wrench some bolts in [target]'s [parse_zone(target_zone)]...")
+
+//open hatch
+/datum/surgery_step/open_hatch
+ name = "open the hatch"
+ accept_hand = 1
+ time = 10
+
+/datum/surgery_step/open_hatch/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ user.visible_message("[user] begins to open the hatch holders in [target]'s [parse_zone(target_zone)].",
+ "You begin to open the hatch holders in [target]'s [parse_zone(target_zone)]...")
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
index f30d45e422..f477535dab 100644
--- a/code/modules/surgery/organ_manipulation.dm
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -1,38 +1,79 @@
/datum/surgery/organ_manipulation
name = "organ manipulation"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("chest", "head")
- requires_organic_bodypart = FALSE
- requires_real_bodypart = TRUE
+ requires_real_bodypart = 1
+ steps = list(
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/saw,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/manipulate_organs,
+ //there should be bone fixing
+ /datum/surgery_step/close
+ )
/datum/surgery/organ_manipulation/soft
possible_locs = list("groin", "eyes", "mouth", "l_arm", "r_arm")
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders,
- /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
+ steps = list(
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/close
+ )
/datum/surgery/organ_manipulation/alien
name = "alien organ manipulation"
possible_locs = list("chest", "head", "groin", "eyes", "mouth", "l_arm", "r_arm")
species = list(/mob/living/carbon/alien/humanoid)
- steps = list(/datum/surgery_step/saw, /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/manipulate_organs)
-
+ steps = list(
+ /datum/surgery_step/saw,
+ /datum/surgery_step/incise,
+ /datum/surgery_step/retract_skin,
+ /datum/surgery_step/saw,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/close
+ )
+/datum/surgery/organ_manipulation/mechanic
+ name = "prosthesis organ manipulation"
+ possible_locs = list("chest", "head")
+ requires_bodypart_type = BODYPART_ROBOTIC
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/mechanic_unwrench,
+ /datum/surgery_step/prepare_electronics,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/mechanic_wrench,
+ /datum/surgery_step/mechanic_close
+ )
+/datum/surgery/organ_manipulation/mechanic/soft
+ possible_locs = list("groin", "eyes", "mouth", "l_arm", "r_arm")
+ steps = list(
+ /datum/surgery_step/mechanic_open,
+ /datum/surgery_step/open_hatch,
+ /datum/surgery_step/prepare_electronics,
+ /datum/surgery_step/manipulate_organs,
+ /datum/surgery_step/mechanic_close
+ )
/datum/surgery_step/manipulate_organs
time = 64
name = "manipulate organs"
+ repeatable = 1
implements = list(/obj/item/organ = 100, /obj/item/reagent_containers/food/snacks/organ = 0, /obj/item/organ_storage = 100)
var/implements_extract = list(/obj/item/hemostat = 100, /obj/item/crowbar = 55)
- var/implements_mend = list(/obj/item/cautery = 100, /obj/item/weldingtool = 70, /obj/item/lighter = 45, /obj/item/match = 20)
var/current_type
var/obj/item/organ/I = null
/datum/surgery_step/manipulate_organs/New()
..()
- implements = implements + implements_extract + implements_mend
+ implements = implements + implements_extract
/datum/surgery_step/manipulate_organs/tool_check(mob/user, obj/item/tool)
if(istype(tool, /obj/item/weldingtool))
@@ -96,33 +137,23 @@
I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
if(I && user && target && user.Adjacent(target) && user.get_active_held_item() == tool)
I = organs[I]
- if(!I) return -1
+ if(!I)
+ return -1
user.visible_message("[user] begins to extract [I] from [target]'s [parse_zone(target_zone)].",
"You begin to extract [I] from [target]'s [parse_zone(target_zone)]...")
else
return -1
- else if(implement_type in implements_mend)
- current_type = "mend"
- user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].",
- "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...")
-
else if(istype(tool, /obj/item/reagent_containers/food/snacks/organ))
to_chat(user, "[tool] was bitten by someone! It's too damaged to use!")
return -1
/datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(current_type == "mend")
- user.visible_message("[user] mends the incision in [target]'s [parse_zone(target_zone)].",
- "You mend the incision in [target]'s [parse_zone(target_zone)].")
- if(locate(/datum/surgery_step/saw) in surgery.steps)
- target.heal_bodypart_damage(45,0)
- return 1
- else if(current_type == "insert")
+ if(current_type == "insert")
if(istype(tool, /obj/item/organ_storage))
I = tool.contents[1]
- tool.icon_state = "evidenceobj"
- tool.desc = "A container for holding body parts."
+ tool.icon_state = initial(tool.icon_state)
+ tool.desc = initial(tool.desc)
tool.cut_overlays()
tool = I
else
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/organic_steps.dm
similarity index 99%
rename from code/modules/surgery/generic_steps.dm
rename to code/modules/surgery/organic_steps.dm
index 5e3c3f33ba..8a4c795c63 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/organic_steps.dm
@@ -2,7 +2,7 @@
//make incision
/datum/surgery_step/incise
name = "make incision"
- implements = list(/obj/item/scalpel = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65,
+ implements = list(/obj/item/scalpel = 100, /obj/item/melee/transforming/energy/sword = 75, /obj/item/kitchen/knife = 65,
/obj/item/shard = 45, /obj/item = 30) // 30% success with any sharp item.
time = 16
@@ -87,7 +87,7 @@
//saw bone
/datum/surgery_step/saw
name = "saw bone"
- implements = list(/obj/item/circular_saw = 100, /obj/item/melee/transforming/energy/sword/cyborg/saw = 100,
+ implements = list(/obj/item/circular_saw = 100, /obj/item/melee/transforming/energy/sword/cyborg/saw = 100,
/obj/item/melee/arm_blade = 75, /obj/item/mounted_chainsaw = 65, /obj/item/twohanded/required/chainsaw = 50,
/obj/item/twohanded/fireaxe = 50, /obj/item/hatchet = 35, /obj/item/kitchen/knife/butcher = 25)
time = 54
diff --git a/code/modules/surgery/organs/appendix.dm b/code/modules/surgery/organs/appendix.dm
index ad51c48d85..35a2d851e3 100644
--- a/code/modules/surgery/organs/appendix.dm
+++ b/code/modules/surgery/organs/appendix.dm
@@ -2,7 +2,7 @@
name = "appendix"
icon_state = "appendix"
zone = "groin"
- slot = "appendix"
+ slot = ORGAN_SLOT_APPENDIX
var/inflamed = 0
/obj/item/organ/appendix/update_icon()
diff --git a/code/modules/surgery/organs/augments_arms.dm b/code/modules/surgery/organs/augments_arms.dm
index 3ebe5dd061..aa1ea10cd0 100644
--- a/code/modules/surgery/organs/augments_arms.dm
+++ b/code/modules/surgery/organs/augments_arms.dm
@@ -2,7 +2,6 @@
name = "arm-mounted implant"
desc = "You shouldn't see this! Adminhelp and report this as an issue on github!"
zone = "r_arm"
- slot = "r_arm_device"
icon_state = "implant-toolkit"
w_class = WEIGHT_CLASS_NORMAL
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -20,9 +19,18 @@
holder = new holder(src)
update_icon()
- slot = zone + "_device"
+ SetSlotFromZone()
items_list = contents.Copy()
+/obj/item/organ/cyberimp/arm/proc/SetSlotFromZone()
+ switch(zone)
+ if("l_arm")
+ slot = ORGAN_SLOT_LEFT_ARM_AUG
+ if("r_arm")
+ slot = ORGAN_SLOT_RIGHT_ARM_AUG
+ else
+ CRASH("Invalid zone for [type]")
+
/obj/item/organ/cyberimp/arm/update_icon()
if(zone == "r_arm")
transform = null
@@ -40,7 +48,7 @@
zone = "l_arm"
else
zone = "r_arm"
- slot = zone + "_device"
+ SetSlotFromZone()
to_chat(user, "You modify [src] to be installed on the [zone == "r_arm" ? "right" : "left"] arm.")
update_icon()
else if(istype(W, /obj/item/card/emag))
@@ -173,7 +181,7 @@
/obj/item/organ/cyberimp/arm/toolset
name = "integrated toolset implant"
- desc = "A stripped-down version of engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
+ desc = "A stripped-down version of the engineering cyborg toolset, designed to be installed on subject's arm. Contains all necessary tools."
origin_tech = "materials=3;engineering=4;biotech=3;powerstorage=4"
contents = newlist(/obj/item/screwdriver/cyborg, /obj/item/wrench/cyborg, /obj/item/weldingtool/largetank/cyborg,
/obj/item/crowbar/cyborg, /obj/item/wirecutters/cyborg, /obj/item/device/multitool/cyborg)
@@ -190,7 +198,7 @@
/obj/item/organ/cyberimp/arm/esword
name = "arm-mounted energy blade"
- desc = "An illegal, and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
+ desc = "An illegal and highly dangerous cybernetic implant that can project a deadly blade of concentrated energy."
contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight)
origin_tech = "materials=4;combat=5;biotech=3;powerstorage=2;syndicate=5"
@@ -202,7 +210,7 @@
/obj/item/organ/cyberimp/arm/flash
name = "integrated high-intensity photon projector" //Why not
- desc = "An integrated projector mounted onto a user's arm, that is able to be used as a powerful flash."
+ desc = "An integrated projector mounted onto a user's arm that is able to be used as a powerful flash."
contents = newlist(/obj/item/device/assembly/flash/armimplant)
origin_tech = "materials=4;combat=3;biotech=4;magnets=4;powerstorage=3"
@@ -220,7 +228,7 @@
/obj/item/organ/cyberimp/arm/combat
name = "combat cybernetics implant"
- desc = "A powerful cybernetic implant that contains combat modules built into the user's arm"
+ desc = "A powerful cybernetic implant that contains combat modules built into the user's arm."
contents = newlist(/obj/item/melee/transforming/energy/blade/hardlight, /obj/item/gun/medbeam, /obj/item/borg/stun, /obj/item/device/assembly/flash/armimplant)
origin_tech = "materials=5;combat=7;biotech=5;powerstorage=5;syndicate=6;programming=5"
@@ -232,6 +240,6 @@
/obj/item/organ/cyberimp/arm/surgery
name = "surgical toolset implant"
- desc = "A set of surgical tools hidden behind a concealed panel on the user's arm"
+ desc = "A set of surgical tools hidden behind a concealed panel on the user's arm."
contents = newlist(/obj/item/retractor/augment, /obj/item/hemostat/augment, /obj/item/cautery/augment, /obj/item/surgicaldrill/augment, /obj/item/scalpel/augment, /obj/item/circular_saw/augment, /obj/item/surgical_drapes)
origin_tech = "materials=3;engineering=3;biotech=3;programming=2;magnets=3"
diff --git a/code/modules/surgery/organs/augments_chest.dm b/code/modules/surgery/organs/augments_chest.dm
index 7fd09d69c2..1e93c4df4a 100644
--- a/code/modules/surgery/organs/augments_chest.dm
+++ b/code/modules/surgery/organs/augments_chest.dm
@@ -1,19 +1,19 @@
/obj/item/organ/cyberimp/chest
name = "cybernetic torso implant"
- desc = "implants for the organs in your torso"
+ desc = "Implants for the organs in your torso."
icon_state = "chest_implant"
implant_overlay = "chest_implant_overlay"
zone = "chest"
/obj/item/organ/cyberimp/chest/nutriment
name = "Nutriment pump implant"
- desc = "This implant with synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
+ desc = "This implant will synthesize and pump into your bloodstream a small amount of nutriment when you are starving."
icon_state = "chest_implant"
implant_color = "#00AA00"
var/hunger_threshold = NUTRITION_LEVEL_STARVING
var/synthesizing = 0
var/poison_amount = 5
- slot = "stomach"
+ slot = ORGAN_SLOT_STOMACH
origin_tech = "materials=2;powerstorage=2;biotech=2"
/obj/item/organ/cyberimp/chest/nutriment/on_life()
@@ -24,8 +24,10 @@
synthesizing = TRUE
to_chat(owner, "You feel less hungry...")
owner.nutrition += 50
- sleep(50)
- synthesizing = FALSE
+ addtimer(CALLBACK(src, .proc/synth_cool), 50)
+
+/obj/item/organ/cyberimp/chest/nutriment/proc/synth_cool()
+ synthesizing = FALSE
/obj/item/organ/cyberimp/chest/nutriment/emp_act(severity)
if(!owner)
@@ -49,7 +51,7 @@
icon_state = "chest_implant"
implant_color = "#AD0000"
origin_tech = "materials=5;programming=4;biotech=4"
- slot = "heartdrive"
+ slot = ORGAN_SLOT_HEART_AID
var/revive_cost = 0
var/reviving = 0
var/cooldown = 0
@@ -118,7 +120,7 @@
name = "implantable thrusters set"
desc = "An implantable set of thruster ports. They use the gas from environment or subject's internals for propulsion in zero-gravity areas. \
Unlike regular jetpack, this device has no stabilization system."
- slot = "thrusters"
+ slot = ORGAN_SLOT_THRUSTERS
icon_state = "imp_jetpack"
origin_tech = "materials=4;magnets=4;biotech=4;engineering=5"
implant_overlay = null
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index 62b427f883..f928db5dd6 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -3,7 +3,7 @@
desc = "artificial photoreceptors with specialized functionality"
icon_state = "eye_implant"
implant_overlay = "eye_implant_overlay"
- slot = "eye_sight"
+ slot = ORGAN_SLOT_EYES
zone = "eyes"
w_class = WEIGHT_CLASS_TINY
@@ -11,7 +11,7 @@
/obj/item/organ/cyberimp/eyes/hud
name = "HUD implant"
desc = "These cybernetic eyes will display a HUD over everything you see. Maybe."
- slot = "eye_hud"
+ slot = ORGAN_SLOT_HUD
var/HUD_type = 0
/obj/item/organ/cyberimp/eyes/hud/Insert(var/mob/living/carbon/M, var/special = 0, drop_if_replaced = FALSE)
diff --git a/code/modules/surgery/organs/augments_internal.dm b/code/modules/surgery/organs/augments_internal.dm
index 1eec609fc0..a6c1517faa 100644
--- a/code/modules/surgery/organs/augments_internal.dm
+++ b/code/modules/surgery/organs/augments_internal.dm
@@ -2,7 +2,7 @@
/obj/item/organ/cyberimp
name = "cybernetic implant"
- desc = "a state-of-the-art implant that improves a baseline's functionality"
+ desc = "A state-of-the-art implant that improves a baseline's functionality."
status = ORGAN_ROBOTIC
var/implant_color = "#FFFFFF"
var/implant_overlay
@@ -23,7 +23,7 @@
/obj/item/organ/cyberimp/brain
name = "cybernetic brain implant"
- desc = "injectors of extra sub-routines for the brain"
+ desc = "Injectors of extra sub-routines for the brain."
icon_state = "brain_implant"
implant_overlay = "brain_implant_overlay"
zone = "head"
@@ -44,7 +44,7 @@
var/active = 0
var/list/stored_items = list()
implant_color = "#DE7E00"
- slot = "brain_antidrop"
+ slot = ORGAN_SLOT_BRAIN_ANTIDROP
origin_tech = "materials=4;programming=5;biotech=4"
actions_types = list(/datum/action/item_action/organ_action/toggle)
@@ -101,7 +101,7 @@
name = "CNS Rebooter implant"
desc = "This implant will automatically give you back control over your central nervous system, reducing downtime when stunned."
implant_color = "#FFFF00"
- slot = "brain_antistun"
+ slot = ORGAN_SLOT_BRAIN_ANTISTUN
origin_tech = "materials=5;programming=4;biotech=5"
/obj/item/organ/cyberimp/brain/anti_stun/on_life()
@@ -133,7 +133,7 @@
name = "breathing tube implant"
desc = "This simple implant adds an internals connector to your back, allowing you to use internals without a mask and protecting you from being choked."
icon_state = "implant_mask"
- slot = "breathing_tube"
+ slot = ORGAN_SLOT_BREATHING_TUBE
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=2;biotech=3"
diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm
index f8a310c8f7..e3aaec0266 100644
--- a/code/modules/surgery/organs/ears.dm
+++ b/code/modules/surgery/organs/ears.dm
@@ -3,7 +3,7 @@
icon_state = "ears"
desc = "There are three parts to the ear. Inner, middle and outer. Only one of these parts should be normally visible."
zone = "head"
- slot = "ears"
+ slot = ORGAN_SLOT_EARS
gender = PLURAL
// `deaf` measures "ticks" of deafness. While > 0, the person is unable
diff --git a/code/modules/surgery/organs/eyes.dm b/code/modules/surgery/organs/eyes.dm
index 8a3b3a92ab..75d4aa0bcc 100644
--- a/code/modules/surgery/organs/eyes.dm
+++ b/code/modules/surgery/organs/eyes.dm
@@ -3,7 +3,7 @@
icon_state = "eyeballs"
desc = "I see you!"
zone = "eyes"
- slot = "eye_sight"
+ slot = ORGAN_SLOT_EYES
gender = PLURAL
var/sight_flags = 0
@@ -68,7 +68,7 @@
/obj/item/organ/eyes/night_vision/zombie
name = "undead eyes"
- desc = "Somewhat counterintuitively, these half rotten eyes actually have superior vision to those of a living human."
+ desc = "Somewhat counterintuitively, these half-rotten eyes actually have superior vision to those of a living human."
/obj/item/organ/eyes/night_vision/nightmare
name = "burning red eyes"
@@ -100,8 +100,8 @@
sight_flags = SEE_MOBS | SEE_OBJS | SEE_TURFS
/obj/item/organ/eyes/robotic/thermals
- name = "Thermals eyes"
- desc = "These cybernetic eye implants will give you Thermal vision. Vertical slit pupil included."
+ name = "thermal eyes"
+ desc = "These cybernetic eye implants will give you thermal vision. Vertical slit pupil included."
eye_color = "FC0"
origin_tech = "materials=5;programming=4;biotech=4;magnets=4;syndicate=1"
sight_flags = SEE_MOBS
@@ -111,7 +111,7 @@
/obj/item/organ/eyes/robotic/flashlight
name = "flashlight eyes"
- desc = "It's two flashlights rigged together with some wire. Why would you put these in someones head?"
+ desc = "It's two flashlights rigged together with some wire. Why would you put these in someone's head?"
eye_color ="fee5a3"
icon = 'icons/obj/lighting.dmi'
icon_state = "flashlight_eyes"
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9308154c48..30825f46bb 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -3,7 +3,7 @@
desc = "I feel bad for the heartless bastard who lost this."
icon_state = "heart-on"
zone = "chest"
- slot = "heart"
+ slot = ORGAN_SLOT_HEART
origin_tech = "biotech=5"
// Heart attack code is in code/modules/mob/living/carbon/human/life.dm
var/beating = 1
@@ -63,10 +63,9 @@
H.stop_sound_channel(CHANNEL_HEARTBEAT)
beat = BEAT_NONE
- if(H.jitteriness)
- if(!beat || beat == BEAT_SLOW)
- H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
- beat = BEAT_FAST
+ if(H.jitteriness && H.health > HEALTH_THRESHOLD_FULLCRIT && (!beat || beat == BEAT_SLOW))
+ H.playsound_local(get_turf(H),fastbeat,40,0, channel = CHANNEL_HEARTBEAT)
+ beat = BEAT_FAST
/obj/item/organ/heart/cursed
name = "cursed heart"
diff --git a/code/modules/surgery/organs/liver.dm b/code/modules/surgery/organs/liver.dm
index eae5e8aee8..352958d9b8 100755
--- a/code/modules/surgery/organs/liver.dm
+++ b/code/modules/surgery/organs/liver.dm
@@ -8,7 +8,7 @@
origin_tech = "biotech=3"
w_class = WEIGHT_CLASS_NORMAL
zone = "chest"
- slot = "liver"
+ slot = ORGAN_SLOT_LIVER
desc = "Pairing suggestion: chianti and fava beans."
var/damage = 0 //liver damage, 0 is no damage, damage=maxHealth causes liver failure
var/alcohol_tolerance = ALCOHOL_RATE//affects how much damage the liver takes from alcohol
diff --git a/code/modules/surgery/organs/lungs.dm b/code/modules/surgery/organs/lungs.dm
index 834a99d1ec..2ed2c2107e 100644
--- a/code/modules/surgery/organs/lungs.dm
+++ b/code/modules/surgery/organs/lungs.dm
@@ -12,7 +12,7 @@
name = "lungs"
icon_state = "lungs"
zone = "chest"
- slot = "lungs"
+ slot = ORGAN_SLOT_LUNGS
gender = PLURAL
w_class = WEIGHT_CLASS_NORMAL
@@ -95,13 +95,13 @@
var/list/breath_gases = breath.gases
- breath.assert_gases("o2", "n2", "plasma", "co2", "n2o", "bz")
+ breath.assert_gases(/datum/gas/oxygen, /datum/gas/plasma, /datum/gas/carbon_dioxide, /datum/gas/nitrous_oxide, /datum/gas/bz, /datum/gas/nitrogen, /datum/gas/tritium, /datum/gas/nitryl, /datum/gas/pluoxium, /datum/gas/stimulum)
//Partial pressures in our breath
- var/O2_pp = breath.get_breath_partial_pressure(breath_gases["o2"][MOLES])
- var/N2_pp = breath.get_breath_partial_pressure(breath_gases["n2"][MOLES])
- var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases["plasma"][MOLES])
- var/CO2_pp = breath.get_breath_partial_pressure(breath_gases["co2"][MOLES])
+ var/O2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/oxygen][MOLES])+(8*breath.get_breath_partial_pressure(breath_gases[/datum/gas/pluoxium][MOLES]))
+ var/N2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrogen][MOLES])
+ var/Toxins_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/plasma][MOLES])
+ var/CO2_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/carbon_dioxide][MOLES])
//-- OXY --//
@@ -109,7 +109,7 @@
//Too much oxygen! //Yes, some species may not like it.
if(safe_oxygen_max)
if(O2_pp > safe_oxygen_max)
- var/ratio = (breath_gases["o2"][MOLES]/safe_oxygen_max) * 10
+ var/ratio = (breath_gases[/datum/gas/oxygen][MOLES]/safe_oxygen_max) * 10
H.apply_damage_type(Clamp(ratio, oxy_breath_dam_min, oxy_breath_dam_max), oxy_damage_type)
H.throw_alert("too_much_oxy", /obj/screen/alert/too_much_oxy)
else
@@ -118,18 +118,18 @@
//Too little oxygen!
if(safe_oxygen_min)
if(O2_pp < safe_oxygen_min)
- gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases["o2"][MOLES])
+ gas_breathed = handle_too_little_breath(H, O2_pp, safe_oxygen_min, breath_gases[/datum/gas/oxygen][MOLES])
H.throw_alert("not_enough_oxy", /obj/screen/alert/not_enough_oxy)
else
H.failed_last_breath = FALSE
if(H.health >= HEALTH_THRESHOLD_CRIT)
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["o2"][MOLES]
+ gas_breathed = breath_gases[/datum/gas/oxygen][MOLES]
H.clear_alert("not_enough_oxy")
//Exhale
- breath_gases["o2"][MOLES] -= gas_breathed
- breath_gases["co2"][MOLES] += gas_breathed
+ breath_gases[/datum/gas/oxygen][MOLES] -= gas_breathed
+ breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
gas_breathed = 0
//-- Nitrogen --//
@@ -137,7 +137,7 @@
//Too much nitrogen!
if(safe_nitro_max)
if(N2_pp > safe_nitro_max)
- var/ratio = (breath_gases["n2"][MOLES]/safe_nitro_max) * 10
+ var/ratio = (breath_gases[/datum/gas/nitrogen][MOLES]/safe_nitro_max) * 10
H.apply_damage_type(Clamp(ratio, nitro_breath_dam_min, nitro_breath_dam_max), nitro_damage_type)
H.throw_alert("too_much_nitro", /obj/screen/alert/too_much_nitro)
else
@@ -146,18 +146,18 @@
//Too little nitrogen!
if(safe_nitro_min)
if(N2_pp < safe_nitro_min)
- gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases["n2"][MOLES])
+ gas_breathed = handle_too_little_breath(H, N2_pp, safe_nitro_min, breath_gases[/datum/gas/nitrogen][MOLES])
H.throw_alert("nitro", /obj/screen/alert/not_enough_nitro)
else
H.failed_last_breath = FALSE
if(H.health >= HEALTH_THRESHOLD_CRIT)
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["n2"][MOLES]
+ gas_breathed = breath_gases[/datum/gas/nitrogen][MOLES]
H.clear_alert("nitro")
//Exhale
- breath_gases["n2"][MOLES] -= gas_breathed
- breath_gases["co2"][MOLES] += gas_breathed
+ breath_gases[/datum/gas/nitrogen][MOLES] -= gas_breathed
+ breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
gas_breathed = 0
//-- CO2 --//
@@ -183,18 +183,18 @@
//Too little CO2!
if(safe_co2_min)
if(CO2_pp < safe_co2_min)
- gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases["co2"][MOLES])
+ gas_breathed = handle_too_little_breath(H, CO2_pp, safe_co2_min, breath_gases[/datum/gas/carbon_dioxide][MOLES])
H.throw_alert("not_enough_co2", /obj/screen/alert/not_enough_co2)
else
H.failed_last_breath = FALSE
if(H.health >= HEALTH_THRESHOLD_CRIT)
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["co2"][MOLES]
+ gas_breathed = breath_gases[/datum/gas/carbon_dioxide][MOLES]
H.clear_alert("not_enough_co2")
//Exhale
- breath_gases["co2"][MOLES] -= gas_breathed
- breath_gases["o2"][MOLES] += gas_breathed
+ breath_gases[/datum/gas/carbon_dioxide][MOLES] -= gas_breathed
+ breath_gases[/datum/gas/oxygen][MOLES] += gas_breathed
gas_breathed = 0
@@ -203,7 +203,7 @@
//Too much toxins!
if(safe_toxins_max)
if(Toxins_pp > safe_toxins_max)
- var/ratio = (breath_gases["plasma"][MOLES]/safe_toxins_max) * 10
+ var/ratio = (breath_gases[/datum/gas/plasma][MOLES]/safe_toxins_max) * 10
H.apply_damage_type(Clamp(ratio, tox_breath_dam_min, tox_breath_dam_max), tox_damage_type)
H.throw_alert("too_much_tox", /obj/screen/alert/too_much_tox)
else
@@ -213,18 +213,18 @@
//Too little toxins!
if(safe_toxins_min)
if(Toxins_pp < safe_toxins_min)
- gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases["plasma"][MOLES])
+ gas_breathed = handle_too_little_breath(H, Toxins_pp, safe_toxins_min, breath_gases[/datum/gas/plasma][MOLES])
H.throw_alert("not_enough_tox", /obj/screen/alert/not_enough_tox)
else
H.failed_last_breath = FALSE
if(H.health >= HEALTH_THRESHOLD_CRIT)
H.adjustOxyLoss(-5)
- gas_breathed = breath_gases["plasma"][MOLES]
+ gas_breathed = breath_gases[/datum/gas/plasma][MOLES]
H.clear_alert("not_enough_tox")
//Exhale
- breath_gases["plasma"][MOLES] -= gas_breathed
- breath_gases["co2"][MOLES] += gas_breathed
+ breath_gases[/datum/gas/plasma][MOLES] -= gas_breathed
+ breath_gases[/datum/gas/carbon_dioxide][MOLES] += gas_breathed
gas_breathed = 0
@@ -234,7 +234,7 @@
// N2O
- var/SA_pp = breath.get_breath_partial_pressure(breath_gases["n2o"][MOLES])
+ var/SA_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitrous_oxide][MOLES])
if(SA_pp > SA_para_min) // Enough to make us stunned for a bit
H.Unconscious(60) // 60 gives them one second to wake up and run away a bit!
if(SA_pp > SA_sleep_min) // Enough to make us sleep as well
@@ -245,16 +245,47 @@
// BZ
- var/bz_pp = breath.get_breath_partial_pressure(breath_gases["bz"][MOLES])
+ var/bz_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/bz][MOLES])
if(bz_pp > BZ_trip_balls_min)
H.hallucination += 20
if(prob(33))
H.adjustBrainLoss(3)
else if(bz_pp > 0.01)
H.hallucination += 5//Removed at 2 per tick so this will slowly build up
+
+
+ // Tritium
+ var/trit_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/tritium][MOLES])
+ if (trit_pp > 50)
+ H.radiation += trit_pp/2 //If you're breathing in half an atmosphere of radioactive gas, you fucked up.
+ else
+ H.radiation += trit_pp/10
+
+ // Nitryl
+ var/nitryl_pp = breath.get_breath_partial_pressure(breath_gases[/datum/gas/nitryl][MOLES])
+ if (prob(nitryl_pp))
+ to_chat(H, "Your mouth feels like it's burning!")
+ if (nitryl_pp >40)
+ H.emote("gasp")
+ H.adjustFireLoss(10)
+ if (prob(nitryl_pp/2))
+ to_chat(H, "Your throat closes up!")
+ H.silent = max(H.silent, 3)
+ else
+ H.adjustFireLoss(nitryl_pp/4)
+ gas_breathed = breath_gases[/datum/gas/nitryl][MOLES]
+ if (gas_breathed > GAS_STIM_MINIMUM)
+ H.reagents.add_reagent("nitryl_gas",1)
+
+ breath_gases[/datum/gas/nitryl][MOLES]-=gas_breathed
+ gas_breathed = 0
+ // Stimulum
+ gas_breathed = breath_gases[/datum/gas/stimulum][MOLES]
+ if (gas_breathed > GAS_STIM_MINIMUM)
+ H.reagents.add_reagent("stimulum",1)
+ breath_gases[/datum/gas/stimulum][MOLES]-=gas_breathed
handle_breath_temperature(breath, H)
breath.garbage_collect()
-
return TRUE
@@ -332,7 +363,7 @@
/obj/item/organ/lungs/cybernetic/upgraded
name = "upgraded cybernetic lungs"
- desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon-dioxide."
+ desc = "A more advanced version of the stock cybernetic lungs. They are capable of filtering out lower levels of toxins and carbon dioxide."
icon_state = "lungs-c-u"
origin_tech = "biotech=5"
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index 681dcb21cf..85a6b098e1 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -22,7 +22,7 @@
if(replaced)
replaced.Remove(M, special = 1)
if(drop_if_replaced)
- replaced.forceMove(get_turf(src))
+ replaced.forceMove(get_turf(M))
else
qdel(replaced)
@@ -118,7 +118,7 @@
var/has_liver = (!(NOLIVER in dna.species.species_traits))
var/has_stomach = (!(NOSTOMACH in dna.species.species_traits))
- if(has_liver && !getorganslot("liver"))
+ if(has_liver && !getorganslot(ORGAN_SLOT_LIVER))
var/obj/item/organ/liver/LI
if(dna.species.mutantliver)
@@ -127,7 +127,7 @@
LI = new()
LI.Insert(src)
- if(has_stomach && !getorganslot("stomach"))
+ if(has_stomach && !getorganslot(ORGAN_SLOT_STOMACH))
var/obj/item/organ/stomach/S
if(dna.species.mutantstomach)
@@ -136,15 +136,15 @@
S = new()
S.Insert(src)
- if(breathes && !getorganslot("lungs"))
+ if(breathes && !getorganslot(ORGAN_SLOT_LUNGS))
var/obj/item/organ/lungs/L = new()
L.Insert(src)
- if(blooded && !getorganslot("heart"))
+ if(blooded && !getorganslot(ORGAN_SLOT_HEART))
var/obj/item/organ/heart/H = new()
H.Insert(src)
- if(!getorganslot("tongue"))
+ if(!getorganslot(ORGAN_SLOT_TONGUE))
var/obj/item/organ/tongue/T
if(dna && dna.species && dna.species.mutanttongue)
@@ -155,7 +155,7 @@
// if they have no mutant tongues, give them a regular one
T.Insert(src)
- if(!getorganslot("eye_sight"))
+ if(!getorganslot(ORGAN_SLOT_EYES))
var/obj/item/organ/eyes/E
if(dna && dna.species && dna.species.mutanteyes)
@@ -165,7 +165,7 @@
E = new()
E.Insert(src)
- if(!getorganslot("ears"))
+ if(!getorganslot(ORGAN_SLOT_EARS))
var/obj/item/organ/ears/ears
if(dna && dna.species && dna.species.mutantears)
ears = new dna.species.mutantears
diff --git a/code/modules/surgery/organs/stomach.dm b/code/modules/surgery/organs/stomach.dm
index 36cd28ac98..2bf34334f4 100755
--- a/code/modules/surgery/organs/stomach.dm
+++ b/code/modules/surgery/organs/stomach.dm
@@ -4,7 +4,7 @@
origin_tech = "biotech=4"
w_class = WEIGHT_CLASS_NORMAL
zone = "chest"
- slot = "stomach"
+ slot = ORGAN_SLOT_STOMACH
attack_verb = list("gored", "squished", "slapped", "digested")
desc = "Onaka ga suite imasu."
var/disgust_metabolism = 1
diff --git a/code/modules/surgery/organs/tails.dm b/code/modules/surgery/organs/tails.dm
index 99d1ed2442..a909463585 100644
--- a/code/modules/surgery/organs/tails.dm
+++ b/code/modules/surgery/organs/tails.dm
@@ -2,7 +2,7 @@
name = "tail"
desc = "What did you cut this off of?"
zone = "groin"
- slot = "tail"
+ slot = ORGAN_SLOT_TAIL
/obj/item/organ/tail/cat
name = "cat tail"
diff --git a/code/modules/surgery/organs/tongue.dm b/code/modules/surgery/organs/tongue.dm
index 5e67e73a8a..6420d8610e 100644
--- a/code/modules/surgery/organs/tongue.dm
+++ b/code/modules/surgery/organs/tongue.dm
@@ -3,15 +3,12 @@
desc = "A fleshy muscle mostly used for lying."
icon_state = "tonguenormal"
zone = "mouth"
- slot = "tongue"
+ slot = ORGAN_SLOT_TONGUE
attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued")
var/list/languages_possible
var/say_mod = null
var/taste_sensitivity = 15 // lower is more sensitive.
-
-/obj/item/organ/tongue/Initialize(mapload)
- . = ..()
- languages_possible = typecacheof(list(
+ var/static/list/languages_possible_base = typecacheof(list(
/datum/language/common,
/datum/language/draconic,
/datum/language/codespeak,
@@ -21,6 +18,10 @@
/datum/language/ratvar
))
+/obj/item/organ/tongue/Initialize(mapload)
+ . = ..()
+ languages_possible = languages_possible_base
+
/obj/item/organ/tongue/get_spans()
return list()
@@ -82,7 +83,7 @@
var/mob/living/carbon/human/user = usr
var/rendered = "[user.name]: [message]"
for(var/mob/living/carbon/human/H in GLOB.living_mob_list)
- var/obj/item/organ/tongue/T = H.getorganslot("tongue")
+ var/obj/item/organ/tongue/T = H.getorganslot(ORGAN_SLOT_TONGUE)
if(!T || T.type != type)
continue
if(H.dna && H.dna.species.id == "abductor" && user.dna && user.dna.species.id == "abductor")
@@ -124,16 +125,17 @@
icon_state = "tonguexeno"
say_mod = "hisses"
taste_sensitivity = 10 // LIZARDS ARE ALIENS CONFIRMED
-
-/obj/item/organ/tongue/alien/Initialize(mapload)
- . = ..()
- languages_possible = typecacheof(list(
+ var/static/list/languages_possible_alien = typecacheof(list(
/datum/language/xenocommon,
/datum/language/common,
/datum/language/draconic,
/datum/language/ratvar,
/datum/language/monkey))
+/obj/item/organ/tongue/alien/Initialize(mapload)
+ . = ..()
+ languages_possible = languages_possible_alien
+
/obj/item/organ/tongue/alien/TongueSpeech(var/message)
playsound(owner, "hiss", 25, 1, 1)
return message
diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm
index eed05c6161..85dc2ae1c3 100644
--- a/code/modules/surgery/organs/vocal_cords.dm
+++ b/code/modules/surgery/organs/vocal_cords.dm
@@ -7,7 +7,7 @@
name = "vocal cords"
icon_state = "appendix"
zone = "mouth"
- slot = "vocal_cords"
+ slot = ORGAN_SLOT_VOICE
gender = PLURAL
var/list/spans = null
@@ -22,17 +22,15 @@
/obj/item/organ/adamantine_resonator
name = "adamantine resonator"
- desc = "Fragments of adamantine exists in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
+ desc = "Fragments of adamantine exist in all golems, stemming from their origins as purely magical constructs. These are used to \"hear\" messages from their leaders."
zone = "head"
- slot = "adamantine_resonator"
+ slot = ORGAN_SLOT_ADAMANTINE_RESONATOR
icon_state = "adamantine_resonator"
/obj/item/organ/vocal_cords/adamantine
name = "adamantine vocal cords"
desc = "When adamantine resonates, it causes all nearby pieces of adamantine to resonate as well. Adamantine golems use this to broadcast messages to nearby golems."
actions_types = list(/datum/action/item_action/organ_action/use/adamantine_vocal_cords)
- zone = "mouth"
- slot = "vocal_cords"
icon_state = "adamantine_cords"
/datum/action/item_action/organ_action/use/adamantine_vocal_cords/Trigger()
@@ -48,7 +46,7 @@
for(var/m in GLOB.player_list)
if(iscarbon(m))
var/mob/living/carbon/C = m
- if(C.getorganslot("adamantine_resonator"))
+ if(C.getorganslot(ORGAN_SLOT_ADAMANTINE_RESONATOR))
to_chat(C, msg)
if(isobserver(m))
var/link = FOLLOW_LINK(m, owner)
@@ -59,8 +57,6 @@
name = "divine vocal cords"
desc = "They carry the voice of an ancient god."
icon_state = "voice_of_god"
- zone = "mouth"
- slot = "vocal_cords"
actions_types = list(/datum/action/item_action/organ_action/colossus)
var/next_command = 0
var/cooldown_mod = 1
@@ -253,6 +249,7 @@
var/static/regex/honk_words = regex("ho+nk") //hooooooonk
var/static/regex/multispin_words = regex("like a record baby|right round")
+ var/i = 0
//STUN
if(findtext(message, stun_words))
cooldown = COOLDOWN_STUN
@@ -362,28 +359,30 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
+ var/text = ""
if(is_devil(L))
var/datum/antagonist/devil/devilinfo = is_devil(L)
- L.say("[devilinfo.truename]")
+ text = devilinfo.truename
else
- L.say("[L.real_name]")
- sleep(5) //So the chat flows more naturally
+ text = L.real_name
+ addtimer(CALLBACK(L, /atom/movable/proc/say, text), 5 * i)
+ i++
//SAY MY NAME
else if((findtext(message, saymyname_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.say("[user.name]!") //"Unknown!"
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /atom/movable/proc/say, user.name), 5 * i)
+ i++
//KNOCK KNOCK
else if((findtext(message, knockknock_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.say("Who's there?")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /atom/movable/proc/say, "Who's there?"), 5 * i)
+ i++
//STATE LAWS
else if((findtext(message, statelaws_words)))
@@ -403,11 +402,10 @@
direction = WEST
else if(findtext(message, right_words))
direction = EAST
- for(var/i=1, i<=(5*power_multiplier), i++)
+ for(var/iter in 1 to 5 * power_multiplier)
for(var/V in listeners)
var/mob/living/L = V
- step(L, direction ? direction : pick(GLOB.cardinals))
- sleep(10)
+ addtimer(CALLBACK(GLOBAL_PROC, .proc/_step, L, direction? direction : pick(GLOB.cardinals)), 10 * (iter - 1))
//WALK
else if((findtext(message, walk_words)))
@@ -429,33 +427,33 @@
else if((findtext(message, helpintent_words)))
cooldown = COOLDOWN_MEME
for(var/mob/living/carbon/human/H in listeners)
- H.a_intent_change(INTENT_HELP)
- H.click_random_mob()
- sleep(2) //delay to make it feel more natural
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_HELP), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
//DISARM INTENT
else if((findtext(message, disarmintent_words)))
cooldown = COOLDOWN_MEME
for(var/mob/living/carbon/human/H in listeners)
- H.a_intent_change(INTENT_DISARM)
- H.click_random_mob()
- sleep(2) //delay to make it feel more natural
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_DISARM), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
//GRAB INTENT
else if((findtext(message, grabintent_words)))
cooldown = COOLDOWN_MEME
for(var/mob/living/carbon/human/H in listeners)
- H.a_intent_change(INTENT_GRAB)
- H.click_random_mob()
- sleep(2) //delay to make it feel more natural
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_GRAB), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
//HARM INTENT
else if((findtext(message, harmintent_words)))
cooldown = COOLDOWN_MEME
for(var/mob/living/carbon/human/H in listeners)
- H.a_intent_change(INTENT_HARM)
- H.click_random_mob()
- sleep(2) //delay to make it feel more natural
+ addtimer(CALLBACK(H, /mob/verb/a_intent_change, INTENT_HARM), i * 2)
+ addtimer(CALLBACK(H, /mob/proc/click_random_mob), i * 2)
+ i++
//THROW/CATCH
else if((findtext(message, throwmode_words)))
@@ -475,8 +473,8 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.say(pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage"))
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /atom/movable/proc/say, pick_list_replacements(BRAIN_DAMAGE_FILE, "brain_damage")), 5 * i)
+ i++
//GET UP
else if((findtext(message, getup_words)))
@@ -511,8 +509,8 @@
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.emote("dance")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "dance"), 5 * i)
+ i++
//JUMP
else if((findtext(message, jump_words)))
@@ -520,33 +518,33 @@
for(var/V in listeners)
var/mob/living/L = V
if(prob(25))
- L.say("HOW HIGH?!!")
- L.emote("jump")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /atom/movable/proc/say, "HOW HIGH?!!"), 5 * i)
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "jump"), 5 * i)
+ i++
//SALUTE
else if((findtext(message, salute_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.emote("salute")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "salute"), 5 * i)
+ i++
//PLAY DEAD
else if((findtext(message, deathgasp_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.emote("deathgasp")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "deathgasp"), 5 * i)
+ i++
//PLEASE CLAP
else if((findtext(message, clap_words)))
cooldown = COOLDOWN_MEME
for(var/V in listeners)
var/mob/living/L = V
- L.emote("clap")
- sleep(5) //So the chat flows more naturally
+ addtimer(CALLBACK(L, /mob/living/.proc/emote, "clap"), 5 * i)
+ i++
//HONK
else if((findtext(message, honk_words)))
diff --git a/code/modules/surgery/prosthetic_replacement.dm b/code/modules/surgery/prosthetic_replacement.dm
index 2dddb95872..b3f3953c49 100644
--- a/code/modules/surgery/prosthetic_replacement.dm
+++ b/code/modules/surgery/prosthetic_replacement.dm
@@ -4,6 +4,7 @@
species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
possible_locs = list("r_arm", "l_arm", "l_leg", "r_leg", "head")
requires_bodypart = FALSE //need a missing limb
+ requires_bodypart_type = 0
/datum/surgery/prosthetic_replacement/can_start(mob/user, mob/living/carbon/target)
if(!iscarbon(target))
@@ -59,8 +60,8 @@
/datum/surgery_step/add_prosthetic/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
if(istype(tool, /obj/item/organ_storage))
- tool.icon_state = "evidenceobj"
- tool.desc = "A container for holding body parts."
+ tool.icon_state = initial(tool.icon_state)
+ tool.desc = initial(tool.desc)
tool.cut_overlays()
tool = tool.contents[1]
if(istype(tool, /obj/item/bodypart) && user.temporarilyRemoveItemFromInventory(tool))
@@ -84,4 +85,3 @@
var/obj/item/melee/arm_blade/new_arm = new(target,TRUE,TRUE)
target_zone == "r_arm" ? target.put_in_r_hand(new_arm) : target.put_in_l_hand(new_arm)
return 1
-
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 03beacf27b..e5c046fac1 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -6,7 +6,7 @@
var/can_cancel = 1 //Can cancel this surgery after step 1 with cautery
var/list/species = list(/mob/living/carbon/human) //Acceptable Species
var/location = "chest" //Surgery location
- var/requires_organic_bodypart = 1 //Prevents you from performing an operation on robotic limbs
+ var/requires_bodypart_type = BODYPART_ORGANIC //Prevents you from performing an operation on robotic limbs
var/list/possible_locs = list() //Multiple locations
var/ignore_clothes = 0 //This surgery ignores clothes
var/mob/living/carbon/target //Operation target mob
@@ -53,6 +53,13 @@
var/step_type = steps[status]
return new step_type
+/datum/surgery/proc/get_surgery_next_step()
+ if(status < steps.len)
+ var/step_type = steps[status + 1]
+ return new step_type
+ else
+ return null
+
/datum/surgery/proc/complete()
SSblackbox.add_details("surgeries_completed", "[type]")
qdel(src)
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index 7047c50084..577dc6547b 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -5,6 +5,7 @@
var/accept_hand = 0 //does the surgery step require an open hand? If true, ignores implements. Compatible with accept_any_item.
var/accept_any_item = 0 //does the surgery step accept any item? If true, ignores implements. Compatible with require_hand.
var/time = 10 //how long does the step take?
+ var/repeatable = 0
/datum/surgery_step/proc/try_op(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
@@ -31,8 +32,19 @@
else
to_chat(user, "You need to expose [target]'s [parse_zone(target_zone)] to perform surgery on it!")
return 1 //returns 1 so we don't stab the guy in the dick or wherever.
+
+ if(repeatable)
+ var/datum/surgery_step/next_step = surgery.get_surgery_next_step()
+ if(next_step)
+ surgery.status++
+ if(next_step.try_op(user, target, user.zone_selected, user.get_active_held_item(), surgery))
+ return 1
+ else
+ surgery.status--
+
if(iscyborg(user) && user.a_intent != INTENT_HARM) //to save asimov borgs a LOT of heartache
return 1
+
return 0
@@ -63,7 +75,7 @@
if(failure(user, target, target_zone, tool, surgery))
advance = 1
- if(advance)
+ if(advance && !repeatable)
surgery.status++
if(surgery.status > surgery.steps.len)
surgery.complete()
diff --git a/code/modules/tgui/states/default.dm b/code/modules/tgui/states/default.dm
index 573dcdf7cf..3ae48c7bc7 100644
--- a/code/modules/tgui/states/default.dm
+++ b/code/modules/tgui/states/default.dm
@@ -42,8 +42,8 @@ GLOBAL_DATUM_INIT(default_state, /datum/ui_state/default, new)
if(. < UI_INTERACTIVE)
return
- // The AI can interact with anything it can see nearby, or with cameras.
- if((get_dist(src, src_object) <= client.view) || GLOB.cameranet.checkTurfVis(get_turf_pixel(src_object)))
+ // The AI can interact with anything it can see nearby, or with cameras while wireless control is enabled.
+ if(!control_disabled && can_see(src_object))
return UI_INTERACTIVE
return UI_CLOSE
diff --git a/code/modules/uplink/uplink_item.dm b/code/modules/uplink/uplink_item.dm
index c4516d33f7..6aad347e2a 100644
--- a/code/modules/uplink/uplink_item.dm
+++ b/code/modules/uplink/uplink_item.dm
@@ -368,6 +368,16 @@ GLOBAL_LIST_EMPTY(uplink_items) // Global list so we only initialize this once.
cost = 12
surplus = 35
include_modes = list(/datum/game_mode/nuclear)
+
+/datum/uplink_item/dangerous/guardian
+ name = "Holoparasites"
+ desc = "Though capable of near sorcerous feats via use of hardlight holograms and nanomachines, they require an \
+ organic host as a home base and source of fuel."
+ item = /obj/item/storage/box/syndie_kit/guardian
+ cost = 18
+ surplus = 0
+ exclude_modes = list(/datum/game_mode/nuclear)
+ player_minimum = 25
// Ammunition
/datum/uplink_item/ammo
diff --git a/code/modules/uplink/uplink_item_cit.dm b/code/modules/uplink/uplink_item_cit.dm
index 40c74269eb..26591c72ef 100644
--- a/code/modules/uplink/uplink_item_cit.dm
+++ b/code/modules/uplink/uplink_item_cit.dm
@@ -160,4 +160,19 @@
new /obj/item/storage/belt/military(src)
new /obj/item/clothing/suit/space/hardsuit/syndi/elite(src)
-///End of Bundle stuff///
\ No newline at end of file
+///End of Bundle stuff///
+
+
+/*/////////////////////////////////////////////////////////////////////////
+///////////// The TRUE Energy Sword ///////////////////////////
+*//////////////////////////////////////////////////////////////////////////
+
+/datum/uplink_item/dangerous/cxneb
+ name = "Dragon's Tooth Non-Eutactic Blade"
+ desc = "An illegal modification of a weapon that is functionally identical to the energy sword, \
+ the Non-Eutactic Blade (NEB) forges a hardlight blade on-demand, \
+ generating an extremely sharp, unbreakable edge that is guaranteed to satisfy your every need. \
+ This particular model has a polychromic hardlight generator, allowing you to murder in style! \
+ The illegal modifications bring this weapon up to par with the classic energy sword, and also gives it the energy sword's distinctive sounds."
+ item = /obj/item/melee/transforming/energy/sword/cx/traitor
+ cost = 8
\ No newline at end of file
diff --git a/code/modules/vehicles/atv.dm b/code/modules/vehicles/atv.dm
index c8c5ed0af9..504e4753df 100644
--- a/code/modules/vehicles/atv.dm
+++ b/code/modules/vehicles/atv.dm
@@ -1,7 +1,7 @@
/obj/vehicle/atv
name = "all-terrain vehicle"
- desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-earth technologies that are still relevant on most planet-bound outposts."
+ desc = "An all-terrain vehicle built for traversing rough terrain with ease. One of the few old-Earth technologies that are still relevant on most planet-bound outposts."
icon_state = "atv"
var/static/mutable_appearance/atvcover
diff --git a/code/modules/vehicles/vehicle.dm b/code/modules/vehicles/vehicle.dm
index c0df79fdb6..e538599754 100644
--- a/code/modules/vehicles/vehicle.dm
+++ b/code/modules/vehicles/vehicle.dm
@@ -1,7 +1,7 @@
/obj/vehicle
name = "vehicle"
- desc = "A basic vehicle, vroom"
+ desc = "A basic vehicle, vroom."
icon = 'icons/obj/vehicles.dmi'
icon_state = "fuckyou"
density = TRUE
@@ -35,8 +35,8 @@
. = ..()
-/obj/vehicle/user_buckle_mob(mob/living/M, mob/user)
- if(user.incapacitated())
+/obj/vehicle/user_buckle_mob(mob/living/M, mob/living/user)
+ if(!istype(user) || user.incapacitated())
return
for(var/atom/movable/A in get_turf(src))
if(A.density)
diff --git a/code/modules/vore/eating/belly_vr.dm b/code/modules/vore/eating/belly_vr.dm
index 4262d9fecd..986e6aad5a 100644
--- a/code/modules/vore/eating/belly_vr.dm
+++ b/code/modules/vore/eating/belly_vr.dm
@@ -137,6 +137,7 @@
M.forceMove(owner.loc) // Move the belly contents into the same location as belly's owner.
M << sound(null, repeat = 0, wait = 0, volume = 80, channel = CHANNEL_PREYLOOP)
src.internal_contents.Remove(M) // Remove from the belly contents
+
var/datum/belly/B = check_belly(owner)
if(B)
B.internal_contents.Add(M)
@@ -394,6 +395,19 @@
if(!silent)
for(var/mob/hearer in range(1,owner))
hearer << sound(target.vore_sound,volume=80)
+/*
+//Handles creation of temporary 'vore chest' upon digestion
+/datum/belly/proc/slimy_mass(var/obj/item/content, var/mob/living/M)
+ if(!content in internal_contents)
+ return
+ internal_contents += new /obj/structure/closet/crate/vore(src)
+ internal_contents.Remove(content)
+ M.transferItemToLoc(content, /obj/structure/closet/crate/vore)
+ if(!M.transferItemToLoc(W))
+ qdel(W)
+
+/datum/belly/proc/regurgitate_items(var/obj/structure/closet/crate/vore/C)
+ */
// Belly copies and then returns the copy
// Needs to be updated for any var changes
diff --git a/code/modules/vore/eating/living_vr.dm b/code/modules/vore/eating/living_vr.dm
index d50cdebf45..b7ace801cd 100644
--- a/code/modules/vore/eating/living_vr.dm
+++ b/code/modules/vore/eating/living_vr.dm
@@ -149,7 +149,7 @@
// If we got this far, nom successful! Announce it!
user.visible_message(success_msg)
- playsound(user, belly_target.vore_sound, 100, 1)
+ playsound(get_turf(user), belly_target.vore_sound,75,0,-6,0)
// Actually shove prey into the belly.
belly_target.nom_mob(prey, user)
@@ -191,7 +191,7 @@
// If we got this far, nom successful! Announce it!
user.visible_message(success_msg)
- playsound(user, belly_target.vore_sound, 100, 1)
+ playsound(get_turf(user), belly_target.vore_sound,75,0,-6,0)
// Actually shove prey into the belly.
belly_target.nom_mob(prey, user)
@@ -243,7 +243,7 @@
I.loc = src
B.internal_contents += I
src.visible_message("[src] is fed the beacon!","You're fed the beacon!")
- playsound(src, B.vore_sound, 100, 1)
+ playsound(get_turf(src), B.vore_sound,50,0,-6,0)
return 1
else
return 1 //You don't get to hit someone 'later'
@@ -407,4 +407,4 @@
if(H.touching.reagent_list.len) //Just the first one otherwise I'll go insane.
var/datum/reagent/R = H.touching.reagent_list[1]
taste_message += " You also get the flavor of [R.taste_description] from something on them"*/
- return taste_message
\ No newline at end of file
+ return taste_message
diff --git a/code/modules/vore/eating/voreitems.dm b/code/modules/vore/eating/voreitems.dm
new file mode 100644
index 0000000000..1215605eac
--- /dev/null
+++ b/code/modules/vore/eating/voreitems.dm
@@ -0,0 +1,22 @@
+/obj/item/restraints/handcuffs/cable/vorecuffs
+ name = "vorecuffs"
+ desc = "Because Poojawa is at a loss for actually making people stop being muppets during vore."
+ icon_state = "vorecuffs"
+ lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi'
+ righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi'
+ materials = list()
+ breakouttime = 20 //Deciseconds = 2s
+ trashtype = /obj/item/restraints/handcuffs/cable/vorecuffs/used
+
+/obj/item/restraints/handcuffs/cable/vorecuffs/used
+ desc = "You don't see this coder related vore trick."
+ icon_state = "vorecuffs_used"
+ item_state = "vorecuffs"
+
+/obj/item/restraints/handcuffs/cable/vorecuffs/used/attack()
+ return
+
+/obj/structure/closet/crate/vore
+ name = "Slimy ooze"
+ desc = "A mass of ooze, with something within"
+ icon_state = "vore_ooze"
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index 8db4e492e4..f203af610a 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -44,7 +44,7 @@
return
var/obj/item/organ/zombie_infection/infection
- infection = target.getorganslot("zombie_infection")
+ infection = target.getorganslot(ORGAN_SLOT_ZOMBIE)
if(!infection)
infection = new()
infection.Insert(target)
diff --git a/code/modules/zombie/organs.dm b/code/modules/zombie/organs.dm
index d089204fc8..0b7a54ee1f 100644
--- a/code/modules/zombie/organs.dm
+++ b/code/modules/zombie/organs.dm
@@ -2,7 +2,7 @@
name = "festering ooze"
desc = "A black web of pus and viscera."
zone = "head"
- slot = "zombie_infection"
+ slot = ORGAN_SLOT_ZOMBIE
icon_state = "blacktumor"
origin_tech = "biotech=5"
var/datum/species/old_species = /datum/species/human
@@ -37,7 +37,7 @@
/obj/item/organ/zombie_infection/on_find(mob/living/finder)
to_chat(finder, "Inside the head is a disgusting black \
- web of pus and vicera, bound tightly around the brain like some \
+ web of pus and viscera, bound tightly around the brain like some \
biological harness.")
/obj/item/organ/zombie_infection/process()
diff --git a/config/config.txt b/config/config.txt
index a81bdf0d8e..168f5202ac 100644
--- a/config/config.txt
+++ b/config/config.txt
@@ -92,6 +92,9 @@ LOG_PRAYER
## log lawchanges
LOG_LAW
+## log crew manifest to seperate file
+LOG_MANIFEST
+
## log all world.Topic() calls
# LOG_WORLD_TOPIC
diff --git a/config/game_options.txt b/config/game_options.txt
index d577756061..d3fa274ed8 100644
--- a/config/game_options.txt
+++ b/config/game_options.txt
@@ -85,8 +85,6 @@ PROBABILITY REVOLUTION 2
PROBABILITY CULT 2
PROBABILITY CHANGELING 2
PROBABILITY WIZARD 4
-PROBABILITY BLOB 2
-PROBABILITY RAGINMAGES 2
PROBABILITY MONKEY 0
PROBABILITY METEOR 0
PROBABILITY EXTENDED 0
@@ -397,6 +395,13 @@ JOIN_WITH_MUTANT_RACE
## You probably want humans on your space station, but technically speaking you can turn them off without any ill effect
ROUNDSTART_RACES human
+ROUNDSTART_RACES mammal
+ROUNDSTART_RACES avian
+ROUNDSTART_RACES aquatic
+ROUNDSTART_RACES insect
+ROUNDSTART_RACES xeno
+ROUNDSTART_RACES datashark
+ROUNDSTART_RACES guilmon
## Races that are strictly worse than humans that could probably be turned on without balance concerns
ROUNDSTART_RACES lizard
diff --git a/html/changelog.html b/html/changelog.html
index a4b13b52cf..45dfe57b20 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -1,7 +1,7 @@
- /tg/ Station 13 Changelog
+ Citadel Station 13 Changelog
+
+
diff --git a/tools/WebhookProcessor/github_webhook_processor.php b/tools/WebhookProcessor/github_webhook_processor.php
index a42cd54117..8dad9f02ec 100644
--- a/tools/WebhookProcessor/github_webhook_processor.php
+++ b/tools/WebhookProcessor/github_webhook_processor.php
@@ -26,7 +26,7 @@ $path_to_script = 'tools/WebhookProcessor/github_webhook_processor.php';
$tracked_branch = "master";
$trackPRBalance = true;
$prBalanceJson = '';
-$startingPRBalance = 3;
+$startingPRBalance = 5;
$maintainer_team_id = 133041;
$validation = "org";
$validation_count = 1;
@@ -42,7 +42,7 @@ set_error_handler(function($severity, $message, $file, $line) {
set_exception_handler(function($e) {
header('HTTP/1.1 500 Internal Server Error');
echo "Error on line {$e->getLine()}: " . htmlSpecialChars($e->getMessage());
- file_put_contents('htwebhookerror.log', "Error on line {$e->getLine()}: " . $e->getMessage(), FILE_APPEND);
+ file_put_contents('htwebhookerror.log', '['.date(DATE_ATOM).'] '."Error on line {$e->getLine()}: " . $e->getMessage().PHP_EOL, FILE_APPEND);
die();
});
$rawPost = NULL;
@@ -167,13 +167,28 @@ function check_tag_and_replace($payload, $title_tag, $label, &$array_to_add_labe
$title = $payload['pull_request']['title'];
if(stripos($title, $title_tag) !== FALSE){
$array_to_add_label_to[] = $label;
- $title = trim(str_ireplace($title_tag, '', $title));
- apisend($payload['pull_request']['url'], 'PATCH', array('title' => $title));
return true;
}
return false;
}
+function set_labels($payload, $labels, $remove) {
+ $existing = get_labels($payload);
+
+ $tags = array();
+
+ $tags = array_merge($labels, $existing);
+ $tags = array_unique($tags);
+ $tags = array_diff($tags, $remove);
+
+ $final = array();
+ foreach($tags as $t)
+ $final[] = $t;
+
+ $url = $payload['pull_request']['issue_url'] . '/labels';
+ echo apisend($url, 'PUT', $final);
+}
+
//rip bs-12
function tag_pr($payload, $opened) {
//get the mergeable state
@@ -202,11 +217,11 @@ function tag_pr($payload, $opened) {
$mergeable = $payload['pull_request']['mergeable'];
if($mergeable === TRUE) //only look for the false value
$remove[] = 'Merge Conflict';
- else if ($mergable === FALSE)
+ else if ($mergeable === FALSE)
$tags[] = 'Merge Conflict';
$treetags = array('_maps' => 'Map Edit', 'tools' => 'Tools', 'SQL' => 'SQL');
- $addonlytags = array('icons' => 'Sprites', 'sounds' => 'Sound', 'config' => 'Config Update', 'code/controllers/configuration/entries' => 'Config Update', 'tgui' => 'UI');
+ $addonlytags = array('icons' => 'Sprites', 'sound' => 'Sound', 'config' => 'Config Update', 'code/controllers/configuration/entries' => 'Config Update', 'tgui' => 'UI');
foreach($treetags as $tree => $tag)
if(has_tree_been_edited($payload, $tree))
$tags[] = $tag;
@@ -217,31 +232,16 @@ function tag_pr($payload, $opened) {
$tags[] = $tag;
check_tag_and_replace($payload, '[dnm]', 'Do Not Merge', $tags);
- if(!check_tag_and_replace($payload, '[wip]', 'Work In Progress', $tags))
- check_tag_and_replace($payload, '[ready]', 'Work In Progress', $remove);
+ if(!check_tag_and_replace($payload, '[wip]', 'Work In Progress', $tags) && check_tag_and_replace($payload, '[ready]', 'Work In Progress', $remove))
+ $tags[] = 'Needs Review';
- $url = $payload['pull_request']['issue_url'] . '/labels';
-
- $existing = get_labels($payload);
-
- $tags = array_merge($tags, $existing);
- $tags = array_unique($tags);
- $tags = array_diff($tags, $remove);
-
- $final = array();
- foreach($tags as $t)
- $final[] = $t;
-
-
- echo apisend($url, 'PUT', $final);
-
- return $final;
+ return array($tags, $remove);
}
function remove_ready_for_review($payload, $labels = null){
if($labels == null)
$labels = get_labels($payload);
- $index = array_search('Ready for Review', $labels);
+ $index = array_search('Needs Review', $labels);
if($index !== FALSE)
unset($labels[$index]);
$url = $payload['pull_request']['issue_url'] . '/labels';
@@ -257,13 +257,14 @@ function get_reviews($payload){
return json_decode(apisend($payload['pull_request']['url'] . '/reviews'), true);
}
-function check_ready_for_review($payload, $labels = null){
- $r4rlabel = 'Ready for Review';
+function check_ready_for_review($payload, $labels = null, $remove = array()){
+ $r4rlabel = 'Needs Review';
$labels_which_should_not_be_ready = array('Do Not Merge', 'Work In Progress', 'Merge Conflict');
$has_label_already = false;
$should_not_have_label = false;
if($labels == null)
$labels = get_labels($payload);
+ $returned = array($labels, $remove);
//if the label is already there we may need to remove it
foreach($labels as $L){
if(in_array($L, $labels_which_should_not_be_ready))
@@ -273,8 +274,8 @@ function check_ready_for_review($payload, $labels = null){
}
if($has_label_already && $should_not_have_label){
- remove_ready_for_review($payload, $labels, $r4rlabel);
- return;
+ $remove[] = $r4rlabel;
+ return $returned;
}
//find all reviews to see if changes were requested at some point
@@ -284,7 +285,7 @@ function check_ready_for_review($payload, $labels = null){
$dismissed_an_approved_review = false;
foreach($reviews as $R)
- if(is_maintainer($R['user']['login'])){
+ if(is_maintainer($payload, $R['user']['login'])){
$lower_state = strtolower($R['state']);
if($lower_state == 'changes_requested')
$reviews_ids_with_changes_requested[] = $R['id'];
@@ -296,8 +297,8 @@ function check_ready_for_review($payload, $labels = null){
if(!$dismissed_an_approved_review && count($reviews_ids_with_changes_requested) == 0){
if($has_label_already)
- remove_ready_for_review($payload, $labels);
- return; //no need to be here
+ $remove[] = $r4rlabel;
+ return $returned; //no need to be here
}
if(count($reviews_ids_with_changes_requested) > 0){
@@ -313,8 +314,8 @@ function check_ready_for_review($payload, $labels = null){
//review comments which are outdated have a null position
if($C['position'] !== null){
if($has_label_already)
- remove_ready_for_review($payload, $labels);
- return; //no need to tag
+ $remove[] = $r4rlabel;
+ return $returned; //no need to tag
}
}
}
@@ -322,9 +323,8 @@ function check_ready_for_review($payload, $labels = null){
//finally, add it if necessary
if(!$has_label_already){
$labels[] = $r4rlabel;
- $url = $payload['pull_request']['issue_url'] . '/labels';
- apisend($url, 'PUT', $labels);
}
+ return $returned;
}
function check_dismiss_changelog_review($payload){
@@ -361,7 +361,8 @@ function handle_pr($payload) {
$validated = validate_user($payload);
switch ($payload["action"]) {
case 'opened':
- tag_pr($payload, true);
+ list($labels, $remove) = tag_pr($payload, true);
+ set_labels($payload, $labels, $remove);
if($no_changelog)
check_dismiss_changelog_review($payload);
if(get_pr_code_friendliness($payload) < 0){
@@ -374,9 +375,10 @@ function handle_pr($payload) {
case 'edited':
check_dismiss_changelog_review($payload);
case 'synchronize':
- $labels = tag_pr($payload, false);
+ list($labels, $remove) = tag_pr($payload, false);
if($payload['action'] == 'synchronize')
- check_ready_for_review($payload, $labels);
+ list($labels, $remove) = check_ready_for_review($payload, $labels, $remove);
+ set_labels($payload, $labels, $remove);
return;
case 'reopened':
$action = $payload['action'];
@@ -454,13 +456,11 @@ function get_pr_code_friendliness($payload, $oldbalance = null){
'Grammar and Formatting' => 1,
'Priority: High' => 4,
'Priority: CRITICAL' => 5,
- 'Atmospherics' => 4,
'Logging' => 1,
'Feedback' => 1,
'Performance' => 3,
'Feature' => -1,
'Balance/Rebalance' => -1,
- 'Tweak' => -1,
'PRB: Reset' => $startingPRBalance - $oldbalance,
);
@@ -521,35 +521,49 @@ function update_pr_balance($payload) {
fclose($balances_file);
}
-function auto_update($payload){
- global $enable_live_tracking;
- global $path_to_script;
- global $repoOwnerAndName;
- global $tracked_branch;
- if(!$enable_live_tracking || !has_tree_been_edited($payload, $path_to_script) || $payload['pull_request']['base']['ref'] != $tracked_branch)
- return;
-
- $content = file_get_contents('https://raw.githubusercontent.com/' . $repoOwnerAndName . '/' . $tracked_branch . '/'. $path_to_script);
-
- create_comment($payload, "Edit detected. Self updating... Here is my new code:\n``" . "`HTML+PHP\n" . $content . "\n``" . '`');
-
- $code_file = fopen(basename($path_to_script), 'w');
- fwrite($code_file, $content);
- fclose($code_file);
-}
-
$github_diff = null;
-function has_tree_been_edited($payload, $tree){
+function get_diff($payload) {
global $github_diff;
if ($github_diff === null) {
//go to the diff url
$url = $payload['pull_request']['diff_url'];
$github_diff = file_get_contents($url);
}
+ return $github_diff;
+}
+
+function auto_update($payload){
+ global $enable_live_tracking;
+ global $path_to_script;
+ global $repoOwnerAndName;
+ global $tracked_branch;
+ global $github_diff;
+ if(!$enable_live_tracking || !has_tree_been_edited($payload, $path_to_script) || $payload['pull_request']['base']['ref'] != $tracked_branch)
+ return;
+
+ get_diff($payload);
+ $content = file_get_contents('https://raw.githubusercontent.com/' . $repoOwnerAndName . '/' . $tracked_branch . '/'. $path_to_script);
+ $content_diff = "### Diff not available. :slightly_frowning_face:";
+ if($github_diff && preg_match('/(diff --git a\/' . preg_quote($path_to_script, '/') . '.+?)(?:^diff)?/sm', $github_diff, $matches)) {
+ $script_diff = matches[1];
+ if($script_diff) {
+ $content_diff = "``" . "`DIFF\n" . $script_diff ."\n``" . "`";
+ }
+ }
+ create_comment($payload, "Edit detected. Self updating... \nHere are my changes:\n\n" . $content_diff . "\n\nHere is my new code:\n\n``" . "`HTML+PHP\n" . $content . "\n``" . '`\n');
+
+ $code_file = fopen(basename($path_to_script), 'w');
+ fwrite($code_file, $content);
+ fclose($code_file);
+}
+
+function has_tree_been_edited($payload, $tree){
+ global $github_diff;
+ get_diff($payload);
//find things in the _maps/map_files tree
//e.g. diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm
- return $github_diff !== FALSE && strpos($github_diff, 'diff --git a/' . $tree) !== FALSE;
+ return ($github_diff !== FALSE) && (preg_match('/^diff --git a\/' . preg_quote($tree, '/') . '/m', $github_diff) !== 0);
}
$no_changelog = false;
diff --git a/tools/WebhookProcessor/secret.php b/tools/WebhookProcessor/secret.php
index 93c9b318f6..7d763c3d6c 100644
--- a/tools/WebhookProcessor/secret.php
+++ b/tools/WebhookProcessor/secret.php
@@ -33,7 +33,7 @@ $tracked_branch = "master";
$trackPRBalance = true; //set this to false to disable PR balance tracking
$prBalanceJson = ''; //Set this to the path you'd like the writable pr balance file to be stored, not setting it writes it to the working directory
-$startingPRBalance = 3; //Starting balance for never before seen users
+$startingPRBalance = 5; //Starting balance for never before seen users
//team 133041: tgstation/commit-access
$maintainer_team_id = 133041; //org team id that is exempt from PR balance system, setting this to null will use anyone with write access to the repo. Get from https://api.github.com/orgs/:org/teams
diff --git a/tools/travis/build_tools.sh b/tools/travis/build_tools.sh
index 2e9810b470..193ad261a6 100755
--- a/tools/travis/build_tools.sh
+++ b/tools/travis/build_tools.sh
@@ -7,6 +7,8 @@ if [ "$BUILD_TOOLS" = true ];
then
md5sum -c - <<< "49bc6b1b9ed56c83cceb6674bd97cb34 *html/changelogs/example.yml";
cd tgui && source ~/.nvm/nvm.sh && gulp && cd ..;
- php5.6 -l tools/WebhookProcessor/github_webhook_processor.php;
+ phpenv global 5.6
+ php -l tools/WebhookProcessor/github_webhook_processor.php;
+ php -l tools/TGUICompiler.php;
python tools/ss13_genchangelog.py html/changelog.html html/changelogs;
fi;
Refresh"
+ dat += "
Eject [cartridge]"
+ dat += " | 
Return"
+ dat += " | 
Notekeeper "
- dat += "
Messenger "
+ dat += "
Honk Synthesizer "
- dat += "
Set Status Display "
+ dat += "
Power Monitor "
+ dat += "
Medical Records "
- dat += "
[scanmode == 1 ? "Disable" : "Enable"] Medical Scanner "
+ dat += "
Security Records "
+ dat += "
Supply Records "
+ dat += "
Bots Access "
+ dat += "
Custodial Locator "
+ dat += "
Signaler System "
+ dat += "
[scanmode == 3 ? "Disable" : "Enable"] Reagent Scanner "
+ dat += "
Toggle Remote Door "
+ dat += "
Drone Phone "
- dat += "
Atmospheric Scan "
- dat += "
[fon ? "Disable" : "Enable"] Flashlight "
+ dat += "
Ringer: [silent == 1 ? "Off" : "On"] | "
- dat += "
Clear Messages"
+ dat += "