\The [src] splits open.")
for(var/atom/movable/A in contents)
A.loc = src.loc
diff --git a/code/game/objects/explosion.dm b/code/game/objects/explosion.dm
index 2802cce4314..e7c04dcd6fa 100644
--- a/code/game/objects/explosion.dm
+++ b/code/game/objects/explosion.dm
@@ -99,7 +99,7 @@
if(W.reinf && W.fulltile)
cached_exp_block[T] += W.explosion_block
- for(var/obj/effect/blob/B in T)
+ for(var/obj/structure/blob/B in T)
cached_exp_block[T] += B.explosion_block
CHECK_TICK
@@ -226,7 +226,7 @@
if(W.explosion_block && W.fulltile)
dist += W.explosion_block
- for(var/obj/effect/blob/B in T)
+ for(var/obj/structure/blob/B in T)
dist += B.explosion_block
if(dist < dev)
diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm
index 32498877e84..61323895705 100644
--- a/code/game/objects/items.dm
+++ b/code/game/objects/items.dm
@@ -116,7 +116,7 @@ var/global/image/fire_overlay = image("icon" = 'icons/effects/fire.dmi', "icon_s
qdel(X)
return ..()
-/obj/item/blob_act(obj/effect/blob/B)
+/obj/item/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
qdel(src)
diff --git a/code/game/objects/items/dehy_carp.dm b/code/game/objects/items/dehy_carp.dm
index 40da8292a12..70856bc37d5 100644
--- a/code/game/objects/items/dehy_carp.dm
+++ b/code/game/objects/items/dehy_carp.dm
@@ -36,6 +36,8 @@
flick("carp_swell", src)
//Wait for animation to end
sleep(6)
+ if(!src || qdeleted(src))//we got toasted while animating
+ return
//Make space carp
var/mob/living/M = new mobtype(get_turf(src))
//Make carp non-hostile to user, and their allies
@@ -49,4 +51,4 @@
visible_message("You have a bad feeling about this.") //welcome to the hostile carp enjoy your die
else
visible_message("The newly grown [M.name] looks up at you with friendly eyes.")
- qdel(src)
\ No newline at end of file
+ qdel(src)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 91745ffed8e..017a6076c8b 100644
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -883,6 +883,9 @@ var/global/list/obj/item/device/pda/PDAs = list()
/obj/item/device/pda/Destroy()
PDAs -= src
+ if(inserted_item)
+ qdel(inserted_item)
+ inserted_item = null
return ..()
//AI verb and proc for sending PDA messages.
diff --git a/code/game/objects/items/devices/camera_bug.dm b/code/game/objects/items/devices/camera_bug.dm
index fc18c1a4c0d..81405579707 100644
--- a/code/game/objects/items/devices/camera_bug.dm
+++ b/code/game/objects/items/devices/camera_bug.dm
@@ -136,11 +136,16 @@
return .(cameras)
return html
+/obj/item/device/camera_bug/proc/get_seens()
+ if(current && current.can_use())
+ var/list/seen = current.can_see()
+ return seen
+
/obj/item/device/camera_bug/proc/camera_report()
// this should only be called if current exists
var/dat = ""
- if(current && current.can_use())
- var/list/seen = current.can_see()
+ var/list/seen = get_seens()
+ if(seen && seen.len >= 1)
var/list/names = list()
for(var/obj/singularity/S in seen) // god help you if you see more than one
if(S.name in names)
@@ -190,23 +195,29 @@
if("mode" in href_list)
track_mode = text2num(href_list["mode"])
if("monitor" in href_list)
- var/obj/machinery/camera/C = locate(href_list["monitor"])
- if(C)
+ //You can't locate on a list with keys
+ var/list/cameras = flatten_list(bugged_cameras)
+ var/obj/machinery/camera/C = locate(href_list["monitor"]) in cameras
+ if(C && istype(C))
track_mode = BUGMODE_MONITOR
current = C
usr.reset_perspective(null)
interact()
if("track" in href_list)
- var/atom/A = locate(href_list["track"])
- if(A)
- tracking = A
- tracked_name = A.name
- last_found = current.c_tag
- last_seen = world.time
- track_mode = BUGMODE_TRACK
+ var/list/seen = get_seens()
+ if(seen && seen.len >= 1)
+ var/atom/A = locate(href_list["track"]) in seen
+ if(A && istype(A))
+ tracking = A
+ tracked_name = A.name
+ last_found = current.c_tag
+ last_seen = world.time
+ track_mode = BUGMODE_TRACK
if("emp" in href_list)
- var/obj/machinery/camera/C = locate(href_list["emp"])
- if(istype(C) && C.bug == src)
+ //You can't locate on a list with keys
+ 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(1)
C.bug = null
bugged_cameras -= C.c_tag
@@ -217,8 +228,10 @@
current = null
return
if("view" in href_list)
- var/obj/machinery/camera/C = locate(href_list["view"])
- if(istype(C))
+ //You can't locate on a list with keys
+ var/list/cameras = flatten_list(bugged_cameras)
+ var/obj/machinery/camera/C = locate(href_list["view"]) in cameras
+ if(C && istype(C))
if(!C.can_use())
usr << "Something's wrong with that camera! You can't get a feed."
return
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index 3cd5be20708..21533c55cd0 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -254,7 +254,7 @@
/obj/effect/chrono_field/ex_act()
return
-/obj/effect/chrono_field/blob_act(obj/effect/blob/B)
+/obj/effect/chrono_field/blob_act(obj/structure/blob/B)
return
diff --git a/code/game/objects/items/weapons/cigs_lighters.dm b/code/game/objects/items/weapons/cigs_lighters.dm
index c2615f28d7a..96f223e59cb 100644
--- a/code/game/objects/items/weapons/cigs_lighters.dm
+++ b/code/game/objects/items/weapons/cigs_lighters.dm
@@ -641,7 +641,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
super = 0
user << "You decrease the voltage in the [src]"
add_overlay(image(icon, "vapeopen_low"))
-
+
if(screw && emagged)
user << "The [name] can't be modified!"
@@ -725,13 +725,13 @@ CIGARETTE PACKETS ARE IN FANCY.DM
if(super && vapetime > 3)//Time to start puffing those fat vapes, yo.
var/datum/effect_system/smoke_spread/chem/s = new
- s.set_up(reagents, 1, loc)
+ s.set_up(reagents, 1, loc, silent=TRUE)
s.start()
vapetime = 0
if(emagged && vapetime > 3)
var/datum/effect_system/smoke_spread/chem/s = new
- s.set_up(reagents, 4, loc)
+ s.set_up(reagents, 4, loc, silent=TRUE)
s.start()
vapetime = 0
if(prob(5))//small chance for the vape to break and deal damage if it's emagged
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 5fdc8e8c197..9ac67af1485 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -12,7 +12,7 @@
for(var/mob/living/M in get_hearers_in_view(7, flashbang_turf))
bang(get_turf(M), M)
- for(var/obj/effect/blob/B in get_hear(8,flashbang_turf)) //Blob damage here
+ for(var/obj/structure/blob/B in get_hear(8,flashbang_turf)) //Blob damage here
var/distance = get_dist(B, get_turf(src))
var/damage = round(100/(distance*distance)+1)
B.take_damage(damage, BURN)
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 7fcc6361441..16a355a1258 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -24,7 +24,7 @@
smoke.start()
- for(var/obj/effect/blob/B in view(8,src))
+ for(var/obj/structure/blob/B in view(8,src))
var/damage = round(30/(get_dist(B,src)+1))
B.health -= damage
B.update_icon()
diff --git a/code/game/objects/items/weapons/holosign_creator.dm b/code/game/objects/items/weapons/holosign_creator.dm
index bcecfc97bdc..4fa45cb7d8c 100644
--- a/code/game/objects/items/weapons/holosign_creator.dm
+++ b/code/game/objects/items/weapons/holosign_creator.dm
@@ -137,7 +137,7 @@
..()
take_damage(I.force * 0.5, I.damtype)
-/obj/effect/overlay/holograph/blob_act(obj/effect/blob/B)
+/obj/effect/overlay/holograph/blob_act(obj/structure/blob/B)
qdel(src)
/obj/effect/overlay/holograph/attack_animal(mob/living/simple_animal/M)
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm
index 731fba971fe..c9270f6da58 100644
--- a/code/game/objects/items/weapons/implants/implant_chem.dm
+++ b/code/game/objects/items/weapons/implants/implant_chem.dm
@@ -24,11 +24,11 @@
/obj/item/weapon/implant/chem/New()
..()
create_reagents(50)
- tracked_implants += src
+ tracked_chem_implants += src
/obj/item/weapon/implant/chem/Destroy()
..()
- tracked_implants -= src
+ tracked_chem_implants -= src
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 14af6140cad..cfb927e1d15 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -21,7 +21,6 @@
var/l_set = 0
var/l_setshort = 0
var/l_hacking = 0
- var/emagged = 0
var/open = 0
w_class = 3
max_w_class = 2
@@ -42,7 +41,7 @@
user.show_message("Now attempting to reset internal memory, please hold.", 1)
src.l_hacking = 1
if (do_after(usr, 100/W.toolspeed, target = src))
- if (prob(40))
+ if (prob(33))
src.l_setshort = 1
src.l_set = 0
user.show_message("Internal memory reset. Please give it a few seconds to reinitialize.", 1)
@@ -62,17 +61,13 @@
// -> storage/attackby() what with handle insertion, etc
return ..()
-/obj/item/weapon/storage/secure/emag_act(mob/user)
- if(locked)
- if(!emagged)
- emagged = 1
- src.add_overlay(image('icons/obj/storage.dmi', icon_sparking))
- sleep(6)
- src.overlays = null
- add_overlay(image('icons/obj/storage.dmi', icon_locking))
- locked = 0
- user << "You short out the lock on [src]."
-
+/obj/item/weapon/storage/secure/attackby(obj/item/weapon/W, mob/user, params)
+ if(istype(W, /obj/item/weapon/card/emag))
+ if(locked)
+ user << "You take a second to realize there's no ID slot for you to emag this with."
+ else
+ user << "You take a second to realize the case is already open, making you look really silly. Hopefully no one saw."
+
/obj/item/weapon/storage/secure/MouseDrop(over_object, src_location, over_location)
if (locked)
src.add_fingerprint(usr)
@@ -84,10 +79,8 @@
user.set_machine(src)
var/dat = text("[]
\n\nLock Status: []",src, (src.locked ? "LOCKED" : "UNLOCKED"))
var/message = "Code"
- if ((src.l_set == 0) && (!src.emagged) && (!src.l_setshort))
+ if ((src.l_set == 0) && (!src.l_setshort))
dat += text("\n5-DIGIT PASSCODE NOT SET.
ENTER NEW PASSCODE.")
- if (src.emagged)
- dat += text("
\nLOCKING SYSTEM ERROR - 1701")
if (src.l_setshort)
dat += text("
\nALERT: MEMORY SYSTEM ERROR - 6040 201")
message = text("[]", src.code)
@@ -105,7 +98,7 @@
if ((src.l_set == 0) && (length(src.code) == 5) && (!src.l_setshort) && (src.code != "ERROR"))
src.l_code = src.code
src.l_set = 1
- else if ((src.code == src.l_code) && (src.emagged == 0) && (src.l_set == 1))
+ else if ((src.code == src.l_code) && (src.l_set == 1))
src.locked = 0
src.overlays = null
add_overlay(image('icons/obj/storage.dmi', icon_opened))
@@ -113,7 +106,7 @@
else
src.code = "ERROR"
else
- if ((href_list["type"] == "R") && (src.emagged == 0) && (!src.l_setshort))
+ if ((href_list["type"] == "R") && (!src.l_setshort))
src.locked = 1
src.overlays = null
src.code = null
@@ -219,4 +212,4 @@
/obj/item/weapon/storage/secure/safe/HoS/New()
..()
- //new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)
\ No newline at end of file
+ //new /obj/item/weapon/storage/lockbox/clusterbang(src) This item is currently broken... and probably shouldnt exist to begin with (even though it's cool)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index 537c4d37c78..ba3361b4c4e 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -91,7 +91,7 @@
user << "It feels [descriptive]."
-/obj/item/weapon/tank/blob_act(obj/effect/blob/B)
+/obj/item/weapon/tank/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
var/turf/location = get_turf(src)
if(!location)
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index c2904d8e37b..9d446d885a5 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -15,7 +15,7 @@
if(ticker)
cameranet.updateVisibility(src)
-/obj/structure/blob_act(obj/effect/blob/B)
+/obj/structure/blob_act(obj/structure/blob/B)
if(density && prob(50))
qdel(src)
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index d049a9f1d9b..7d6e95810be 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -119,7 +119,7 @@
if(3)
take_damage(50, BRUTE, 0)
-/obj/structure/alien/blob_act(obj/effect/blob/B)
+/obj/structure/alien/blob_act(obj/structure/blob/B)
take_damage(50, BRUTE, 0)
/obj/structure/alien/resin/hitby(atom/movable/AM)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index 529443ad568..a28c8b3ebfd 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -120,7 +120,7 @@
if(user.environment_smash)
shatter()
-/obj/structure/closet/statue/blob_act(obj/effect/blob/B)
+/obj/structure/closet/statue/blob_act(obj/structure/blob/B)
shatter()
/obj/structure/closet/statue/attacked_by(obj/item/I, mob/living/user)
diff --git a/code/game/objects/structures/displaycase.dm b/code/game/objects/structures/displaycase.dm
index 203900c76dd..0194e0d9f40 100644
--- a/code/game/objects/structures/displaycase.dm
+++ b/code/game/objects/structures/displaycase.dm
@@ -48,7 +48,7 @@
showpiece.loc = src.loc
showpiece = null
-/obj/structure/displaycase/blob_act(obj/effect/blob/B)
+/obj/structure/displaycase/blob_act(obj/structure/blob/B)
take_damage(30)
/obj/structure/displaycase/hitby(atom/movable/AM)
diff --git a/code/game/objects/structures/fireaxe.dm b/code/game/objects/structures/fireaxe.dm
index f7118a6c191..840613533ad 100644
--- a/code/game/objects/structures/fireaxe.dm
+++ b/code/game/objects/structures/fireaxe.dm
@@ -83,7 +83,7 @@
take_damage(P.damage, P.damage_type, 0)
-/obj/structure/fireaxecabinet/blob_act(obj/effect/blob/B)
+/obj/structure/fireaxecabinet/blob_act(obj/structure/blob/B)
if(fireaxe)
fireaxe.forceMove(loc)
qdel(src)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 4351847af1c..236f88c7f3f 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -272,7 +272,7 @@
qdel(src)
-/obj/structure/girder/blob_act(obj/effect/blob/B)
+/obj/structure/girder/blob_act(obj/structure/blob/B)
if(prob(40))
qdel(src)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 2bd2368370e..f3cbde713e8 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -32,7 +32,7 @@
new /obj/structure/grille/ratvar(src.loc)
qdel(src)
-/obj/structure/grille/blob_act(obj/effect/blob/B)
+/obj/structure/grille/blob_act(obj/structure/blob/B)
if(!destroyed)
Break()
diff --git a/code/game/objects/structures/guncase.dm b/code/game/objects/structures/guncase.dm
index abaebce5de3..9477946c356 100644
--- a/code/game/objects/structures/guncase.dm
+++ b/code/game/objects/structures/guncase.dm
@@ -76,7 +76,9 @@
/obj/structure/guncase/Topic(href, href_list)
if(href_list["retrieve"])
- var/obj/item/O = locate(href_list["retrieve"])
+ var/obj/item/O = locate(href_list["retrieve"]) in contents
+ if(!O || !istype(O))
+ return
if(!usr.canUseTopic(src))
return
if(ishuman(usr))
diff --git a/code/game/objects/structures/lattice.dm b/code/game/objects/structures/lattice.dm
index 23aa35ed986..bf40a96002b 100644
--- a/code/game/objects/structures/lattice.dm
+++ b/code/game/objects/structures/lattice.dm
@@ -27,7 +27,7 @@
stored = null
return ..()
-/obj/structure/lattice/blob_act(obj/effect/blob/B)
+/obj/structure/lattice/blob_act(obj/structure/blob/B)
return
/obj/structure/lattice/ex_act(severity, target)
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 5b1acebb898..e249db51d59 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -164,7 +164,7 @@ FLOOR SAFES
return ..()
-obj/structure/safe/blob_act(obj/effect/blob/B)
+obj/structure/safe/blob_act(obj/structure/blob/B)
return
obj/structure/safe/ex_act(severity, target)
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index 6abb4c9d244..bf634f55443 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -13,7 +13,7 @@
/obj/structure/sign/ex_act(severity, target)
qdel(src)
-/obj/structure/sign/blob_act(obj/effect/blob/B)
+/obj/structure/sign/blob_act(obj/structure/blob/B)
qdel(src)
/obj/structure/sign/attackby(obj/item/O, mob/user, params)
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 4f41941388d..067ea45c404 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -53,7 +53,7 @@
if(3)
take_damage(rand(40,80), BRUTE, 0)
-/obj/structure/table/blob_act(obj/effect/blob/B)
+/obj/structure/table/blob_act(obj/structure/blob/B)
take_damage(rand(75,150), BRUTE, 0)
/obj/structure/table/narsie_act()
@@ -477,7 +477,7 @@
if(3)
take_damage(rand(5,25), BRUTE, 0)
-/obj/structure/rack/blob_act(obj/effect/blob/B)
+/obj/structure/rack/blob_act(obj/structure/blob/B)
rack_destroy()
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index a240706f2c7..f6a9cd7b922 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -65,7 +65,7 @@
if(3)
take_damage(rand(25,75), BRUTE, 0)
-/obj/structure/window/blob_act(obj/effect/blob/B)
+/obj/structure/window/blob_act(obj/structure/blob/B)
take_damage(rand(75,150), BRUTE, 0)
/obj/structure/window/narsie_act()
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index 3766ed75826..2ac025cc98a 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -77,7 +77,7 @@ var/list/icons_to_ignore_at_floor_init = list("damaged1","damaged2","damaged3","
if(A.level == 3)
return 1
-/turf/open/floor/blob_act(obj/effect/blob/B)
+/turf/open/floor/blob_act(obj/structure/blob/B)
return
/turf/open/floor/proc/update_icon()
diff --git a/code/game/turfs/simulated/floor/warning.dm b/code/game/turfs/simulated/floor/warning.dm
index a6d40948936..bc8e5c520a0 100644
--- a/code/game/turfs/simulated/floor/warning.dm
+++ b/code/game/turfs/simulated/floor/warning.dm
@@ -1,6 +1,5 @@
//ASTEROID FLOORS
/turf/open/floor/plasteel/asteroid/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "asteroid_warn"
/turf/open/floor/plasteel/asteroid/warning/side
icon_state = "asteroid_warn_side"
@@ -10,7 +9,6 @@
icon_state = "asteroid_warn_end"
/turf/open/floor/plasteel/airless/asteroid/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "asteroid_warn"
/turf/open/floor/plasteel/airless/asteroid/warning/side
icon_state = "asteroid_warn_side"
@@ -20,7 +18,6 @@
icon_state = "asteroid_warn_end"
/turf/open/floor/plating/astplate/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "astplate_warn"
/turf/open/floor/plating/astplate/warning/corner
icon_state = "astplate_warn_corner"
@@ -30,7 +27,6 @@
icon_state = "astplate_warn_end"
/turf/open/floor/plating/airless/astplate/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "astplate_warn"
/turf/open/floor/plating/airless/astplate/warning/corner
icon_state = "astplate_warn_corner"
@@ -42,7 +38,6 @@
//PLASTEEL
/turf/open/floor/plasteel/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "plasteel_warn"
/turf/open/floor/plasteel/warning/corner
icon_state = "plasteel_warn_corner"
@@ -52,7 +47,6 @@
icon_state = "plasteel_warn_end"
/turf/open/floor/plasteel/airless/warning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "plasteel_warn"
/turf/open/floor/plasteel/airless/warning/corner
icon_state = "plasteel_warn_corner"
@@ -63,7 +57,6 @@
//PLASTEEL WHITE
/turf/open/floor/plasteel/warnwhite
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "white_warn"
/turf/open/floor/plasteel/warnwhite/corner
icon_state = "white_warn_corner"
@@ -73,7 +66,6 @@
icon_state = "white_warn_end"
/turf/open/floor/plasteel/airless/warnwhite
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "white_warn"
/turf/open/floor/plasteel/airless/warnwhite/corner
icon_state = "white_warn_corner"
@@ -85,7 +77,6 @@
//PLASTEEL BLACK
/turf/open/floor/plasteel/darkwarning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "black_warn"
/turf/open/floor/plasteel/darkwarning/corner
icon_state = "black_warn_corner"
@@ -95,7 +86,6 @@
icon_state = "black_warn_end"
/turf/open/floor/plasteel/airless/darkwarning
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "black_warn"
/turf/open/floor/plasteel/airless/darkwarning/corner
icon_state = "black_warn_corner"
@@ -107,7 +97,6 @@
//PLATING
/turf/open/floor/plating/warnplate
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "plating_warn"
/turf/open/floor/plating/warnplate/corner
icon_state = "plating_warn_corner"
@@ -117,7 +106,6 @@
icon_state = "plating_warn_end"
/turf/open/floor/plating/airless/warnplate
- icon = 'icons/turf/floors/warning.dmi'
icon_state = "plating_warn"
/turf/open/floor/plating/airless/warnplate/corner
icon_state = "plating_warn_corner"
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 4e0224b3c41..95ba9cc818d 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -80,7 +80,7 @@
..()
return
-/turf/closed/wall/blob_act(obj/effect/blob/B)
+/turf/closed/wall/blob_act(obj/structure/blob/B)
if(prob(50))
dismantle_wall()
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index a229b10f337..843edc9bdc2 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -1140,7 +1140,7 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
/client/proc/modify_goals()
set category = "Debug"
- set name = "Modify station goals"
+ set name = "Modify goals"
if(!check_rights(R_ADMIN))
return
@@ -1152,4 +1152,4 @@ var/list/datum/outfit/custom_outfits = list() //Admin created outfits
for(var/datum/station_goal/S in ticker.mode.station_goals)
dat += "[S.name] - Announce | Remove
"
dat += "
Add New Goal"
- usr << browse(dat, "window=goals;size=400x400")
+ usr << browse(dat, "window=goals;size=400x400")
diff --git a/code/modules/atmospherics/machinery/atmosmachinery.dm b/code/modules/atmospherics/machinery/atmosmachinery.dm
index ec1eb426723..0101bd9d415 100644
--- a/code/modules/atmospherics/machinery/atmosmachinery.dm
+++ b/code/modules/atmospherics/machinery/atmosmachinery.dm
@@ -208,7 +208,7 @@ Pipelines + Other Objects -> Pipe network
return img
-/obj/machinery/atmospherics/construction(pipe_type, obj_color)
+/obj/machinery/atmospherics/on_construction(pipe_type, obj_color)
if(can_unwrench)
color = obj_color
pipe_color = obj_color
diff --git a/code/modules/atmospherics/machinery/components/components_base.dm b/code/modules/atmospherics/machinery/components/components_base.dm
index a7b3dddd18d..4e01f5915b3 100644
--- a/code/modules/atmospherics/machinery/components/components_base.dm
+++ b/code/modules/atmospherics/machinery/components/components_base.dm
@@ -72,7 +72,7 @@ Pipenet stuff; housekeeping
qdel(AIR_I)
AIR_I = null
-/obj/machinery/atmospherics/components/construction()
+/obj/machinery/atmospherics/components/on_construction()
..()
update_parents()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
index 089eea372e5..9ec331734ac 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/cryo.dm
@@ -35,7 +35,7 @@
/obj/item/weapon/stock_parts/console_screen = 1,
/obj/item/stack/sheet/glass = 2)
-/obj/machinery/atmospherics/components/unary/cryo_cell/construction()
+/obj/machinery/atmospherics/components/unary/cryo_cell/on_construction()
..(dir, dir)
/obj/machinery/atmospherics/components/unary/cryo_cell/RefreshParts()
diff --git a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
index de9f37bb4a3..74a0a279188 100644
--- a/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
+++ b/code/modules/atmospherics/machinery/components/unary_devices/thermomachine.dm
@@ -49,7 +49,7 @@
else
return ..()
-/obj/machinery/atmospherics/components/unary/thermomachine/construction()
+/obj/machinery/atmospherics/components/unary/thermomachine/on_construction()
..(dir,dir)
/obj/machinery/atmospherics/components/unary/thermomachine/RefreshParts()
diff --git a/code/modules/atmospherics/machinery/portable/canister.dm b/code/modules/atmospherics/machinery/portable/canister.dm
index 4065954db83..df48ca85a8d 100644
--- a/code/modules/atmospherics/machinery/portable/canister.dm
+++ b/code/modules/atmospherics/machinery/portable/canister.dm
@@ -236,7 +236,7 @@
air_update_turf() // Update the environment if needed.
update_icon()
-/obj/machinery/portable_atmospherics/canister/blob_act(obj/effect/blob/B)
+/obj/machinery/portable_atmospherics/canister/blob_act(obj/structure/blob/B)
take_damage(100, BRUTE, 0)
/obj/machinery/portable_atmospherics/canister/burn()
diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm
index 2e07b33d86d..1890010e36d 100644
--- a/code/modules/clothing/spacesuits/hardsuit.dm
+++ b/code/modules/clothing/spacesuits/hardsuit.dm
@@ -556,6 +556,7 @@
var/shield_on = "shield-old"
/obj/item/clothing/suit/space/hardsuit/shielded/hit_reaction(mob/living/carbon/human/owner, attack_text)
+ recharge_cooldown = world.time + recharge_delay
if(current_charges > 0)
var/datum/effect_system/spark_spread/s = new
s.set_up(2, 1, src)
@@ -563,7 +564,6 @@
owner.visible_message("[owner]'s shields deflect [attack_text] in a shower of sparks!")
current_charges--
if(recharge_rate)
- recharge_cooldown = world.time + recharge_delay
START_PROCESSING(SSobj, src)
if(current_charges <= 0)
owner.visible_message("[owner]'s shield overloads!")
diff --git a/code/modules/events/blob.dm b/code/modules/events/blob.dm
index 155924c09bd..09c4bf2bc25 100644
--- a/code/modules/events/blob.dm
+++ b/code/modules/events/blob.dm
@@ -30,7 +30,7 @@
if(!candidates.len)
return NOT_ENOUGH_PLAYERS
var/mob/dead/observer/new_blob = pick(candidates)
- var/obj/effect/blob/core/BC = new/obj/effect/blob/core(pick(blobstart), new_blob.client, new_rate)
+ var/obj/structure/blob/core/BC = new/obj/structure/blob/core(pick(blobstart), new_blob.client, new_rate)
BC.overmind.blob_points = min(20 + player_list.len, BC.overmind.max_blob_points)
spawned_mobs += BC.overmind
message_admins("[BC.overmind.key] has been made into a blob overmind by an event.")
diff --git a/code/modules/events/shuttle_loan.dm b/code/modules/events/shuttle_loan.dm
index 328e8af3268..4b894183670 100644
--- a/code/modules/events/shuttle_loan.dm
+++ b/code/modules/events/shuttle_loan.dm
@@ -129,7 +129,7 @@
for(var/i in 1 to 5)
T = pick_n_take(empty_shuttle_turfs)
- new /obj/effect/spider/stickyweb(T)
+ new /obj/structure/spider/stickyweb(T)
if(ANTIDOTE_NEEDED)
var/virus_type = pick(/datum/disease/beesease, /datum/disease/brainrot, /datum/disease/fluspanish)
diff --git a/code/modules/events/spacevine.dm b/code/modules/events/spacevine.dm
index 2fb21e145a5..de3632195d5 100644
--- a/code/modules/events/spacevine.dm
+++ b/code/modules/events/spacevine.dm
@@ -8,7 +8,7 @@
/datum/round_event/spacevine/start()
var/list/turfs = list() //list of all the empty floor turfs in the hallway areas
- var/obj/effect/spacevine/SV = new()
+ var/obj/structure/spacevine/SV = new()
for(var/area/hallway/A in world)
for(var/turf/F in A)
@@ -19,7 +19,7 @@
if(turfs.len) //Pick a turf to spawn at if we can
var/turf/T = pick(turfs)
- new/obj/effect/spacevine_controller(T) //spawn a controller at turf
+ new/obj/structure/spacevine_controller(T) //spawn a controller at turf
/datum/spacevine_mutation
@@ -28,44 +28,44 @@
var/hue
var/quality
-/datum/spacevine_mutation/proc/add_mutation_to_vinepiece(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/add_mutation_to_vinepiece(obj/structure/spacevine/holder)
holder.mutations |= src
holder.color = hue
-/datum/spacevine_mutation/proc/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/process_mutation(obj/structure/spacevine/holder)
return
-/datum/spacevine_mutation/proc/process_temperature(obj/effect/spacevine/holder, temp, volume)
+/datum/spacevine_mutation/proc/process_temperature(obj/structure/spacevine/holder, temp, volume)
return
-/datum/spacevine_mutation/proc/on_birth(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/on_birth(obj/structure/spacevine/holder)
return
-/datum/spacevine_mutation/proc/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/on_grow(obj/structure/spacevine/holder)
return
-/datum/spacevine_mutation/proc/on_death(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/on_death(obj/structure/spacevine/holder)
return
-/datum/spacevine_mutation/proc/on_hit(obj/effect/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
+/datum/spacevine_mutation/proc/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
. = expected_damage
-/datum/spacevine_mutation/proc/on_cross(obj/effect/spacevine/holder, mob/crosser)
+/datum/spacevine_mutation/proc/on_cross(obj/structure/spacevine/holder, mob/crosser)
return
-/datum/spacevine_mutation/proc/on_chem(obj/effect/spacevine/holder, datum/reagent/R)
+/datum/spacevine_mutation/proc/on_chem(obj/structure/spacevine/holder, datum/reagent/R)
return
-/datum/spacevine_mutation/proc/on_eat(obj/effect/spacevine/holder, mob/living/eater)
+/datum/spacevine_mutation/proc/on_eat(obj/structure/spacevine/holder, mob/living/eater)
return
-/datum/spacevine_mutation/proc/on_spread(obj/effect/spacevine/holder, turf/target)
+/datum/spacevine_mutation/proc/on_spread(obj/structure/spacevine/holder, turf/target)
return
-/datum/spacevine_mutation/proc/on_buckle(obj/effect/spacevine/holder, mob/living/buckled)
+/datum/spacevine_mutation/proc/on_buckle(obj/structure/spacevine/holder, mob/living/buckled)
return
-/datum/spacevine_mutation/proc/on_explosion(severity, target, obj/effect/spacevine/holder)
+/datum/spacevine_mutation/proc/on_explosion(severity, target, obj/structure/spacevine/holder)
return
@@ -111,7 +111,7 @@
ChangeTurf(src.baseturf)
/turf/open/floor/vines/ChangeTurf(turf/open/floor/T)
- for(var/obj/effect/spacevine/SV in src)
+ for(var/obj/structure/spacevine/SV in src)
qdel(SV)
. = ..()
UpdateAffectingLights()
@@ -129,17 +129,17 @@
/turf/open/space/transit
))
-/datum/spacevine_mutation/space_covering/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/space_covering/on_grow(obj/structure/spacevine/holder)
process_mutation(holder)
-/datum/spacevine_mutation/space_covering/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/space_covering/process_mutation(obj/structure/spacevine/holder)
var/turf/T = get_turf(holder)
if(is_type_in_typecache(T, coverable_turfs))
var/currtype = T.type
T.ChangeTurf(/turf/open/floor/vines)
T.baseturf = currtype
-/datum/spacevine_mutation/space_covering/on_death(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/space_covering/on_death(obj/structure/spacevine/holder)
var/turf/T = get_turf(holder)
if(istype(T, /turf/open/floor/vines))
T.ChangeTurf(T.baseturf)
@@ -149,8 +149,8 @@
hue = "#3333ff"
quality = MINOR_NEGATIVE
-/datum/spacevine_mutation/bluespace/on_spread(obj/effect/spacevine/holder, turf/target)
- if(holder.energy > 1 && !locate(/obj/effect/spacevine) in target)
+/datum/spacevine_mutation/bluespace/on_spread(obj/structure/spacevine/holder, turf/target)
+ if(holder.energy > 1 && !locate(/obj/structure/spacevine) in target)
holder.master.spawn_spacevine_piece(target, holder)
/datum/spacevine_mutation/light
@@ -159,7 +159,7 @@
quality = POSITIVE
severity = 4
-/datum/spacevine_mutation/light/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/light/on_grow(obj/structure/spacevine/holder)
if(holder.energy)
holder.SetLuminosity(severity, 3)
@@ -169,14 +169,14 @@
severity = 10
quality = NEGATIVE
-/datum/spacevine_mutation/toxicity/on_cross(obj/effect/spacevine/holder, mob/living/crosser)
+/datum/spacevine_mutation/toxicity/on_cross(obj/structure/spacevine/holder, mob/living/crosser)
if(issilicon(crosser))
return
if(prob(severity) && istype(crosser) && !isvineimmune(crosser))
crosser << "You accidently touch the vine and feel a strange sensation."
crosser.adjustToxLoss(5)
-/datum/spacevine_mutation/toxicity/on_eat(obj/effect/spacevine/holder, mob/living/eater)
+/datum/spacevine_mutation/toxicity/on_eat(obj/structure/spacevine/holder, mob/living/eater)
if(!isvineimmune(eater))
eater.adjustToxLoss(5)
@@ -186,14 +186,14 @@
quality = NEGATIVE
severity = 2
-/datum/spacevine_mutation/explosive/on_explosion(explosion_severity, target, obj/effect/spacevine/holder)
+/datum/spacevine_mutation/explosive/on_explosion(explosion_severity, target, obj/structure/spacevine/holder)
if(explosion_severity < 3)
qdel(src)
else
. = 1
QDEL_IN(src, 5)
-/datum/spacevine_mutation/explosive/on_death(obj/effect/spacevine/holder, mob/hitter, obj/item/I)
+/datum/spacevine_mutation/explosive/on_death(obj/structure/spacevine/holder, mob/hitter, obj/item/I)
explosion(holder.loc, 0, 0, severity, 0, 0)
/datum/spacevine_mutation/fire_proof
@@ -201,10 +201,10 @@
hue = "#ff8888"
quality = MINOR_NEGATIVE
-/datum/spacevine_mutation/fire_proof/process_temperature(obj/effect/spacevine/holder, temp, volume)
+/datum/spacevine_mutation/fire_proof/process_temperature(obj/structure/spacevine/holder, temp, volume)
return 1
-/datum/spacevine_mutation/fire_proof/on_hit(obj/effect/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
+/datum/spacevine_mutation/fire_proof/on_hit(obj/structure/spacevine/holder, mob/hitter, obj/item/I, expected_damage)
if(I && I.damtype == "fire")
. = 0
else
@@ -215,8 +215,8 @@
hue = "#ff7700"
quality = MINOR_NEGATIVE
-/datum/spacevine_mutation/vine_eating/on_spread(obj/effect/spacevine/holder, turf/target)
- var/obj/effect/spacevine/prey = locate() in target
+/datum/spacevine_mutation/vine_eating/on_spread(obj/structure/spacevine/holder, turf/target)
+ var/obj/structure/spacevine/prey = locate() in target
if(prey && !prey.mutations.Find(src)) //Eat all vines that are not of the same origin
qdel(prey)
@@ -226,10 +226,10 @@
severity = 3
quality = NEGATIVE
-/datum/spacevine_mutation/aggressive_spread/on_spread(obj/effect/spacevine/holder, turf/target)
+/datum/spacevine_mutation/aggressive_spread/on_spread(obj/structure/spacevine/holder, turf/target)
target.ex_act(severity, src) // vine immunity handled at /mob/ex_act
-/datum/spacevine_mutation/aggressive_spread/on_buckle(obj/effect/spacevine/holder, mob/living/buckled)
+/datum/spacevine_mutation/aggressive_spread/on_buckle(obj/structure/spacevine/holder, mob/living/buckled)
buckled.ex_act(severity, src)
/datum/spacevine_mutation/transparency
@@ -237,7 +237,7 @@
hue = ""
quality = POSITIVE
-/datum/spacevine_mutation/transparency/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/transparency/on_grow(obj/structure/spacevine/holder)
holder.SetOpacity(0)
holder.alpha = 125
@@ -247,7 +247,7 @@
severity = 3
quality = NEGATIVE
-/datum/spacevine_mutation/oxy_eater/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/oxy_eater/process_mutation(obj/structure/spacevine/holder)
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
@@ -262,7 +262,7 @@
severity = 3
quality = NEGATIVE
-/datum/spacevine_mutation/nitro_eater/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/nitro_eater/process_mutation(obj/structure/spacevine/holder)
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
@@ -277,7 +277,7 @@
severity = 3
quality = POSITIVE
-/datum/spacevine_mutation/carbondioxide_eater/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/carbondioxide_eater/process_mutation(obj/structure/spacevine/holder)
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
@@ -292,7 +292,7 @@
severity = 3
quality = POSITIVE
-/datum/spacevine_mutation/plasma_eater/process_mutation(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/plasma_eater/process_mutation(obj/structure/spacevine/holder)
var/turf/open/floor/T = holder.loc
if(istype(T))
var/datum/gas_mixture/GM = T.air
@@ -307,13 +307,13 @@
severity = 10
quality = NEGATIVE
-/datum/spacevine_mutation/thorns/on_cross(obj/effect/spacevine/holder, mob/living/crosser)
+/datum/spacevine_mutation/thorns/on_cross(obj/structure/spacevine/holder, mob/living/crosser)
if(prob(severity) && istype(crosser) && !isvineimmune(holder))
var/mob/living/M = crosser
M.adjustBruteLoss(5)
M << "You cut yourself on the thorny vines."
-/datum/spacevine_mutation/thorns/on_hit(obj/effect/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
+/datum/spacevine_mutation/thorns/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
if(prob(severity) && istype(hitter) && !isvineimmune(holder))
var/mob/living/M = hitter
M.adjustBruteLoss(5)
@@ -325,13 +325,13 @@
hue = "#997700"
quality = NEGATIVE
-/datum/spacevine_mutation/woodening/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/woodening/on_grow(obj/structure/spacevine/holder)
if(holder.energy)
holder.density = 1
holder.maxhealth = 100
holder.health = holder.maxhealth
-/datum/spacevine_mutation/woodening/on_hit(obj/effect/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
+/datum/spacevine_mutation/woodening/on_hit(obj/structure/spacevine/holder, mob/living/hitter, obj/item/I, expected_damage)
if(I.is_sharp())
. = expected_damage * 0.5
else
@@ -343,16 +343,16 @@
quality = NEGATIVE
severity = 10
-/datum/spacevine_mutation/flowering/on_grow(obj/effect/spacevine/holder)
+/datum/spacevine_mutation/flowering/on_grow(obj/structure/spacevine/holder)
if(holder.energy == 2 && prob(severity) && !locate(/obj/structure/alien/resin/flower_bud_enemy) in range(5,holder))
new/obj/structure/alien/resin/flower_bud_enemy(get_turf(holder))
-/datum/spacevine_mutation/flowering/on_cross(obj/effect/spacevine/holder, mob/living/crosser)
+/datum/spacevine_mutation/flowering/on_cross(obj/structure/spacevine/holder, mob/living/crosser)
holder.entangle(crosser)
// SPACE VINES (Note that this code is very similar to Biomass code)
-/obj/effect/spacevine
+/obj/structure/spacevine
name = "space vines"
desc = "An extremely expansionistic species of vine."
icon = 'icons/effects/spacevines.dmi'
@@ -365,10 +365,10 @@
var/health = 50
var/maxhealth = 50
var/energy = 0
- var/obj/effect/spacevine_controller/master = null
+ var/obj/structure/spacevine_controller/master = null
var/list/mutations = list()
-/obj/effect/spacevine/examine(mob/user)
+/obj/structure/spacevine/examine(mob/user)
..()
var/text = "This one is a"
if(mutations.len)
@@ -380,7 +380,7 @@
text += " vine."
user << text
-/obj/effect/spacevine/Destroy()
+/obj/structure/spacevine/Destroy()
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_death(src)
if(master)
@@ -397,7 +397,7 @@
unbuckle_all_mobs(force=1)
return ..()
-/obj/effect/spacevine/proc/on_chem_effect(datum/reagent/R)
+/obj/structure/spacevine/proc/on_chem_effect(datum/reagent/R)
var/override = 0
for(var/datum/spacevine_mutation/SM in mutations)
override += SM.on_chem(src, R)
@@ -405,7 +405,7 @@
if(prob(50))
qdel(src)
-/obj/effect/spacevine/proc/eat(mob/eater)
+/obj/structure/spacevine/proc/eat(mob/eater)
var/override = 0
for(var/datum/spacevine_mutation/SM in mutations)
override += SM.on_eat(src, eater)
@@ -414,7 +414,7 @@
eater.say("Nom")
qdel(src)
-/obj/effect/spacevine/attackby(obj/item/weapon/W, mob/user, params)
+/obj/structure/spacevine/attackby(obj/item/weapon/W, mob/user, params)
if (!W || !user || !W.type)
return
user.changeNext_move(CLICK_CD_MELEE)
@@ -422,7 +422,7 @@
if(istype(W, /obj/item/weapon/scythe))
force = force * 4
- for(var/obj/effect/spacevine/B in orange(1,src))
+ for(var/obj/structure/spacevine/B in orange(1,src))
B.health = health - force
if(B.health < 1)
qdel(B)
@@ -449,36 +449,36 @@
..()
-/obj/effect/spacevine/Crossed(mob/crosser)
+/obj/structure/spacevine/Crossed(mob/crosser)
if(isliving(crosser))
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_cross(src, crosser)
-/obj/effect/spacevine/attack_hand(mob/user)
+/obj/structure/spacevine/attack_hand(mob/user)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
user_unbuckle_mob(user, user)
-/obj/effect/spacevine/attack_paw(mob/living/user)
+/obj/structure/spacevine/attack_paw(mob/living/user)
user.do_attack_animation(src)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_hit(src, user)
user_unbuckle_mob(user,user)
-/obj/effect/spacevine/attack_alien(mob/living/user)
+/obj/structure/spacevine/attack_alien(mob/living/user)
eat(user)
-/obj/effect/spacevine_controller
+/obj/structure/spacevine_controller
invisibility = INVISIBILITY_ABSTRACT
- var/list/obj/effect/spacevine/vines = list()
+ var/list/obj/structure/spacevine/vines = list()
var/list/growth_queue = list()
var/spread_multiplier = 5
var/spread_cap = 30
var/list/mutations_list = list()
var/mutativness = 1
-/obj/effect/spacevine_controller/New(loc, list/muts, mttv, spreading)
+/obj/structure/spacevine_controller/New(loc, list/muts, mttv, spreading)
spawn_spacevine_piece(loc, , muts)
START_PROCESSING(SSobj, src)
init_subtypes(/datum/spacevine_mutation/, mutations_list)
@@ -488,21 +488,21 @@
spread_cap *= spreading / 50
spread_multiplier /= spreading / 50
-/obj/effect/spacevine_controller/ex_act() //only killing all vines will end this suffering
+/obj/structure/spacevine_controller/ex_act() //only killing all vines will end this suffering
return
-/obj/effect/spacevine_controller/singularity_act()
+/obj/structure/spacevine_controller/singularity_act()
return
-/obj/effect/spacevine_controller/singularity_pull()
+/obj/structure/spacevine_controller/singularity_pull()
return
-/obj/effect/spacevine_controller/Destroy()
+/obj/structure/spacevine_controller/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/effect/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/effect/spacevine/parent, list/muts)
- var/obj/effect/spacevine/SV = new(location)
+/obj/structure/spacevine_controller/proc/spawn_spacevine_piece(turf/location, obj/structure/spacevine/parent, list/muts)
+ var/obj/structure/spacevine/SV = new(location)
growth_queue += SV
vines += SV
SV.master = src
@@ -520,7 +520,7 @@
for(var/datum/spacevine_mutation/SM in SV.mutations)
SM.on_birth(SV)
-/obj/effect/spacevine_controller/process()
+/obj/structure/spacevine_controller/process()
if(!vines)
qdel(src) //space vines exterminated. Remove the controller
return
@@ -532,9 +532,9 @@
length = min( spread_cap , max( 1 , vines.len / spread_multiplier ) )
var/i = 0
- var/list/obj/effect/spacevine/queue_end = list()
+ var/list/obj/structure/spacevine/queue_end = list()
- for(var/obj/effect/spacevine/SV in growth_queue)
+ for(var/obj/structure/spacevine/SV in growth_queue)
if(qdeleted(SV))
continue
i++
@@ -555,7 +555,7 @@
growth_queue = growth_queue + queue_end
-/obj/effect/spacevine/proc/grow()
+/obj/structure/spacevine/proc/grow()
if(!energy)
src.icon_state = pick("Med1", "Med2", "Med3")
energy = 1
@@ -567,7 +567,7 @@
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_grow(src)
-/obj/effect/spacevine/proc/entangle_mob()
+/obj/structure/spacevine/proc/entangle_mob()
if(!has_buckled_mobs() && prob(25))
for(var/mob/living/V in src.loc)
entangle(V)
@@ -575,7 +575,7 @@
break //only capture one mob at a time
-/obj/effect/spacevine/proc/entangle(mob/living/V)
+/obj/structure/spacevine/proc/entangle(mob/living/V)
if(!V || isvineimmune(V))
return
for(var/datum/spacevine_mutation/SM in mutations)
@@ -584,18 +584,18 @@
V << "The vines [pick("wind", "tangle", "tighten")] around you!"
buckle_mob(V)
-/obj/effect/spacevine/proc/spread()
+/obj/structure/spacevine/proc/spread()
var/direction = pick(cardinal)
var/turf/stepturf = get_step(src,direction)
for(var/datum/spacevine_mutation/SM in mutations)
SM.on_spread(src, stepturf)
stepturf = get_step(src,direction) //in case turf changes, to make sure no runtimes happen
- if(!locate(/obj/effect/spacevine, stepturf))
+ if(!locate(/obj/structure/spacevine, stepturf))
if(stepturf.Enter(src))
if(master)
master.spawn_spacevine_piece(stepturf, src)
-/obj/effect/spacevine/ex_act(severity, target)
+/obj/structure/spacevine/ex_act(severity, target)
if(istype(target, type)) //if its agressive spread vine dont do anything
return
var/i
@@ -604,14 +604,14 @@
if(!i && prob(100/severity))
qdel(src)
-/obj/effect/spacevine/temperature_expose(null, temp, volume)
+/obj/structure/spacevine/temperature_expose(null, temp, volume)
var/override = 0
for(var/datum/spacevine_mutation/SM in mutations)
override += SM.process_temperature(src, temp, volume)
if(!override)
qdel(src)
-/obj/effect/spacevine/CanPass(atom/movable/mover, turf/target, height=0)
+/obj/structure/spacevine/CanPass(atom/movable/mover, turf/target, height=0)
if(isvineimmune(mover))
. = TRUE
else
diff --git a/code/modules/events/spider_infestation.dm b/code/modules/events/spider_infestation.dm
index a25f60366ee..451ad34a466 100644
--- a/code/modules/events/spider_infestation.dm
+++ b/code/modules/events/spider_infestation.dm
@@ -29,7 +29,7 @@
while((spawncount >= 1) && vents.len)
var/obj/vent = pick(vents)
- var/obj/effect/spider/spiderling/S = new(vent.loc)
+ var/obj/structure/spider/spiderling/S = new(vent.loc)
if(prob(66))
S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/nurse
vents -= vent
diff --git a/code/modules/food_and_drinks/food/snacks_other.dm b/code/modules/food_and_drinks/food/snacks_other.dm
index a257234425d..db9aacf6ce2 100644
--- a/code/modules/food_and_drinks/food/snacks_other.dm
+++ b/code/modules/food_and_drinks/food/snacks_other.dm
@@ -324,5 +324,9 @@
icon_state = "powercrepe"
bonus_reagents = list("nutriment" = 5, "vitamin" = 3, "iron" = 10)
list_reagents = list("nutriment" = 10, "vitamin" = 5, "cherryjelly" = 5)
- force = 15
+ force = 20
+ throwforce = 10
+ block_chance = 50
+ armour_penetration = 75
+ attack_verb = list("slapped", "slathered")
w_class = 4
\ No newline at end of file
diff --git a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
index 480713d7ebc..33e5d058f9c 100644
--- a/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
+++ b/code/modules/food_and_drinks/kitchen_machinery/smartfridge.dm
@@ -49,11 +49,11 @@
else
return ..()
-/obj/machinery/smartfridge/construction()
+/obj/machinery/smartfridge/on_construction()
for(var/datum/A in contents)
qdel(A)
-/obj/machinery/smartfridge/deconstruction()
+/obj/machinery/smartfridge/on_deconstruction()
for(var/atom/movable/A in contents)
A.loc = loc
diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm
index fb8da24143e..cf7e6ae024d 100644
--- a/code/modules/games/cards.dm
+++ b/code/modules/games/cards.dm
@@ -264,9 +264,8 @@
if (istype(hclient))
switch (href_list["action"])
if ("play_card")
- var/datum/playingcard/card = locate(href_list["card"])
-
- if (card in src.cards)
+ var/datum/playingcard/card = locate(href_list["card"]) in cards
+ if (card && istype(card))
src.discard(card)
if ("toggle_conceal")
src.toggle_conceal()
diff --git a/code/modules/holodeck/computer.dm b/code/modules/holodeck/computer.dm
index cc50f155f0b..c29ebfb5ea7 100644
--- a/code/modules/holodeck/computer.dm
+++ b/code/modules/holodeck/computer.dm
@@ -204,6 +204,6 @@
emergency_shutdown()
..()
-/obj/machinery/computer/holodeck/blob_act(obj/effect/blob/B)
+/obj/machinery/computer/holodeck/blob_act(obj/structure/blob/B)
emergency_shutdown()
..()
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm
index c9f67b39589..04b48caa83a 100644
--- a/code/modules/hydroponics/grown/kudzu.dm
+++ b/code/modules/hydroponics/grown/kudzu.dm
@@ -32,7 +32,7 @@
var/turf/T = get_turf(src)
message_admins("Kudzu planted by [key_name_admin(user)](?) (FLW) at ([T.x],[T.y],[T.z] - (JMP))",0,1)
investigate_log("was planted by [key_name(user)] at ([T.x],[T.y],[T.z])","kudzu")
- new /obj/effect/spacevine_controller(user.loc, mutations, potency, production)
+ new /obj/structure/spacevine_controller(user.loc, mutations, potency, production)
qdel(src)
/obj/item/seeds/kudzu/attack_self(mob/user)
diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm
index b47e119bf2b..9dc0ab8f97c 100644
--- a/code/modules/hydroponics/grown/mushrooms.dm
+++ b/code/modules/hydroponics/grown/mushrooms.dm
@@ -237,13 +237,13 @@
desc = "Mycena Bregprox: This species of mushroom glows in the dark."
icon_state = "glowshroom"
filling_color = "#00FA9A"
- var/effect_path = /obj/effect/glowshroom
+ var/effect_path = /obj/structure/glowshroom
origin_tech = "biotech=4;plasmatech=6"
/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user)
if(istype(user.loc,/turf/open/space))
return
- var/obj/effect/glowshroom/planted = new effect_path(user.loc)
+ var/obj/structure/glowshroom/planted = new effect_path(user.loc)
planted.delay = planted.delay - seed.production * 100 //So the delay goes DOWN with better stats instead of up. :I
planted.endurance = seed.endurance
planted.yield = seed.yield
@@ -274,5 +274,5 @@
desc = "Mycena Ruthenia: This species of mushroom glows in the dark, but aren't bioluminescent. They're warm to the touch..."
icon_state = "glowcap"
filling_color = "#00FA9A"
- effect_path = /obj/effect/glowshroom/glowcap
+ effect_path = /obj/structure/glowshroom/glowcap
origin_tech = "biotech=4;powerstorage=6;plasmatech=4"
diff --git a/code/modules/hydroponics/hydroponics.dm b/code/modules/hydroponics/hydroponics.dm
index afcf5b0e83d..744b4126cb3 100644
--- a/code/modules/hydroponics/hydroponics.dm
+++ b/code/modules/hydroponics/hydroponics.dm
@@ -444,7 +444,7 @@
if(pestlevel > 5)
visible_message("The pests seem to behave oddly...")
for(var/i=0, i<3, i++)
- var/obj/effect/spider/spiderling/S = new(src.loc)
+ var/obj/structure/spider/spiderling/S = new(src.loc)
S.grow_as = /mob/living/simple_animal/hostile/poison/giant_spider/hunter
else
usr << "The pests seem to behave oddly, but quickly settle down..."
diff --git a/code/modules/jobs/job_types/civilian.dm b/code/modules/jobs/job_types/civilian.dm
index faa6818ec73..6264c73d6ed 100644
--- a/code/modules/jobs/job_types/civilian.dm
+++ b/code/modules/jobs/job_types/civilian.dm
@@ -177,3 +177,5 @@ Lawyer
if(J.lawyers>1)
uniform = /obj/item/clothing/under/lawyer/purpsuit
suit = /obj/item/clothing/suit/toggle/lawyer/purple
+
+ H.bubble_icon = "lawyer"
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index ba15a04fcc6..2d85151c98d 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -374,11 +374,13 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
b.duedate = world.time + (checkoutperiod * 600)
checkouts.Add(b)
if(href_list["checkin"])
- var/datum/borrowbook/b = locate(href_list["checkin"])
- checkouts.Remove(b)
+ var/datum/borrowbook/b = locate(href_list["checkin"]) in checkouts
+ if(b && istype(b))
+ checkouts.Remove(b)
if(href_list["delbook"])
- var/obj/item/weapon/book/b = locate(href_list["delbook"])
- inventory.Remove(b)
+ var/obj/item/weapon/book/b = locate(href_list["delbook"]) in inventory
+ if(b && istype(b))
+ inventory.Remove(b)
if(href_list["setauthor"])
var/newauthor = copytext(sanitize(input("Enter the author's name: ") as text|null),1,MAX_MESSAGE_LEN)
if(newauthor)
@@ -542,4 +544,4 @@ var/global/list/datum/cachedbook/cachedbooks // List of our cached book datums
B.icon_state = "book[rand(1,7)]"
qdel(P)
else
- P.loc = loc
\ No newline at end of file
+ P.loc = loc
diff --git a/code/modules/mining/machine_redemption.dm b/code/modules/mining/machine_redemption.dm
index 443f37ea406..149669a713b 100644
--- a/code/modules/mining/machine_redemption.dm
+++ b/code/modules/mining/machine_redemption.dm
@@ -126,7 +126,7 @@
return ..()
-/obj/machinery/mineral/ore_redemption/deconstruction()
+/obj/machinery/mineral/ore_redemption/on_deconstruction()
empty_content()
/obj/machinery/mineral/ore_redemption/proc/SmeltMineral(obj/item/weapon/ore/O)
diff --git a/code/modules/mob/inventory.dm b/code/modules/mob/inventory.dm
index 377d8ac3b15..542616a278e 100644
--- a/code/modules/mob/inventory.dm
+++ b/code/modules/mob/inventory.dm
@@ -281,42 +281,37 @@
//Outdated but still in use apparently. This should at least be a human proc.
//Daily reminder to murder this - Remie.
-/mob/proc/get_equipped_items()
- var/list/items = list()
+/mob/living/proc/get_equipped_items()
+ return
- if(hasvar(src,"back"))
- if(src:back)
- items += src:back
- if(hasvar(src,"belt"))
- if(src:belt)
- items += src:belt
- if(hasvar(src,"ears"))
- if(src:ears)
- items += src:ears
- if(hasvar(src,"glasses"))
- if(src:glasses)
- items += src:glasses
- if(hasvar(src,"gloves"))
- if(src:gloves)
- items += src:gloves
- if(hasvar(src,"head"))
- if(src:head)
- items += src:head
- if(hasvar(src,"shoes"))
- if(src:shoes)
- items += src:shoes
- if(hasvar(src,"wear_id"))
- if(src:wear_id)
- items += src:wear_id
- if(hasvar(src,"wear_mask"))
- if(src:wear_mask)
- items += src:wear_mask
- if(hasvar(src,"wear_suit"))
- if(src:wear_suit)
- items += src:wear_suit
- if(hasvar(src,"w_uniform"))
- if(src:w_uniform)
- items += src:w_uniform
+/mob/living/carbon/get_equipped_items()
+ var/list/items = list()
+ if(back)
+ items += back
+ if(head)
+ items += head
+ if(wear_mask)
+ items += wear_mask
+ return items
+
+/mob/living/carbon/human/get_equipped_items()
+ var/list/items = ..()
+ if(belt)
+ items += belt
+ if(ears)
+ items += ears
+ if(glasses)
+ items += glasses
+ if(gloves)
+ items += gloves
+ if(shoes)
+ items += shoes
+ if(wear_id)
+ items += wear_id
+ if(wear_suit)
+ items += wear_suit
+ if(w_uniform)
+ items += w_uniform
return items
diff --git a/code/modules/mob/living/brain/brain.dm b/code/modules/mob/living/brain/brain.dm
index dfdf30fb3c5..e90b4a72972 100644
--- a/code/modules/mob/living/brain/brain.dm
+++ b/code/modules/mob/living/brain/brain.dm
@@ -44,7 +44,7 @@
/mob/living/brain/ex_act() //you cant blow up brainmobs because it makes transfer_to() freak out when borgs blow up.
return
-/mob/living/brain/blob_act(obj/effect/blob/B)
+/mob/living/brain/blob_act(obj/structure/blob/B)
return
/mob/living/brain/get_eye_protection()//no eyes
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 96afa3055f4..ea2195d1727 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -155,7 +155,7 @@ mob/living/carbon/bullet_act(obj/item/projectile/P, def_zone)
return dam_zone
-/mob/living/carbon/blob_act(obj/effect/blob/B)
+/mob/living/carbon/blob_act(obj/structure/blob/B)
if (stat == DEAD)
return
else
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index b0e2feb9fec..766a37aad4a 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -379,7 +379,7 @@
break
..()
-/mob/living/carbon/human/blob_act(obj/effect/blob/B)
+/mob/living/carbon/human/blob_act(obj/structure/blob/B)
if(stat == DEAD)
return
show_message("The blob attacks you!")
diff --git a/code/modules/mob/living/carbon/human/species_types.dm b/code/modules/mob/living/carbon/human/species_types.dm
index 97d1a2dd8ab..faeda3530d7 100644
--- a/code/modules/mob/living/carbon/human/species_types.dm
+++ b/code/modules/mob/living/carbon/human/species_types.dm
@@ -16,18 +16,6 @@
/datum/species/human/qualifies_for_rank(rank, list/features)
if((!features["tail_human"] || features["tail_human"] == "None") && (!features["ears"] || features["ears"] == "None"))
return 1 //Pure humans are always allowed in all roles.
-
- //Mutants are not allowed in most roles.
- if(rank in security_positions) //This list does not include lawyers.
- return 0
- if(rank in science_positions)
- return 0
- if(rank in medical_positions)
- return 0
- if(rank in engineering_positions)
- return 0
- if(rank == "Quartermaster") //QM is not contained in command_positions but we still want to bar mutants from it.
- return 0
return ..()
diff --git a/code/modules/mob/living/silicon/ai/ai_defense.dm b/code/modules/mob/living/silicon/ai/ai_defense.dm
index 771a6d7c2f5..6e08200af66 100644
--- a/code/modules/mob/living/silicon/ai/ai_defense.dm
+++ b/code/modules/mob/living/silicon/ai/ai_defense.dm
@@ -14,7 +14,7 @@
/mob/living/silicon/ai/attack_slime(mob/living/simple_animal/slime/user)
return //immune to slimes
-/mob/living/silicon/ai/blob_act(obj/effect/blob/B)
+/mob/living/silicon/ai/blob_act(obj/structure/blob/B)
if (stat != DEAD)
adjustBruteLoss(60)
updatehealth()
diff --git a/code/modules/mob/living/silicon/pai/pai_defense.dm b/code/modules/mob/living/silicon/pai/pai_defense.dm
index 5cdbebfd995..416ee756b66 100644
--- a/code/modules/mob/living/silicon/pai/pai_defense.dm
+++ b/code/modules/mob/living/silicon/pai/pai_defense.dm
@@ -1,5 +1,5 @@
-/mob/living/silicon/pai/blob_act(obj/effect/blob/B)
+/mob/living/silicon/pai/blob_act(obj/structure/blob/B)
return 0
/mob/living/silicon/pai/emp_act(severity)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 6f56ca375b9..5b3b3ee6e2e 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -683,90 +683,6 @@
update_fire()
-/mob/living/silicon/robot/proc/installed_modules()
- if(!module)
- pick_module()
- return
- var/dat = {"Close
-
-
- Activated Modules
-
-
- Installed Modules
-
- "}
-
- for (var/obj in module.modules)
- if (!obj)
- dat += text("| Resource depleted |
")
- else if(activated(obj))
- dat += text("| [obj] | Activated |
")
- else
- dat += text("| [obj] | Activate |
")
- if (emagged)
- if(activated(module.emag))
- dat += text("| [module.emag] | Activated |
")
- else
- dat += text("| [module.emag] | Activate |
")
- dat += "
"
-/*
- if(activated(obj))
- dat += text("[obj]: \[Activated | Deactivate\]
")
- else
- dat += text("[obj]: \[Activate | Deactivated\]
")
-*/
- var/datum/browser/popup = new(src, "robotmod", "Modules")
- popup.set_content(dat)
- popup.open()
-
-/mob/living/silicon/robot/Topic(href, href_list)
- ..()
- if(usr && (src != usr))
- return
-
- if (href_list["mach_close"])
- var/t1 = text("window=[href_list["mach_close"]]")
- unset_machine()
- src << browse(null, t1)
- return
-
- if (href_list["showalerts"])
- robot_alerts()
- return
-
- if (href_list["mod"])
- var/obj/item/O = locate(href_list["mod"])
- if (O)
- O.attack_self(src)
-
- if (href_list["act"])
- var/obj/item/O = locate(href_list["act"])
- activate_module(O)
- installed_modules()
-
- if (href_list["deact"])
- var/obj/item/O = locate(href_list["deact"])
- if(activated(O))
- if(module_state_1 == O)
- module_state_1 = null
- contents -= O
- else if(module_state_2 == O)
- module_state_2 = null
- contents -= O
- else if(module_state_3 == O)
- module_state_3 = null
- contents -= O
- else
- src << "Module isn't activated."
- else
- src << "Module isn't activated"
- installed_modules()
-
#define BORG_CAMERA_BUFFER 30
/mob/living/silicon/robot/Move(a, b, flag)
var/oldLoc = src.loc
@@ -1161,4 +1077,4 @@
status_flags |= CANPUSH
- return 1
\ No newline at end of file
+ return 1
diff --git a/code/modules/mob/living/silicon/robot/robot_defense.dm b/code/modules/mob/living/silicon/robot/robot_defense.dm
index 7fa7a720d42..a56ef87aedc 100644
--- a/code/modules/mob/living/silicon/robot/robot_defense.dm
+++ b/code/modules/mob/living/silicon/robot/robot_defense.dm
@@ -150,7 +150,7 @@
update_icons()
-/mob/living/silicon/robot/blob_act(obj/effect/blob/B)
+/mob/living/silicon/robot/blob_act(obj/structure/blob/B)
if (stat != 2)
adjustBruteLoss(60)
updatehealth()
diff --git a/code/modules/mob/living/simple_animal/animal_defense.dm b/code/modules/mob/living/simple_animal/animal_defense.dm
index 53dd3b50454..0b36b950653 100644
--- a/code/modules/mob/living/simple_animal/animal_defense.dm
+++ b/code/modules/mob/living/simple_animal/animal_defense.dm
@@ -112,6 +112,6 @@
bloss = bloss / 1.5
adjustBruteLoss(bloss)
-/mob/living/simple_animal/blob_act(obj/effect/blob/B)
+/mob/living/simple_animal/blob_act(obj/structure/blob/B)
adjustBruteLoss(20)
return
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
index 0e6495170dc..e36c96c79f5 100644
--- a/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
+++ b/code/modules/mob/living/simple_animal/friendly/farm_animals.dm
@@ -50,14 +50,14 @@
src.visible_message("[src] calms down.")
if(stat == CONSCIOUS)
udder.generateMilk()
- if(locate(/obj/effect/spacevine) in loc)
- var/obj/effect/spacevine/SV = locate(/obj/effect/spacevine) in loc
+ if(locate(/obj/structure/spacevine) in loc)
+ var/obj/structure/spacevine/SV = locate(/obj/structure/spacevine) in loc
SV.eat(src)
if(!pulledby)
for(var/direction in shuffle(list(1,2,4,8,5,6,9,10)))
var/step = get_step(src, direction)
if(step)
- if(locate(/obj/effect/spacevine) in step)
+ if(locate(/obj/structure/spacevine) in step)
Move(step, get_dir(src, step))
/mob/living/simple_animal/hostile/retaliate/goat/Retaliate()
@@ -67,8 +67,8 @@
/mob/living/simple_animal/hostile/retaliate/goat/Move()
..()
if(!stat)
- if(locate(/obj/effect/spacevine) in loc)
- var/obj/effect/spacevine/SV = locate(/obj/effect/spacevine) in loc
+ if(locate(/obj/structure/spacevine) in loc)
+ var/obj/structure/spacevine/SV = locate(/obj/structure/spacevine) in loc
SV.eat(src)
/mob/living/simple_animal/hostile/retaliate/goat/attackby(obj/item/O, mob/user, params)
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 73395aba50f..2e79f072bf6 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -138,7 +138,7 @@
return
//second, spin a sticky spiderweb on this tile
- var/obj/effect/spider/stickyweb/W = locate() in get_turf(src)
+ var/obj/structure/spider/stickyweb/W = locate() in get_turf(src)
if(!W)
Web()
else
@@ -183,7 +183,7 @@
stop_automated_movement = 1
if(do_after(src, 40, target = T))
if(busy == SPINNING_WEB && src.loc == T)
- new /obj/effect/spider/stickyweb(T)
+ new /obj/structure/spider/stickyweb(T)
busy = 0
stop_automated_movement = 0
@@ -215,7 +215,7 @@
if(do_after(src, 50, target = src))
if(busy == SPINNING_COCOON)
if(cocoon_target && istype(cocoon_target.loc, /turf) && get_dist(src,cocoon_target) <= 1)
- var/obj/effect/spider/cocoon/C = new(cocoon_target.loc)
+ var/obj/structure/spider/cocoon/C = new(cocoon_target.loc)
var/large_cocoon = 0
C.pixel_x = cocoon_target.pixel_x
C.pixel_y = cocoon_target.pixel_y
@@ -251,7 +251,7 @@
set category = "Spider"
set desc = "Lay a clutch of eggs, but you must wrap a creature for feeding first."
- var/obj/effect/spider/eggcluster/E = locate() in get_turf(src)
+ var/obj/structure/spider/eggcluster/E = locate() in get_turf(src)
if(stat == DEAD)
return
if(E)
@@ -266,7 +266,7 @@
if(busy == LAYING_EGGS)
E = locate() in get_turf(src)
if(!E)
- var/obj/effect/spider/eggcluster/C = new /obj/effect/spider/eggcluster(src.loc)
+ var/obj/structure/spider/eggcluster/C = new /obj/structure/spider/eggcluster(src.loc)
if(ckey)
C.player_spiders = 1
C.poison_type = poison_type
diff --git a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
index 56457b02ba5..67f9e8e8255 100644
--- a/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/energy_net_nets.dm
@@ -3,7 +3,7 @@ It will teleport people to a holding facility after 30 seconds. (Check the proce
It is possible to destroy the net by the occupant or someone else.
*/
-/obj/effect/energy_net
+/obj/structure/energy_net
name = "energy net"
desc = "It's a net made of green energy."
icon = 'icons/effects/effects.dmi'
@@ -20,7 +20,7 @@ It is possible to destroy the net by the occupant or someone else.
-/obj/effect/energy_net/proc/take_damage(damage, damage_type = BRUTE, sound_effect = 1)
+/obj/structure/energy_net/proc/take_damage(damage, damage_type = BRUTE, sound_effect = 1)
switch(damage_type)
if(BRUTE)
if(sound_effect)
@@ -34,7 +34,7 @@ It is possible to destroy the net by the occupant or someone else.
if(health <=0)
qdel(src)
-/obj/effect/energy_net/Destroy()
+/obj/structure/energy_net/Destroy()
if(affecting)
var/mob/living/carbon/M = affecting
M.anchored = 0
@@ -44,7 +44,7 @@ It is possible to destroy the net by the occupant or someone else.
master << "ERROR: unable to initiate transport protocol. Procedure terminated."
return ..()
-/obj/effect/energy_net/process(mob/living/carbon/M)
+/obj/structure/energy_net/process(mob/living/carbon/M)
var/check = 30//30 seconds before teleportation. Could be extended I guess.
var/mob_name = affecting.name//Since they will report as null if terminated before teleport.
//The person can still try and attack the net when inside.
@@ -101,13 +101,13 @@ It is possible to destroy the net by the occupant or someone else.
-/obj/effect/energy_net/bullet_act(obj/item/projectile/Proj)
+/obj/structure/energy_net/bullet_act(obj/item/projectile/Proj)
. = ..()
take_damage(Proj.damage, Proj.damage_type)
-/obj/effect/energy_net/ex_act(severity, target)
+/obj/structure/energy_net/ex_act(severity, target)
switch(severity)
if(1)
qdel(src)
@@ -116,10 +116,10 @@ It is possible to destroy the net by the occupant or someone else.
if(3)
take_damage(rand(10,25), BRUTE, 0)
-/obj/effect/energy_net/blob_act(obj/effect/blob/B)
+/obj/structure/energy_net/blob_act(obj/structure/blob/B)
qdel(src)
-/obj/effect/energy_net/hitby(atom/movable/AM)
+/obj/structure/energy_net/hitby(atom/movable/AM)
..()
var/tforce = 0
if(ismob(AM))
@@ -130,7 +130,7 @@ It is possible to destroy the net by the occupant or someone else.
take_damage(tforce)
-/obj/effect/energy_net/attack_hulk(mob/living/carbon/human/user)
+/obj/structure/energy_net/attack_hulk(mob/living/carbon/human/user)
..(user, 1)
user.visible_message("[user] rips the energy net apart!", \
"You easily destroy the energy net.")
@@ -138,12 +138,12 @@ It is possible to destroy the net by the occupant or someone else.
-/obj/effect/energy_net/attack_paw(mob/user)
+/obj/structure/energy_net/attack_paw(mob/user)
return attack_hand()
-/obj/effect/energy_net/attack_alien(mob/living/user)
+/obj/structure/energy_net/attack_alien(mob/living/user)
user.do_attack_animation(src)
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, 'sound/weapons/slash.ogg', 80, 1)
@@ -153,7 +153,7 @@ It is possible to destroy the net by the occupant or someone else.
-/obj/effect/energy_net/attacked_by(obj/item/weapon/W, mob/user)
+/obj/structure/energy_net/attacked_by(obj/item/weapon/W, mob/user)
..()
take_damage(W.force, W.damtype)
diff --git a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
index a8d6931a951..64666922379 100644
--- a/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
+++ b/code/modules/ninja/suit/n_suit_verbs/ninja_net.dm
@@ -9,7 +9,7 @@
if(!ninjacost(200,N_STEALTH_CANCEL) && iscarbon(C))
var/mob/living/carbon/human/H = affecting
if(C.client)//Monkeys without a client can still step_to() and bypass the net. Also, netting inactive people is lame.
- if(!locate(/obj/effect/energy_net) in C.loc)//Check if they are already being affected by an energy net.
+ if(!locate(/obj/structure/energy_net) in C.loc)//Check if they are already being affected by an energy net.
for(var/turf/T in getline(H.loc, C.loc))
if(T.density)//Don't want them shooting nets through walls. It's kind of cheesy.
H << "You may not use an energy net through solid obstacles!"
@@ -17,7 +17,7 @@
spawn(0)
H.Beam(C,"n_beam",time=15)
H.say("Get over here!")
- var/obj/effect/energy_net/E = new /obj/effect/energy_net(C.loc)
+ var/obj/structure/energy_net/E = new /obj/structure/energy_net(C.loc)
H.visible_message("[H] caught [C] with an energy net!","You caught [C] with an energy net!")
E.affecting = C
E.master = H
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 91521b27bba..b5e0c64b81a 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -321,7 +321,7 @@
toner = 0
-/obj/machinery/photocopier/blob_act(obj/effect/blob/B)
+/obj/machinery/photocopier/blob_act(obj/structure/blob/B)
if(prob(50))
qdel(src)
else
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 70e9f80ca89..a394940966d 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1095,7 +1095,7 @@
if(prob(25))
set_broken()
-/obj/machinery/power/apc/blob_act(obj/effect/blob/B)
+/obj/machinery/power/apc/blob_act(obj/structure/blob/B)
set_broken()
/obj/machinery/power/apc/disconnect_terminal()
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 434a31157a4..4ce5dfb3f9a 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -93,7 +93,7 @@ By design, d1 is the smallest direction and d2 is the highest
cable_list -= src //remove it from global cable list
return ..() // then go ahead and delete the cable
-/obj/structure/cable/blob_act(obj/effect/blob/B)
+/obj/structure/cable/blob_act(obj/structure/blob/B)
if(invisibility != INVISIBILITY_MAXIMUM)
qdel(src)
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index e4e12b62061..3b176d0a14a 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -146,7 +146,7 @@
corrupt()
-/obj/item/weapon/stock_parts/cell/blob_act(obj/effect/blob/B)
+/obj/item/weapon/stock_parts/cell/blob_act(obj/structure/blob/B)
ex_act(1)
/obj/item/weapon/stock_parts/cell/proc/get_electrocute_damage()
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 9409d20d415..395eebbb65b 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -32,7 +32,7 @@ var/const/GRAV_NEEDS_WRENCH = 3
if(severity == 1) // Very sturdy.
set_broken()
-/obj/machinery/gravity_generator/blob_act(obj/effect/blob/B)
+/obj/machinery/gravity_generator/blob_act(obj/structure/blob/B)
if(prob(20))
set_broken()
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 56adb1ad851..3647c9173e8 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -116,7 +116,7 @@
return
return ..()
-/obj/machinery/light_construct/blob_act(obj/effect/blob/B)
+/obj/machinery/light_construct/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
qdel(src)
@@ -529,7 +529,7 @@
if(prob(25))
broken()
-/obj/machinery/light/blob_act(obj/effect/blob/B)
+/obj/machinery/light/blob_act(obj/structure/blob/B)
if(B && B.loc == loc)
broken()
qdel(src)
diff --git a/code/modules/power/rtg.dm b/code/modules/power/rtg.dm
index 862228ffb6e..058084e1cec 100644
--- a/code/modules/power/rtg.dm
+++ b/code/modules/power/rtg.dm
@@ -133,7 +133,7 @@
log_game("[key_name(Proj.firer)] triggered an Abductor Core explosion via projectile.")
overload()
-/obj/machinery/power/rtg/abductor/blob_act(obj/effect/blob/B)
+/obj/machinery/power/rtg/abductor/blob_act(obj/structure/blob/B)
overload()
/obj/machinery/power/rtg/abductor/ex_act()
diff --git a/code/modules/power/singularity/containment_field.dm b/code/modules/power/singularity/containment_field.dm
index 152c256b2d5..6b3f4deb296 100644
--- a/code/modules/power/singularity/containment_field.dm
+++ b/code/modules/power/singularity/containment_field.dm
@@ -27,7 +27,7 @@
return 1
-/obj/machinery/field/containment/blob_act(obj/effect/blob/B)
+/obj/machinery/field/containment/blob_act(obj/structure/blob/B)
return 0
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index 18a44a73ff7..366bab4bad9 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -147,7 +147,7 @@ field_generator power level display
return 0
-/obj/machinery/field/generator/blob_act(obj/effect/blob/B)
+/obj/machinery/field/generator/blob_act(obj/structure/blob/B)
if(active)
return 0
else
diff --git a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
index a376041d55b..b8140b80a10 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_accelerator.dm
@@ -149,7 +149,7 @@
master.toggle_power()
investigate_log("was moved whilst active; it powered down.","singulo")
-/obj/structure/particle_accelerator/blob_act(obj/effect/blob/B)
+/obj/structure/particle_accelerator/blob_act(obj/structure/blob/B)
if(prob(50))
qdel(src)
diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm
index 3872b404183..e64d304c065 100644
--- a/code/modules/power/singularity/particle_accelerator/particle_control.dm
+++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm
@@ -320,7 +320,7 @@
..()
-/obj/machinery/particle_accelerator/control_box/blob_act(obj/effect/blob/B)
+/obj/machinery/particle_accelerator/control_box/blob_act(obj/structure/blob/B)
if(prob(50))
qdel(src)
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index 67833e0c461..2dda4c96dbb 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -63,7 +63,7 @@
/obj/singularity/Process_Spacemove() //The singularity stops drifting for no man!
return 0
-/obj/singularity/blob_act(obj/effect/blob/B)
+/obj/singularity/blob_act(obj/structure/blob/B)
return
/obj/singularity/ex_act(severity, target)
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index 6e3eda3027f..e20e68a1683 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -177,7 +177,7 @@
return ..()
-/obj/machinery/power/smes/deconstruction()
+/obj/machinery/power/smes/on_deconstruction()
for(var/obj/item/weapon/stock_parts/cell/cell in component_parts)
cell.charge = (charge / capacity) * cell.maxcharge
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 67c4e448213..d38b2a9c426 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -537,7 +537,7 @@
if(3)
take_damage(rand(10,20), BRUTE, 0)
-/obj/machinery/power/solar_control/blob_act(obj/effect/blob/B)
+/obj/machinery/power/solar_control/blob_act(obj/structure/blob/B)
if (prob(75))
set_broken()
src.density = 0
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index a6f99c390a8..28b0a7ef434 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -242,7 +242,7 @@
qdel(src)
return(gain)
-/obj/machinery/power/supermatter_shard/blob_act(obj/effect/blob/B)
+/obj/machinery/power/supermatter_shard/blob_act(obj/structure/blob/B)
if(B && !istype(loc, /turf/open/space)) //does nothing in space
playsound(get_turf(src), 'sound/effects/supermatter.ogg', 50, 1)
damage += B.health * 0.5 //take damage equal to 50% of remaining blob health before it tried to eat us
@@ -321,7 +321,7 @@
investigate_log("has consumed [key_name(user)].", "supermatter")
user.dust()
power += 200
- else if(isobj(AM) && (!istype(AM, /obj/effect) || istype(AM, /obj/effect/blob)))
+ else if(isobj(AM) && !istype(AM, /obj/effect))
investigate_log("has consumed [AM].", "supermatter")
qdel(AM)
diff --git a/code/modules/power/tesla/energy_ball.dm b/code/modules/power/tesla/energy_ball.dm
index 46d5f269e33..4f6fc7641b8 100644
--- a/code/modules/power/tesla/energy_ball.dm
+++ b/code/modules/power/tesla/energy_ball.dm
@@ -166,7 +166,7 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
var/mob/living/closest_mob
var/obj/machinery/closest_machine
var/obj/structure/closest_structure
- var/obj/effect/blob/closest_blob
+ var/obj/structure/blob/closest_blob
for(var/A in oview(source, zap_range+2))
if(istype(A, /obj/machinery/power/tesla_coil))
@@ -216,8 +216,8 @@ var/list/blacklisted_tesla_types = typecacheof(list(/obj/machinery/atmospherics,
else if(closest_mob)
continue
- else if(istype(A, /obj/effect/blob))
- var/obj/effect/blob/B = A
+ else if(istype(A, /obj/structure/blob))
+ var/obj/structure/blob/B = A
var/dist = get_dist(source, A)
if(dist <= zap_range && (dist < closest_dist || !closest_tesla_coil) && !B.being_shocked)
closest_blob = B
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index a44f99f2626..7279ec41475 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -84,7 +84,7 @@
if(severity < 3)
..()
-/obj/machinery/chem_dispenser/blob_act(obj/effect/blob/B)
+/obj/machinery/chem_dispenser/blob_act(obj/structure/blob/B)
if(prob(50))
qdel(src)
@@ -284,7 +284,7 @@
return
return ..()
-/obj/machinery/chem_dispenser/constructable/deconstruction()
+/obj/machinery/chem_dispenser/constructable/on_deconstruction()
if(beaker)
beaker.loc = loc
beaker = null
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 33daa476e62..aa4955e7ef1 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -68,7 +68,7 @@
return
return ..()
-/obj/machinery/chem_heater/deconstruction()
+/obj/machinery/chem_heater/on_deconstruction()
eject_beaker()
/obj/machinery/chem_heater/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = 0, \
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 54d2aa60b0b..07042c5e1ad 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -54,7 +54,7 @@
if(severity < 3)
..()
-/obj/machinery/chem_master/blob_act(obj/effect/blob/B)
+/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
if (prob(50))
qdel(src)
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index d63704dc71c..9fd265af203 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -292,7 +292,7 @@
else
return ..()
-/obj/machinery/computer/pandemic/deconstruction()
+/obj/machinery/computer/pandemic/on_deconstruction()
if(beaker)
beaker.loc = get_turf(src)
..()
\ No newline at end of file
diff --git a/code/modules/reagents/chemistry/reagents/blob_reagents.dm b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
index 7db4cb3c752..3c0e289f6da 100644
--- a/code/modules/reagents/chemistry/reagents/blob_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/blob_reagents.dm
@@ -25,22 +25,22 @@
return 0 //the dead, and blob mobs, don't cause reactions
return round(reac_volume * min(1.5 - touch_protection, 1), 0.1) //full touch protection means 50% volume, any prot below 0.5 means 100% volume.
-/datum/reagent/blob/proc/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause) //when the blob takes damage, do this
+/datum/reagent/blob/proc/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause) //when the blob takes damage, do this
return damage
-/datum/reagent/blob/proc/death_reaction(obj/effect/blob/B, cause) //when a blob dies, do this
+/datum/reagent/blob/proc/death_reaction(obj/structure/blob/B, cause) //when a blob dies, do this
return
-/datum/reagent/blob/proc/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T) //when the blob expands, do this
+/datum/reagent/blob/proc/expand_reaction(obj/structure/blob/B, obj/structure/blob/newB, turf/T) //when the blob expands, do this
return
-/datum/reagent/blob/proc/tesla_reaction(obj/effect/blob/B, power) //when the blob is hit by a tesla bolt, do this
+/datum/reagent/blob/proc/tesla_reaction(obj/structure/blob/B, power) //when the blob is hit by a tesla bolt, do this
return 1 //return 0 to ignore damage
-/datum/reagent/blob/proc/extinguish_reaction(obj/effect/blob/B) //when the blob is hit with water, do this
+/datum/reagent/blob/proc/extinguish_reaction(obj/structure/blob/B) //when the blob is hit with water, do this
return
-/datum/reagent/blob/proc/emp_reaction(obj/effect/blob/B, severity) //when the blob is hit with an emp, do this
+/datum/reagent/blob/proc/emp_reaction(obj/structure/blob/B, severity) //when the blob is hit with an emp, do this
return
//does brute damage but can replicate when damaged and has a chance of expanding again
@@ -59,19 +59,19 @@
reac_volume = ..()
M.apply_damage(0.7*reac_volume, BRUTE)
-/datum/reagent/blob/replicating_foam/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/replicating_foam/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
var/effectivedamage = damage
if(damage_type == BRUTE)
effectivedamage = damage * 2
if(damage_type == BURN && effectivedamage > 0 && original_health - effectivedamage > 0 && prob(60))
- var/obj/effect/blob/newB = B.expand(null, null, 0)
+ var/obj/structure/blob/newB = B.expand(null, null, 0)
if(newB)
newB.health = original_health - effectivedamage
newB.check_health(cause)
newB.update_icon()
return effectivedamage
-/datum/reagent/blob/replicating_foam/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T)
+/datum/reagent/blob/replicating_foam/expand_reaction(obj/structure/blob/B, obj/structure/blob/newB, turf/T)
if(prob(30))
newB.expand(null, null, 0) //do it again!
@@ -90,19 +90,19 @@
reac_volume = ..()
M.apply_damage(0.7*reac_volume, BRUTE)
-/datum/reagent/blob/shifting_fragments/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T)
- if(istype(B, /obj/effect/blob/normal) || (istype(B, /obj/effect/blob/shield) && prob(25)))
+/datum/reagent/blob/shifting_fragments/expand_reaction(obj/structure/blob/B, obj/structure/blob/newB, turf/T)
+ if(istype(B, /obj/structure/blob/normal) || (istype(B, /obj/structure/blob/shield) && prob(25)))
newB.forceMove(get_turf(B))
B.forceMove(T)
-/datum/reagent/blob/shifting_fragments/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/shifting_fragments/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(cause && damage > 0 && original_health - damage > 0 && prob(60-damage))
var/list/blobstopick = list()
- for(var/obj/effect/blob/OB in orange(1, B))
- if((istype(OB, /obj/effect/blob/normal) || (istype(OB, /obj/effect/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id)
+ for(var/obj/structure/blob/OB in orange(1, B))
+ if((istype(OB, /obj/structure/blob/normal) || (istype(OB, /obj/structure/blob/shield) && prob(25))) && OB.overmind && OB.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id)
blobstopick += OB //as long as the blob picked is valid; ie, a normal or shield blob that has the same chemical as we do, we can swap with it
if(blobstopick.len)
- var/obj/effect/blob/targeted = pick(blobstopick) //randomize the blob chosen, because otherwise it'd tend to the lower left
+ var/obj/structure/blob/targeted = pick(blobstopick) //randomize the blob chosen, because otherwise it'd tend to the lower left
var/turf/T = get_turf(targeted)
targeted.forceMove(get_turf(B))
B.forceMove(T) //swap the blobs
@@ -131,13 +131,13 @@
if(iscarbon(M))
M.emote("scream")
-/datum/reagent/blob/blazing_oil/extinguish_reaction(obj/effect/blob/B)
+/datum/reagent/blob/blazing_oil/extinguish_reaction(obj/structure/blob/B)
B.take_damage(rand(1, 3), BURN)
-/datum/reagent/blob/blazing_oil/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/blazing_oil/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(cause && damage_type == BURN)
for(var/turf/open/T in range(1, B))
- var/obj/effect/blob/C = locate() in T
+ var/obj/structure/blob/C = locate() in T
if(!(C && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) && prob(80))
PoolOrNew(/obj/effect/hotspot, T)
return ..()
@@ -200,7 +200,7 @@
O.add_points(points)
O << "Gained [points] resources from the zombification of [M]."
-/datum/reagent/blob/zombifying_pods/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/zombifying_pods/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(!isnull(cause) && damage <= 20 && original_health - damage <= 0 && prob(30)) //if the cause isn't fire or a bomb, the damage is less than 21, we're going to die from that damage, 20% chance of a shitty spore.
B.visible_message("A spore floats free of the blob!")
var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(B.loc)
@@ -209,7 +209,7 @@
B.overmind.blob_mobs.Add(BS)
return ..()
-/datum/reagent/blob/zombifying_pods/expand_reaction(obj/effect/blob/B, obj/effect/blob/newB, turf/T)
+/datum/reagent/blob/zombifying_pods/expand_reaction(obj/structure/blob/B, obj/structure/blob/newB, turf/T)
if(prob(10))
var/mob/living/simple_animal/hostile/blob/blobspore/weak/BS = new/mob/living/simple_animal/hostile/blob/blobspore/weak(T)
BS.overmind = B.overmind
@@ -236,16 +236,16 @@
if(M)
M.apply_damage(0.6*reac_volume, OXY)
-/datum/reagent/blob/energized_jelly/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/energized_jelly/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(!isnull(cause) && original_health - damage <= 0 && prob(10))
spark_system.set_up(rand(2, 4), 0, B)
spark_system.start()
return ..()
-/datum/reagent/blob/energized_jelly/tesla_reaction(obj/effect/blob/B, power)
+/datum/reagent/blob/energized_jelly/tesla_reaction(obj/structure/blob/B, power)
return 0
-/datum/reagent/blob/energized_jelly/emp_reaction(obj/effect/blob/B, severity)
+/datum/reagent/blob/energized_jelly/emp_reaction(obj/structure/blob/B, severity)
var/damage = rand(30, 50) - severity * rand(10, 15)
B.take_damage(damage, BURN)
@@ -278,7 +278,7 @@
else
M.apply_damage(0.6*reac_volume, BRUTE)
-/datum/reagent/blob/explosive_lattice/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/explosive_lattice/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(isnull(cause))
if(damage_type == BRUTE)
return 0 //no-sell the explosion we do not take damage
@@ -334,7 +334,7 @@
if(M)
M.apply_damage(reac_volume, BURN)
-/datum/reagent/blob/electromagnetic_web/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/electromagnetic_web/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(damage_type == BRUTE) //take full brute
switch(B.brute_resist)
if(0.5)
@@ -345,7 +345,7 @@
return damage * 10
return damage * 1.25 //a laser will do 25 damage, which will kill any normal blob
-/datum/reagent/blob/electromagnetic_web/death_reaction(obj/effect/blob/B, cause)
+/datum/reagent/blob/electromagnetic_web/death_reaction(obj/structure/blob/B, cause)
if(cause)
empulse(B.loc, 1, 3) //less than screen range, so you can stand out of range to avoid it
@@ -366,19 +366,19 @@
reac_volume = ..()
M.apply_damage(0.2*reac_volume, BRUTE)
if(M && reac_volume)
- for(var/obj/effect/blob/B in range(1, M)) //if the target is completely surrounded, this is 2.4*reac_volume bonus damage, total of 2.6*reac_volume
+ for(var/obj/structure/blob/B in range(1, M)) //if the target is completely surrounded, this is 2.4*reac_volume bonus damage, total of 2.6*reac_volume
if(M)
B.blob_attack_animation(M) //show them they're getting a bad time
M.apply_damage(0.3*reac_volume, BRUTE)
-/datum/reagent/blob/synchronous_mesh/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/synchronous_mesh/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(!isnull(cause)) //the cause isn't fire or bombs, so split the damage
var/damagesplit = 1 //maximum split is 9, reducing the damage each blob takes to 11% but doing that damage to 9 blobs
- for(var/obj/effect/blob/C in orange(1, B))
- if(!istype(C, /obj/effect/blob/core) && !istype(C, /obj/effect/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //if it doesn't have the same chemical or is a core or node, don't split damage to it
+ for(var/obj/structure/blob/C in orange(1, B))
+ if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //if it doesn't have the same chemical or is a core or node, don't split damage to it
damagesplit += 1
- for(var/obj/effect/blob/C in orange(1, B))
- if(!istype(C, /obj/effect/blob/core) && !istype(C, /obj/effect/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
+ for(var/obj/structure/blob/C in orange(1, B))
+ if(!istype(C, /obj/structure/blob/core) && !istype(C, /obj/structure/blob/node) && C.overmind && C.overmind.blob_reagent_datum.id == B.overmind.blob_reagent_datum.id) //only hurt blobs that have the same overmind chemical and aren't cores or nodes
C.take_damage(damage/damagesplit, CLONE, B, 0)
return damage / damagesplit
else
@@ -402,7 +402,7 @@
return 0 //the dead, and blob mobs, don't cause reactions
M.adjustBruteLoss(0.8*reac_volume)
-/datum/reagent/blob/reactive_spines/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/reactive_spines/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(damage && damage_type == BRUTE && original_health - damage > 0) //is there any damage, is it brute, and will we be alive
if(isliving(cause))
B.visible_message("The blob retaliates, lashing out!")
@@ -437,17 +437,17 @@
if(M)
M.adjustStaminaLoss(0.2*reac_volume)
-/datum/reagent/blob/pressurized_slime/damage_reaction(obj/effect/blob/B, original_health, damage, damage_type, cause)
+/datum/reagent/blob/pressurized_slime/damage_reaction(obj/structure/blob/B, original_health, damage, damage_type, cause)
if(cause || damage_type != BURN)
extinguisharea(B, damage)
return ..()
-/datum/reagent/blob/pressurized_slime/death_reaction(obj/effect/blob/B, cause)
+/datum/reagent/blob/pressurized_slime/death_reaction(obj/structure/blob/B, cause)
if(!isnull(cause))
B.visible_message("The blob ruptures, spraying the area with liquid!")
extinguisharea(B, 50)
-/datum/reagent/blob/pressurized_slime/proc/extinguisharea(obj/effect/blob/B, probchance)
+/datum/reagent/blob/pressurized_slime/proc/extinguisharea(obj/structure/blob/B, probchance)
for(var/turf/open/T in range(1, B))
if(prob(probchance))
T.MakeSlippery(min_wet_time = 10, wet_time_to_add = 5)
diff --git a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
index ce375b1d228..61aeb01946b 100644
--- a/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/medicine_reagents.dm
@@ -1058,6 +1058,26 @@ datum/reagent/medicine/syndicate_nanites/on_mob_life(mob/living/M)
..()
. = 1
+/datum/reagent/medicine/miningnanites
+ name = "Nanites"
+ id = "miningnanites"
+ description = "It's mining magic. We don't have to explain it."
+ color = "#C8A5DC" // rgb: 200, 165, 220
+ overdose_threshold = 3 //To prevent people stacking massive amounts of a very strong healing reagent
+ can_synth = 0
+
+/datum/reagent/medicine/miningnanites/on_mob_life(mob/living/M)
+ M.heal_bodypart_damage(5,5, 0)
+ ..()
+ . = 1
+
+/datum/reagent/medicine/miningnanites/overdose_process(mob/living/M)
+ M.adjustBruteLoss(3*REM, 0)
+ M.adjustFireLoss(3*REM, 0)
+ M.adjustToxLoss(3*REM, 0)
+ ..()
+ . = 1
+
//used for changeling's adrenaline power
/datum/reagent/medicine/changelingAdrenaline
name = "Adrenaline"
diff --git a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
index 2d344c1276e..e95cae5ea9b 100644
--- a/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
+++ b/code/modules/reagents/chemistry/reagents/toxin_reagents.dm
@@ -184,10 +184,10 @@
if(istype(O,/obj/structure/alien/weeds))
var/obj/structure/alien/weeds/alien_weeds = O
alien_weeds.take_damage(rand(15,35), BRUTE, 0) // Kills alien weeds pretty fast
- else if(istype(O,/obj/effect/glowshroom)) //even a small amount is enough to kill it
+ else if(istype(O,/obj/structure/glowshroom)) //even a small amount is enough to kill it
qdel(O)
- else if(istype(O,/obj/effect/spacevine))
- var/obj/effect/spacevine/SV = O
+ else if(istype(O,/obj/structure/spacevine))
+ var/obj/structure/spacevine/SV = O
SV.on_chem_effect(src)
/datum/reagent/toxin/plantbgone/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index c03dc50dbb2..b258903653e 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -128,11 +128,11 @@
/obj/item/weapon/reagent_containers/hypospray/medipen/survival
name = "survival medipen"
- desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. "
+ desc = "A medipen for surviving in the harshest of environments, heals and protects from environmental hazards. WARNING: Do not inject more than one pen in quick succession."
icon_state = "stimpen"
- volume = 82
- amount_per_transfer_from_this = 82
- list_reagents = list("nanites" = 2, "salbutamol" = 10, "coffee" = 20, "leporazine" = 20, "tricordrazine" = 15, "epinephrine" = 10, "omnizine" = 5, "stimulants" = 10)
+ volume = 57
+ amount_per_transfer_from_this = 57
+ list_reagents = list("salbutamol" = 10, "leporazine" = 15, "tricordrazine" = 15, "epinephrine" = 10, "miningnanites" = 2, "omnizine" = 5)
/obj/item/weapon/reagent_containers/hypospray/medipen/species_mutator
name = "species mutator medipen"
diff --git a/code/modules/reagents/reagent_dispenser.dm b/code/modules/reagents/reagent_dispenser.dm
index 5ed872fc0ff..962649807d4 100644
--- a/code/modules/reagents/reagent_dispenser.dm
+++ b/code/modules/reagents/reagent_dispenser.dm
@@ -25,7 +25,7 @@
else
return
-/obj/structure/reagent_dispensers/blob_act(obj/effect/blob/B)
+/obj/structure/reagent_dispensers/blob_act(obj/structure/blob/B)
if(prob(50))
boom()
@@ -63,7 +63,7 @@
if(tank_volume && istype(Proj) && !Proj.nodamage && ((Proj.damage_type == BURN) || (Proj.damage_type == BRUTE)))
boom()
-/obj/structure/reagent_dispensers/watertank/blob_act(obj/effect/blob/B)
+/obj/structure/reagent_dispensers/watertank/blob_act(obj/structure/blob/B)
if(prob(50))
PoolOrNew(/obj/effect/particle_effect/water, loc)
qdel(src)
@@ -93,7 +93,7 @@
explosion(get_turf(src), 0, 1, 5, flame_range = 5)
qdel(src)
-/obj/structure/reagent_dispensers/fueltank/blob_act(obj/effect/blob/B)
+/obj/structure/reagent_dispensers/fueltank/blob_act(obj/structure/blob/B)
boom()
/obj/structure/reagent_dispensers/fueltank/ex_act()
@@ -174,7 +174,7 @@
icon_state = "beer"
reagent_id = "beer"
-/obj/structure/reagent_dispensers/beerkeg/blob_act(obj/effect/blob/B)
+/obj/structure/reagent_dispensers/beerkeg/blob_act(obj/structure/blob/B)
explosion(src.loc,0,3,5,7,10)
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index 010a4105883..a235391790b 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -62,7 +62,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
T += M.rating
efficiency_coeff = 2 ** (T - 1) //Only 1 manipulator here, you're making runtimes Razharas
-/obj/machinery/r_n_d/circuit_imprinter/blob_act(obj/effect/blob/B)
+/obj/machinery/r_n_d/circuit_imprinter/blob_act(obj/structure/blob/B)
if (prob(50))
qdel(src)
@@ -76,7 +76,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return round(A / max(1, (all_materials[M]/efficiency_coeff)))
//we eject the materials upon deconstruction.
-/obj/machinery/r_n_d/circuit_imprinter/deconstruction()
+/obj/machinery/r_n_d/circuit_imprinter/on_deconstruction()
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
materials.retrieve_all()
diff --git a/code/modules/research/designs.dm b/code/modules/research/designs.dm
index 8b304469259..a532b35573d 100644
--- a/code/modules/research/designs.dm
+++ b/code/modules/research/designs.dm
@@ -39,6 +39,7 @@ other types of metals and chemistry for reagents).
var/list/category = null //Primarily used for Mech Fabricators, but can be used for anything
var/list/reagents_list = list() //List of reagents. Format: "id" = amount.
var/maxstack = 1
+ var/lathe_time_factor = 1 //How many times faster than normal is this to build on the protolathe
////////////////////////////////////////
diff --git a/code/modules/research/designs/stock_parts_designs.dm b/code/modules/research/designs/stock_parts_designs.dm
index 13188c91923..d849a1a95d4 100644
--- a/code/modules/research/designs/stock_parts_designs.dm
+++ b/code/modules/research/designs/stock_parts_designs.dm
@@ -32,6 +32,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/capacitor
category = list("Stock Parts","Machinery","initial")
+ lathe_time_factor = 0.2
/datum/design/adv_capacitor
name = "Advanced Capacitor"
@@ -42,6 +43,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 150)
build_path = /obj/item/weapon/stock_parts/capacitor/adv
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/super_capacitor
name = "Super Capacitor"
@@ -52,6 +54,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/super
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/quadratic_capacitor
name = "Quadratic Capacitor"
@@ -62,6 +65,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 100)
build_path = /obj/item/weapon/stock_parts/capacitor/quadratic
category = list("Stock Parts")
+ lathe_time_factor = 0.2
//Scanning modules
/datum/design/basic_scanning
@@ -73,6 +77,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/scanning_module
category = list("Stock Parts","Machinery","initial")
+ lathe_time_factor = 0.2
/datum/design/adv_scanning
name = "Advanced Scanning Module"
@@ -83,6 +88,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/scanning_module/adv
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/phasic_scanning
name = "Phasic Scanning Module"
@@ -93,6 +99,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_SILVER = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/phasic
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/triphasic_scanning
name = "Triphasic Scanning Module"
@@ -103,6 +110,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/scanning_module/triphasic
category = list("Stock Parts")
+ lathe_time_factor = 0.2
//Maipulators
/datum/design/micro_mani
@@ -114,6 +122,7 @@
materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/manipulator
category = list("Stock Parts","Machinery","initial")
+ lathe_time_factor = 0.2
/datum/design/nano_mani
name = "Nano Manipulator"
@@ -124,6 +133,7 @@
materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/manipulator/nano
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/pico_mani
name = "Pico Manipulator"
@@ -134,6 +144,7 @@
materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/manipulator/pico
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/femto_mani
name = "Femto Manipulator"
@@ -144,6 +155,7 @@
materials = list(MAT_METAL = 200, MAT_DIAMOND = 30, MAT_TITANIUM = 30)
build_path = /obj/item/weapon/stock_parts/manipulator/femto
category = list("Stock Parts")
+ lathe_time_factor = 0.2
//Micro-lasers
/datum/design/basic_micro_laser
@@ -155,6 +167,7 @@
materials = list(MAT_METAL = 100, MAT_GLASS = 50)
build_path = /obj/item/weapon/stock_parts/micro_laser
category = list("Stock Parts","Machinery","initial")
+ lathe_time_factor = 0.2
/datum/design/high_micro_laser
name = "High-Power Micro-Laser"
@@ -165,6 +178,7 @@
materials = list(MAT_METAL = 150, MAT_GLASS = 100)
build_path = /obj/item/weapon/stock_parts/micro_laser/high
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/ultra_micro_laser
name = "Ultra-High-Power Micro-Laser"
@@ -175,6 +189,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 150, MAT_URANIUM = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/ultra
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/quadultra_micro_laser
name = "Quad-Ultra Micro-Laser"
@@ -185,6 +200,7 @@
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_URANIUM = 100, MAT_DIAMOND = 60)
build_path = /obj/item/weapon/stock_parts/micro_laser/quadultra
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/basic_matter_bin
name = "Basic Matter Bin"
@@ -195,6 +211,7 @@
materials = list(MAT_METAL = 100)
build_path = /obj/item/weapon/stock_parts/matter_bin
category = list("Stock Parts","Machinery","initial")
+ lathe_time_factor = 0.2
/datum/design/adv_matter_bin
name = "Advanced Matter Bin"
@@ -205,6 +222,7 @@
materials = list(MAT_METAL = 150)
build_path = /obj/item/weapon/stock_parts/matter_bin/adv
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/super_matter_bin
name = "Super Matter Bin"
@@ -215,6 +233,7 @@
materials = list(MAT_METAL = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/super
category = list("Stock Parts")
+ lathe_time_factor = 0.2
/datum/design/bluespace_matter_bin
name = "Bluespace Matter Bin"
@@ -225,6 +244,7 @@
materials = list(MAT_METAL = 250, MAT_DIAMOND = 200)
build_path = /obj/item/weapon/stock_parts/matter_bin/bluespace
category = list("Stock Parts")
+ lathe_time_factor = 0.2
//T-Comms devices
/datum/design/subspace_ansible
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index 1b526830d0c..7f7c58186cf 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -76,7 +76,7 @@ Note: Must be placed west/left of and R&D console to function.
return round(A / max(1, (all_materials[M]*efficiency_coeff)))
//we eject the materials upon deconstruction.
-/obj/machinery/r_n_d/protolathe/deconstruction()
+/obj/machinery/r_n_d/protolathe/on_deconstruction()
for(var/obj/item/weapon/reagent_containers/glass/G in component_parts)
reagents.trans_to(G, G.reagents.maximum_volume)
materials.retrieve_all()
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 76a956259bf..7e06dc89b02 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -138,7 +138,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
updateUsrDialog()
-/obj/machinery/computer/rdconsole/deconstruction()
+/obj/machinery/computer/rdconsole/on_deconstruction()
if(linked_destroy)
linked_destroy.linked_console = null
linked_destroy = null
@@ -438,6 +438,9 @@ won't update every console in existence) but it's more of a hassle to do. Also,
linked_lathe.reagents.remove_reagent(R, being_built.reagents_list[R]*coeff)
var/P = being_built.build_path //lets save these values before the spawn() just in case. Nobody likes runtimes.
+
+ coeff *= being_built.lathe_time_factor
+
spawn(32*coeff*amount**0.8)
if(linked_lathe)
if(g2g) //And if we only fail the material requirements, we still spend time and power
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index e90dcb20412..339d468a7df 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -105,7 +105,7 @@
//we eject the loaded item when deconstructing the machine
-/obj/machinery/r_n_d/deconstruction()
+/obj/machinery/r_n_d/on_deconstruction()
if(loaded_item)
loaded_item.loc = loc
..()
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index e57becb8253..7545803b9e0 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -90,7 +90,7 @@
..()
-/obj/machinery/r_n_d/server/blob_act(obj/effect/blob/B)
+/obj/machinery/r_n_d/server/blob_act(obj/structure/blob/B)
griefProtection()
..()
@@ -129,7 +129,7 @@
air_update_turf()
//called when the server is deconstructed.
-/obj/machinery/r_n_d/server/deconstruction()
+/obj/machinery/r_n_d/server/on_deconstruction()
griefProtection()
..()
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 4dd4b3f0b3a..464609a046e 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -1,8 +1,8 @@
var/list/blacklisted_cargo_types = typecacheof(list(
/mob/living,
- /obj/effect/blob,
+ /obj/structure/blob,
/obj/effect/rune,
- /obj/effect/spider/spiderling,
+ /obj/structure/spider/spiderling,
/obj/item/weapon/disk/nuclear,
/obj/machinery/nuclearbomb,
/obj/item/device/radio/beacon,
diff --git a/code/modules/stock_market/computer.dm b/code/modules/stock_market/computer.dm
index 97a2bc983b1..91802bb473d 100644
--- a/code/modules/stock_market/computer.dm
+++ b/code/modules/stock_market/computer.dm
@@ -248,7 +248,7 @@ a.updated {
usr.machine = src
if (href_list["viewhistory"])
- var/datum/stock/S = locate(href_list["viewhistory"])
+ var/datum/stock/S = locate(href_list["viewhistory"]) in stockExchange.stocks
if (S)
S.displayValues(usr)
@@ -256,20 +256,15 @@ a.updated {
logged_in = null
if (href_list["buyshares"])
- var/datum/stock/S = locate(href_list["buyshares"])
+ var/datum/stock/S = locate(href_list["buyshares"]) in stockExchange.stocks
if (S)
buy_some_shares(S, usr)
if (href_list["sellshares"])
- var/datum/stock/S = locate(href_list["sellshares"])
+ var/datum/stock/S = locate(href_list["sellshares"]) in stockExchange.stocks
if (S)
sell_some_shares(S, usr)
- if (href_list["take"])
- var/datum/borrow/B = locate(href_list["take"])
- if (B && !B.lease_expires)
- do_borrowing_deal(B, usr)
-
if (href_list["show_logs"])
var/dat = "Stock Transaction LogsStock Transaction Logs
"
for(var/D in stockExchange.logs)
diff --git a/code/modules/zombie/items.dm b/code/modules/zombie/items.dm
index c2aa26041cd..40961cdb193 100644
--- a/code/modules/zombie/items.dm
+++ b/code/modules/zombie/items.dm
@@ -69,7 +69,7 @@
A.audible_message("You hear a loud metallic \
grinding sound.")
- addtimer(src, "growl", 20, unique=FALSE, user)
+ addtimer(src, "growl", 20, unique=FALSE, target=user)
if(do_after(user, delay=160, needhand=FALSE, target=A, progress=TRUE))
playsound(src.loc, 'sound/hallucinations/far_noise.ogg', 50, 1)
diff --git a/code/world.dm b/code/world.dm
index db19f30966c..97242e14e7e 100644
--- a/code/world.dm
+++ b/code/world.dm
@@ -198,6 +198,14 @@ var/last_irc_status = 0
world << "An admin has delayed the round end."
return
world << "Rebooting World in [delay/10] [delay > 10 ? "seconds" : "second"]. [reason]"
+ var/round_end_sound_sent = FALSE
+ if(ticker.round_end_sound)
+ round_end_sound_sent = TRUE
+ for(var/thing in clients)
+ var/client/C = thing
+ if (!C)
+ continue
+ C.Export("##action=load_rsc", ticker.round_end_sound)
sleep(delay)
if(blackbox)
blackbox.save_all_data_to_sql()
@@ -215,7 +223,7 @@ var/last_irc_status = 0
feedback_set_details("[feedback_c]","[feedback_r]")
log_game("Rebooting World. [reason]")
kick_clients_in_lobby("The round came to an end with you in the lobby.", 1) //second parameter ensures only afk clients are kicked
- #ifdef dellogging
+#ifdef dellogging
var/log = file("data/logs/del.log")
log << time2text(world.realtime)
for(var/index in del_counter)
@@ -223,12 +231,24 @@ var/last_irc_status = 0
if(count > 10)
log << "#[count]\t[index]"
#endif
- spawn(0)
+ var/soundwait = 0
+ if (ticker.round_end_sound && !round_end_sound_sent)
+ soundwait = 10
+ for(var/thing in clients)
+ var/client/C = thing
+ if (!C)
+ continue
+ C.Export("##action=load_rsc", ticker.round_end_sound)
+ spawn(soundwait/2)
if(ticker && ticker.round_end_sound)
world << sound(ticker.round_end_sound)
else
world << sound(pick('sound/AI/newroundsexy.ogg','sound/misc/apcdestroyed.ogg','sound/misc/bangindonk.ogg','sound/misc/leavingtg.ogg', 'sound/misc/its_only_game.ogg')) // random end sounds!! - LastyBatsy
- for(var/client/C in clients)
+ sleep(soundwait)
+ for(var/thing in clients)
+ var/client/C = thing
+ if (!C)
+ continue
if(config.server) //if you set a server location in config.txt, it sends you there instead of trying to reconnect to the same world address. -- NeoFite
C << link("byond://[config.server]")
..(0)
diff --git a/config/admins.txt b/config/admins.txt
index 46be5e597e5..8be65927ee9 100644
--- a/config/admins.txt
+++ b/config/admins.txt
@@ -119,3 +119,4 @@ Quiltyquilty = Game Master
SnipeDragon = Game Master
Fjeld = Game Master
kevinz000 = Game Master
+TrustyGun = Game Master
diff --git a/html/changelog.html b/html/changelog.html
index bd09936a871..2fc8987451f 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,52 @@
-->
+
28 September 2016
+
Cuboos updated:
+
+ - Removed the admin message spam from the smoke_spread proc. You may now vape in peace without the threat of a Blue Space Artillery
+
+
LanCartwright updated:
+
+ - Removed Stimulants and Coffee from survival pens.
+ - Nanites have been replaced with Mining Nanites which heal more when you are lower health, and do not have the ridiculous healing Adminorazine had.
+
+
+
27 September 2016
+
Cobby updated:
+
+ - Nanotrasen has buffed the electronic safety devices found in Secure Briefcases and Wallsafes, making them... well... more secure. In Particular, we added more wires that do absolutely nothing but hinder the use of the multitool, along with removing the ID slot only used by syndicates to emag the safe.
+
+
Incoming5643 updated:
+
+ - The secret satchels system has been updated to hide more smuggler's satchels hidden randomly under the station
+ - In case you forgot about the secret satchel system, basically if you take a smuggler's satchel (a traitor item also occasionally found under a random tile in the station [USE T-RAYS]), stow away an item in it, and bury it under the floor tiles that item can reappear in a random later round!
+
+
MrStonedOne updated:
+
+ - Custom Round end sounds selected by admins will be preloaded to all clients before actually rebooting the world
+
+
Shadowlight213 updated:
+
+ - Fixes broken icon states when replacing warning floor tile
+
+
Supermichael777 updated:
+
+ - Cat men have finally achieved equal discrimination.
+
+
TrustyGun+Pubby updated:
+
+ - Lawyers now have unique speech bubbles.
+
+
XDTM updated:
+
+ - Using plasma on dark blue slimes will now spawn freon instead of arbitrarily freezing mobs.
+
+
uraniummeltdown updated:
+
+ - Protolathe stock parts now build 5 times faster
+
+
26 September 2016
Cuboos updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6ced9198133..2e5523ab41a 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7245,3 +7245,38 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
fall to the floor.
oranges:
- rscadd: It looks like a pizza delivery from an un-named station got misplaced
+2016-09-27:
+ Cobby:
+ - tweak: Nanotrasen has buffed the electronic safety devices found in Secure Briefcases
+ and Wallsafes, making them... well... more secure. In Particular, we added more
+ wires that do absolutely nothing but hinder the use of the multitool, along
+ with removing the ID slot only used by syndicates to emag the safe.
+ Incoming5643:
+ - rscadd: The secret satchels system has been updated to hide more smuggler's satchels
+ hidden randomly under the station
+ - experiment: In case you forgot about the secret satchel system, basically if you
+ take a smuggler's satchel (a traitor item also occasionally found under a random
+ tile in the station [USE T-RAYS]), stow away an item in it, and bury it under
+ the floor tiles that item can reappear in a random later round!
+ MrStonedOne:
+ - tweak: Custom Round end sounds selected by admins will be preloaded to all clients
+ before actually rebooting the world
+ Shadowlight213:
+ - bugfix: Fixes broken icon states when replacing warning floor tile
+ Supermichael777:
+ - tweak: Cat men have finally achieved equal discrimination.
+ TrustyGun+Pubby:
+ - imageadd: Lawyers now have unique speech bubbles.
+ XDTM:
+ - tweak: Using plasma on dark blue slimes will now spawn freon instead of arbitrarily
+ freezing mobs.
+ uraniummeltdown:
+ - tweak: Protolathe stock parts now build 5 times faster
+2016-09-28:
+ Cuboos:
+ - bugfix: Removed the admin message spam from the smoke_spread proc. You may now
+ vape in peace without the threat of a Blue Space Artillery
+ LanCartwright:
+ - rscdel: Removed Stimulants and Coffee from survival pens.
+ - tweak: Nanites have been replaced with Mining Nanites which heal more when you
+ are lower health, and do not have the ridiculous healing Adminorazine had.
diff --git a/html/changelogs/AutoChangeLog-pr-20664.yml b/html/changelogs/AutoChangeLog-pr-20664.yml
deleted file mode 100644
index 8ba6f9a0f90..00000000000
--- a/html/changelogs/AutoChangeLog-pr-20664.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "XDTM"
-delete-after: True
-changes:
- - tweak: "Using plasma on dark blue slimes will now spawn freon instead of arbitrarily freezing mobs."
diff --git a/html/changelogs/AutoChangeLog-pr-20686.yml b/html/changelogs/AutoChangeLog-pr-20686.yml
deleted file mode 100644
index e3c38d5de30..00000000000
--- a/html/changelogs/AutoChangeLog-pr-20686.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-author: "Incoming5643"
-delete-after: True
-changes:
- - rscadd: "The secret satchels system has been updated to hide more smuggler's satchels hidden randomly under the station"
- - experiment: "In case you forgot about the secret satchel system, basically if you take a smuggler's satchel (a traitor item also occasionally found under a random tile in the station [USE T-RAYS]), stow away an item in it, and bury it under the floor tiles that item can reappear in a random later round!"
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 613fdf7e18b..15ad97a0700 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index fc596866750..299557c4613 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/talk.dmi b/icons/mob/talk.dmi
index 3b160b59174..05fe6f56236 100644
Binary files a/icons/mob/talk.dmi and b/icons/mob/talk.dmi differ
diff --git a/icons/obj/chemical.dmi b/icons/obj/chemical.dmi
index e7769484894..97f450831fa 100644
Binary files a/icons/obj/chemical.dmi and b/icons/obj/chemical.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 505eae306ab..f3edc5716e7 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 260540db932..bdbbef4c1f5 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/icons/turf/floors/warning.dmi b/icons/turf/floors/warning.dmi
deleted file mode 100644
index ece3f5a9e01..00000000000
Binary files a/icons/turf/floors/warning.dmi and /dev/null differ
diff --git a/tgstation.dme b/tgstation.dme
index f1bd42061ad..dbf30b18350 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -553,6 +553,7 @@
#include "code\game\objects\effects\anomalies.dm"
#include "code\game\objects\effects\bump_teleporter.dm"
#include "code\game\objects\effects\contraband.dm"
+#include "code\game\objects\effects\effects.dm"
#include "code\game\objects\effects\forcefields.dm"
#include "code\game\objects\effects\glowshroom.dm"
#include "code\game\objects\effects\landmarks.dm"