\icon[src] Sparks briefly jump out of \the [src], but it's disarmed!")
return
src.audible_message("\icon[src] [src] beeps, \"Enjoy the pizza!\"")
src.visible_message("\The [src] violently explodes!")
explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
qdel(src)
+
+/obj/item/device/pizza_bomb/attack_hand(mob/user)
+ if(loc == user || primed)
+ wires.Interact(user)
+ else
+ ..()
+
+
/obj/item/device/pizza_bomb/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/weapon/wirecutters) && primed)
- user << "Oh God, what wire do you cut?!"
- var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires
- if(!user.canUseTopic(src))
- return
- playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1)
- user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!")
- sleep(5)
- if(chosen_wire == correct_wire)
- src.audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.")
- user << "You did it!"
- icon_state = "pizzabox_bomb_[correct_wire]"
- name = "pizza bomb"
- desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed."
- disarmed = 1
- primed = 0
+ if(istype(I, /obj/item/weapon/wirecutters))
+ if(disarmed)
+ if(!in_range(user, src))
+ user << "You can't see the box well enough to cut the wires out!"
+ return
+ user.visible_message("[user] starts removing the payload and wires from \the [src].", "You start removing the payload and wires from \the [src]...")
+ if(do_after(user, 40, target = src))
+ playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1)
+ user.unEquip(src)
+ user.visible_message("[user] removes the insides of \the [src]!", "You remove the insides of \the [src].")
+ var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc)
+ C.amount = 3
+ new /obj/item/weapon/bombcore/miniature(src.loc)
+ new /obj/item/pizzabox(src.loc)
+ qdel(src)
return
else
- user << "WRONG WIRE!"
- go_boom()
+ attack_hand(user)
return
- if(istype(I, /obj/item/weapon/wirecutters) && disarmed)
- if(!in_range(user, src))
- user << "You can't see the box well enough to cut the wires out!"
- return
- user.visible_message("[user] starts removing the payload and wires from \the [src].", "You start removing the payload and wires from \the [src]...")
- if(do_after(user, 40, target = src))
- playsound(src, 'sound/items/Wirecutter.ogg', 50, 1, 1)
- user.unEquip(src)
- user.visible_message("[user] removes the insides of \the [src]!", "You remove the insides of \the [src].")
- var/obj/item/stack/cable_coil/C = new /obj/item/stack/cable_coil(src.loc)
- C.amount = 3
- new /obj/item/weapon/bombcore/miniature(src.loc)
- new /obj/item/pizzabox(src.loc)
- qdel(src)
+ if(istype(I, /obj/item/device/multitool))
+ attack_hand(user)
return
+
..()
/obj/item/device/pizza_bomb/New()
..()
- correct_wire = pick(wires)
+ wires = new(src)
+
+
+/obj/item/device/pizza_bomb/proc/disarm()
+ audible_message("\icon[src] \The [src] suddenly stops beeping and seems lifeless.")
+ icon_state = "pizzabox_bomb_[wires.GetColour(PIZZA_WIRE_DISARM)]"
+ name = "pizza bomb"
+ desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed."
+ disarmed = 1
+ primed = 0
+
+
+/obj/item/device/pizza_bomb/proc/arm()
+ name = "pizza bomb"
+ desc = "OH GOD THAT'S NOT A PIZZA"
+ icon_state = "pizzabox_bomb"
+ audible_message("\icon[src] *beep* *beep*")
+ primed = 1
+ sleep(timer)
+ return go_boom()
\ No newline at end of file
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 16769bb4b99..c4f2a7190e5 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -143,7 +143,7 @@ MASS SPECTROMETER
user << "\tSubject appears to have [M.getCloneLoss() > 30 ? "severe" : "minor"] cellular damage."
if (M.reagents && M.reagents.get_reagent_amount("epinephrine"))
user << "\tBloodstream analysis located [M.reagents:get_reagent_amount("epinephrine")] units of rejuvenation chemicals."
- if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/brain))
+ if (M.getBrainLoss() >= 100 || !M.getorgan(/obj/item/organ/internal/brain))
user << "\tSubject brain function is non-existant."
else if (M.getBrainLoss() >= 60)
user << "\tSevere brain damage detected. Subject likely to have mental retardation."
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index 63e9d3b2f72..e14aa1d859f 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -12,6 +12,14 @@
icon_state = "sheet-corgi"
origin_tech = null
+var/global/list/datum/stack_recipe/corgi_recipes = list ( \
+ new/datum/stack_recipe("corgi costume", /obj/item/clothing/suit/hooded/ian_costume, 3, on_floor = 1), \
+ )
+
+/obj/item/stack/sheet/animalhide/corgi/New(var/loc, var/amount=null)
+ recipes = corgi_recipes
+ return ..()
+
/obj/item/stack/sheet/animalhide/cat
name = "cat hide"
desc = "The by-product of cat farming."
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 6f5c2246562..4f92383cd30 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -99,10 +99,11 @@
singular_name = "astral carpet"
desc = "A piece of carpet with a convincing star pattern."
icon_state = "tile_space"
- amount = 30
turf_type = /turf/simulated/floor/fakespace
burn_state = 0 //Burnable
+/obj/item/stack/tile/fakespace/loaded
+ amount = 30
//High-traction
/obj/item/stack/tile/noslip
@@ -132,4 +133,4 @@
desc = "The ground you walk on." //Not the usual floor tile desc as that refers to throwing, Cyborgs can't do that - RR
materials = list() // All other Borg versions of items have no Metal or Glass - RR
is_cyborg = 1
- cost = 125
\ No newline at end of file
+ cost = 125
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index 8a0c26f1b1e..b5ffd7faa7a 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -26,17 +26,44 @@ RCD
var/max_matter = 160
var/working = 0
var/mode = 1
- var/canRwall = 0
+ var/canRturf = 0
var/disabled = 0
var/airlock_type = /obj/machinery/door/airlock
var/advanced_airlock_setting = 1 //Set to 1 if you want more paintjobs available
var/sheetmultiplier = 4 //Controls the amount of matter added for each glass/metal sheet, triple for plasteel
+ var/plasteelmultiplier = 3 //Plasteel is worth 3 times more than glass or metal
var/list/conf_access = null
var/use_one_access = 0 //If the airlock should require ALL or only ONE of the listed accesses.
var/last_configurator = null
var/locked = 1
+ /* Construction costs */
+
+ var/wallcost = 16
+ var/floorcost = 2
+ var/grillecost = 4
+ var/windowcost = 8
+ var/airlockcost = 16
+ var/deconwallcost = 26
+ var/deconfloorcost = 33
+ var/decongrillecost = 4
+ var/deconwindowcost = 8
+ var/deconairlockcost = 32
+
+ /* Build delays (deciseconds) */
+
+ var/walldelay = 20
+ var/floordelay = null //space wind's a bitch
+ var/grilledelay = 40
+ var/windowdelay = 40
+ var/airlockdelay = 50
+ var/deconwalldelay = 40
+ var/deconfloordelay = 50
+ var/decongrilledelay = null //as rapid as wirecutters
+ var/deconwindowdelay = 50
+ var/deconairlockdelay = 50
+
/obj/item/weapon/rcd/verb/change_airlock_access()
set name = "Change Airlock Access"
set category = "Object"
@@ -199,7 +226,7 @@ RCD
/obj/item/weapon/rcd/New()
- desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
+ desc = "An RCD. It currently holds [matter]/[max_matter] matter-units."
src.spark_system = new /datum/effect/effect/system/spark_spread
spark_system.set_up(5, 0, src)
spark_system.attach(src)
@@ -230,7 +257,7 @@ RCD
else if(istype(W, /obj/item/stack/sheet/metal) || istype(W, /obj/item/stack/sheet/glass))
loaded = loadwithsheets(W, sheetmultiplier, user)
else if(istype(W, /obj/item/stack/sheet/plasteel))
- loaded = loadwithsheets(W, 3*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal
+ loaded = loadwithsheets(W, plasteelmultiplier*sheetmultiplier, user) //Plasteel is worth 3 times more than glass or metal
if(loaded)
user << "The RCD now holds [matter]/[max_matter] matter-units."
desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
@@ -294,7 +321,7 @@ RCD
if(1)
if(istype(A, /turf/space))
var/turf/space/S = A
- if(useResource(1, user))
+ if(useResource(floorcost, user))
user << "You start building floor..."
activate()
S.ChangeTurf(/turf/simulated/floor/plating)
@@ -303,11 +330,11 @@ RCD
if(istype(A, /turf/simulated/floor))
var/turf/simulated/floor/F = A
- if(checkResource(3, user))
+ if(checkResource(wallcost, user))
user << "You start building wall..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 20, target = A))
- if(!useResource(3, user)) return 0
+ if(do_after(user, walldelay, target = A))
+ if(!useResource(wallcost, user)) return 0
activate()
F.ChangeTurf(/turf/simulated/wall)
return 1
@@ -315,7 +342,7 @@ RCD
if(2)
if(istype(A, /turf/simulated/floor))
- if(checkResource(10, user))
+ if(checkResource(airlockcost, user))
var/door_check = 1
for(var/obj/machinery/door/D in A)
if(!D.sub_door)
@@ -325,8 +352,8 @@ RCD
if(door_check)
user << "You start building airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50, target = A))
- if(!useResource(10, user)) return 0
+ if(do_after(user, airlockdelay, target = A))
+ if(!useResource(airlockcost, user)) return 0
activate()
var/obj/machinery/door/airlock/T = new airlock_type( A )
@@ -345,7 +372,7 @@ RCD
if(!T.checkForMultipleDoors())
qdel(T)
- useResource(-10, user)
+ useResource(-airlockcost, user)
return 0
T.autoclose = 1
return 1
@@ -358,13 +385,13 @@ RCD
if(3)
if(istype(A, /turf/simulated/wall))
var/turf/simulated/wall/W = A
- if(istype(W, /turf/simulated/wall/r_wall) && !canRwall)
+ if(istype(W, /turf/simulated/wall/r_wall) && !canRturf)
return 0
- if(checkResource(5, user))
+ if(checkResource(deconwallcost, user))
user << "You start deconstructing wall..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 40, target = A))
- if(!useResource(5, user)) return 0
+ if(do_after(user, deconwalldelay, target = A))
+ if(!useResource(deconwallcost, user)) return 0
activate()
W.ChangeTurf(/turf/simulated/floor/plating)
return 1
@@ -372,63 +399,64 @@ RCD
if(istype(A, /turf/simulated/floor))
var/turf/simulated/floor/F = A
+ if(istype(F, /turf/simulated/floor/engine) && !canRturf)
+ return 0
if(istype(F, F.baseturf))
user << "You can't dig any deeper!"
return 0
- else if(checkResource(5, user))
+ else if(checkResource(deconfloorcost, user))
user << "You start deconstructing floor..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50, target = A))
- if(!useResource(5, user)) return 0
+ if(do_after(user, deconfloordelay, target = A))
+ if(!useResource(deconfloorcost, user)) return 0
activate()
F.ChangeTurf(F.baseturf)
return 1
return 0
if(istype(A, /obj/machinery/door/airlock))
- if(checkResource(20, user))
+ if(checkResource(deconairlockcost, user))
user << "You start deconstructing airlock..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50, target = A))
- if(!useResource(20, user)) return 0
+ if(do_after(user, deconairlockdelay, target = A))
+ if(!useResource(deconairlockcost, user)) return 0
activate()
qdel(A)
return 1
return 0
if(istype(A, /obj/structure/window))
- if(checkResource(5, user))
+ if(checkResource(deconwindowcost, user))
user << "You start deconstructing the window..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50, target = A))
- if(!useResource(5, user)) return 0
+ if(do_after(user, deconwindowdelay, target = A))
+ if(!useResource(deconwindowcost, user)) return 0
activate()
qdel(A)
return 1
return 0
if(istype(A, /obj/structure/grille))
- if(checkResource(5, user))
- user << "You start deconstructing the grille..."
- playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50, target = A))
- if(!useResource(5, user)) return 0
+ var/obj/structure/grille/G = A
+ if(!G.shock(user, 90)) //if it's shocked, try to shock them
+ if(useResource(decongrillecost, user))
+ user << "You start deconstructing the grille..."
activate()
+ playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
qdel(A)
return 1
- return 0
- return 0
+ return 0
if (4)
if(istype(A, /turf/simulated/floor))
- if(checkResource(5, user))
+ if(checkResource(grillecost, user))
for(var/obj/structure/grille/GRILLE in A)
user << "There is already a grille there!"
return 0
user << "You start building a grille..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 40, target = A))
- if(!useResource(5, user)) return 0
+ if(do_after(user, grilledelay, target = A))
+ if(!useResource(grillecost, user)) return 0
activate()
var/obj/structure/grille/G = new/obj/structure/grille(A)
G.anchored = 1
@@ -436,12 +464,12 @@ RCD
return 0
return 0
if(istype(A, /obj/structure/grille))
- if(checkResource(5, user))
+ if(checkResource(windowcost, user))
user << "You start building a window..."
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 40, target = A))
+ if(do_after(user, windowdelay, target = A))
if(locate(/obj/structure/window) in A.loc) return 0
- if(!useResource(5, user)) return 0
+ if(!useResource(windowcost, user)) return 0
activate()
var/obj/structure/window/WD = new/obj/structure/window/fulltile(A.loc)
WD.anchored = 1
@@ -457,7 +485,7 @@ RCD
if(matter < amount)
return 0
matter -= amount
- desc = "A RCD. It currently holds [matter]/[max_matter] matter-units."
+ desc = "An RCD. It currently holds [matter]/[max_matter] matter-units."
return 1
/obj/item/weapon/rcd/proc/checkResource(amount, mob/user)
@@ -474,8 +502,8 @@ RCD
/obj/item/weapon/rcd/borg/New()
..()
- desc = "A device used to rapidly build walls/floor."
- canRwall = 1
+ desc = "A device used to rapidly build walls and floors."
+ canRturf = 1
/obj/item/weapon/rcd/loaded
matter = 160
@@ -484,7 +512,7 @@ RCD
name = "combat RCD"
max_matter = 500
matter = 500
- canRwall = 1
+ canRturf = 1
/obj/item/weapon/rcd_ammo
name = "compressed matter cartridge"
@@ -496,8 +524,8 @@ RCD
density = 0
anchored = 0.0
origin_tech = "materials=2"
- materials = list(MAT_METAL=16000, MAT_GLASS=8000)
- var/ammoamt = 20
+ materials = list(MAT_METAL=3000, MAT_GLASS=2000)
+ var/ammoamt = 40
/obj/item/weapon/rcd_ammo/large
- ammoamt = 100
\ No newline at end of file
+ ammoamt = 160
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/RPD.dm b/code/game/objects/items/weapons/RPD.dm
index 91c8e9cc2b9..ea570f4257e 100644
--- a/code/game/objects/items/weapons/RPD.dm
+++ b/code/game/objects/items/weapons/RPD.dm
@@ -5,7 +5,7 @@ CONTAINS:
RPD
*/
#define PIPE_BINARY 0
-#define PIPE_BENT 1
+#define PIPE_BENDABLE 1
#define PIPE_TRINARY 2
#define PIPE_TRIN_M 3
#define PIPE_UNARY 4
@@ -24,14 +24,14 @@ RPD
var/id=-1
var/categoryId = CATEGORY_ATMOS
var/dir=SOUTH
- var/dirtype=PIPE_BINARY
+ var/dirtype = PIPE_BENDABLE
var/icon = 'icons/obj/atmospherics/pipes/pipe_item.dmi'
var/icon_state=""
var/selected=0
/datum/pipe_info/New(pid,direction,dt)
src.id=pid
- src.icon_state=pipeID2State[pid+1]
+ src.icon_state=pipeID2State["[pid]"]
src.dir=direction
src.dirtype=dt
@@ -81,8 +81,8 @@ var/global/list/disposalpipeID2State=list(
//find these defines in code\game\machinery\pipe\consruction.dm
var/global/list/RPD_recipes=list(
"Regular Pipes" = list(
- "Pipe" = new /datum/pipe_info(PIPE_SIMPLE_STRAIGHT, 1, PIPE_BINARY),
- "Bent Pipe" = new /datum/pipe_info(PIPE_SIMPLE_BENT, 5, PIPE_BENT),
+ "Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 1, PIPE_BENDABLE),
+ //"Bent Pipe" = new /datum/pipe_info(PIPE_SIMPLE, 5, PIPE_BENT),
"Manifold" = new /datum/pipe_info(PIPE_MANIFOLD, 1, PIPE_TRINARY),
"Manual Valve" = new /datum/pipe_info(PIPE_MVALVE, 1, PIPE_BINARY),
"Digital Valve" = new /datum/pipe_info(PIPE_DVALVE, 1, PIPE_BINARY),
@@ -101,19 +101,19 @@ var/global/list/RPD_recipes=list(
// "Injector" = new /datum/pipe_info(PIPE_INJECTOR, 1, PIPE_UNARY),
),
"Heat Exchange" = list(
- "Pipe" = new /datum/pipe_info(PIPE_HE_STRAIGHT, 1, PIPE_BINARY),
- "Bent Pipe" = new /datum/pipe_info(PIPE_HE_BENT, 5, PIPE_BENT),
+ "Pipe" = new /datum/pipe_info(PIPE_HE, 1, PIPE_BENDABLE),
+ //"Bent Pipe" = new /datum/pipe_info(PIPE_HE, 5, PIPE_BENT),
"Junction" = new /datum/pipe_info(PIPE_JUNCTION, 1, PIPE_UNARY),
"Heat Exchanger" = new /datum/pipe_info(PIPE_HEAT_EXCHANGE, 1, PIPE_UNARY),
),
"Disposal Pipes" = list(
"Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_STRAIGHT, PIPE_BINARY),
"Bent Pipe" = new /datum/pipe_info/disposal(DISP_PIPE_BENT, PIPE_TRINARY),
- "Junction" = new /datum/pipe_info/disposal(DISP_JUNCTION, PIPE_TRINARY),
+ "Junction" = new /datum/pipe_info/disposal(DISP_JUNCTION, PIPE_TRINARY),
"Y-Junction" = new /datum/pipe_info/disposal(DISP_YJUNCTION, PIPE_TRINARY),
"Trunk" = new /datum/pipe_info/disposal(DISP_END_TRUNK, PIPE_TRINARY),
- "Bin" = new /datum/pipe_info/disposal(DISP_END_BIN, PIPE_QUAD),
- "Outlet" = new /datum/pipe_info/disposal(DISP_END_OUTLET, PIPE_UNARY),
+ "Bin" = new /datum/pipe_info/disposal(DISP_END_BIN, PIPE_QUAD),
+ "Outlet" = new /datum/pipe_info/disposal(DISP_END_OUTLET, PIPE_UNARY),
"Chute" = new /datum/pipe_info/disposal(DISP_END_CHUTE, PIPE_UNARY),
"Sort Junction" = new /datum/pipe_info/disposal(DISP_SORTJUNCTION, PIPE_TRINARY),
)
@@ -261,14 +261,20 @@ var/global/list/RPD_recipes=list(
↔
"}
- if(PIPE_BENT) // Bent, N-W, N-E etc
+
+ if(PIPE_BENDABLE) // Bent, N-W, N-E etc
if(preview)
+ user << browse_rsc(new /icon(preview, dir=NORTH), "vertical.png")
+ user << browse_rsc(new /icon(preview, dir=EAST), "horizontal.png")
user << browse_rsc(new /icon(preview, dir=NORTHWEST), "nw.png")
user << browse_rsc(new /icon(preview, dir=NORTHEAST), "ne.png")
user << browse_rsc(new /icon(preview, dir=SOUTHWEST), "sw.png")
user << browse_rsc(new /icon(preview, dir=SOUTHEAST), "se.png")
dirsel += ""
+ dirsel += render_dir_img(1,"vertical.png","Vertical")
+ dirsel += render_dir_img(4,"horizontal.png","Horizontal")
+ dirsel += "
"
dirsel += render_dir_img(9,"nw.png","West to North")
dirsel += render_dir_img(5,"ne.png","North to East")
dirsel += "
"
@@ -278,6 +284,9 @@ var/global/list/RPD_recipes=list(
else
dirsel+={"
+ ↕
+ ↔
+
╝
╚
@@ -349,7 +358,7 @@ var/global/list/RPD_recipes=list(
╠
"}
- if(PIPE_UNARY) // Unary
+ if(PIPE_UNARY) // Stuff with four directions - includes pumps etc.
if(preview)
user << browse_rsc(new /icon(preview, dir=NORTH), "n.png")
user << browse_rsc(new /icon(preview, dir=EAST), "e.png")
@@ -471,7 +480,7 @@ var/global/list/RPD_recipes=list(
show_menu(usr)
if(href_list["makepipe"])
- p_type = text2num(href_list["makepipe"])
+ p_type = text2path(href_list["makepipe"])
p_dir = text2num(href_list["dir"])
p_conntype = text2num(href_list["type"])
p_class = ATMOS_MODE
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 5266cb9077e..7f5e121e441 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -361,11 +361,13 @@
return
if(user.zone_sel && user.zone_sel.selecting == "chest")
if(!defib.safety && user.a_intent == "harm")
- user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You overcharge the paddles and begin to place them onto [M]'s chest...")
+ user.visible_message("[user] begins to place [src] on [M.name]'s chest.",
+ "You overcharge the paddles and begin to place them onto [M]'s chest...")
busy = 1
update_icon()
if(do_after(user, 30, target = M))
- user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest and begin to charge them.")
+ user.visible_message("[user] places [src] on [M.name]'s chest.",
+ "You place [src] on [M.name]'s chest and begin to charge them.")
var/turf/T = get_turf(defib)
playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
T.audible_message("\The [defib] lets out an urgent beep and lets out a steadily rising hum...")
@@ -384,7 +386,8 @@
if(!HU.heart_attack)
HU.heart_attack = 1
if(!HU.stat)
- HU.visible_message("[M] thrashes wildly, clutching at their chest!", "You feel a horrible agony in your chest!")
+ HU.visible_message("[M] thrashes wildly, clutching at their chest!",
+ "You feel a horrible agony in your chest!")
HU.apply_damage(50, BURN, "chest")
add_logs(user, M, "overloaded the heart of", defib)
M.Weaken(5)
@@ -427,7 +430,22 @@
total_brute = H.getBruteLoss()
total_burn = H.getFireLoss()
- if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !H.get_ghost() && tplus < tlimit && !(NOCLONE in H.mutations))
+ var/failed = null
+
+ if (H.suiciding || (NOCLONE in H.mutations))
+ failed = "[defib] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile."
+ else if ((tplus > tlimit) || !H.getorgan(/obj/item/organ/internal/heart))
+ failed = "[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return. Further attempts futile."
+ else if(total_burn >= 180 || total_brute >= 180)
+ failed = "[defib] buzzes: Resuscitation failed - Severe tissue damage makes recovery of patient impossible via defibrillator. Further attempts futile."
+ else if(H.get_ghost() || !H.getorgan(/obj/item/organ/internal/brain))
+ failed = "[defib] buzzes: Resuscitation failed - No activity in patient's brain. Further attempts may be successful."
+
+
+ if(failed)
+ user.visible_message(failed)
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
+ else
//If the body has been fixed so that they would not be in crit when defibbed, give them oxyloss to put them back into crit
if (H.health > halfwaycritdeath)
H.adjustOxyLoss(H.health - halfwaycritdeath)
@@ -446,19 +464,8 @@
H.emote("gasp")
if(tplus > tloss)
H.setBrainLoss( max(0, min(99, ((tlimit - tplus) / tlimit * 100))))
- defib.deductcharge(revivecost)
add_logs(user, M, "revived", defib)
- else
- if (H.suiciding || (NOCLONE in H.mutations))
- user.visible_message("[defib] buzzes: Resuscitation failed - Recovery of patient impossible. Further attempts futile.")
- else if (tplus > tlimit)
- user.visible_message("[defib] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation. Further attempts futile.")
- else if(total_burn >= 180 || total_brute >= 180)
- user.visible_message("[defib] buzzes: Resuscitation failed - Severe tissue damage detected.")
- else
- user.visible_message("[defib] buzzes: Resuscitation failed - No soul in patient body. Further attempts may be successful.")
- playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
- defib.deductcharge(revivecost)
+ defib.deductcharge(revivecost)
update_icon()
cooldown = 1
defib.cooldowncheck(user)
@@ -473,4 +480,4 @@
update_icon()
else
user << "You need to target your patient's chest with [src]!"
- return
\ No newline at end of file
+ return
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm
index 719666b47b2..58baba89092 100644
--- a/code/game/objects/items/weapons/implants/implant_explosive.dm
+++ b/code/game/objects/items/weapons/implants/implant_explosive.dm
@@ -3,7 +3,7 @@
desc = "And boom goes the weasel."
icon_state = "explosive"
origin_tech = "materials=2;combat=3;biotech=4;syndicate=4"
- var/weak = 1.6
+ var/weak = 2
var/medium = 0.8
var/heavy = 0.4
var/delay = 7
@@ -42,7 +42,7 @@
/obj/item/weapon/implant/explosive/implant(mob/source)
var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source
- if(imp_e)
+ if(imp_e && imp_e != src)
imp_e.heavy += heavy
imp_e.medium += medium
imp_e.weak += weak
@@ -89,10 +89,10 @@
/obj/item/weapon/implant/explosive/macro/implant(mob/source)
var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source
- if(imp_e)
+ if(imp_e && imp_e != src)
return 0
imp_e = locate(/obj/item/weapon/implant/explosive) in source
- if(imp_e)
+ if(imp_e && imp_e != src)
heavy += imp_e.heavy
medium += imp_e.medium
weak += imp_e.weak
diff --git a/code/game/objects/items/weapons/implants/implant_loyality.dm b/code/game/objects/items/weapons/implants/implant_loyality.dm
index 3751cd63343..f5ad7e7ec11 100644
--- a/code/game/objects/items/weapons/implants/implant_loyality.dm
+++ b/code/game/objects/items/weapons/implants/implant_loyality.dm
@@ -21,13 +21,13 @@
if(..())
if((target.mind in (ticker.mode.head_revolutionaries | ticker.mode.get_gang_bosses())) || is_shadow_or_thrall(target))
target.visible_message("[target] seems to resist the implant!", "You feel the corporate tendrils of Nanotrasen try to invade your mind!")
- imp_in = null
+ removed(target, 1)
qdel(src)
return -1
if(target.mind in ticker.mode.get_gangsters())
ticker.mode.remove_gangster(target.mind)
target.visible_message("[src] was destroyed in the process!", "You feel a surge of loyalty towards Nanotrasen.")
- imp_in = null
+ removed(target, 1)
qdel(src)
return -1
if(target.mind in ticker.mode.revolutionaries)
@@ -39,9 +39,9 @@
return 1
return 0
-/obj/item/weapon/implant/loyalty/removed(mob/target)
+/obj/item/weapon/implant/loyalty/removed(mob/target, var/silent = 0)
if(..())
- if(target.stat != DEAD)
+ if(target.stat != DEAD && !silent)
target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
return 1
return 0
diff --git a/code/game/objects/items/weapons/implants/implant_storage.dm b/code/game/objects/items/weapons/implants/implant_storage.dm
new file mode 100644
index 00000000000..e498513f7f9
--- /dev/null
+++ b/code/game/objects/items/weapons/implants/implant_storage.dm
@@ -0,0 +1,51 @@
+/obj/item/weapon/storage/internal/implant
+ name = "bluespace pocket"
+ max_w_class = 3
+ max_combined_w_class = 6
+ cant_hold = list(/obj/item/weapon/disk/nuclear)
+ silent = 1
+
+
+/obj/item/weapon/implant/storage
+ name = "storage implant"
+ desc = "Stores up to two big items in a bluespace pocket."
+ icon_state = "storage"
+ origin_tech = "materials=2;magnets=4;bluespace=4;syndicate=4"
+ item_color = "r"
+ var/obj/item/weapon/storage/internal/implant/storage
+
+/obj/item/weapon/implant/storage/New()
+ ..()
+ storage = new /obj/item/weapon/storage/internal/implant(src)
+
+/obj/item/weapon/implant/storage/activate()
+ storage.MouseDrop(imp_in)
+
+/obj/item/weapon/implant/storage/removed(source)
+ if(..())
+ storage.close_all()
+ for(var/obj/item/I in storage)
+ storage.remove_from_storage(I, get_turf(source))
+ return 1
+
+/obj/item/weapon/implant/storage/implant(mob/source)
+ var/obj/item/weapon/implant/storage/imp_e = locate(src.type) in source
+ if(imp_e)
+ imp_e.storage.storage_slots += storage.storage_slots
+ imp_e.storage.max_combined_w_class += storage.max_combined_w_class
+ imp_e.storage.contents += storage.contents
+
+ storage.close_all()
+ storage.show_to(source)
+
+ qdel(src)
+ return 1
+
+ return ..()
+
+/obj/item/weapon/implanter/storage
+ name = "implanter (storage)"
+
+/obj/item/weapon/implanter/storage/New()
+ imp = new /obj/item/weapon/implant/storage(src)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index b38dbaea378..d6644f1c886 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -83,3 +83,11 @@
/obj/item/weapon/implantcase/weapons_auth/New()
imp = new /obj/item/weapon/implant/weapons_auth(src)
..()
+
+/obj/item/weapon/implantcase/adrenaline
+ name = "implant case - 'Adrenaline'"
+ desc = "A glass case containing an adrenaline implant."
+
+/obj/item/weapon/implantcase/adrenaline/New()
+ imp = new /obj/item/weapon/implant/adrenalin(src)
+ ..()
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index b19bb66d995..3ccea8aee20 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/code/game/objects/items/weapons/implants/implantuplink.dm
@@ -12,7 +12,7 @@
/obj/item/weapon/implant/uplink/implant(mob/source)
var/obj/item/weapon/implant/imp_e = locate(src.type) in source
- if(imp_e)
+ if(imp_e && imp_e != src)
imp_e.hidden_uplink.uses += hidden_uplink.uses
qdel(src)
return 1
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 84b158e9e4b..ecb03b97266 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -18,6 +18,7 @@
slot_flags = SLOT_BACK //ERROOOOO
max_w_class = 3
max_combined_w_class = 21
+ storage_slots = 21
burn_state = 0 //Burnable
burntime = 20
@@ -109,7 +110,6 @@
icon_state = "giftbag0"
item_state = "giftbag"
w_class = 4.0
- storage_slots = 20 //Can store a lot.
max_w_class = 3
max_combined_w_class = 60
@@ -270,7 +270,6 @@
desc = "A very slim satchel that can easily fit into tight spaces."
icon_state = "satchel-flat"
w_class = 3 //Can fit in backpacks itself.
- storage_slots = 5
max_combined_w_class = 15
level = 1
cant_hold = list(/obj/item/weapon/storage/backpack/satchel_flat) //muh recursive backpacks
@@ -292,31 +291,37 @@
/obj/item/weapon/storage/backpack/dufflebag
name = "dufflebag"
- desc = "A large dufflebag for holding extra things"
+ desc = "A large dufflebag for holding extra things."
icon_state = "duffle"
item_state = "duffle"
- storage_slots = 9
slowdown = 1
- max_combined_w_class = 27
+ max_combined_w_class = 30
-/obj/item/weapon/storage/backpack/dufflebag/syndiemed
+/obj/item/weapon/storage/backpack/dufflebag/syndie
+ name = "suspicious looking dufflebag"
+ desc = "A large dufflebag for holding extra tactical supplies."
+ icon_state = "duffle-syndie"
+ item_state = "duffle-syndiemed"
+ origin_tech = "syndicate=1"
+ silent = 1
+ slowdown = 0
+
+/obj/item/weapon/storage/backpack/dufflebag/syndie/med
name = "medical dufflebag"
desc = "A large dufflebag for holding extra tactical medical supplies."
icon_state = "duffle-syndiemed"
item_state = "duffle-syndiemed"
- slowdown = 0
-/obj/item/weapon/storage/backpack/dufflebag/syndieammo
+/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo
name = "ammunition dufflebag"
desc = "A large dufflebag for holding extra weapons ammunition and supplies."
icon_state = "duffle-syndieammo"
item_state = "duffle-syndieammo"
- slowdown = 0
-/obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded
+/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/loaded
desc = "A large dufflebag, packed to the brim with Bulldog shotgun ammo."
-/obj/item/weapon/storage/backpack/dufflebag/syndieammo/loaded/New()
+/obj/item/weapon/storage/backpack/dufflebag/syndie/ammo/loaded/New()
..()
contents = list()
new /obj/item/ammo_box/magazine/m12g(src)
@@ -330,14 +335,13 @@
new /obj/item/ammo_box/magazine/m12g/dragon(src)
return
-/obj/item/weapon/storage/backpack/dufflebag/syndiesurgery
- name = "Syndicate surgery dufflebag"
- desc = "A menacingly looking dufflebag for holding surgery tools."
+/obj/item/weapon/storage/backpack/dufflebag/syndie/surgery
+ name = "surgery dufflebag"
+ desc = "A suspicious looking dufflebag for holding surgery tools."
icon_state = "duffle-syndiemed"
item_state = "duffle-syndiemed"
- storage_slots = 10
-/obj/item/weapon/storage/backpack/dufflebag/syndiesurgery/New()
+/obj/item/weapon/storage/backpack/dufflebag/syndie/surgery/New()
..()
contents = list()
new /obj/item/weapon/scalpel(src)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a1091e7f685..8d817f95c4f 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -654,7 +654,7 @@
..()
user.changeNext_move(CLICK_CD_MELEE)
playsound(loc, "rustle", 50, 1, -5)
- user.visible_message("[user] hugs the [src].","You hug the [src].")
+ user.visible_message("[user] hugs \the [src].","You hug \the [src].")
return
/obj/item/weapon/storage/box/hug/medical/New()
diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm
new file mode 100644
index 00000000000..ae927ca5808
--- /dev/null
+++ b/code/game/objects/items/weapons/storage/internal.dm
@@ -0,0 +1,42 @@
+/obj/item/weapon/storage/internal
+ storage_slots = 2
+ max_w_class = 2
+ max_combined_w_class = 4
+ w_class = 4
+ var/priority = 1
+
+/*obj/item/weapon/storage/internal/pocket/New()
+ ..()
+ if(loc) name = loc.name
+
+/obj/item/weapon/storage/internal/pocket/big
+ max_w_class = 3
+ max_combined_w_class = 6
+
+/obj/item/weapon/storage/internal/pocket/small
+ storage_slots = 1
+ max_combined_w_class = 2
+ priority = 0
+
+/obj/item/weapon/storage/internal/pocket/tiny
+ storage_slots = 1
+ max_w_class = 1
+ max_combined_w_class = 1
+ priority = 0
+
+
+/obj/item/weapon/storage/internal/pocket/small/detective
+ priority = 1
+
+/obj/item/weapon/storage/internal/pocket/small/detective/New()
+ ..()
+ new /obj/item/weapon/reagent_containers/food/drinks/flask/det(src)
+
+
+proc/isstorage(var/atom/A)
+ if(istype(A, /obj/item/weapon/storage))
+ return 1
+
+ if(istype(A, /obj/item/clothing))
+ var/obj/item/clothing/C = A
+ if(C.pockets) return 1*/
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index b00ffd68c61..f3b168c85f2 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -9,6 +9,7 @@
name = "storage"
icon = 'icons/obj/storage.dmi'
w_class = 3.0
+ var/silent = 0 // No message on putting items in
var/list/can_hold = new/list() //List of objects which this item can store (if set, it can't store anything else)
var/list/cant_hold = new/list() //List of objects which this item can't store (in effect only if can_hold isn't set)
var/list/is_seeing = new/list() //List of mobs which are currently seeing the contents of this item's storage
@@ -268,7 +269,7 @@
if(sum_w_class > max_combined_w_class)
if(!stop_messages)
- usr << "[src] is full, make some space!"
+ usr << "[W] won't fit in [src], make some space!"
return 0
if(W.w_class >= w_class && (istype(W, /obj/item/weapon/storage)))
@@ -292,6 +293,8 @@
if(usr)
if(!usr.unEquip(W))
return 0
+ if(silent)
+ prevent_warning = 1
W.loc = src
W.on_enter_storage(src)
if(usr)
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 703a17807d5..4d3e413f51d 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -71,6 +71,7 @@
icon_state = "syndicate"
item_state = "toolbox_syndi"
origin_tech = "combat=1;syndicate=1"
+ silent = 1
force = 15
throwforce = 18
@@ -82,7 +83,7 @@
new /obj/item/weapon/crowbar/red(src)
new /obj/item/weapon/wirecutters(src, "red")
new /obj/item/device/multitool(src)
- new /obj/item/clothing/gloves/color/red/insulated(src)
+ new /obj/item/clothing/gloves/combat(src)
/obj/item/weapon/storage/toolbox/drone
name = "mechanical toolbox"
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index becd01a5308..dc3d34b95f4 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -58,6 +58,7 @@
new /obj/item/weapon/implanter/emp(src)
new /obj/item/weapon/implanter/adrenalin(src)
new /obj/item/weapon/implanter/explosive(src)
+ new /obj/item/weapon/implanter/storage(src)
return
if("hacker")
@@ -136,6 +137,20 @@
O.update_icon()
return
+/obj/item/weapon/storage/box/syndie_kit/bioterror
+ name = "bioterror syringe box"
+
+/obj/item/weapon/storage/box/syndie_kit/bioterror/New()
+ ..()
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ new /obj/item/weapon/reagent_containers/syringe/bioterror(src)
+ return
+
/obj/item/weapon/storage/box/syndie_kit/imp_adrenal
name = "boxed adrenal implant (with injector)"
@@ -148,6 +163,15 @@
return
+/obj/item/weapon/storage/box/syndie_kit/imp_storage
+ name = "boxed storage implant (with injector)"
+
+/obj/item/weapon/storage/box/syndie_kit/imp_storage/New()
+ ..()
+ new /obj/item/weapon/implanter/storage(src)
+ return
+
+
/obj/item/weapon/storage/box/syndie_kit/space
name = "boxed space suit and helmet"
can_hold = list(/obj/item/clothing/suit/space/syndicate, /obj/item/clothing/head/helmet/space/syndicate)
@@ -173,6 +197,7 @@
/obj/item/weapon/storage/box/syndie_kit/chemical
name = "boxed chemical kit"
+ storage_slots = 14
/obj/item/weapon/storage/box/syndie_kit/chemical/New()
..()
diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm
index 04ca7d61176..5ad497513cc 100644
--- a/code/game/objects/objs.dm
+++ b/code/game/objects/objs.dm
@@ -145,11 +145,8 @@
return 2
/obj/singularity_pull(S, current_size)
- if(anchored)
- if(current_size >= STAGE_FIVE)
- anchored = 0
- step_towards(src,S)
- else step_towards(src,S)
+ if(!anchored || current_size >= STAGE_FIVE)
+ step_towards(src,S)
/obj/proc/Deconstruct()
qdel(src)
@@ -176,6 +173,7 @@
Item.fire_act() //Set them on fire, too
var/obj/effect/decal/cleanable/ash/A = new(src.loc)
A.desc = "Looks like this used to be a [name] some time ago."
+ SSobj.burning -= src
qdel(src)
/obj/proc/extinguish()
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 32ad17dc3c7..46f83a340af 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -8,7 +8,7 @@ LINEN BINS
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
icon = 'icons/obj/bedsheets.dmi'
- icon_state = "white"
+ icon_state = "sheetwhite"
item_state = "bedsheet"
slot_flags = SLOT_BACK
layer = 4.0
@@ -41,131 +41,131 @@ LINEN BINS
..()
/obj/item/weapon/bedsheet/blue
- icon_state = "blue"
+ icon_state = "sheetblue"
item_color = "blue"
/obj/item/weapon/bedsheet/green
- icon_state = "green"
+ icon_state = "sheetgreen"
item_color = "green"
/obj/item/weapon/bedsheet/orange
- icon_state = "orange"
+ icon_state = "sheetorange"
item_color = "orange"
/obj/item/weapon/bedsheet/purple
- icon_state = "purple"
+ icon_state = "sheetpurple"
item_color = "purple"
/obj/item/weapon/bedsheet/patriot
name = "patriotic bedsheet"
desc = "You've never felt more free than when sleeping on this."
- icon_state = "USA"
+ icon_state = "sheetUSA"
item_color = "sheetUSA"
/obj/item/weapon/bedsheet/rainbow
name = "rainbow bedsheet"
desc = "A multicolored blanket. It's actually several different sheets cut up and sewn together."
- icon_state = "rainbow"
+ icon_state = "sheetrainbow"
item_color = "rainbow"
/obj/item/weapon/bedsheet/red
- icon_state = "red"
+ icon_state = "sheetred"
item_color = "red"
/obj/item/weapon/bedsheet/yellow
- icon_state = "yellow"
+ icon_state = "sheetyellow"
item_color = "yellow"
/obj/item/weapon/bedsheet/mime
name = "mime's blanket"
desc = "A very soothing striped blanket. All the noise just seems to fade out when you're under the covers in this."
- icon_state = "mime"
+ icon_state = "sheetmime"
item_color = "mime"
/obj/item/weapon/bedsheet/clown
name = "clown's blanket"
desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
- icon_state = "clown"
+ icon_state = "sheetclown"
item_color = "clown"
/obj/item/weapon/bedsheet/captain
name = "captain's bedsheet"
desc = "It has a Nanotrasen symbol on it, and was woven with a revolutionary new kind of thread guaranteed to have 0.01% permeability for most non-chemical substances, popular among most modern captains."
- icon_state = "captain"
+ icon_state = "sheetcaptain"
item_color = "captain"
/obj/item/weapon/bedsheet/rd
name = "research director's bedsheet"
desc = "It appears to have a beaker emblem, and is made out of fire-resistant material, although it probably won't protect you in the event of fires you're familiar with every day."
- icon_state = "rd"
+ icon_state = "sheetrd"
item_color = "director"
/obj/item/weapon/bedsheet/medical
name = "medical blanket"
desc = "It's a sterilized* blanket commonly used in the Medbay. *Sterilization is voided if a virologist is present onboard the station."
- icon_state = "medical"
+ icon_state = "sheetmedical"
item_color = "medical"
/obj/item/weapon/bedsheet/cmo
name = "chief medical officer's bedsheet"
desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
- icon_state = "cmo"
+ icon_state = "sheetcmo"
item_color = "cmo"
/obj/item/weapon/bedsheet/hos
name = "head of security's bedsheet"
desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
- icon_state = "hos"
+ icon_state = "sheethos"
item_color = "hosred"
/obj/item/weapon/bedsheet/hop
name = "head of personnel's bedsheet"
desc = "It is decorated with a key emblem. For those rare moments when you can rest and cuddle with Ian without someone screaming for you over the radio."
- icon_state = "hop"
+ icon_state = "sheethop"
item_color = "hop"
/obj/item/weapon/bedsheet/ce
name = "chief engineer's bedsheet"
desc = "It is decorated with a wrench emblem. It's highly reflective and stain resistant, so you don't need to worry about ruining it with oil."
- icon_state = "ce"
+ icon_state = "sheetce"
item_color = "chief"
/obj/item/weapon/bedsheet/qm
name = "quartermaster's bedsheet"
desc = "It is decorated with a crate emblem in silver lining. It's rather tough, and just the thing to lie on after a hard day of pushing paper."
- icon_state = "qm"
+ icon_state = "sheetqm"
item_color = "qm"
/obj/item/weapon/bedsheet/brown
- icon_state = "brown"
+ icon_state = "sheetbrown"
item_color = "cargo"
/obj/item/weapon/bedsheet/centcom
name = "\improper Centcom bedsheet"
desc = "Woven with advanced nanothread for warmth as well as being very decorated, essential for all officials."
- icon_state = "centcom"
+ icon_state = "sheetcentcom"
item_color = "centcom"
/obj/item/weapon/bedsheet/syndie
name = "syndicate bedsheet"
desc = "It has a syndicate emblem and it has an aura of evil."
- icon_state = "syndie"
+ icon_state = "sheetsyndie"
item_color = "syndie"
/obj/item/weapon/bedsheet/cult
name = "cultist's bedsheet"
desc = "You might dream of Nar'Sie if you sleep with this. It seems rather tattered and glows of an eldritch presence."
- icon_state = "cult"
+ icon_state = "sheetcult"
item_color = "cult"
/obj/item/weapon/bedsheet/wiz
name = "wizard's bedsheet"
desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
- icon_state = "wiz"
+ icon_state = "sheetwiz"
item_color = "wiz"
/obj/item/weapon/bedsheet/ian
- icon_state = "ian"
+ icon_state = "sheetian"
item_color = "ian"
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index b6ad237fbba..a44de8f144d 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -30,7 +30,7 @@
new /obj/item/ammo_box/magazine/m10mm(src)
new /obj/item/weapon/storage/box/flashbangs(src)
new /obj/item/weapon/storage/box/teargas(src)
- new /obj/item/weapon/storage/backpack/dufflebag/syndiemed(src)
+ new /obj/item/weapon/storage/backpack/dufflebag/syndie/med(src)
new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
new /obj/item/weapon/gun/projectile/automatic/shotgun/bulldog(src)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index aab27eea79b..c628df81cc1 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -45,7 +45,7 @@
icon_state = "medicalcrate"
/obj/structure/closet/crate/rcd
- desc = "A crate for the storage of the RCD."
+ desc = "A crate for the storage of an RCD."
name = "\improper RCD crate"
/obj/structure/closet/crate/rcd/New()
@@ -53,6 +53,7 @@
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd_ammo(src)
+ new /obj/item/weapon/rcd_ammo(src)
new /obj/item/weapon/rcd(src)
/obj/structure/closet/crate/freezer
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 1e72ad484a0..355938166f5 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -15,33 +15,52 @@
/obj/structure/girder/attackby(obj/item/W, mob/user, params)
add_fingerprint(user)
- if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_DISPLACED)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user.visible_message("[user] disassembles the girder.", \
- "You start to disassemble the girder...", "You hear clanking and banging noises.")
- if(do_after(user, 40, target = src))
- if(state == GIRDER_DISASSEMBLED)
- return
- state = GIRDER_DISASSEMBLED
- user << "You disassemble the girder."
- var/obj/item/stack/sheet/metal/M = new (loc, 2)
- M.add_fingerprint(user)
- qdel(src)
+ if(istype(W, /obj/item/weapon/screwdriver))
+ if(state == GIRDER_DISPLACED)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ user.visible_message("[user] disassembles the girder.", \
+ "You start to disassemble the girder...", "You hear clanking and banging noises.")
+ if(do_after(user, 40, target = src))
+ if(state != GIRDER_DISPLACED)
+ return
+ state = GIRDER_DISASSEMBLED
+ user << "You disassemble the girder."
+ var/obj/item/stack/sheet/metal/M = new (loc, 2)
+ M.add_fingerprint(user)
+ qdel(src)
+ else if(state == GIRDER_REINF)
+ playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
+ user << "You start unsecuring support struts..."
+ if(do_after(user, 40, target = src))
+ if(state != GIRDER_REINF)
+ return
+ user << "You unsecure the support struts."
+ state = GIRDER_REINF_STRUTS
- else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_DISPLACED)
- if (!istype(src.loc, /turf/simulated/floor))
- user << "A floor must be present to secure the girder!"
- return
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You start securing the girder..."
- if(do_after(user, 40, target = src))
- user << "You secure the girder."
- var/obj/structure/girder/G = new (loc)
- transfer_fingerprints_to(G)
- qdel(src)
+ else if(istype(W, /obj/item/weapon/wrench))
+ if(state == GIRDER_DISPLACED)
+ if(!istype(loc, /turf/simulated/floor))
+ user << "A floor must be present to secure the girder!"
+ return
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You start securing the girder..."
+ if(do_after(user, 40, target = src))
+ user << "You secure the girder."
+ var/obj/structure/girder/G = new (loc)
+ transfer_fingerprints_to(G)
+ qdel(src)
+ else if(state == GIRDER_NORMAL)
+ playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
+ user << "You start unsecuring the girder..."
+ if(do_after(user, 40, target = src))
+ user << "You unsecure the girder."
+ var/obj/structure/girder/displaced/D = new (loc)
+ transfer_fingerprints_to(D)
+ qdel(src)
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
user << "You start slicing apart the girder..."
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(do_after(user, 30, target = src))
user << "You slice apart the girder."
var/obj/item/stack/sheet/metal/M = new (loc, 2)
@@ -55,13 +74,6 @@
D.playDigSound()
qdel(src)
- else if(istype(W, /obj/item/weapon/screwdriver) && state == GIRDER_REINF)
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 100, 1)
- user << "You start unsecuring support struts..."
- if(do_after(user, 40, target = src))
- user << "You unsecure the support struts."
- state = GIRDER_REINF_STRUTS
-
else if(istype(W, /obj/item/weapon/wirecutters) && state == GIRDER_REINF_STRUTS)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1)
user << "You start removing support struts..."
@@ -72,15 +84,6 @@
transfer_fingerprints_to(G)
qdel(src)
- else if(istype(W, /obj/item/weapon/wrench) && state == GIRDER_NORMAL && anchored )
- playsound(src.loc, 'sound/items/Ratchet.ogg', 100, 1)
- user << "You start unsecuring the girder..."
- if(do_after(user, 40, target = src))
- user << "You unsecure the girder."
- var/obj/structure/girder/displaced/D = new (loc)
- transfer_fingerprints_to(D)
- qdel(src)
-
else if(istype(W, /obj/item/stack/sheet))
if (istype(src.loc, /turf/simulated/wall))
user << "There is already a wall present!"
@@ -96,7 +99,7 @@
switch(S.type)
if(/obj/item/stack/sheet/metal, /obj/item/stack/sheet/metal/cyborg)
- if(!anchored)
+ if(state == GIRDER_DISPLACED)
if(S.get_amount() < 2)
user << "You need two sheets of metal to create a false wall!"
return
@@ -119,16 +122,14 @@
return
S.use(2)
user << "You add the plating."
- var/turf/Tsrc = get_turf(src)
- Tsrc.ChangeTurf(/turf/simulated/wall)
- for(var/turf/simulated/wall/X in Tsrc.loc)
- if(X)
- transfer_fingerprints_to(X)
+ var/turf/T = get_turf(src)
+ T.ChangeTurf(/turf/simulated/wall)
+ transfer_fingerprints_to(T)
qdel(src)
return
if(/obj/item/stack/sheet/plasteel)
- if(!anchored)
+ if(state == GIRDER_DISPLACED)
if(S.amount < 2)
user << "You need at least two sheets to create a false wall!"
return
@@ -142,22 +143,23 @@
transfer_fingerprints_to(FW)
qdel(src)
else
- if (src.icon_state == "reinforced") //I cant believe someone would actually write this line of code...
- if(S.amount < 1) return ..()
+ if(state == GIRDER_REINF)
+ if(S.amount < 1)
+ return
user << "You start finalizing the reinforced wall..."
if(do_after(user, 50, target = src))
if(!src.loc || !S || S.amount < 1)
return
S.use(1)
user << "You fully reinforce the wall."
- var/turf/Tsrc = get_turf(src)
- Tsrc.ChangeTurf(/turf/simulated/wall/r_wall)
- for(var/turf/simulated/wall/r_wall/X in Tsrc.loc)
- if(X) transfer_fingerprints_to(X)
+ var/turf/T = get_turf(src)
+ T.ChangeTurf(/turf/simulated/wall/r_wall)
+ transfer_fingerprints_to(T)
qdel(src)
return
else
- if(S.amount < 1) return ..()
+ if(S.amount < 1)
+ return
user << "You start reinforcing the girder..."
if (do_after(user, 60, target = src))
if(!src.loc || !S || S.amount < 1)
@@ -171,7 +173,7 @@
if(S.sheettype)
var/M = S.sheettype
- if(!anchored)
+ if(state == GIRDER_DISPLACED)
if(S.amount < 2)
user << "You need at least two sheets to create a false wall!"
return
@@ -182,17 +184,18 @@
transfer_fingerprints_to(FW)
qdel(src)
else
- if(S.amount < 2) return ..()
+ if(S.amount < 2)
+ user << "You need at least two sheets to add plating!"
+ return
user << "You start adding plating..."
if (do_after(user, 40, target = src))
if(!src.loc || !S || S.amount < 2)
return
S.use(2)
user << "You add the plating."
- var/turf/Tsrc = get_turf(src)
- Tsrc.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
- for(var/turf/simulated/wall/mineral/X in Tsrc.loc)
- if(X) transfer_fingerprints_to(X)
+ var/turf/T = get_turf(src)
+ T.ChangeTurf(text2path("/turf/simulated/wall/mineral/[M]"))
+ transfer_fingerprints_to(T)
qdel(src)
return
@@ -224,7 +227,6 @@
if(prob(40))
qdel(src)
-
/obj/structure/girder/ex_act(severity, target)
switch(severity)
if(1.0)
@@ -277,6 +279,9 @@
return
return
+
+//////////////////////////////////////////// cult girder //////////////////////////////////////////////
+
/obj/structure/cultgirder
icon= 'icons/obj/cult.dmi'
icon_state= "cultgirder"
@@ -290,18 +295,18 @@
var/obj/item/weapon/weldingtool/WT = W
if(WT.remove_fuel(0,user))
playsound(src.loc, 'sound/items/Welder2.ogg', 50, 1)
- user.visible_message("[user] disassembles the girder.", \
- "You start to disassemble the girder...", "You hear welding and clanking.")
+ user << "You start slicing apart the girder..."
if(do_after(user, 40, target = src))
if( !WT.isOn() )
return
- user << "You disassemble the girder."
+ user << "You slice apart the girder."
var/obj/effect/decal/remains/human/R = new (get_turf(src))
transfer_fingerprints_to(R)
qdel(src)
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
user << "You start slicing apart the girder..."
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
if(do_after(user, 30, target = src))
user << "You slice apart the girder."
var/obj/effect/decal/remains/human/R = new (get_turf(src))
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 22f4ae79d1b..7246ac3dbbd 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -238,14 +238,6 @@
step(src, direction)
update_mob()
handle_rotation()
- if(istype(src.loc, /turf/simulated))
- var/turf/simulated/T = src.loc
- if(T.wet == 2) //Lube! Fall off!
- playsound(src, 'sound/misc/slip.ogg', 50, 1, -3)
- buckled_mob.Stun(7)
- buckled_mob.Weaken(7)
- unbuckle_mob()
- step(src, dir)
move_delay = 1
spawn(2)
move_delay = 0
@@ -300,11 +292,6 @@
buckled_mob.pixel_x = -12
buckled_mob.pixel_y = 7
-
-/obj/structure/stool/bed/chair/janicart/bullet_act(obj/item/projectile/Proj)
- if(buckled_mob)
- buckled_mob.bullet_act(Proj)
-
/obj/item/key
name = "key"
desc = "A small grey key."
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index f58f8fbce8c..48bda2583fd 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -45,6 +45,7 @@
anchored = 1
else if(istype(W, /obj/item/weapon/gun/energy/plasmacutter))
+ playsound(src, 'sound/items/Welder.ogg', 100, 1)
user.visible_message("[user] is slicing apart the [name]...", \
"You are slicing apart the [name]...")
if(do_after(user,30, target = src))
@@ -212,7 +213,7 @@
log_game("Plasma statue ignited by [key_name(Proj.firer)] in ([x],[y],[z])")
else
message_admins("Plasma statue ignited by [Proj]. No known firer.(?) (FLW) in ([x],[y],[z] - JMP)",0,1)
- log_game("Plasma statue ignited by [Proj] in ([x],[y],[z]). No known firer.")
+ log_game("Plasma statue ignited by [Proj] in ([x],[y],[z]). No known firer.")
..()
/obj/structure/statue/plasma/attackby(obj/item/weapon/W, mob/user, params)
diff --git a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
index 6f96e87bdbb..1f83bdc4ae5 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
@@ -15,9 +15,15 @@
nest_overlay = image('icons/mob/alien.dmi', "nestoverlay", layer=MOB_LAYER - 0.2)
return ..()
-/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/user)
+/obj/structure/stool/bed/nest/user_unbuckle_mob(mob/living/user)
if(buckled_mob && buckled_mob.buckled == src)
var/mob/living/M = buckled_mob
+
+ if(user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
+ unbuckle_mob()
+ add_fingerprint(user)
+ return
+
if(M != user)
M.visible_message(\
"[user.name] pulls [M.name] free from the sticky nest!",\
@@ -42,13 +48,13 @@
unbuckle_mob()
add_fingerprint(user)
-/obj/structure/stool/bed/nest/user_buckle_mob(mob/M, mob/user)
+/obj/structure/stool/bed/nest/user_buckle_mob(mob/living/M, mob/living/user)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || user.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
- if(istype(M,/mob/living/carbon/alien))
+ if(M.getorgan(/obj/item/organ/internal/alien/plasmavessel))
return
- if(!istype(user,/mob/living/carbon/alien/humanoid))
+ if(!user.getorgan(/obj/item/organ/internal/alien/plasmavessel))
return
unbuckle_mob()
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 7f7b7c0ae05..160c798e99c 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -24,14 +24,12 @@
/obj/structure/stool/bed/Move(atom/newloc, direct) //Some bed children move
. = ..()
if(buckled_mob)
- buckled_mob.buckled = null
if(!buckled_mob.Move(loc, direct))
loc = buckled_mob.loc //we gotta go back
last_move = buckled_mob.last_move
inertia_dir = last_move
buckled_mob.inertia_dir = last_move
. = 0
- buckled_mob.buckled = src
/obj/structure/stool/bed/Process_Spacemove(movement_dir = 0)
if(buckled_mob)
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 58e7ae67fd2..5267ccbae9e 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -44,14 +44,13 @@
..()
if (istype(A,/mob/living/carbon))
var/mob/living/carbon/M = A
- if(M.lying) return
- switch (src.wet)
+ switch(wet)
if(1) //wet floor
- if(!M.slip(4, 2, null, (NO_SLIP_WHEN_WALKING|STEP)))
+ if(!M.slip(4, 2, null, NO_SLIP_WHEN_WALKING))
M.inertia_dir = 0
return
if(2) //lube
- M.slip(0, 7, null, (STEP|SLIDE|GALOSHES_DONT_HELP))
+ M.slip(0, 7, null, (SLIDE|GALOSHES_DONT_HELP))
/turf/simulated/ChangeTurf(var/path)
. = ..()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 2bcfe8d976f..2ecee6da10f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -224,38 +224,43 @@
if(has_gravity(src))
playsound(src, "bodyfall", 50, 1)
-/turf/handle_slip(mob/slipper, s_amount, w_amount, obj/O, lube)
+/turf/handle_slip(mob/living/carbon/C, s_amount, w_amount, obj/O, lube)
if(has_gravity(src))
- var/mob/living/carbon/M = slipper
- if (M.m_intent=="walk" && (lube&NO_SLIP_WHEN_WALKING))
- return 0
- if(!M.lying && (M.status_flags & CANWEAKEN)) // we slip those who are standing and can fall.
- if(O)
- M << "You slipped on the [O.name]!"
- else
- M << "You slipped!"
- M.attack_log += "\[[time_stamp()]\] Slipped[O ? " on the [O.name]" : ""][(lube&SLIDE)? " (LUBE)" : ""]!"
- playsound(M.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+ var/obj/buckled_obj
+ var/oldlying = C.lying
+ if(C.buckled)
+ buckled_obj = C.buckled
+ if(!(lube&GALOSHES_DONT_HELP)) //can't slip while buckled unless it's lube.
+ return 0
+ else
+ if(C.lying || !(C.status_flags & CANWEAKEN)) // can't slip unbuckled mob if they're lying or can't fall.
+ return 0
+ if(C.m_intent=="walk" && (lube&NO_SLIP_WHEN_WALKING))
+ return 0
- M.accident(M.l_hand)
- M.accident(M.r_hand)
+ C << "You slipped[ O ? " on the [O.name]" : ""]!"
- var/olddir = M.dir
- M.Stun(s_amount)
- M.Weaken(w_amount)
- M.stop_pulling()
- if(lube&SLIDE)
- for(var/i=1, i<5, i++)
- spawn (i)
- step(M, olddir)
- M.spin(1,1)
- if(M.lying) //did I fall over?
- M.adjustBruteLoss(2)
+ C.attack_log += "\[[time_stamp()]\] Slipped[O ? " on the [O.name]" : ""][(lube&SLIDE)? " (LUBE)" : ""]!"
+ playsound(C.loc, 'sound/misc/slip.ogg', 50, 1, -3)
+ C.accident(C.l_hand)
+ C.accident(C.r_hand)
-
- return 1
- return 0 // no success. Used in clown pda and wet floors
+ var/olddir = C.dir
+ C.Stun(s_amount)
+ C.Weaken(w_amount)
+ C.stop_pulling()
+ if(buckled_obj)
+ buckled_obj.unbuckle_mob()
+ step(buckled_obj, olddir)
+ else if(lube&SLIDE)
+ for(var/i=1, i<5, i++)
+ spawn (i)
+ step(C, olddir)
+ C.spin(1,1)
+ if(C.lying != oldlying) //did we actually fall?
+ C.adjustBruteLoss(2)
+ return 1
/turf/singularity_act()
if(intact)
@@ -280,6 +285,7 @@
density = 1
blocks_air = 1
opacity = 1
+ explosion_block = 50
/turf/indestructible/splashscreen
name = "Space Station 13"
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 3849bf0f623..249cd05528b 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -129,7 +129,8 @@ var/list/admin_verbs_debug = list(
/client/proc/check_bomb_impacts,
/proc/machine_upgrade,
/client/proc/populate_world,
- /client/proc/cmd_display_del_log
+ /client/proc/cmd_display_del_log,
+ /client/proc/reset_latejoin_spawns
)
var/list/admin_verbs_possess = list(
/proc/possess,
diff --git a/code/modules/admin/verbs/massmodvar.dm b/code/modules/admin/verbs/massmodvar.dm
index 2fcae2ed698..cf13ea9fe4c 100644
--- a/code/modules/admin/verbs/massmodvar.dm
+++ b/code/modules/admin/verbs/massmodvar.dm
@@ -173,38 +173,117 @@
if("text")
var/new_value = input("Enter new text:","Text",O.vars[variable]) as text|null
if(new_value == null) return
+
+ var/process_vars = 0
+ var/unique = 0
+ if(findtext(new_value,"\["))
+ process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
+ if(process_vars == "Yes")
+ process_vars = 1
+ unique = alert(usr,"Process vars unique to each instance, or same for all?","Variable Association","Unique","Same")
+ if(unique == "Unique")
+ unique = 1
+ else
+ unique = 0
+ else
+ process_vars = 0
+
+ var/pre_processing = new_value
+ var/list/varsvars = list()
+
+ if(process_vars)
+ varsvars = string2listofvars(new_value, O)
+ if(varsvars.len)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[O.vars[V]]")
+
O.vars[variable] = new_value
+ //Convert the string vars for anything that's not O
if(method)
if(istype(O, /mob))
for(var/mob/M in mob_list)
if ( istype(M , O.type) )
- M.vars[variable] = O.vars[variable]
+ new_value = pre_processing //reset new_value, ready to convert it uniquely for the next iteration
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[M.vars[V]]")
+ else
+ new_value = O.vars[variable] //We already processed the non-unique form for O, reuse it
+
+ M.vars[variable] = new_value
else if(istype(O, /obj))
for(var/obj/A in world)
if ( istype(A , O.type) )
- A.vars[variable] = O.vars[variable]
+ new_value = pre_processing
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[A.vars[V]]")
+ else
+ new_value = O.vars[variable]
+
+ A.vars[variable] = new_value
else if(istype(O, /turf))
for(var/turf/A in world)
if ( istype(A , O.type) )
- A.vars[variable] = O.vars[variable]
+ new_value = pre_processing
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[A.vars[V]]")
+ else
+ new_value = O.vars[variable]
+
+ A.vars[variable] = new_value
else
if(istype(O, /mob))
for(var/mob/M in mob_list)
if (M.type == O.type)
- M.vars[variable] = O.vars[variable]
+ new_value = pre_processing
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[M.vars[V]]")
+ else
+ new_value = O.vars[variable]
+
+ M.vars[variable] = new_value
else if(istype(O, /obj))
for(var/obj/A in world)
if (A.type == O.type)
- A.vars[variable] = O.vars[variable]
+ new_value = pre_processing
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[A.vars[V]]")
+ else
+ new_value = O.vars[variable]
+
+ A.vars[variable] = new_value
else if(istype(O, /turf))
for(var/turf/A in world)
if (A.type == O.type)
- A.vars[variable] = O.vars[variable]
+ new_value = pre_processing
+
+ if(process_vars)
+ if(unique)
+ for(var/V in varsvars)
+ new_value = replacetext(new_value,"\[[V]]","[A.vars[V]]")
+ else
+ new_value = O.vars[variable]
+
+ A.vars[variable] = new_value
if("num")
var/new_value = input("Enter new number:","Num",\
diff --git a/code/modules/admin/verbs/modifyvariables.dm b/code/modules/admin/verbs/modifyvariables.dm
index e1c1430d0e3..9cc7f8a7a76 100644
--- a/code/modules/admin/verbs/modifyvariables.dm
+++ b/code/modules/admin/verbs/modifyvariables.dm
@@ -28,7 +28,7 @@ var/list/VVckey_edit = list("key", "ckey")
src.modify_variables(ticker)
feedback_add_details("admin_verb","ETV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
-/client/proc/mod_list_add_ass() //haha
+/client/proc/mod_list_add_ass(atom/O) //haha
var/class = "text"
if(src.holder && src.holder.marked_datum)
@@ -74,6 +74,14 @@ var/list/VVckey_edit = list("key", "ckey")
if(!var_value) return
+ if(istext(var_value))
+ if(findtext(var_value,"\["))
+ var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
+ if(process_vars == "Yes")
+ var/list/varsvars = string2listofvars(var_value, O)
+ for(var/V in varsvars)
+ var_value = replacetext(var_value,"\[[V]]","[O.vars[V]]")
+
return var_value
@@ -123,12 +131,18 @@ var/list/VVckey_edit = list("key", "ckey")
if(!var_value) return
+ if(istext(var_value))
+ if(findtext(var_value,"\["))
+ var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
+ if(process_vars == "Yes")
+ var/list/varsvars = string2listofvars(var_value, O)
+ for(var/V in varsvars)
+ var_value = replacetext(var_value,"\[[V]]","[O.vars[V]]")
+
+ L += var_value
switch(alert("Would you like to associate a var with the list entry?",,"Yes","No"))
if("Yes")
- L += var_value
- L[var_value] = mod_list_add_ass() //haha
- if("No")
- L += var_value
+ L[var_value] = mod_list_add_ass(O) //haha
world.log << "### ListVarEdit by [src]: [O.type] [objectvar]: ADDED=[var_value]"
log_admin("[key_name(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
message_admins("[key_name_admin(src)] modified [original_name]'s [objectvar]: ADDED=[var_value]")
@@ -289,6 +303,14 @@ var/list/VVckey_edit = list("key", "ckey")
if("text")
new_var = input("Enter new text:","Text") as text
+
+ if(findtext(new_var,"\["))
+ var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
+ if(process_vars == "Yes")
+ var/list/varsvars = string2listofvars(new_var, O)
+ for(var/V in varsvars)
+ new_var = replacetext(new_var,"\[[V]]","[O.vars[V]]")
+
if(assoc)
L[assoc_key] = new_var
else
@@ -537,6 +559,14 @@ var/list/VVckey_edit = list("key", "ckey")
if("text")
var/var_new = input("Enter new text:","Text",O.vars[variable]) as null|text
if(var_new==null) return
+
+ if(findtext(var_new,"\["))
+ var/process_vars = alert(usr,"\[] detected in string, process as variables?","Process Variables?","Yes","No")
+ if(process_vars == "Yes")
+ var/list/varsvars = string2listofvars(var_new, O)
+ for(var/V in varsvars)
+ var_new = replacetext(var_new,"\[[V]]","[O.vars[V]]")
+
O.vars[variable] = var_new
if("num")
diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm
index 96054f461d4..e886190f079 100644
--- a/code/modules/admin/verbs/randomverbs.dm
+++ b/code/modules/admin/verbs/randomverbs.dm
@@ -747,3 +747,14 @@ Traitors and the like can also be revived with the previous role mostly intact.
log_admin("[key_name(usr)] [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z]).")
message_admins("[key_name_admin(usr)] (FLW) [N.timing ? "activated" : "deactivated"] a nuke at ([N.x],[N.y],[N.z] - JMP).")
feedback_add_details("admin_verb","TN") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
+
+/client/proc/reset_latejoin_spawns()
+ set category = "Debug"
+ set name = "Remove Latejoin Spawns"
+
+ if(!check_rights(R_DEBUG)) return
+
+ latejoin.Cut()
+
+ log_admin("[key_name(usr)] removed latejoin spawnpoints.")
+ message_admins("[key_name_admin(usr)] removed latejoin spawnpoints.")
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 4b6489290d2..fe02a86da7f 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -21,7 +21,7 @@
attach(A2,user)
name = "[A.name]-[A2.name] assembly"
update_icon()
- feedback_add_details("assembly_made","[name]")
+ feedback_add_details("assembly_made","[type]")
/obj/item/device/assembly_holder/proc/attach(obj/item/device/assembly/A, mob/user)
if(!A.remove_item_from_storage(src))
diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm
index 2084d8f3ad3..34cc80ba905 100644
--- a/code/modules/clothing/masks/gasmask.dm
+++ b/code/modules/clothing/masks/gasmask.dm
@@ -145,3 +145,8 @@
flags = MASKINTERNALS
flags_cover = MASKCOVERSEYES
burn_state = 0 //Burnable
+
+/obj/item/clothing/mask/gas/carp
+ name = "carp mask"
+ desc = "Gnash gnash."
+ icon_state = "carp_mask"
\ No newline at end of file
diff --git a/code/modules/clothing/spacesuits/miscellaneous.dm b/code/modules/clothing/spacesuits/miscellaneous.dm
index 2f7f85299e6..71f6d7058f7 100644
--- a/code/modules/clothing/spacesuits/miscellaneous.dm
+++ b/code/modules/clothing/spacesuits/miscellaneous.dm
@@ -1,3 +1,18 @@
+//miscellaneous spacesuits
+/*
+Contains:
+ - Captain's spacesuit
+ - Death squad's hardsuit
+ - Officer's beret/spacesuit
+ - NASA Voidsuit
+ - Father Christmas' magical clothes
+ - Pirate's spacesuit
+ - ERT hardsuit: command, sec, engi, med
+ - EVA spacesuit
+ - Freedom's spacesuit (freedom from vacuum's oppression)
+ - Carp hardsuit
+*/
+
//Captain's space suit, not hardsuits because no flashlight!
/obj/item/clothing/head/helmet/space/captain
name = "captain's space helmet"
@@ -235,3 +250,27 @@
strip_delay = 130
max_heat_protection_temperature = FIRE_IMMUNITY_HELM_MAX_TEMP_PROTECT
unacidable = 1
+
+//Carpsuit, bestsuit, lovesuit
+/obj/item/clothing/head/helmet/space/hardsuit/carp
+ name = "carp helmet"
+ desc = "Spaceworthy and it looks like a space carp's head, smells like one too."
+ icon_state = "carp_helm"
+ item_state = "syndicate"
+ armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 75) //As whimpy as a space carp
+ brightness_on = 0 //luminosity when on
+ action_button_name = ""
+ flags = BLOCKHAIR | STOPSPRESSUREDMAGE | THICKMATERIAL | NODROP
+ flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
+ flags_inv = HIDEEARS|HIDEEYES|HIDEFACE
+
+
+/obj/item/clothing/suit/space/hardsuit/carp
+ name = "carp space suit"
+ desc = "A slimming piece of dubious space carp technology, you suspect it won't stand up to hand-to-hand blows."
+ icon_state = "carp_suit"
+ item_state = "space_suit_syndicate"
+ slowdown = 0 //Space carp magic, never stop believing
+ armor = list(melee = -20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 75) //As whimpy whimpy whoo
+ allowed = list(/obj/item/weapon/tank/internals, /obj/item/weapon/gun/projectile/automatic/speargun) //I'm giving you a hint here
+ helmettype = /obj/item/clothing/head/helmet/space/hardsuit/carp
diff --git a/code/modules/clothing/suits/miscellaneous.dm b/code/modules/clothing/suits/miscellaneous.dm
index 0369bcab18d..8c570131a3f 100644
--- a/code/modules/clothing/suits/miscellaneous.dm
+++ b/code/modules/clothing/suits/miscellaneous.dm
@@ -197,6 +197,49 @@
body_parts_covered = CHEST|GROIN|LEGS|FEET
flags_inv = HIDEJUMPSUIT|HIDESHOES
+/obj/item/clothing/suit/hooded/carp_costume
+ name = "carp costume"
+ desc = "A costume made from 'synthetic' carp scales, it smells."
+ icon_state = "carp_casual"
+ item_state = "labcoat"
+ body_parts_covered = CHEST|GROIN|ARMS
+ cold_protection = CHEST|GROIN|ARMS
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT //Space carp like space, so you should too
+ allowed = list(/obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/gun/projectile/automatic/speargun)
+ hooded = 1
+ action_button_name = "Toggle Carp Hood"
+ hoodtype = /obj/item/clothing/head/carp_hood
+
+/obj/item/clothing/head/carp_hood
+ name = "carp hood"
+ desc = "A hood attached to a carp costume."
+ icon_state = "carp_casual"
+ body_parts_covered = HEAD
+ cold_protection = HEAD
+ min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ flags = NODROP
+
+/obj/item/clothing/suit/hooded/ian_costume //It's Ian, rub his bell- oh god what happened to his inside parts?
+ name = "corgi costume"
+ desc = "A costume that looks like someone made a human-like corgi, it won't guarantee belly rubs."
+ icon_state = "ian"
+ item_state = "labcoat"
+ body_parts_covered = CHEST|GROIN|ARMS
+ //cold_protection = CHEST|GROIN|ARMS
+ //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ allowed = list(,)
+ hooded = 1
+ action_button_name = "Toggle Ian Hood"
+ hoodtype = /obj/item/clothing/head/ian_hood
+
+/obj/item/clothing/head/ian_hood
+ name = "corgi hood"
+ desc = "A hood that looks just like a corgi's head, it won't guarantee dog biscuits."
+ icon_state = "ian"
+ body_parts_covered = HEAD
+ //cold_protection = HEAD
+ //min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
+ flags = NODROP
/*
* Misc
@@ -355,3 +398,4 @@
allowed = list(/obj/item/weapon/pickaxe,/obj/item/device/flashlight,/obj/item/weapon/tank/internals/emergency_oxygen,/obj/item/toy,/obj/item/weapon/storage/fancy/cigarettes,/obj/item/weapon/lighter)
armor = list(melee = 10, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0)
+//
\ No newline at end of file
diff --git a/code/modules/crafting/table.dm b/code/modules/crafting/table.dm
index 3d0ed8b6d84..1999ed6edb8 100644
--- a/code/modules/crafting/table.dm
+++ b/code/modules/crafting/table.dm
@@ -78,7 +78,7 @@
if(istype(I, /obj/item/weapon/reagent_containers/food/snacks))
var/obj/item/weapon/reagent_containers/food/snacks/S = I
S.create_reagents(S.volume)
- feedback_add_details("food_made","[S.name]")
+ feedback_add_details("food_made","[S.type]")
send_feedback = 0
var/list/parts = del_reqs(R, I)
for(var/A in parts)
@@ -93,7 +93,7 @@
I.reagents.reagent_list.Add(A)
I.CheckParts()
if(send_feedback)
- feedback_add_details("object_crafted","[I.name]")
+ feedback_add_details("object_crafted","[I.type]")
return 1
return 0
diff --git a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
index 97fc97d5e47..1d63733a175 100644
--- a/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
+++ b/code/modules/food&drinks/kitchen machinery/icecream_vat.dm
@@ -6,7 +6,7 @@
#define CONE_CHOC 6
/obj/machinery/icecream_vat
- name = "icecream vat"
+ name = "ice cream vat"
desc = "Ding-aling ding dong. Get your Nanotrasen-approved ice cream!"
icon = 'icons/obj/kitchen.dmi'
icon_state = "icecream_vat"
@@ -60,6 +60,9 @@
reagents.add_reagent("flour", 5)
reagents.add_reagent("sugar", 5)
reagents.add_reagent("ice", 5)
+ reagents.add_reagent("cocoa", 5)
+ reagents.add_reagent("berryjuice", 5)
+ reagents.add_reagent("singulo", 5)
/obj/machinery/icecream_vat/attack_hand(mob/user)
user.set_machine(src)
@@ -67,12 +70,12 @@
/obj/machinery/icecream_vat/interact(mob/user)
var/dat
- dat += "ICECREAM
"
+ dat += "
ICE CREAM"
dat += "
Dispensing: [flavour_name] icecream "
- dat += "
Vanilla icecream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
"
- dat += "
Strawberry icecream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
"
- dat += "
Chocolate icecream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
"
- dat += "
Blue icecream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
"
+ dat += "
Vanilla ice cream: Select Make x5 [product_types[ICECREAM_VANILLA]] scoops left. (Ingredients: milk, ice)
"
+ dat += "
Strawberry ice cream: Select Make x5 [product_types[ICECREAM_STRAWBERRY]] dollops left. (Ingredients: milk, ice, berry juice)
"
+ dat += "
Chocolate ice cream: Select Make x5 [product_types[ICECREAM_CHOCOLATE]] dollops left. (Ingredients: milk, ice, coco powder)
"
+ dat += "
Blue ice cream: Select Make x5 [product_types[ICECREAM_BLUE]] dollops left. (Ingredients: milk, ice, singulo)
CONES
"
dat += "
Waffle cones: Dispense Make x5 [product_types[CONE_WAFFLE]] cones left. (Ingredients: flour, sugar)
"
dat += "
Chocolate cones: Dispense Make x5 [product_types[CONE_CHOC]] cones left. (Ingredients: flour, sugar, coco powder)
[round(storedPlasma)]
"
+ hud_used.alien_plasma_display.maptext = "[round(getPlasma())]
"
/mob/living/carbon/alien/larva/updatePlasmaDisplay()
return
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
index b62a11e5153..6995c025b0e 100644
--- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm
@@ -8,27 +8,41 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
icon_state = "larva0_dead"
var/stage = 0
+/obj/item/organ/internal/body_egg/alien_embryo/on_find(mob/living/finder)
+ ..()
+ if(stage < 4)
+ finder << "It's small and weak, barely the size of a foetus."
+ else
+ finder << "It's grown quite large, and writhes slightly as you look at it."
+ if(prob(10))
+ AttemptGrow(0)
+
+/obj/item/organ/internal/body_egg/alien_embryo/prepare_eat()
+ var/obj/S = ..()
+ S.reagents.add_reagent("sacid", 10)
+ return S
+
/obj/item/organ/internal/body_egg/alien_embryo/on_life()
switch(stage)
if(2, 3)
- if(prob(1))
+ if(prob(2))
owner.emote("sneeze")
- if(prob(1))
- owner.emote("cough")
- if(prob(1))
- owner << "Your throat feels sore."
- if(prob(1))
- owner << "Mucous runs down the back of your throat."
- if(4)
- if(prob(1))
- owner.emote("sneeze")
- if(prob(1))
+ if(prob(2))
owner.emote("cough")
if(prob(2))
+ owner << "Your throat feels sore."
+ if(prob(2))
+ owner << "Mucous runs down the back of your throat."
+ if(4)
+ if(prob(2))
+ owner.emote("sneeze")
+ if(prob(2))
+ owner.emote("cough")
+ if(prob(4))
owner << "Your muscles ache."
if(prob(20))
owner.take_organ_damage(1)
- if(prob(2))
+ if(prob(4))
owner << "Your stomach hurts."
if(prob(20))
owner.adjustToxLoss(1)
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index ff8b9538eb8..1a9ba9601a2 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -102,8 +102,10 @@ var/const/MAX_ACTIVE_TIME = 400
icon_state = "[initial(icon_state)]"
Attach(hit_atom)
-/obj/item/clothing/mask/facehugger/proc/Attach(mob/M)
- if( (!iscorgi(M) && !iscarbon(M)) || isalien(M))
+/obj/item/clothing/mask/facehugger/proc/Attach(mob/living/M)
+ if(!isliving(M)) return 0
+
+ if((!iscorgi(M) && !iscarbon(M)) || isalien(M))
return 0
if(attached)
return 0
@@ -112,18 +114,18 @@ var/const/MAX_ACTIVE_TIME = 400
spawn(MAX_IMPREGNATION_TIME)
attached = 0
- var/mob/living/L = M //just so I don't need to use :
+ if(M.getorgan(/obj/item/organ/internal/alien/hivenode)) return 0
+ if(M.getorgan(/obj/item/organ/internal/body_egg/alien_embryo)) return 0
- if(loc == L) return 0
+ if(loc == M) return 0
if(stat != CONSCIOUS) return 0
- if(locate(/obj/item/organ/internal/body_egg/alien_embryo) in L) return 0
- if(!sterile) L.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
+ if(!sterile) M.take_organ_damage(strength,0) //done here so that even borgs and humans in helmets take damage
- L.visible_message("[src] leaps at [L]'s face!", \
- "[src] leaps at [L]'s face!")
+ M.visible_message("[src] leaps at [M]'s face!", \
+ "[src] leaps at [M]'s face!")
- if(ishuman(L))
- var/mob/living/carbon/human/H = L
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
if(H.is_mouth_covered(head_only = 1))
H.visible_message("[src] smashes against [H]'s [H.head]!", \
"[src] smashes against [H]'s [H.head]!")
@@ -131,7 +133,7 @@ var/const/MAX_ACTIVE_TIME = 400
return 0
if(iscarbon(M))
- var/mob/living/carbon/target = L
+ var/mob/living/carbon/target = M
if(target.wear_mask)
if(prob(20)) return 0
var/obj/item/clothing/W = target.wear_mask
@@ -144,7 +146,7 @@ var/const/MAX_ACTIVE_TIME = 400
src.loc = target
target.equip_to_slot(src, slot_wear_mask,,0)
- if(!sterile) L.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
+ if(!sterile) M.Paralyse(MAX_IMPREGNATION_TIME/6) //something like 25 ticks = 20 seconds with the default settings
else if (iscorgi(M))
var/mob/living/simple_animal/pet/dog/corgi/C = M
loc = C
@@ -154,7 +156,7 @@ var/const/MAX_ACTIVE_TIME = 400
GoIdle() //so it doesn't jump the people that tear it off
spawn(rand(MIN_IMPREGNATION_TIME,MAX_IMPREGNATION_TIME))
- Impregnate(L)
+ Impregnate(M)
return 1
@@ -175,7 +177,7 @@ var/const/MAX_ACTIVE_TIME = 400
Die()
icon_state = "[initial(icon_state)]_impregnated"
- if(!target.getlimb(/obj/item/organ/limb/robot/chest) && !(target.status_flags & XENO_HOST))
+ if(!target.getlimb(/obj/item/organ/limb/robot/chest) && !target.getorgan(/obj/item/organ/internal/body_egg/alien_embryo))
new /obj/item/organ/internal/body_egg/alien_embryo(target)
if(iscorgi(target))
@@ -228,11 +230,13 @@ var/const/MAX_ACTIVE_TIME = 400
return
-/proc/CanHug(mob/M)
+/proc/CanHug(mob/living/M)
if(!istype(M))
return 0
if(M.stat == DEAD)
return 0
+ if(M.getorgan(/obj/item/organ/internal/alien/hivenode))
+ return 0
if(iscorgi(M) || ismonkey(M))
return 1
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 1303a8ee03b..a7360f8ef65 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -13,11 +13,11 @@
var/mob/living/carbon/brain/brainmob = null //The current occupant.
var/mob/living/silicon/robot = null //Appears unused.
var/obj/mecha = null //This does not appear to be used outside of reference in mecha.dm.
- var/obj/item/organ/brain/brain = null //The actual brain
+ var/obj/item/organ/internal/brain/brain = null //The actual brain
/obj/item/device/mmi/update_icon()
if(brain)
- if(istype(brain,/obj/item/organ/brain/alien))
+ if(istype(brain,/obj/item/organ/internal/brain/alien))
icon_state = "mmi_alien"
braintype = "Xenoborg" //HISS....Beep.
else
@@ -28,8 +28,8 @@
/obj/item/device/mmi/attackby(obj/item/O, mob/user, params)
user.changeNext_move(CLICK_CD_MELEE)
- if(istype(O,/obj/item/organ/brain)) //Time to stick a brain in it --NEO
- var/obj/item/organ/brain/newbrain = O
+ if(istype(O,/obj/item/organ/internal/brain)) //Time to stick a brain in it --NEO
+ var/obj/item/organ/internal/brain/newbrain = O
if(brain)
user << "There's already a brain in the MMI!"
return
@@ -94,7 +94,7 @@
brainmob.container = src
if(istype(H))
- var/obj/item/organ/brain/newbrain = H.getorgan(/obj/item/organ/brain)
+ var/obj/item/organ/internal/brain/newbrain = H.getorgan(/obj/item/organ/internal/brain)
newbrain.loc = src
brain = newbrain
diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm
index 5df89ec19ae..21e701b4940 100644
--- a/code/modules/mob/living/carbon/brain/brain_item.dm
+++ b/code/modules/mob/living/carbon/brain/brain_item.dm
@@ -1,20 +1,48 @@
-/obj/item/organ/brain
+/obj/item/organ/internal/brain
name = "brain"
desc = "A piece of juicy meat found in a person's head."
- icon = 'icons/obj/surgery.dmi'
icon_state = "brain"
- force = 1.0
- w_class = 2.0
- throwforce = 0
throw_speed = 3
throw_range = 5
layer = 4.1
+ zone = "head"
+ slot = "brain"
+ vital = 1
origin_tech = "biotech=4"
attack_verb = list("attacked", "slapped", "whacked")
var/mob/living/carbon/brain/brainmob = null
+/obj/item/organ/internal/brain/Insert(mob/living/carbon/M, special = 0)
+ ..()
+ name = "brain"
+ if(brainmob)
+ if(M.key)
+ M.ghostize()
-/obj/item/organ/brain/New()
+ if(brainmob.mind)
+ brainmob.mind.transfer_to(M)
+ else
+ M.key = brainmob.key
+
+ qdel(brainmob)
+
+ //Update the body's icon so it doesnt appear debrained anymore
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_hair(0)
+
+/obj/item/organ/internal/brain/Remove(mob/living/carbon/M, special = 0)
+ ..()
+ if(!special)
+ transfer_identity(M)
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ H.update_hair(0)
+
+/obj/item/organ/internal/brain/prepare_eat()
+ return // Too important to eat.
+
+/obj/item/organ/internal/brain/New()
..()
//Shifting the brain "mob" over to the brain object so it's easier to keep track of. --NEO
spawn(5)
@@ -22,19 +50,21 @@
brainmob.client.screen.len = null //clear the hud
-/obj/item/organ/brain/proc/transfer_identity(mob/living/carbon/H)
- name = "[H]'s brain"
+/obj/item/organ/internal/brain/proc/transfer_identity(mob/living/L)
+ name = "[L.name]'s brain"
brainmob = new(src)
- brainmob.name = H.real_name
- brainmob.real_name = H.real_name
- brainmob.dna = H.dna
- brainmob.timeofhostdeath = H.timeofdeath
- if(H.mind)
- H.mind.transfer_to(brainmob)
+ brainmob.name = L.real_name
+ brainmob.real_name = L.real_name
+ brainmob.timeofhostdeath = L.timeofdeath
+ if(iscarbon(L))
+ var/mob/living/carbon/C = L
+ brainmob.dna = C.dna
+ if(L.mind)
+ L.mind.transfer_to(brainmob)
brainmob << "You feel slightly disoriented. That's normal when you're just a brain."
-/obj/item/organ/brain/examine(mob/user)
+/obj/item/organ/internal/brain/examine(mob/user)
..()
if(brainmob && brainmob.client)
user << "You can feel the small spark of life still left in this one."
@@ -42,7 +72,7 @@
user << "This one seems particularly lifeless. Perhaps it will regain some of its luster later."
-/obj/item/organ/brain/attack(mob/living/carbon/M, mob/user)
+/obj/item/organ/internal/brain/attack(mob/living/carbon/M, mob/user)
if(!istype(M))
return ..()
@@ -58,7 +88,7 @@
//since these people will be dead M != usr
- if(!M.getorgan(/obj/item/organ/brain))
+ if(!M.getorgan(/obj/item/organ/internal/brain))
user.drop_item()
for(var/mob/O in viewers(M, null))
if(O == (user || M))
@@ -74,35 +104,18 @@
else
user << "You insert [src] into your head." //LOL
- //this might actually be outdated since barring badminnery, a debrain'd body will have any client sucked out to the brain's internal mob. Leaving it anyway to be safe. --NEO
- if(M.key)
- M.ghostize()
-
- if(brainmob.mind)
- brainmob.mind.transfer_to(M)
- else
- M.key = brainmob.key
-
- qdel(brainmob)
-
- M.internal_organs += src
- loc = null
-
- //Update the body's icon so it doesnt appear debrained anymore
- if(ishuman(M))
- H.update_hair(0)
-
+ Insert(M)
else
..()
-/obj/item/organ/brain/alien
- name = "alien brain"
- desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
- icon_state = "brain-alien"
- origin_tech = "biotech=7"
-
-/obj/item/organ/brain/Destroy() //copypasted from MMIs.
+/obj/item/organ/internal/brain/Destroy() //copypasted from MMIs.
if(brainmob)
qdel(brainmob)
brainmob = null
..()
+
+/obj/item/organ/internal/brain/alien
+ name = "alien brain"
+ desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?"
+ icon_state = "brain-alien"
+ origin_tech = "biotech=7"
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/brain/death.dm b/code/modules/mob/living/carbon/brain/death.dm
index f97ddb1a3db..889c0826459 100644
--- a/code/modules/mob/living/carbon/brain/death.dm
+++ b/code/modules/mob/living/carbon/brain/death.dm
@@ -3,7 +3,7 @@
if(!gibbed && container && istype(container, /obj/item/device/mmi))//If not gibbed but in a container.
container.visible_message("[src]'s MMI flatlines!", \
"You hear something flatline.")
- if(istype(src,/obj/item/organ/brain/alien))
+ if(istype(src,/obj/item/organ/internal/brain/alien))
container.icon_state = "mmi_alien_dead"
else
container.icon_state = "mmi_dead"
@@ -23,6 +23,6 @@
if(container && istype(container, /obj/item/device/mmi))
qdel(container)//Gets rid of the MMI if there is one
if(loc)
- if(istype(loc,/obj/item/organ/brain))
+ if(istype(loc,/obj/item/organ/internal/brain))
qdel(loc)//Gets rid of the brain item
..()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index c54c9e9f592..8fdb1c39ccf 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -335,11 +335,10 @@
return "trails_2"
var/const/NO_SLIP_WHEN_WALKING = 1
-var/const/STEP = 2
-var/const/SLIDE = 4
-var/const/GALOSHES_DONT_HELP = 8
+var/const/SLIDE = 2
+var/const/GALOSHES_DONT_HELP = 4
/mob/living/carbon/slip(s_amount, w_amount, obj/O, lube)
- loc.handle_slip(src, s_amount, w_amount, O, lube)
+ return loc.handle_slip(src, s_amount, w_amount, O, lube)
/mob/living/carbon/fall(forced)
loc.handle_fall(src, forced)//it's loc so it doesn't call the mob's handle_fall which does nothing
@@ -505,7 +504,7 @@ var/const/GALOSHES_DONT_HELP = 8
return 1
/mob/living/carbon/proc/accident(obj/item/I)
- if(!I || (I.flags & NODROP))
+ if(!I || (I.flags & (NODROP|ABSTRACT)))
return
unEquip(I)
@@ -537,9 +536,40 @@ var/const/GALOSHES_DONT_HELP = 8
O.emp_act(severity)
..()
-
/mob/living/carbon/check_eye_prot()
var/number = ..()
for(var/obj/item/organ/internal/cyberimp/eyes/EFP in internal_organs)
number += EFP.flash_protect
- return number
\ No newline at end of file
+ return number
+
+/mob/living/carbon/proc/AddAbility(obj/effect/proc_holder/alien/A)
+ abilities.Add(A)
+ A.on_gain(src)
+ if(A.has_action)
+ if(!A.action)
+ A.action = new/datum/action/spell_action/alien
+ A.action.target = A
+ A.action.name = A.name
+ A.action.button_icon = A.action_icon
+ A.action.button_icon_state = A.action_icon_state
+ A.action.background_icon_state = A.action_background_icon_state
+ A.action.Grant(src)
+ sortInsert(abilities, /proc/cmp_abilities_cost, 0)
+
+/mob/living/carbon/proc/RemoveAbility(obj/effect/proc_holder/alien/A)
+ abilities.Remove(A)
+ A.on_lose(src)
+ if(A.action)
+ A.action.Remove(src)
+
+/mob/living/carbon/proc/add_abilities_to_panel()
+ for(var/obj/effect/proc_holder/alien/A in abilities)
+ statpanel("[A.panel]",A.plasma_cost > 0?"([A.plasma_cost])":"",A)
+
+/mob/living/carbon/Stat()
+ ..()
+ if(statpanel("Status"))
+ var/obj/item/organ/internal/alien/plasmavessel/vessel = getorgan(/obj/item/organ/internal/alien/plasmavessel)
+ if(vessel)
+ stat(null, "Plasma Stored: [vessel.storedPlasma]/[vessel.max_plasma]")
+ add_abilities_to_panel()
\ No newline at end of file
diff --git a/code/modules/mob/living/carbon/carbon_defense.dm b/code/modules/mob/living/carbon/carbon_defense.dm
index 3c92e6403a1..80224f72e38 100644
--- a/code/modules/mob/living/carbon/carbon_defense.dm
+++ b/code/modules/mob/living/carbon/carbon_defense.dm
@@ -1,5 +1,5 @@
-/mob/living/carbon/hitby(atom/movable/AM, skip)
- if(!skip) //ugly, but easy
+/mob/living/carbon/hitby(atom/movable/AM, skipcatch, hitpush = 1)
+ if(!skipcatch) //ugly, but easy
if(in_throw_mode && !get_active_hand()) //empty active hand and we're in throw mode
if(canmove && !restrained())
if(istype(AM, /obj/item))
@@ -9,7 +9,7 @@
visible_message("[src] catches [I]!")
throw_mode_off()
return 1
- return ..()
+ ..()
/mob/living/carbon/throw_impact(atom/hit_atom)
. = ..()
diff --git a/code/modules/mob/living/carbon/carbon_defines.dm b/code/modules/mob/living/carbon/carbon_defines.dm
index 95e6875e55d..580b0b5919d 100644
--- a/code/modules/mob/living/carbon/carbon_defines.dm
+++ b/code/modules/mob/living/carbon/carbon_defines.dm
@@ -1,8 +1,8 @@
-/mob/living/carbon/
+/mob/living/carbon
gender = MALE
hud_possible = list(HEALTH_HUD,STATUS_HUD,ANTAG_HUD)
var/list/stomach_contents = list()
- var/list/internal_organs = list() //List of /obj/item/organ in the mob. they don't go in the contents.
+ var/list/internal_organs = list() //List of /obj/item/organ/internal in the mob. They don't go in the contents for some reason I don't want to know.
var/silent = 0 //Can't talk. Value goes down every life proc. //NOTE TO FUTURE CODERS: DO NOT INITIALIZE NUMERICAL VARS AS NULL OR I WILL MURDER YOU.
@@ -28,4 +28,5 @@
var/obj/item/weapon/reagent_containers/food/snacks/meat/slab/type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/
var/remote_view = 0
+ var/list/obj/effect/proc_holder/alien/abilities = list()
var/gib_type = /obj/effect/decal/cleanable/blood/gibs
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index c9ff89d92bd..f2a6715af8e 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -173,7 +173,7 @@
var/appears_dead = 0
if(stat == DEAD || (status_flags & FAKEDEATH))
appears_dead = 1
- if(getorgan(/obj/item/organ/brain))//Only perform these checks if there is no brain
+ if(getorgan(/obj/item/organ/internal/brain))//Only perform these checks if there is no brain
if(suiciding)
msg += "[t_He] appears to have commited suicide... there is no hope of recovery.\n"
msg += "[t_He] [t_is] limp and unresponsive; there are no signs of life"
@@ -252,7 +252,7 @@
else if(getBrainLoss() >= 60)
msg += "[t_He] [t_has] a stupid expression on [t_his] face.\n"
- if(getorgan(/obj/item/organ/brain))
+ if(getorgan(/obj/item/organ/internal/brain))
if(istype(src,/mob/living/carbon/human/interactive))
msg += "[t_He] [t_is] appears to be some sort of sick automaton, [t_his] eyes are glazed over and [t_his] mouth is slightly agape.\n"
else if(!key)
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 658bd354c0c..795c7e68da7 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -24,7 +24,7 @@
O.owner = src
internal_organs += new /obj/item/organ/internal/appendix
internal_organs += new /obj/item/organ/internal/heart
- internal_organs += new /obj/item/organ/brain
+ internal_organs += new /obj/item/organ/internal/brain
for(var/obj/item/organ/internal/I in internal_organs)
I.Insert(src)
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index 5522563f1cd..7a39b9969fe 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -129,8 +129,8 @@ emp_act
var/obj/item/organ/limb/affecting = get_organ(ran_zone(user.zone_sel.selecting))
var/hit_area = parse_zone(affecting.name)
var/target_area = parse_zone(target_limb.name)
- feedback_add_details("item_used_for_combat","[I.name]|[I.force]")
- feedback_add_details("zone_targeted","[def_zone]")
+ feedback_add_details("item_used_for_combat","[I.type]|[I.force]")
+ feedback_add_details("zone_targeted","[target_area]")
if(dna) // allows your species to affect the attacked_by code
return dna.species.spec_attacked_by(I,user,def_zone,affecting,hit_area,src.a_intent,target_limb,target_area,src)
@@ -455,7 +455,9 @@ emp_act
..()
/mob/living/carbon/human/hitby(atom/movable/AM)
- if(throw_speed >= EMBED_THROWSPEED_THRESHOLD)
+ var/hitpush = 1
+ var/skipcatch = 0
+ if(AM.throw_speed >= EMBED_THROWSPEED_THRESHOLD)
if(istype(AM, /obj/item))
var/obj/item/I = AM
if(can_embed(I))
@@ -467,5 +469,6 @@ emp_act
I.loc = src
L.take_damage(I.w_class*I.embedded_impact_pain_multiplier)
visible_message("\the [I.name] embeds itself in [src]'s [L.getDisplayName()]!","\the [I.name] embeds itself in your [L.getDisplayName()]!")
- return
- return ..()
+ hitpush = 0
+ skipcatch = 1 //can't catch the now embedded item
+ return ..(AM, skipcatch, hitpush)
diff --git a/code/modules/mob/living/carbon/human/species.dm b/code/modules/mob/living/carbon/human/species.dm
index 12266289786..db366b79fb0 100644
--- a/code/modules/mob/living/carbon/human/species.dm
+++ b/code/modules/mob/living/carbon/human/species.dm
@@ -168,7 +168,7 @@
standing += img_facial_s
//Applies the debrained overlay if there is no brain
- if(!H.getorgan(/obj/item/organ/brain))
+ if(!H.getorgan(/obj/item/organ/internal/brain))
standing += image("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s", "layer" = -HAIR_LAYER)
if((H.wear_suit) && (H.wear_suit.hooded) && (H.wear_suit.suittoggled == 1))
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 8f6db5b5086..86014c735ca 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -261,7 +261,7 @@
if(..()) //alive
- if(health <= config.health_threshold_dead || !getorgan(/obj/item/organ/brain))
+ if(health <= config.health_threshold_dead || !getorgan(/obj/item/organ/internal/brain))
death()
return
diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm
index 7a2a5379910..5f721ecb512 100644
--- a/code/modules/mob/living/carbon/monkey/monkey.dm
+++ b/code/modules/mob/living/carbon/monkey/monkey.dm
@@ -10,6 +10,7 @@
ventcrawler = 1
type_of_meat = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey
gib_type = /obj/effect/decal/cleanable/blood/gibs
+ unique_name = 1
/mob/living/carbon/monkey/New()
create_reagents(1000)
@@ -18,14 +19,10 @@
internal_organs += new /obj/item/organ/internal/appendix
internal_organs += new /obj/item/organ/internal/heart
- internal_organs += new /obj/item/organ/brain
+ internal_organs += new /obj/item/organ/internal/brain
for(var/obj/item/organ/internal/I in internal_organs)
I.Insert(src)
-
- if(name == "monkey")
- name = text("monkey ([rand(1, 1000)])")
- real_name = name
gender = pick(MALE, FEMALE)
..()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 5dc99707a72..2578a8a774e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -20,6 +20,9 @@ Sorry Giacom. Please don't be mad :(
else //no choice? force static
D.staticOverlays |= staticOverlays["static"]
D.client.images |= staticOverlays["static"]
+ if(unique_name)
+ name = "[name] ([rand(1, 1000)])"
+ real_name = name
/mob/living/Destroy()
@@ -836,12 +839,12 @@ Sorry Giacom. Please don't be mad :(
else if(istype(loc, /obj/machinery/atmospherics/components/unary/cryo_cell))
var/obj/machinery/atmospherics/components/unary/cryo_cell/C = loc
- var/datum/gas_mixture/C_air_contents = C.airs[1]
+ var/datum/gas_mixture/G = C.airs["a1"]
- if(C_air_contents.total_moles() < 10)
+ if(G.total_moles() < 10)
loc_temp = environment.temperature
else
- loc_temp = C_air_contents.temperature
+ loc_temp = G.temperature
else
loc_temp = environment.temperature
diff --git a/code/modules/mob/living/living_defense.dm b/code/modules/mob/living/living_defense.dm
index 9d8017d0c2b..9a332445538 100644
--- a/code/modules/mob/living/living_defense.dm
+++ b/code/modules/mob/living/living_defense.dm
@@ -44,7 +44,7 @@
else
return 0
-/mob/living/hitby(atom/movable/AM)
+/mob/living/hitby(atom/movable/AM, skipcatch, hitpush = 1)
if(istype(AM, /obj/item))
var/obj/item/I = AM
var/zone = ran_zone("chest", 65)//Hits a random part of the body, geared towards the chest
@@ -75,7 +75,7 @@
add_logs(I.thrownby, src, "hit", I)
else
playsound(loc, 'sound/weapons/genhit.ogg', 50, 1, -1)
- return ..()
+ ..()
/mob/living/mech_melee_attack(obj/mecha/M)
if(M.occupant.a_intent == "harm")
diff --git a/code/modules/mob/living/living_defines.dm b/code/modules/mob/living/living_defines.dm
index 06f14523bcf..b9f1cefa0f2 100644
--- a/code/modules/mob/living/living_defines.dm
+++ b/code/modules/mob/living/living_defines.dm
@@ -52,3 +52,4 @@
var/list/say_log = list() //a log of what we've said, plain text, no spans or junk, essentially just each individual "message"
var/last_bumped = 0
+ var/unique_name = 0 //if a mob's name should be appended with an id when created e.g. Mob (666)
diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm
index d9a69f3c25a..a95d8be0c5d 100644
--- a/code/modules/mob/living/say.dm
+++ b/code/modules/mob/living/say.dm
@@ -220,6 +220,10 @@ var/list/crit_allowed_modes = list(MODE_WHISPER,MODE_CHANGELING,MODE_ALIEN)
if(1)
src << "Our senses have not evolved enough to be able to communicate this way..."
return 1
+ if(message_mode == MODE_ALIEN)
+ if(hivecheck())
+ alien_talk(message)
+ return 1
return 0
/mob/living/proc/treat_message(message)
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 3f601c0810f..5fb2d87bf7d 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -309,7 +309,7 @@ var/list/ai_list = list()
usr << "Wireless control is disabled!"
return
- var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as text
+ var/reason = input(src, "What is the nature of your emergency? ([CALL_SHUTTLE_REASON_LENGTH] characters required.)", "Confirm Shuttle Call") as null|text
if(trim(reason))
SSshuttle.requestEvac(src, reason)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index e978c6c37a6..f22de8919e0 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -106,7 +106,7 @@
//MMI stuff. Held togheter by magic. ~Miauw
if(!mmi || !mmi.brainmob)
mmi = new(src)
- mmi.brain = new /obj/item/organ/brain(mmi)
+ mmi.brain = new /obj/item/organ/internal/brain(mmi)
mmi.brain.name = "[real_name]'s brain"
mmi.icon_state = "mmi_full"
mmi.name = "Man-Machine Interface: [real_name]"
diff --git a/code/modules/mob/living/simple_animal/constructs.dm b/code/modules/mob/living/simple_animal/constructs.dm
index ed126f984ed..a0f2e39fca2 100644
--- a/code/modules/mob/living/simple_animal/constructs.dm
+++ b/code/modules/mob/living/simple_animal/constructs.dm
@@ -18,13 +18,13 @@
minbodytemp = 0
faction = list("cult")
flying = 1
+ unique_name = 1
var/list/construct_spells = list()
var/playstyle_string = "You are a generic construct! Your job is to not exist."
+
/mob/living/simple_animal/construct/New()
..()
- name = text("[initial(name)] ([rand(1, 1000)])")
- real_name = name
for(var/spell in construct_spells)
mob_spell_list += new spell(src)
diff --git a/code/modules/mob/living/simple_animal/friendly/dog.dm b/code/modules/mob/living/simple_animal/friendly/dog.dm
index 996f8706290..bc0ebe9883b 100644
--- a/code/modules/mob/living/simple_animal/friendly/dog.dm
+++ b/code/modules/mob/living/simple_animal/friendly/dog.dm
@@ -22,7 +22,7 @@
icon_living = "corgi"
icon_dead = "corgi_dead"
gender = MALE
- butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3)
+ butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi = 3, /obj/item/stack/sheet/animalhide/corgi = 1)
childtype = /mob/living/simple_animal/pet/dog/corgi/puppy
species = /mob/living/simple_animal/pet/dog
var/shaved = 0
@@ -183,6 +183,7 @@
/obj/item/weapon/tank/internals/oxygen,
/obj/item/weapon/tank/internals/air,
/obj/item/weapon/extinguisher,
+ /obj/item/clothing/suit/hooded/ian_costume,
)
if( ! ( item_to_add.type in allowed_types ) )
diff --git a/code/modules/mob/living/simple_animal/hostile/alien.dm b/code/modules/mob/living/simple_animal/hostile/alien.dm
index 3d04bb5dc61..08ca902017d 100644
--- a/code/modules/mob/living/simple_animal/hostile/alien.dm
+++ b/code/modules/mob/living/simple_animal/hostile/alien.dm
@@ -28,6 +28,7 @@
minbodytemp = 0
see_in_dark = 8
see_invisible = SEE_INVISIBLE_MINIMUM
+ unique_name = 1
/mob/living/simple_animal/hostile/alien/drone
name = "alien drone"
@@ -82,6 +83,7 @@
projectiletype = /obj/item/projectile/neurotox
projectilesound = 'sound/weapons/pierce.ogg'
status_flags = 0
+ unique_name = 0
var/sterile = 1
var/plants_off = 0
var/egg_cooldown = 30
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 ae03ebe143e..9eb111c521e 100644
--- a/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+++ b/code/modules/mob/living/simple_animal/hostile/giant_spider.dm
@@ -44,6 +44,7 @@
ventcrawler = 2
attacktext = "bites"
attack_sound = 'sound/weapons/bite.ogg'
+ unique_name = 1
//nursemaids - these create webs and eggs
/mob/living/simple_animal/hostile/poison/giant_spider/nurse
diff --git a/code/modules/mob/living/simple_animal/hostile/mimic.dm b/code/modules/mob/living/simple_animal/hostile/mimic.dm
index 4c99fd62ca2..5e0f67211e6 100644
--- a/code/modules/mob/living/simple_animal/hostile/mimic.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mimic.dm
@@ -1,7 +1,3 @@
-//
-// Abstract Class
-//
-
/mob/living/simple_animal/hostile/mimic
name = "crate"
desc = "A rectangular steel crate."
@@ -37,19 +33,10 @@
ghostize()
qdel(src)
-
-
-//
-// Crate Mimic
-//
-
-
// Aggro when you try to open them. Will also pickup loot when spawns and drop it when dies.
/mob/living/simple_animal/hostile/mimic/crate
-
attacktext = "bites"
speak_emote = list("clatters")
-
stop_automated_movement = 1
wander = 0
var/attempt_open = 0
@@ -96,7 +83,6 @@
icon_state = initial(icon_state)
/mob/living/simple_animal/hostile/mimic/crate/death()
-
var/obj/structure/closet/crate/C = new(get_turf(src))
// Put loot in crate
for(var/obj/O in src)
@@ -113,21 +99,18 @@
C.visible_message("\The [src] knocks down \the [C]!", \
"\The [src] knocks you down!")
-//
-// Copy Mimic
-//
+
var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/cable, /obj/structure/window)
/mob/living/simple_animal/hostile/mimic/copy
-
health = 100
maxHealth = 100
var/mob/living/creator = null // the creator
var/destroy_objects = 0
var/knockdown_people = 0
-/mob/living/simple_animal/hostile/mimic/copy/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0)
+/mob/living/simple_animal/hostile/mimic/copy/New(loc, obj/copy, mob/living/creator, destroy_original = 0)
..(loc)
CopyObject(copy, creator, destroy_original)
@@ -137,13 +120,11 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
death()
/mob/living/simple_animal/hostile/mimic/copy/death()
-
for(var/atom/movable/M in src)
M.loc = get_turf(src)
..()
/mob/living/simple_animal/hostile/mimic/copy/ListTargets()
- // Return a list of targets that isn't the creator
. = ..()
return . - creator
@@ -159,9 +140,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
return 0
/mob/living/simple_animal/hostile/mimic/copy/proc/CopyObject(obj/O, mob/living/creator, destroy_original = 0)
-
if(destroy_original || CheckObject(O))
-
O.loc = src
name = O.name
desc = O.desc
@@ -169,7 +148,6 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
icon_state = O.icon_state
icon_living = icon_state
overlays = O.overlays
-
if(istype(O, /obj/structure) || istype(O, /obj/machinery))
health = (anchored * 50) + 50
destroy_objects = 1
@@ -183,15 +161,13 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
melee_damage_lower = 2 + I.force
melee_damage_upper = 2 + I.force
move_to_delay = 2 * I.w_class + 1
-
maxHealth = health
if(creator)
- src.creator = creator
+ creator = creator
faction += "\ref[creator]" // very unique
if(destroy_original)
qdel(O)
return 1
- return
/mob/living/simple_animal/hostile/mimic/copy/DestroySurroundings()
if(destroy_objects)
@@ -207,9 +183,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
C.visible_message("\The [src] knocks down \the [C]!", \
"\The [src] knocks you down!")
-//
-// Machine Mimics (Made by Malf AI)
-//
+
/mob/living/simple_animal/hostile/mimic/copy/machine
speak = list("HUMANS ARE IMPERFECT!", "YOU SHALL BE ASSIMILATED!", "YOU ARE HARMING YOURSELF", "You have been deemed hazardous. Will you comply?", \
@@ -225,93 +199,57 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
return 0
return ..()
-//
-//animated blasters, wands, etc
-//
+
/mob/living/simple_animal/hostile/mimic/copy/ranged
- name = "animated shooty gun"
- desc = "there's something fishy here."
- environment_smash = 0 //needed? seems weird for them to do so
- ranged = 1
- retreat_distance = 1 //just enough to shoot
- minimum_distance = 6
- projectiletype = /obj/item/projectile/magic/
- projectilesound = 'sound/items/bikehorn.ogg'
- casingtype = null
- emote_see = list("aims menacingly")
var/obj/item/weapon/gun/TrueGun = null
- var/obj/item/weapon/gun/magic/Zapstick = list()
- var/obj/item/weapon/gun/projectile/Pewgun = list()
- var/obj/item/weapon/gun/energy/Zapgun = list()
-
-/mob/living/simple_animal/hostile/mimic/copy/ranged/New(loc, var/obj/copy, var/mob/living/creator, var/destroy_original = 0)
- ..()
-
+ var/obj/item/weapon/gun/magic/Zapstick
+ var/obj/item/weapon/gun/projectile/Pewgun
+ var/obj/item/weapon/gun/energy/Zapgun
/mob/living/simple_animal/hostile/mimic/copy/ranged/CopyObject(obj/O, mob/living/creator, destroy_original = 0)
- if(destroy_original || CheckObject(O))
-
- O.loc = src
- name = O.name
- desc = O.desc
- icon = O.icon
- icon_state = O.icon_state
- icon_living = icon_state
-
- if(istype(O, /obj/item/weapon/gun)) //leaving for sanity i guess
- var/obj/item/weapon/gun/G = O
- health = 15 * G.w_class
- melee_damage_upper = G.force
- melee_damage_lower = G.force - max(0, (G.force / 2))
- move_to_delay = 2 * G.w_class + 1
- projectilesound = G.fire_sound
- TrueGun = G
-
- if(istype(G, /obj/item/weapon/gun/magic))
- Zapstick = G
- var/obj/item/ammo_casing/magic/Zapshot = new Zapstick.ammo_type //this is done because ammo_type.proj_type can't be directly checked
- projectiletype = Zapshot.projectile_type
- qdel(Zapshot) //is this needed? i dare not risk piles of nullspace bullets
-
- if(istype(G, /obj/item/weapon/gun/projectile))
- Pewgun = G
- var/obj/item/ammo_box/magazine/Pewmag = new Pewgun.mag_type //same problem, mag_type.ammo_type.proj_type can't be checked directly
- var/obj/item/ammo_casing/Pewshot = new Pewmag.ammo_type
- projectiletype = Pewshot.projectile_type
- casingtype = Pewmag.ammo_type
- qdel(Pewshot)
- qdel(Pewmag)
-
- if(istype(G, /obj/item/weapon/gun/energy))
- Zapgun = G
- var/selectfiresetting = Zapgun.select
- var/obj/item/ammo_casing/energy/Energyammotype = Zapgun.ammo_type[selectfiresetting]
- projectiletype = Energyammotype.projectile_type
-
- maxHealth = health
- if(creator)
- src.creator = creator
- faction += "\ref[creator]"
- if(destroy_original)
- qdel(O)
- return 1
- return
+ if(..())
+ emote_see = list("aims menacingly")
+ environment_smash = 0 //needed? seems weird for them to do so
+ ranged = 1
+ retreat_distance = 1 //just enough to shoot
+ minimum_distance = 6
+ var/obj/item/weapon/gun/G = O
+ melee_damage_upper = G.force
+ melee_damage_lower = G.force - max(0, (G.force / 2))
+ move_to_delay = 2 * G.w_class + 1
+ projectilesound = G.fire_sound
+ TrueGun = G
+ if(istype(G, /obj/item/weapon/gun/magic))
+ Zapstick = G
+ var/obj/item/ammo_casing/magic/M = Zapstick.ammo_type
+ projectiletype = initial(M.projectile_type)
+ if(istype(G, /obj/item/weapon/gun/projectile))
+ Pewgun = G
+ var/obj/item/ammo_box/magazine/M = Pewgun.mag_type
+ var/obj/item/ammo_casing/A = initial(M.ammo_type)
+ projectiletype = initial(A.projectile_type)
+ casingtype = initial(M.ammo_type)
+ if(istype(G, /obj/item/weapon/gun/energy))
+ Zapgun = G
+ var/selectfiresetting = Zapgun.select
+ var/obj/item/ammo_casing/energy/E = Zapgun.ammo_type[selectfiresetting]
+ projectiletype = initial(E.projectile_type)
/mob/living/simple_animal/hostile/mimic/copy/ranged/OpenFire(the_target)
if(Zapgun)
- if(Zapgun.power_supply) //sanity
+ if(Zapgun.power_supply)
var/obj/item/ammo_casing/energy/shot = Zapgun.ammo_type[Zapgun.select]
- if(Zapgun.power_supply.charge >= shot.e_cost) //if she can zap
+ if(Zapgun.power_supply.charge >= shot.e_cost)
Zapgun.power_supply.use(shot.e_cost)
Zapgun.update_icon()
- ..() //zap 'em
- if(Zapstick)
+ ..()
+ else if(Zapstick)
if(Zapstick.charges)
Zapstick.charges--
Zapstick.update_icon()
..()
- if(Pewgun)
+ else if(Pewgun)
if(Pewgun.chambered)
if(Pewgun.chambered.BB)
qdel(Pewgun.chambered.BB)
@@ -320,7 +258,7 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
..()
else
visible_message("The [src] clears a jam!")
- Pewgun.chambered.loc = src.loc //rip revolver immersions, blame shotgun snowflake procs
+ Pewgun.chambered.loc = loc //rip revolver immersions, blame shotgun snowflake procs
Pewgun.chambered = null
if(Pewgun.magazine && Pewgun.magazine.stored_ammo.len)
Pewgun.chambered = Pewgun.magazine.get_round(0)
@@ -330,11 +268,10 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
Pewgun.chambered = Pewgun.magazine.get_round(0)
Pewgun.chambered.loc = Pewgun
visible_message("The [src] cocks itself!")
-
- else //if somehow the mimic has no weapon
- src.ranged = 0 //BANZAIIII
- src.retreat_distance = 0
- src.minimum_distance = 1
- src.icon_state = TrueGun.icon_state
- src.icon_living = TrueGun.icon_state
- return
\ No newline at end of file
+ else
+ ranged = 0 //BANZAIIII
+ retreat_distance = 0
+ minimum_distance = 1
+ return
+ icon_state = TrueGun.icon_state
+ icon_living = TrueGun.icon_state
\ No newline at end of file
diff --git a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
index 7e01e2942ef..777ecc44f92 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
@@ -42,7 +42,7 @@
..()
/mob/living/simple_animal/hostile/asteroid/death(gibbed)
- feedback_add_details("mobs_killed_mining","[src.name]")
+ feedback_add_details("mobs_killed_mining","[src.type]")
..(gibbed)
/mob/living/simple_animal/hostile/asteroid/basilisk
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant.dm b/code/modules/mob/living/simple_animal/revenant/revenant.dm
index cb99c234248..0a984a21f4b 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant.dm
@@ -12,27 +12,29 @@
invisibility = INVISIBILITY_OBSERVER
health = 25
maxHealth = 25
- see_in_dark = 255
see_invisible = SEE_INVISIBLE_OBSERVER
languages = ALL
response_help = "passes through"
response_disarm = "swings at"
- response_harm = "punches"
+ response_harm = "punches through"
+ unsuitable_atmos_damage = 0
atmos_requirements = list("min_oxy" = 0, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 0, "min_co2" = 0, "max_co2" = 0, "min_n2" = 0, "max_n2" = 0)
minbodytemp = 0
maxbodytemp = INFINITY
- harm_intent_damage = 5
- speak_emote = list("hisses", "spits", "growls")
+ harm_intent_damage = 0
friendly = "touches"
status_flags = 0
wander = 0
density = 0
+ flying = 1
+ anchored = 1
- var/essence = 25 //The resource of revenants. Max health is equal to twice this amount
+ var/essence = 25 //The resource of revenants. Max health is equal to three times this amount
var/essence_regen_cap = 25 //The regeneration cap of essence (go figure); regenerates every Life() tick up to this amount.
- var/essence_regen = 1 //If the revenant regenerates essence or not; 1 for yes, 0 for no
+ var/essence_regenerating = 1 //If the revenant regenerates essence or not; 1 for yes, 0 for no
+ var/essence_regen_amount = 2 //How much essence regenerates
var/essence_min = 1 //The minimum amount of essence a revenant can have; by default, it never drops below one
- var/strikes = 0 //How many times a revenant can die before dying for good
+ var/essence_accumulated = 0 //How much essence the revenant has stolen
var/revealed = 0 //If the revenant can take damage from normal sources.
var/inhibited = 0 //If the revenant's abilities are blocked by a chaplain's power.
@@ -40,20 +42,20 @@
..()
if(essence < essence_min)
essence = essence_min
- if(strikes > 0)
- strikes--
- src << "Your essence has dropped below critical levels. You barely manage to save yourself - [strikes ? "you can't keep this up!" : "next time, it's death."]"
- else if(strikes <= 0)
- death()
- maxHealth = essence * 2
+ if(essence_regenerating && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate
+ essence += essence_regen_amount
+ if(essence > essence_regen_cap)
+ essence = essence_regen_cap
+ maxHealth = essence * 3
if(!revealed)
health = maxHealth //Heals to full when not revealed
- if(essence_regen && !inhibited && essence < essence_regen_cap) //While inhibited, essence will not regenerate
- essence++
/mob/living/simple_animal/revenant/ex_act(severity, target)
return 1 //Immune to the effects of explosions.
+/mob/living/simple_animal/revenant/blob_act()
+ return //blah blah blobs aren't in tune with the spirit world, or something.
+
/mob/living/simple_animal/revenant/ClickOn(atom/A, params) //Copypaste from ghost code - revenants can't interact with the world directly.
if(client.buildmode)
build_click(src, client.buildmode, params, A)
@@ -84,6 +86,7 @@
..()
if(statpanel("Status"))
stat(null, "Current essence: [essence]E")
+ stat(null, "Stolen essence: [essence_accumulated]E")
/mob/living/simple_animal/revenant/New()
..()
@@ -101,17 +104,17 @@
src << "You do not remember anything of your past lives, nor will you remember anything about this one after your death."
src << "Be sure to read the wiki page at https://tgstation13.org/wiki/Revenant to learn more."
var/datum/objective/revenant/objective = new
- objective.owner = src
+ objective.owner = src.mind
src.mind.objectives += objective
src << "Objective #1: [objective.explanation_text]"
var/datum/objective/revenantFluff/objective2 = new
- objective2.owner = src
+ objective2.owner = src.mind
src.mind.objectives += objective2
src << "Objective #2: [objective2.explanation_text]"
ticker.mode.traitors |= src.mind //Necessary for announcing
if(!src.giveSpells())
- message_admins("Revenant was created but has no mind. Trying again in five seconds.")
- spawn(50)
+ message_admins("Revenant was created but has no mind. Trying again in ten seconds.")
+ spawn(100)
if(!src.giveSpells())
message_admins("Revenant still has no mind. Deleting...")
qdel(src)
@@ -121,13 +124,11 @@
src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_harvest
src.mind.spell_list += new /obj/effect/proc_holder/spell/targeted/revenant_transmit
src.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/revenant_light
- src.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/revenantDefile
+ src.mind.spell_list += new /obj/effect/proc_holder/spell/aoe_turf/revenant_defile
return 1
return 0
/mob/living/simple_animal/revenant/death()
- if(strikes)
- return 0 //Impossible to die with strikes still active
..(1)
src << "NO! No... it's too late, you can feel yourself fading..."
notransform = 1
@@ -147,15 +148,14 @@
/mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params)
- ..()
if(istype(W, /obj/item/weapon/nullrod))
visible_message("[src] violently flinches!", \
- "The null rod invokes agony in you! You feel your essence draining away!")
+ "As the null rod passes through you, you feel your essence draining away!")
essence -= 25 //hella effective
inhibited = 1
spawn(30)
inhibited = 0
-
+ ..()
/mob/living/simple_animal/revenant/proc/castcheck(essence_cost)
@@ -170,7 +170,7 @@
user << "You lack the essence to use that ability."
return 0
if(user.inhibited)
- user << "Your powers have been suppressed by holy energies!"
+ user << "Your powers have been suppressed by nulling energy!"
return 0
return 1
@@ -183,7 +183,10 @@
if(user.essence + essence_amt <= 0)
return
user.essence += essence_amt
- user.essence = Clamp(user.essence, 0, INFINITY)
+ user.essence = max(0, user.essence)
+ if(essence_amt > 0)
+ user.essence_accumulated += essence_amt
+ user.essence_accumulated = max(0, user.essence_accumulated)
if(!silent)
if(essence_amt > 0)
user << "Gained [essence_amt]E from [source]."
@@ -201,13 +204,13 @@
R.invisibility = 0
if(stun)
R.notransform = 1
- R << "You have been revealed [stun ? "and cannot move" : ""]."
+ R << "You have been revealed[stun ? " and cannot move" : ""]."
spawn(time)
R.revealed = 0
R.invisibility = INVISIBILITY_OBSERVER
if(stun)
R.notransform = 0
- R << "You are once more concealed [stun ? "and can move again" : ""]."
+ R << "You are once more concealed[stun ? " and can move again" : ""]."
/datum/objective/revenant
dangerrating = 10
@@ -215,17 +218,17 @@
/datum/objective/revenant/New()
targetAmount = rand(100,200)
- explanation_text = "Absorb [targetAmount] points of essence."
+ explanation_text = "Absorb [targetAmount] points of essence from humans."
..()
/datum/objective/revenant/check_completion()
- if(!istype(owner.current, /mob/living/simple_animal/revenant) || !owner.current)
+ if(!istype(owner.current, /mob/living/simple_animal/revenant))
return 0
var/mob/living/simple_animal/revenant/R = owner.current
if(!R || R.stat == DEAD)
return 0
- var/essenceAccumulated = R.essence
- if(essenceAccumulated < targetAmount)
+ var/essence_stolen = R.essence_accumulated
+ if(essence_stolen < targetAmount)
return 0
return 1
@@ -258,7 +261,7 @@
/obj/item/weapon/ectoplasm/revenant/New()
..()
reforming = 1
- spawn(1800) //3 minutes
+ spawn(600) //1 minute
if(src && reforming)
return reform()
if(src && !reforming)
@@ -294,7 +297,7 @@
/obj/item/weapon/ectoplasm/revenant/proc/reform()
if(!reforming || !src)
return
- message_admins("Revenant ectoplasm was left undestroyed for 3 minutes and has reformed into a new revenant.")
+ message_admins("Revenant ectoplasm was left undestroyed for 1 minute and has reformed into a new revenant.")
loc = get_turf(src) //In case it's in a backpack or someone's hand
visible_message("[src] suddenly rises into the air before fading away.")
var/mob/living/simple_animal/revenant/R = new(get_turf(src))
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
index b4f47647871..4bd9418c2e9 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_abilities.dm
@@ -5,7 +5,7 @@
panel = "Revenant Abilities"
charge_max = 100 //Short cooldown
clothes_req = 0
- range = 5
+ range = 1
var/essence_drained = 0
var/draining
var/list/drained_mobs = list() //Cannot harvest the same mob twice
@@ -18,22 +18,29 @@
spawn(0)
if(draining)
user << "You are already siphoning the essence of a soul!"
+ charge_counter = charge_max
return
if(target in drained_mobs)
user << "[target]'s soul is dead and empty."
+ charge_counter = charge_max
return
- if(target.stat != DEAD)
+ if(!target.stat)
user << "This being's soul is too strong to harvest."
if(prob(10))
target << "You feel as if you are being watched."
return
draining = 1
- essence_drained = 1
- user << "You search for the still-living soul of [target]."
+ essence_drained = 2
+ user << "You search for the soul of [target]."
sleep(10)
if(target.ckey)
user << "Their soul burns with intelligence."
- essence_drained += 3
+ essence_drained += 2
+ if(target.stat != DEAD)
+ user << "Their soul blazes with life!"
+ essence_drained += 2
+ else
+ user << "Their soul is weak and faltering."
sleep(20)
switch(essence_drained)
if(1 to 2)
@@ -50,23 +57,19 @@
if(!target.stat)
user << "They are now powerful enough to fight off your draining."
target << "You feel something tugging across your body before subsiding."
- user << "You begin siphoning essence from [target]'s soul. You can not move while this is happening."
+ return //hey, wait a minute...
+ user << "You begin siphoning essence from [target]'s soul."
if(target.stat != DEAD)
target << "You feel a horribly unpleasant draining sensation as your grip on life weakens..."
user.icon_state = "revenant_draining"
- user.notransform = 1
- user.revealed = 1
- user.invisibility = 0
+ user.reveal(65,1)
target.visible_message("[target] suddenly rises slightly into the air, their skin turning an ashy gray.")
- target.Beam(user,icon_state="drain_life",icon='icons/effects/effects.dmi',time=80)
+ target.Beam(user,icon_state="drain_life",icon='icons/effects/effects.dmi',time=60)
target.death(0)
target.visible_message("[target] gently slumps back onto the ground.")
user.icon_state = "revenant_idle"
user.change_essence_amount(essence_drained * 5, 0, target)
user << "[target]'s soul has been considerably weakened and will yield no more essence for the time being."
- user.revealed = 0
- user.notransform = 0
- user.invisibility = INVISIBILITY_OBSERVER
drained_mobs.Add(target)
draining = 0
@@ -106,25 +109,29 @@
//Overload Light: Breaks a light that's online and sends out lightning bolts to all nearby people.
/obj/effect/proc_holder/spell/aoe_turf/revenant_light
- name = "Overload Light (25E)"
- desc = "Directs a large amount of essence into an electrical light, causing an impressive light show."
+ name = "Overload Lights (30E)"
+ desc = "Directs a large amount of essence into nearby electrical lights, causing lights to shock those nearby."
panel = "Revenant Abilities (Locked)"
- charge_max = 300
+ charge_max = 200
clothes_req = 0
range = 1
var/locked = 1
/obj/effect/proc_holder/spell/aoe_turf/revenant_light/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
- if(!user.castcheck(-25))
- charge_counter = charge_max
- return
if(locked)
- user << "You have unlocked Overload Light!"
+ if(!user.castcheck(-30))
+ charge_counter = charge_max
+ return
+ user << "You have unlocked Overload Lights!"
+ name = "Overload Lights (20E)"
panel = "Revenant Abilities"
locked = 0
range = 5
charge_counter = charge_max
return
+ if(!user.castcheck(-20))
+ charge_counter = charge_max
+ return
for(var/turf/T in targets)
spawn(0)
for(var/obj/machinery/light/L in T.contents)
@@ -132,57 +139,68 @@
if(!L.on)
return
L.visible_message("\The [L] suddenly flares brightly and begins to spark!")
- sleep(20)
+ sleep(10)
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(4, 1, L)
+ s.start()
+ sleep(10)
for(var/mob/living/M in orange(4, L))
if(M == user)
return
M.Beam(L,icon_state="lightning",icon='icons/effects/effects.dmi',time=5)
M.electrocute_act(25, "[L.name]")
+ var/datum/effect/effect/system/spark_spread/z = new /datum/effect/effect/system/spark_spread
+ z.set_up(4, 1, M)
+ z.start()
playsound(M, 'sound/machines/defib_zap.ogg', 50, 1, -1)
- user.reveal(50, 1)
+ user.reveal(80)
//Defile: Corrupts nearby stuff, unblesses floor tiles.
-/obj/effect/proc_holder/spell/aoe_turf/revenantDefile
- name = "Defile (30E)"
+/obj/effect/proc_holder/spell/aoe_turf/revenant_defile
+ name = "Defile (40E)"
desc = "Twists and corrupts certain nearby objects. Also dispels holy auras on floors, but not salt lines."
panel = "Revenant Abilities (Locked)"
- charge_max = 300
+ charge_max = 200
clothes_req = 0
range = 1
var/locked = 1
-/obj/effect/proc_holder/spell/aoe_turf/revenantDefile/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
- if(!user.castcheck(-30))
- charge_counter = charge_max
- return
+/obj/effect/proc_holder/spell/aoe_turf/revenant_defile/cast(list/targets, mob/living/simple_animal/revenant/user = usr)
if(locked)
+ if(!user.castcheck(-40))
+ charge_counter = charge_max
+ return
user << "You have unlocked Defile!"
+ name = "Defile (20E)"
panel = "Revenant Abilities"
locked = 0
range = 4
charge_counter = charge_max
return
+ if(!user.castcheck(-20))
+ charge_counter = charge_max
+ return
for(var/turf/T in targets)
spawn(0)
if(T.flags & NOJAUNT)
T.flags -= NOJAUNT
- for(var/obj/machinery/bot/secbot/secbot in T.contents) //Not including ED-209
- secbot.emagged = 2
- secbot.Emag(null)
- for(var/obj/machinery/bot/cleanbot/cleanbot in T.contents)
- cleanbot.emagged = 2
- cleanbot.Emag(null)
+ for(var/obj/machinery/bot/bot in T.contents)
+ bot.locked = 0
+ bot.open = 1
+ bot.emagged = 2
+ bot.Emag(null)
for(var/mob/living/carbon/human/human in T.contents)
human << "You suddenly feel tired."
- human.adjustStaminaLoss(25)
+ human.adjustStaminaLoss(50)
for(var/mob/living/silicon/robot/robot in T.contents)
robot.visible_message("[robot] lets out an alarm!", \
"01001111 01010110 01000101 01010010 01001100 01001111 01000001 01000100") //Translates to "OVERLOAD"
robot << 'sound/misc/interference.ogg'
+ robot.emp_act(2)
playsound(robot, 'sound/machines/warning-buzzer.ogg', 50, 1)
for(var/obj/structure/window/window in T.contents)
- window.hit(rand(10,50))
+ window.hit(rand(50,200))
for(var/obj/machinery/light/light in T.contents)
light.flicker() //spooky
- user.reveal(30, 1)
+ user.reveal(100)
diff --git a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
index 25516b51619..0db127f03ae 100644
--- a/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
+++ b/code/modules/mob/living/simple_animal/revenant/revenant_spawn_event.dm
@@ -3,9 +3,9 @@
/datum/round_event_control/revenant
name = "Spawn Revenant"
typepath = /datum/round_event/revenant
- weight = 0 //Admin only
+ weight = 20
max_occurrences = 3
- earliest_start = 0 //Meant to mix things up early-game.
+ earliest_start = 6000 //Meant to mix things up early-game.
/datum/round_event/revenant
diff --git a/code/modules/mob/living/ventcrawling.dm b/code/modules/mob/living/ventcrawling.dm
index d0b506f1a12..c0531581a36 100644
--- a/code/modules/mob/living/ventcrawling.dm
+++ b/code/modules/mob/living/ventcrawling.dm
@@ -12,6 +12,9 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/components/unary
if(lying)
src << "You can't vent crawl while you're stunned!"
return
+ if(restrained())
+ src << "You can't vent crawl while you're restrained!"
+ return
var/obj/machinery/atmospherics/components/unary/vent_found
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index 3c0e579eb5f..e5dd2c589dc 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -376,7 +376,7 @@ var/list/slot_equipment_priority = list( \
//this and stop_pulling really ought to be /mob/living procs
/mob/proc/start_pulling(atom/movable/AM)
- if ( !AM || !src || src==AM || !isturf(src.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
+ if ( !AM || !src || src==AM || !isturf(AM.loc) ) //if there's no person pulling OR the person is pulling themself OR the object being pulled is inside something: abort!
return
if (!( AM.anchored ))
AM.add_fingerprint(src)
@@ -975,4 +975,4 @@ var/list/slot_equipment_priority = list( \
//override to avoid rotating pixel_xy on mobs
/mob/shuttleRotate(rotation)
- dir = angle2dir(rotation+dir2angle(dir))
\ No newline at end of file
+ dir = angle2dir(rotation+dir2angle(dir))
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 265a428ba71..51fd9bece6f 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -83,7 +83,7 @@
var/a_intent = "help"//Living
var/m_intent = "run"//Living
var/lastKnownIP = null
- var/obj/structure/stool/bed/buckled = null//Living
+ var/obj/buckled = null//Living
var/obj/item/l_hand = null//Living
var/obj/item/r_hand = null//Living
var/obj/item/weapon/storage/s_active = null//Carbon
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index b99735503ee..152e160e7c9 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -43,7 +43,7 @@
if(charge < amount) return 0
charge = (charge - amount)
if(!istype(loc, /obj/machinery/power/apc))
- feedback_add_details("cell_used","[src.name]")
+ feedback_add_details("cell_used","[src.type]")
return 1
// recharge the cell
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index ef0d35fb175..9e8b6c4accc 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -121,7 +121,7 @@
/obj/item/ammo_casing/energy/plasma
projectile_type = /obj/item/projectile/plasma
select_name = "plasma burst"
- fire_sound = 'sound/weapons/Laser.ogg'
+ fire_sound = 'sound/weapons/plasma_cutter.ogg'
delay = 15
e_cost = 25
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index cc5bd988992..fe5ef91095c 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -232,7 +232,7 @@
user.update_inv_l_hand()
else
user.update_inv_r_hand()
- feedback_add_details("gun_fired","[src.name]")
+ feedback_add_details("gun_fired","[src.type]")
/obj/item/weapon/gun/attack(mob/M as mob, mob/user)
if(user.a_intent == "harm") //Flogging
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 45660958359..8b1aaecd735 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -190,13 +190,22 @@
burst_size = 3
fire_delay = 2
pin = /obj/item/device/firing_pin/implant/pindicate
-/obj/item/weapon/gun/projectile/automatic/m90/unrestricted
- pin = /obj/item/device/firing_pin
+
/obj/item/weapon/gun/projectile/automatic/m90/New()
..()
underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher(src)
update_icon()
return
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted
+ pin = /obj/item/device/firing_pin
+
+/obj/item/weapon/gun/projectile/automatic/m90/unrestricted/New()
+ ..()
+ underbarrel = new /obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted(src)
+ update_icon()
+ return
+
/obj/item/weapon/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
if(select == 2)
underbarrel.afterattack(target, user, flag, params)
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 4bddd2d3ce4..506f51e306c 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -9,6 +9,10 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/grenadelauncher
fire_sound = 'sound/weapons/grenadelaunch.ogg'
w_class = 3
+ pin = /obj/item/device/firing_pin/implant/pindicate
+
+/obj/item/weapon/gun/projectile/revolver/grenadelauncher/unrestricted
+ pin = /obj/item/device/firing_pin
/obj/item/weapon/gun/projectile/revolver/grenadelauncher/attackby(obj/item/A, mob/user, params)
..()
diff --git a/code/modules/projectiles/projectile.dm b/code/modules/projectiles/projectile.dm
index dc411940f0d..46f44c40a4a 100644
--- a/code/modules/projectiles/projectile.dm
+++ b/code/modules/projectiles/projectile.dm
@@ -83,7 +83,7 @@
reagent_note += num2text(R.volume) + ") "
add_logs(firer, L, "shot", src, reagent_note)
- return L.apply_effects(stun, weaken, paralyze, irradiate, stutter, slur, eyeblur, drowsy, blocked, stamina, jitter)
+ return L.apply_effects(stun, weaken, paralyze, irradiate, slur, stutter, eyeblur, drowsy, blocked, stamina, jitter)
/obj/item/projectile/proc/vol_by_damage()
if(src.damage)
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index bbe10e02af3..5c891b9fae0 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -243,7 +243,7 @@
new_mob << "Your form morphs into that of a [randomize]."
- del(M)
+ qdel(M)
return new_mob
/obj/item/projectile/magic/animate
diff --git a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
index 3f08110b756..5a45714ad8a 100644
--- a/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Medicine-Reagents.dm
@@ -164,7 +164,7 @@
color = "#C8A5DC"
/datum/reagent/medicine/silver_sulfadiazine/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
- if(iscarbon(M))
+ if(iscarbon(M) && M.stat != DEAD)
if(method == TOUCH)
M.adjustFireLoss(-volume)
if(show_message)
@@ -190,7 +190,7 @@
color = "#C8A5DC"
/datum/reagent/medicine/styptic_powder/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
- if(iscarbon(M))
+ if(iscarbon(M) && M.stat != DEAD)
if(method == TOUCH)
M.adjustBruteLoss(-volume)
if(show_message)
@@ -268,7 +268,7 @@
color = "#C8A5DC"
/datum/reagent/medicine/synthflesh/reaction_mob(mob/living/M, method=TOUCH, volume,show_message = 1)
- if(iscarbon(M))
+ if(iscarbon(M) && M.stat != DEAD)
if(method == TOUCH)
M.adjustBruteLoss(-1.5*volume)
M.adjustFireLoss(-1.5*volume)
diff --git a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
index edfd038e960..a5975560f1c 100644
--- a/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Other-Reagents.dm
@@ -260,7 +260,7 @@
color = "#FFC080" // rgb: 255, 196, 128 Bright orange
metabolization_rate = 10 * REAGENTS_METABOLISM // very fast, so it can be applied rapidly. But this changes on an overdose
overdose_threshold = 11 //Slightly more than one un-nozzled spraybottle.
-
+
/datum/reagent/spraytan/reaction_mob(mob/living/M, method=TOUCH, volume, show_message = 1)
if(istype(M, /mob/living/carbon/human))
if(method == TOUCH)
@@ -289,7 +289,7 @@
N.skin_tone = "caucasian2"
if ("albino")
N.skin_tone = "caucasian1"
-
+
if(MUTCOLORS in N.dna.species.specflags) //take current alien color and darken it slightly
var/newcolor = ""
var/len = length(N.dna.features["mcolor"])
@@ -307,20 +307,20 @@
N.dna.features["mcolor"] = newcolor
N.regenerate_icons()
N.update_body()
-
-
-
+
+
+
if(method == INGEST)
if(show_message)
M << "That tasted horrible."
M.AdjustStunned(2)
M.AdjustWeakened(2)
..()
-
-
+
+
/datum/reagent/spraytan/overdose_process(mob/living/M)
metabolization_rate = 1 * REAGENTS_METABOLISM
-
+
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/N = M
if(N.dna.species.id == "human") // If they're human, turn em to the "orange" race, and give em spiky black hair
@@ -329,7 +329,7 @@
N.hair_color = "000"
N.update_hair()
if(MUTCOLORS in N.dna.species.specflags) //Aliens with custom colors simply get turned orange
- N.dna.features["mcolor"] = "f80"
+ N.dna.features["mcolor"] = "f80"
N.regenerate_icons()
N.update_body()
if(prob(7))
@@ -881,6 +881,13 @@
reagent_state = LIQUID
color = "#C8A5DC"
+/datum/reagent/stable_plasma/on_mob_life(mob/living/M)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ C.adjustPlasma(10)
+ ..()
+ return
+
/datum/reagent/iodine
name = "Iodine"
id = "iodine"
diff --git a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
index 56300fffd97..51b06d2774e 100644
--- a/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Pyrotechnic-Reagents.dm
@@ -128,13 +128,16 @@
description = "Catches you on fire and makes you ignite."
reagent_state = LIQUID
color = "#FF9999"
+
+/datum/reagent/phlogiston/reaction_mob(mob/living/M, method=TOUCH, volume)
+ M.IgniteMob()
+ ..()
/datum/reagent/phlogiston/on_mob_life(mob/living/M)
M.adjust_fire_stacks(1)
- M.IgniteMob()
- M.adjustFireLoss(0.2*M.fire_stacks)
+ var/burndmg = max(0.3*M.fire_stacks, 0.3)
+ M.adjustFireLoss(burndmg)
..()
- return
/datum/reagent/napalm
name = "Napalm"
diff --git a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
index c5416d0fe77..2672d7e678a 100644
--- a/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Toxin-Reagents.dm
@@ -60,6 +60,9 @@
/datum/reagent/toxin/plasma/on_mob_life(mob/living/M)
if(holder.has_reagent("epinephrine"))
holder.remove_reagent("epinephrine", 2*REM)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ C.adjustPlasma(20)
..()
return
diff --git a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
index a0b76e0bad4..09231890a94 100644
--- a/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
+++ b/code/modules/reagents/Chemistry-Recipes/Slime_extracts.dm
@@ -10,7 +10,7 @@
required_other = 1
/datum/chemical_reaction/slimespawn/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
S.loc = get_turf(holder.my_atom)
S.visible_message("Infused with plasma, the core begins to quiver and grow, and soon a new baby slime emerges from it!")
@@ -25,7 +25,7 @@
required_container = /obj/item/slime_extract/grey
/datum/chemical_reaction/slimeinaprov/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
/datum/chemical_reaction/slimemonkey
name = "Slime Monkey"
@@ -37,7 +37,7 @@
required_other = 1
/datum/chemical_reaction/slimemonkey/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/i = 1, i <= 3, i++)
var /obj/item/weapon/reagent_containers/food/snacks/monkeycube/M = new /obj/item/weapon/reagent_containers/food/snacks/monkeycube
M.loc = get_turf(holder.my_atom)
@@ -53,7 +53,7 @@
required_container = /obj/item/slime_extract/green
/datum/chemical_reaction/slimemutate/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
//Mutated Green
/datum/chemical_reaction/slimemutate_unstable
@@ -67,7 +67,7 @@
mix_message = "The mixture rapidly expands and contracts, its appearance shifting into a sickening green."
/datum/chemical_reaction/slimemutate_unstable/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
//Metal
/datum/chemical_reaction/slimemetal
@@ -80,7 +80,7 @@
required_other = 1
/datum/chemical_reaction/slimemetal/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/stack/sheet/metal/M = new /obj/item/stack/sheet/metal
M.amount = 15
M.loc = get_turf(holder.my_atom)
@@ -99,7 +99,7 @@
required_other = 1
/datum/chemical_reaction/slimecrit/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
@@ -116,7 +116,7 @@
required_other = 1
/datum/chemical_reaction/slimecritlesser/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
@@ -133,7 +133,7 @@
required_other = 1
/datum/chemical_reaction/slimecritfriendly/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate adorably !"), 1)
spawn(50)
@@ -152,7 +152,7 @@
/datum/chemical_reaction/slimebork/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/list/blocked = list(/obj/item/weapon/reagent_containers/food/snacks,
/obj/item/weapon/reagent_containers/food/snacks/store/bread,
/obj/item/weapon/reagent_containers/food/snacks/breadslice,
@@ -200,7 +200,7 @@
/datum/chemical_reaction/slimebork2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/list/blocked = list(/obj/item/weapon/reagent_containers/food/drinks)
var/list/borks = typesof(/obj/item/weapon/reagent_containers/food/drinks) - blocked
@@ -232,7 +232,7 @@
required_other = 1
/datum/chemical_reaction/slimefrost/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
/datum/chemical_reaction/slimestabilizer
@@ -245,7 +245,7 @@
required_other = 1
/datum/chemical_reaction/slimestabilizer/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/weapon/slimestabilizer/P = new /obj/item/weapon/slimestabilizer
P.loc = get_turf(holder.my_atom)
@@ -262,7 +262,7 @@
required_other = 1
/datum/chemical_reaction/slimefreeze/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
@@ -283,7 +283,7 @@
required_other = 1
/datum/chemical_reaction/slimecasp/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
/datum/chemical_reaction/slimefire
name = "Slime fire"
@@ -295,7 +295,7 @@
required_other = 1
/datum/chemical_reaction/slimefire/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
@@ -316,7 +316,7 @@
required_other = 1
/datum/chemical_reaction/slimeoverload/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
empulse(get_turf(holder.my_atom), 3, 7)
@@ -330,7 +330,7 @@
required_other = 1
/datum/chemical_reaction/slimecell/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/weapon/stock_parts/cell/high/slime/P = new /obj/item/weapon/stock_parts/cell/high/slime
P.loc = get_turf(holder.my_atom)
@@ -344,7 +344,7 @@
required_other = 1
/datum/chemical_reaction/slimeglow/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime begins to emit a soft light. Squeezing it will cause it to grow brightly."), 1)
var/obj/item/device/flashlight/slime/F = new /obj/item/device/flashlight/slime
@@ -362,7 +362,7 @@
required_other = 1
/datum/chemical_reaction/slimepsteroid/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/weapon/slimesteroid/P = new /obj/item/weapon/slimesteroid
P.loc = get_turf(holder.my_atom)
@@ -376,7 +376,7 @@
required_other = 1
/datum/chemical_reaction/slimejam/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
//Dark Purple
@@ -390,25 +390,11 @@
required_other = 1
/datum/chemical_reaction/slimeplasma/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/stack/sheet/mineral/plasma/P = new /obj/item/stack/sheet/mineral/plasma
P.amount = 10
P.loc = get_turf(holder.my_atom)
-//Red
-/*/datum/chemical_reaction/slimeglycerol
- name = "Slime Glycerol"
- id = "m_glycerol"
- result = "glycerol"
- required_reagents = list("plasma" = 1)
- result_amount = 8
- required_container = /obj/item/slime_extract/red
- required_other = 1
-
-/datum/chemical_reaction/slimeglycerol/on_reaction(var/datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
-*/
-
/datum/chemical_reaction/slimemutator
name = "Slime Mutator"
id = "m_slimemutator"
@@ -419,7 +405,7 @@
required_other = 1
/datum/chemical_reaction/slimemutator/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/weapon/slimemutator/P = new /obj/item/weapon/slimemutator
P.loc = get_turf(holder.my_atom)
@@ -433,7 +419,7 @@
required_other = 1
/datum/chemical_reaction/slimebloodlust/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/living/simple_animal/slime/slime in viewers(get_turf(holder.my_atom), null))
slime.rabid = 1
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
@@ -450,7 +436,7 @@
required_other = 1
/datum/chemical_reaction/slimeppotion/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/slimepotion/P = new /obj/item/slimepotion
P.loc = get_turf(holder.my_atom)
@@ -466,7 +452,7 @@
required_container = /obj/item/slime_extract/black
/datum/chemical_reaction/slimemutate2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
//Oil
/datum/chemical_reaction/slimeexplosion
@@ -479,7 +465,7 @@
required_other = 1
/datum/chemical_reaction/slimeexplosion/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
for(var/mob/O in viewers(get_turf(holder.my_atom), null))
O.show_message(text("The slime extract begins to vibrate violently !"), 1)
spawn(50)
@@ -497,7 +483,7 @@
required_other = 1
/datum/chemical_reaction/slimepotion2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/slimepotion2/P = new /obj/item/slimepotion2
P.loc = get_turf(holder.my_atom)
@@ -512,7 +498,7 @@
required_other = 1
/datum/chemical_reaction/slimegolem/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/effect/golemrune/Z = new /obj/effect/golemrune
Z.loc = get_turf(holder.my_atom)
notify_ghosts("Golem rune created in [get_area(Z)].", 'sound/effects/ghost2.ogg')
@@ -528,7 +514,7 @@
required_other = 1
/datum/chemical_reaction/slimefloor2/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/stack/tile/bluespace/P = new /obj/item/stack/tile/bluespace
P.amount = 25
P.loc = get_turf(holder.my_atom)
@@ -544,7 +530,7 @@
required_other = 1
/datum/chemical_reaction/slimecrystal/on_reaction(datum/reagents/holder, created_volume)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
if(holder.my_atom)
var/obj/item/bluespace_crystal/BC = new(get_turf(holder.my_atom))
BC.visible_message("The [BC.name] appears out of thin air!")
@@ -560,7 +546,7 @@
required_other = 1
/datum/chemical_reaction/slimepsteroid2/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/weapon/slimesteroid2/P = new /obj/item/weapon/slimesteroid2
P.loc = get_turf(holder.my_atom)
@@ -575,11 +561,11 @@
required_other = 1
/datum/chemical_reaction/slimestop/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/mob/mob = get_mob_by_key(holder.my_atom.fingerprintslast)
var/obj/effect/timestop/T = new /obj/effect/timestop
T.loc = get_turf(holder.my_atom)
- T.immune = mob
+ T.immune += mob
T.timestop()
@@ -593,7 +579,7 @@
required_other = 1
/datum/chemical_reaction/slimecamera/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/device/camera/P = new /obj/item/device/camera
P.loc = get_turf(holder.my_atom)
var/obj/item/device/camera_film/Z = new /obj/item/device/camera_film
@@ -609,7 +595,7 @@
required_other = 1
/datum/chemical_reaction/slimefloor/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/obj/item/stack/tile/sepia/P = new /obj/item/stack/tile/sepia
P.amount = 25
P.loc = get_turf(holder.my_atom)
@@ -628,7 +614,7 @@
required_other = 1
/datum/chemical_reaction/slimepaint/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/list/paints = typesof(/obj/item/weapon/paint) - /obj/item/weapon/paint
var/chosen = pick(paints)
var/obj/P = new chosen
@@ -646,7 +632,7 @@
required_container = /obj/item/slime_extract/rainbow
/datum/chemical_reaction/slimeRNG/on_reaction(datum/reagents/holder)
- feedback_add_details("slime_cores_used","[replacetext(name," ","_")]")
+ feedback_add_details("slime_cores_used","[type]")
var/mob/living/simple_animal/slime/S = new /mob/living/simple_animal/slime
S.colour = pick("grey","orange", "metal", "blue", "purple", "dark purple", "dark blue", "green", "silver", "yellow", "gold", "yellow", "red", "silver", "pink", "cerulean", "sepia", "bluespace", "pyrite", "light pink", "oil", "adamantine", "black")
S.loc = get_turf(holder.my_atom)
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index 46b77827093..3bac3f14830 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -221,6 +221,11 @@
desc = "Contains antiviral agents."
list_reagents = list("spaceacillin" = 15)
+/obj/item/weapon/reagent_containers/syringe/bioterror
+ name = "bioterror syringe"
+ desc = "Contains several paralyzing reagents."
+ list_reagents = list("neurotoxin" = 5, "mutetoxin" = 5, "sodium_thiopental" = 5)
+
/obj/item/weapon/reagent_containers/syringe/stimulants
name = "Stimpack"
desc = "Contains stimulants."
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index 5a68e76e7e2..a9ef8e34eed 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -190,7 +190,7 @@
name = "Compressed matter cardridge"
id = "rcd_ammo"
build_type = AUTOLATHE
- materials = list(MAT_METAL = 16000, MAT_GLASS=8000)
+ materials = list(MAT_METAL = 3000, MAT_GLASS=2000)
build_path = /obj/item/weapon/rcd_ammo
category = list("initial","Construction")
diff --git a/code/modules/research/designs/medical_designs.dm b/code/modules/research/designs/medical_designs.dm
index 1501167a730..c01225e38e1 100644
--- a/code/modules/research/designs/medical_designs.dm
+++ b/code/modules/research/designs/medical_designs.dm
@@ -111,15 +111,27 @@
//////////Cybernetic Implants////////////
/////////////////////////////////////////
+/datum/design/cyberimp_welding
+ name = "Welding Shield implant"
+ desc = "These reactive micro-shields will protect you from welders and flashes without obscuring your vision."
+ id = "ci-welding"
+ req_tech = list("materials" = 4, "biotech" = 2)
+ build_type = PROTOLATHE | MECHFAB
+ construction_time = 40
+ materials = list(MAT_METAL = 200, MAT_GLASS = 400)
+ build_path = /obj/item/organ/internal/cyberimp/eyes/shield
+ category = list("Misc", "Medical Designs")
+
/datum/design/cyberimp_medical_hud
name = "Medical HUD implant"
desc = "These cybernetic eyes will display a medical HUD over everything you see. Wiggle eyes to control."
id = "ci-medhud"
req_tech = list("materials" = 6, "programming" = 4, "biotech" = 4)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 50
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 500)
build_path = /obj/item/organ/internal/cyberimp/eyes/hud/medical
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_security_hud
name = "Security HUD implant"
@@ -127,9 +139,10 @@
id = "ci-sechud"
req_tech = list("materials" = 6, "programming" = 5, "biotech" = 4, "combat" = 2)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 50
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 750, MAT_GOLD = 750)
build_path = /obj/item/organ/internal/cyberimp/eyes/hud/security
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_xray
name = "X-Ray implant"
@@ -137,9 +150,10 @@
id = "ci-xray"
req_tech = list("materials" = 7, "programming" = 5, "biotech" = 6, "magnets" = 5)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/internal/cyberimp/eyes/xray
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_thermals
name = "Thermals implant"
@@ -147,9 +161,10 @@
id = "ci-thermals"
req_tech = list("materials" = 7, "programming" = 5, "biotech" = 5, "magnets" = 5, "syndicate" = 5)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 600, MAT_GOLD = 600, MAT_PLASMA = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/internal/cyberimp/eyes/thermals
- category = list("Medical Designs")
+ category = list("Misc", "Medical Designs")
/datum/design/cyberimp_antidrop
name = "Anti-Drop implant"
@@ -157,6 +172,7 @@
id = "ci-antidrop"
req_tech = list("materials" = 7, "programming" = 5, "biotech" = 5)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 400, MAT_GOLD = 400)
build_path = /obj/item/organ/internal/cyberimp/brain/anti_drop
category = list("Medical Designs")
@@ -167,6 +183,7 @@
id = "ci-antistun"
req_tech = list("materials" = 7, "programming" = 5, "biotech" = 6)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_SILVER = 500, MAT_GOLD = 1000)
build_path = /obj/item/organ/internal/cyberimp/brain/anti_stun
category = list("Medical Designs")
@@ -177,6 +194,7 @@
id = "ci-nutriment"
req_tech = list("materials" = 6, "programming" = 4, "biotech" = 5)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 40
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 500)
build_path = /obj/item/organ/internal/cyberimp/chest/nutriment
category = list("Medical Designs")
@@ -187,6 +205,7 @@
id = "ci-nutrimentplus"
req_tech = list("materials" = 6, "programming" = 4, "biotech" = 6)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 50
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 750)
build_path = /obj/item/organ/internal/cyberimp/chest/nutriment/plus
category = list("Medical Designs")
@@ -197,6 +216,52 @@
id = "ci-reviver"
req_tech = list("materials" = 6, "programming" = 4, "biotech" = 7, "syndicate" = 4)
build_type = PROTOLATHE | MECHFAB
+ construction_time = 60
materials = list(MAT_METAL = 200, MAT_GLASS = 200, MAT_GOLD = 500, MAT_URANIUM = 1000, MAT_DIAMOND = 2000)
build_path = /obj/item/organ/internal/cyberimp/chest/reviver
+ category = list("Misc", "Medical Designs")
+
+
+/////////////////////////////////////////
+////////////Regular Implants/////////////
+/////////////////////////////////////////
+
+/datum/design/implanter
+ name = "Implanter"
+ desc = "A sterile automatic implant injector."
+ id = "implanter"
+ req_tech = list("materials" = 1, "programming" = 2, "biotech" = 3)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 600, MAT_GLASS = 200)
+ build_path = /obj/item/weapon/implanter
+ category = list("Medical Designs")
+
+/datum/design/implantcase
+ name = "Implant Case"
+ desc = "A glass case containing an implant."
+ id = "implantcase"
+ req_tech = list("materials" = 1, "biotech" = 2)
+ build_type = PROTOLATHE
+ materials = list(MAT_GLASS = 500)
+ build_path = /obj/item/weapon/implantcase
+ category = list("Medical Designs")
+
+/datum/design/implant_freedom
+ name = "Freedom Implant Case"
+ desc = "A glass case containing an implant."
+ id = "implant_freedom"
+ req_tech = list("materials" = 2, "biotech" = 3, "magnets" = 3, "syndicate" = 5)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 50, MAT_GLASS = 500, MAT_GOLD = 250)
+ build_path = /obj/item/weapon/implantcase/freedom
+ category = list("Medical Designs")
+
+/datum/design/implant_adrenalin
+ name = "Adrenalin Implant Case"
+ desc = "A glass case containing an implant."
+ id = "implant_adrenalin"
+ req_tech = list("materials" = 2, "biotech" = 5, "combat" = 3, "syndicate" = 6)
+ build_type = PROTOLATHE
+ materials = list(MAT_METAL = 50, MAT_GLASS = 500, MAT_GOLD = 500, MAT_URANIUM = 100, MAT_DIAMOND = 200)
+ build_path = /obj/item/weapon/implantcase/adrenaline
category = list("Medical Designs")
\ No newline at end of file
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index a3e8c47888d..a474c049c94 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -278,7 +278,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
if(linked_lathe) //Also sends salvaged materials to a linked protolathe, if any.
linked_lathe.m_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.materials[MAT_METAL]*(linked_destroy.decon_mod/10)))
linked_lathe.g_amount += min((linked_lathe.max_material_storage - linked_lathe.TotalMaterials()), (linked_destroy.loaded_item.materials[MAT_GLASS]*(linked_destroy.decon_mod/10)))
- feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.name]")
+ feedback_add_details("item_deconstructed","[linked_destroy.loaded_item.type]")
linked_destroy.loaded_item = null
else
screen = 1.0
@@ -421,7 +421,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
R = max((new_item.reliability/2), 0)
new_item.loc = linked_lathe.loc
if(!already_logged)
- feedback_add_details("item_printed","[new_item.name]|[amount]")
+ feedback_add_details("item_printed","[new_item.type]|[amount]")
already_logged = 1
linked_lathe.busy = 0
screen = old_screen
@@ -476,7 +476,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
var/obj/item/new_item = new P(src)
new_item.reliability = R
new_item.loc = linked_imprinter.loc
- feedback_add_details("circuit_printed","[new_item.name]")
+ feedback_add_details("circuit_printed","[new_item.type]")
linked_imprinter.busy = 0
screen = old_screen
updateUsrDialog()
@@ -715,11 +715,14 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Load Design to Disk"
else
dat += "Name: [d_disk.blueprint.name]
"
- dat += "Level: [Clamp((d_disk.blueprint.reliability + rand(-15,15)), 0, 100)]
"
- switch(d_disk.blueprint.build_type)
- if(IMPRINTER) dat += "Lathe Type: Circuit Imprinter
"
- if(PROTOLATHE) dat += "Lathe Type: Proto-lathe
"
- if(AUTOLATHE) dat += "Lathe Type: Auto-lathe
"
+ dat += "Level: [d_disk.blueprint.reliability]
"
+ var/b_type = d_disk.blueprint.build_type
+ if(b_type)
+ dat += "Lathe Types:
"
+ if(b_type & IMPRINTER) dat += "Circuit Imprinter
"
+ if(b_type & PROTOLATHE) dat += "Proto-lathe
"
+ if(b_type & AUTOLATHE) dat += "Auto-lathe
"
+ if(b_type & MECHFAB) dat += "Mech Fabricator
"
dat += "Required Materials:
"
for(var/M in d_disk.blueprint.materials)
if(copytext(M, 1, 2) == "$") dat += "* [copytext(M, 2)] x [d_disk.blueprint.materials[M]]
"
@@ -790,7 +793,12 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Origin Tech:
"
var/list/temp_tech = linked_destroy.ConvertReqString2List(linked_destroy.loaded_item.origin_tech)
for(var/T in temp_tech)
- dat += "* [CallTechName(T)] [temp_tech[T]]
"
+ dat += "* [CallTechName(T)] [temp_tech[T]]"
+ for(var/datum/tech/F in files.known_tech)
+ if(F.name == CallTechName(T))
+ dat += " (Current: [F.level])"
+ break
+ dat += "
"
dat += "Options: "
dat += "Deconstruct Item"
dat += "Eject Item"
@@ -1102,4 +1110,4 @@ won't update every console in existence) but it's more of a hassle to do. Also,
/obj/machinery/computer/rdconsole/experiment
name = "E.X.P.E.R.I-MENTOR R&D Console"
desc = "A console used to interface with R&D tools."
- id = 1
+ id = 3
diff --git a/code/modules/research/rdmachines.dm b/code/modules/research/rdmachines.dm
index 91a33aa41be..7300f924b1a 100644
--- a/code/modules/research/rdmachines.dm
+++ b/code/modules/research/rdmachines.dm
@@ -13,94 +13,31 @@
var/hacked = 0
var/disabled = 0
var/shocked = 0
- var/list/wires = list()
- var/hack_wire
- var/disable_wire
- var/shock_wire
var/obj/machinery/computer/rdconsole/linked_console
+ var/datum/wires/r_n_d/wires
/obj/machinery/r_n_d/New()
..()
- wires["Red"] = 0
- wires["Blue"] = 0
- wires["Green"] = 0
- wires["Yellow"] = 0
- wires["Black"] = 0
- wires["White"] = 0
- var/list/w = list("Red","Blue","Green","Yellow","Black","White")
- src.hack_wire = pick(w)
- w -= src.hack_wire
- src.shock_wire = pick(w)
- w -= src.shock_wire
- src.disable_wire = pick(w)
- w -= src.disable_wire
+ wires = new(src)
-/obj/machinery/r_n_d/proc/
- shock(mob/user, prb)
- if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
- return 0
- if(!prob(prb))
- return 0
- var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
- s.set_up(5, 1, src)
- s.start()
- if (electrocute_mob(user, get_area(src), src, 0.7))
- return 1
- else
- return 0
+/obj/machinery/r_n_d/proc/shock(mob/user, prb)
+ if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
+ return 0
+ if(!prob(prb))
+ return 0
+ var/datum/effect/effect/system/spark_spread/s = new /datum/effect/effect/system/spark_spread
+ s.set_up(5, 1, src)
+ s.start()
+ if (electrocute_mob(user, get_area(src), src, 0.7))
+ return 1
+ else
+ return 0
/obj/machinery/r_n_d/attack_hand(mob/user)
- if (shocked)
+ if(shocked)
shock(user,50)
if(panel_open)
- var/dat as text
- dat += "[src.name] Wires:
"
- for(var/wire in src.wires)
- dat += text("[wire] Wire: [src.wires[wire] ? "Mend" : "Cut"] Pulse
")
-
- dat += text("The red light is [src.disabled ? "off" : "on"].
")
- dat += text("The green light is [src.shocked ? "off" : "on"].
")
- dat += text("The blue light is [src.hacked ? "off" : "on"].
")
- user << browse("[src.name] Hacking[dat]","window=hack_win")
- return
+ wires.Interact(user)
+
-/obj/machinery/r_n_d/Topic(href, href_list)
- if(..())
- return
- usr.set_machine(src)
- src.add_fingerprint(usr)
- if(href_list["pulse"])
- var/temp_wire = href_list["wire"]
- if (!istype(usr.get_active_hand(), /obj/item/device/multitool))
- usr << "You need a multitool!"
- else
- if(src.wires[temp_wire])
- usr << "You can't pulse a cut wire!"
- else
- if(src.hack_wire == href_list["wire"])
- src.hacked = !src.hacked
- spawn(100) src.hacked = !src.hacked
- if(src.disable_wire == href_list["wire"])
- src.disabled = !src.disabled
- src.shock(usr,50)
- spawn(100) src.disabled = !src.disabled
- if(src.shock_wire == href_list["wire"])
- src.shocked = !src.shocked
- src.shock(usr,50)
- spawn(100) src.shocked = !src.shocked
- if(href_list["cut"])
- if (!istype(usr.get_active_hand(), /obj/item/weapon/wirecutters))
- usr << "You need wirecutters!"
- else
- var/temp_wire = href_list["wire"]
- wires[temp_wire] = !wires[temp_wire]
- if(src.hack_wire == temp_wire)
- src.hacked = !src.hacked
- if(src.disable_wire == temp_wire)
- src.disabled = !src.disabled
- src.shock(usr,50)
- if(src.shock_wire == temp_wire)
- src.shocked = !src.shocked
- src.shock(usr,50)
- src.updateUsrDialog()
diff --git a/code/modules/research/research.dm b/code/modules/research/research.dm
index ac43f99f99c..d164418c115 100644
--- a/code/modules/research/research.dm
+++ b/code/modules/research/research.dm
@@ -190,6 +190,7 @@ research holder datum.
var/desc = "description" //General description of what it does and what it makes.
var/id = "id" //An easily referenced ID. Must be alphanumeric, lower-case, and no symbols.
var/level = 1 //A simple number scale of the research level. Level 0 = Secret tech.
+ var/rare = 1 //How much CentCom wants to get that tech. Used in supply shuttle tech cost calculation.
var/list/req_tech = list() //List of ids associated values of techs required to research this tech. "id" = #
@@ -209,6 +210,7 @@ research holder datum.
name = "Plasma Research"
desc = "Research into the mysterious substance colloqually known as 'plasma'."
id = "plasmatech"
+ rare = 3
/datum/tech/powerstorage
name = "Power Manipulation Technology"
@@ -219,6 +221,7 @@ research holder datum.
name = "'Blue-space' Research"
desc = "Research into the sub-reality known as 'blue-space'"
id = "bluespace"
+ rare = 2
/datum/tech/biotech
name = "Biological Technology"
@@ -244,6 +247,8 @@ research holder datum.
name = "Illegal Technologies Research"
desc = "The study of technologies that violate Nanotrassen regulations."
id = "syndicate"
+ rare = 4
+
/*
/datum/tech/arcane
@@ -273,6 +278,26 @@ research holder datum.
*/
+/datum/tech/proc/getCost(var/current_level = null)
+ // Calculates tech disk's supply points sell cost
+ if(!current_level)
+ current_level = initial(level)
+
+ if(current_level >= level)
+ return 0
+
+ var/cost = 0
+ var/i
+ for(i=current_level+1, i<=level, i++)
+ if(i == initial(level))
+ continue
+ cost += i*5*rare
+
+ return cost
+
+
+
+
/obj/item/weapon/disk/tech_disk
name = "Technology Disk"
desc = "A disk for storing technology data for further research."
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 63ea9a0a6d3..68d65f28023 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -410,7 +410,7 @@
var/mob/living/carbon/human/G = new /mob/living/carbon/human
if(prob(50)) G.gender = "female"
hardset_dna(G, null, null, null, null, /datum/species/golem/adamantine)
-
+
G.set_cloned_appearance()
G.real_name = text("Adamantine Golem ([rand(1, 1000)])")
G.dna.species.auto_equip(G)
@@ -436,13 +436,16 @@
pixel_x = -64
pixel_y = -64
unacidable = 1
- var/mob/living/immune = null // the one who creates the timestop is immune
+ var/mob/living/immune = list() // the one who creates the timestop is immune
var/freezerange = 2
var/duration = 140
alpha = 125
/obj/effect/timestop/New()
..()
+ for(var/mob/living/M in player_list)
+ for(var/obj/effect/proc_holder/spell/aoe_turf/conjure/timestop/T in M.mind.spell_list) //People who can stop time are immune to timestop
+ immune |= M
timestop()
@@ -451,7 +454,7 @@
while(loc)
if(duration)
for(var/mob/living/M in orange (freezerange, src.loc))
- if(M == immune)
+ if(M in immune)
continue
M.stunned = 10
M.anchored = 1
@@ -478,6 +481,9 @@
sleep(1)
+/obj/effect/timestop/wizard
+ duration = 90
+
/obj/item/stack/tile/bluespace
name = "bluespace floor tile"
diff --git a/code/modules/security levels/security levels.dm b/code/modules/security levels/security levels.dm
index da714890067..19d85889439 100644
--- a/code/modules/security levels/security levels.dm
+++ b/code/modules/security levels/security levels.dm
@@ -23,7 +23,7 @@
if(SEC_LEVEL_GREEN)
minor_announce(config.alert_desc_green, "Attention! Security level lowered to green:")
security_level = SEC_LEVEL_GREEN
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(FA.z == ZLEVEL_STATION)
FA.update_icon()
if(SEC_LEVEL_BLUE)
@@ -32,7 +32,7 @@
else
minor_announce(config.alert_desc_blue_downto, "Attention! Security level lowered to blue:")
security_level = SEC_LEVEL_BLUE
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(FA.z == ZLEVEL_STATION)
FA.update_icon()
if(SEC_LEVEL_RED)
@@ -47,15 +47,19 @@
if(CC)
CC.post_status("alert", "redalert")*/
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(FA.z == ZLEVEL_STATION)
FA.update_icon()
+ for(var/obj/machinery/computer/shuttle/pod/pod in machines)
+ pod.admin_controlled = 0
if(SEC_LEVEL_DELTA)
minor_announce(config.alert_desc_delta, "Attention! Delta security level reached!",1)
security_level = SEC_LEVEL_DELTA
- for(var/obj/machinery/firealarm/FA in world)
+ for(var/obj/machinery/firealarm/FA in machines)
if(FA.z == ZLEVEL_STATION)
FA.update_icon()
+ for(var/obj/machinery/computer/shuttle/pod/pod in machines)
+ pod.admin_controlled = 0
else
return
@@ -102,4 +106,4 @@
set_security_level(2)
/mob/verb/set_thing3()
set_security_level(3)
-*/
\ No newline at end of file
+*/
diff --git a/code/modules/surgery/appendectomy.dm b/code/modules/surgery/appendectomy.dm
deleted file mode 100644
index 9355890cb5f..00000000000
--- a/code/modules/surgery/appendectomy.dm
+++ /dev/null
@@ -1,32 +0,0 @@
-/datum/surgery/appendectomy
- name = "appendectomy"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/incise, /datum/surgery_step/extract_appendix, /datum/surgery_step/close)
- species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- possible_locs = list("groin")
-
-
-//extract appendix
-/datum/surgery_step/extract_appendix
- name = "extract appendix"
- accept_hand = 1
- time = 64
- var/obj/item/organ/internal/appendix/A = null
-
-/datum/surgery_step/extract_appendix/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- A = locate() in target.internal_organs
- if(A)
- user.visible_message("[user] begins to extract [target]'s appendix.", "You begin to extract [target]'s appendix...")
- else
- user.visible_message("[user] looks for an appendix in [target].", "You look for an appendix in [target]...")
-
-/datum/surgery_step/extract_appendix/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(A)
- user.visible_message("[user] successfully removes [target]'s appendix!", "You successfully removes [target]'s appendix.")
- A.loc = get_turf(target)
- A.Remove(target)
- for(var/datum/disease/appendicitis in target.viruses)
- appendicitis.cure()
- target.resistances += /datum/disease/appendicitis
- else
- user << "You can't find an appendix in [target]!"
- return 1
diff --git a/code/modules/surgery/brain_removal.dm b/code/modules/surgery/brain_removal.dm
deleted file mode 100644
index 0d2426775a6..00000000000
--- a/code/modules/surgery/brain_removal.dm
+++ /dev/null
@@ -1,43 +0,0 @@
-/datum/surgery/brain_removal
- name = "brain removal"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/extract_brain)
- species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- possible_locs = list("head")
- requires_organic_bodypart = 0
-
-
-//extract brain
-/datum/surgery_step/extract_brain
- name = "extract brain"
- implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55)
- time = 64
- var/obj/item/organ/brain/B = null
-
-/datum/surgery_step/extract_brain/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- B = target.getorgan(/obj/item/organ/brain)
- if(B)
- user.visible_message("[user] begins to extract [target]'s brain.", "You begin to extract [target]'s brain...")
- else
- user.visible_message("[user] looks for a brain in [target].", "You look for a brain in [target]...")
-
-/datum/surgery_step/extract_brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(B)
- user.visible_message("[user] successfully removes [target]'s brain!", "You successfully remove [target]'s brain.")
- B.loc = get_turf(target)
- B.transfer_identity(target)
- target.internal_organs -= B
- if(ishuman(target))
- var/mob/living/carbon/human/H = target
- H.update_hair(0)
- H.apply_damage(25,"brute","head")
- add_logs(user, target, "debrained", addition="INTENT: [uppertext(user.a_intent)]")
- else
- user << "You can't find a brain in [target]!"
- return 1
-
-
-//brain removal for aliens
-/datum/surgery/brain_removal/alien
- name = "alien brain removal"
- steps = list(/datum/surgery_step/saw, /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/extract_brain)
- species = list(/mob/living/carbon/alien/humanoid)
diff --git a/code/modules/surgery/core_removal.dm b/code/modules/surgery/core_removal.dm
index fe976b25824..4f872f6c047 100644
--- a/code/modules/surgery/core_removal.dm
+++ b/code/modules/surgery/core_removal.dm
@@ -2,8 +2,11 @@
name = "core removal"
steps = list(/datum/surgery_step/incise, /datum/surgery_step/incise, /datum/surgery_step/extract_core)
species = list(/mob/living/simple_animal/slime)
- target_must_be_dead = 1
+/datum/surgery/core_removal/can_start(mob/user, mob/living/carbon/target)
+ if(target.stat == DEAD)
+ return 1
+ return 0
//extract brain
/datum/surgery_step/extract_core
diff --git a/code/modules/surgery/cybernetic_implants.dm b/code/modules/surgery/cybernetic_implants.dm
deleted file mode 100644
index ed6813bf087..00000000000
--- a/code/modules/surgery/cybernetic_implants.dm
+++ /dev/null
@@ -1,80 +0,0 @@
-#define MAX_BRAIN_IMPLANT 2
-#define MAX_CHEST_IMPLANT 3
-
-/datum/surgery_step/cybernetic_implant/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/organ/internal/cyberimp/implant, datum/surgery/surgery)
- user.visible_message("[user] begins to implant [target] with [implant].", "You begin to implant [target] with [implant]...")
-
-//[[[[EYES]]]]
-/datum/surgery/cybernetic_implant/eyes
- name = "eye cybernetic implant"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/cybernetic_implant/eyes, /datum/surgery_step/fix_eyes, /datum/surgery_step/close)
- possible_locs = list("eyes")
-
-/datum/surgery_step/cybernetic_implant/eyes
- name = "insert eye cybernetic implant"
- implements = list(/obj/item/organ/internal/cyberimp/eyes = 100)
- time = 32
-
-/datum/surgery_step/cybernetic_implant/eyes/success(mob/user, mob/living/carbon/target, target_zone, obj/item/organ/internal/cyberimp/eyes/implant, datum/surgery/surgery)
- if(implant)
- var/full = 0
- if(locate(/obj/item/organ/internal/cyberimp/eyes, target.internal_organs))
- full = 1
- insert(user,target,implant,target_zone,full)
- return 1
-
-//[[[[BRAIN]]]]
-/datum/surgery/cybernetic_implant/brain
- name = "brain cybernetic implant"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/cybernetic_implant/brain, /datum/surgery_step/close)
- possible_locs = list("head")
- requires_organic_bodypart = 0
-
-/datum/surgery_step/cybernetic_implant/brain
- name = "insert brain cybernetic implant"
- implements = list(/obj/item/organ/internal/cyberimp/brain = 100)
- time = 32
-
-/datum/surgery_step/cybernetic_implant/brain/success(mob/user, mob/living/carbon/target, target_zone, obj/item/organ/internal/cyberimp/brain/implant, datum/surgery/surgery)
- if(implant)
- var/full = 0
- for(var/obj/item/I in target.internal_organs)
- if(istype(I,/obj/item/organ/internal/cyberimp/brain))
- full++
-
- if(full < MAX_BRAIN_IMPLANT)
- full = 0
- insert(user,target,implant,target_zone,full)
- return 1
-
-//[[[[CHEST]]]]
-/datum/surgery/cybernetic_implant/chest
- name = "torso cybernetic implant"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/cybernetic_implant/chest, /datum/surgery_step/close)
- possible_locs = list("chest")
- requires_organic_bodypart = 0
-
-/datum/surgery_step/cybernetic_implant/chest
- name = "insert torso cybernetic implant"
- implements = list(/obj/item/organ/internal/cyberimp/chest = 100)
- time = 32
-
-/datum/surgery_step/cybernetic_implant/chest/success(mob/user, mob/living/carbon/target, target_zone, obj/item/organ/internal/cyberimp/chest/implant, datum/surgery/surgery)
- if(implant)
- var/full = 0
- for(var/obj/item/I in target.internal_organs)
- if(istype(I,/obj/item/organ/internal/cyberimp/chest))
- full++
- if(full < MAX_CHEST_IMPLANT)
- full = 0
-
- insert(user,target,implant,target_zone,full)
- return 1
-
-/datum/surgery_step/cybernetic_implant/proc/insert(mob/user, mob/living/carbon/target, obj/item/organ/internal/cyberimp/implant,target_zone,full)
- if(full)
- user << "You can't seem to implant anything else into the [target]'s [target_zone]!"
- else
- user.visible_message("[user] inserts [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone]!", "You insert [implant] into the [target]'s [target_zone == "head" ? "brain" : target_zone].")
- user.drop_item()
- implant.Insert(target)
\ No newline at end of file
diff --git a/code/modules/surgery/dethrall.dm b/code/modules/surgery/dethrall.dm
index bd54a7f3f6f..c421e8ece6e 100644
--- a/code/modules/surgery/dethrall.dm
+++ b/code/modules/surgery/dethrall.dm
@@ -3,14 +3,17 @@
steps = list(/datum/surgery_step/incise, /datum/surgery_step/clamp_bleeders, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/dethrall)
possible_locs = list("head")
+/datum/surgery/dethrall/can_start(mob/user, mob/living/carbon/target)
+ return is_thrall(target)
+
/datum/surgery_step/dethrall
name = "search head"
accept_hand = 1
time = 70
- var/obj/item/organ/brain/B = null
+ var/obj/item/organ/internal/brain/B = null
/datum/surgery_step/dethrall/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- B = target.getorgan(/obj/item/organ/brain)
+ B = target.getorgan(/obj/item/organ/internal/brain)
if(B)
user.visible_message("[user] begins looking around in [target]'s head.", "You begin looking for foreign influences on [target]'s brain...")
@@ -19,8 +22,6 @@
if(!is_thrall(target))
user << "You are unable to locate anything on [target]'s brain."
return 1
- user << "You locate a small, pulsing black tumor on the side of [target]'s brain and begin to remove it."
- target << "A small part of your head pulses with agony as the light impacts it."
sleep(30)
user.visible_message("[user] begins removing something from [target]'s head.", \
"You begin carefully extracting the tumor...")
diff --git a/code/modules/surgery/eye_surgery.dm b/code/modules/surgery/eye_surgery.dm
index 06117fb80d7..83821b42e1d 100644
--- a/code/modules/surgery/eye_surgery.dm
+++ b/code/modules/surgery/eye_surgery.dm
@@ -23,7 +23,7 @@
return 1
/datum/surgery_step/fix_eyes/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(target.getorgan(/obj/item/organ/brain))
+ if(target.getorgan(/obj/item/organ/internal/brain))
user.visible_message("[user] accidentally stabs [target] right in the brain!", "You accidentally stab [target] right in the brain!")
target.adjustBrainLoss(100)
else
diff --git a/code/modules/surgery/generic_steps.dm b/code/modules/surgery/generic_steps.dm
index 1f01549e999..351e2eec06a 100644
--- a/code/modules/surgery/generic_steps.dm
+++ b/code/modules/surgery/generic_steps.dm
@@ -3,7 +3,7 @@
/datum/surgery_step/incise
name = "make incision"
implements = list(/obj/item/weapon/scalpel = 100, /obj/item/weapon/kitchen/knife = 65, /obj/item/weapon/shard = 45)
- time = 24
+ time = 16
/datum/surgery_step/incise/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] begins to make an incision in [target]'s [parse_zone(target_zone)].", "You begin to make an incision in [target]'s [parse_zone(target_zone)]...")
@@ -14,7 +14,7 @@
/datum/surgery_step/clamp_bleeders
name = "clamp bleeders"
implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/wirecutters = 60, /obj/item/stack/cable_coil = 15)
- time = 48
+ time = 24
/datum/surgery_step/clamp_bleeders/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] begins to clamp bleeders in [target]'s [parse_zone(target_zone)].", "You begin to clamp bleeders in [target]'s [parse_zone(target_zone)]...")
@@ -29,7 +29,7 @@
/datum/surgery_step/retract_skin
name = "retract skin"
implements = list(/obj/item/weapon/retractor = 100, /obj/item/weapon/screwdriver = 45, /obj/item/weapon/wirecutters = 35)
- time = 32
+ time = 24
/datum/surgery_step/retract_skin/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] begins to retract the skin in [target]'s [parse_zone(target_zone)].", "You begin to retract the skin in [target]'s [parse_zone(target_zone)]...")
@@ -40,7 +40,7 @@
/datum/surgery_step/close
name = "mend incision"
implements = list(/obj/item/weapon/cautery = 100, /obj/item/weapon/weldingtool = 70, /obj/item/weapon/lighter = 45, /obj/item/weapon/match = 20)
- time = 32
+ time = 24
/datum/surgery_step/close/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] begins to mend the incision in [target]'s [parse_zone(target_zone)].", "You begin to mend the incision in [target]'s [parse_zone(target_zone)]...")
@@ -75,7 +75,7 @@
/datum/surgery_step/saw
name = "saw bone"
implements = list(/obj/item/weapon/circular_saw = 100, /obj/item/weapon/melee/arm_blade = 75, /obj/item/weapon/hatchet = 35, /obj/item/weapon/kitchen/knife/butcher = 25)
- time = 64
+ time = 54
/datum/surgery_step/saw/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
user.visible_message("[user] begins to saw through the bone in [target]'s [parse_zone(target_zone)].", "You begin to saw through the bone in [target]'s [parse_zone(target_zone)]...")
diff --git a/code/modules/surgery/helpers.dm b/code/modules/surgery/helpers.dm
index 021eddeb277..a9675ffba2f 100644
--- a/code/modules/surgery/helpers.dm
+++ b/code/modules/surgery/helpers.dm
@@ -18,8 +18,8 @@
if(!current_surgery)
var/list/all_surgeries = surgeries_list.Copy()
var/list/available_surgeries = list()
- for(var/i in all_surgeries)
- var/datum/surgery/S = all_surgeries[i]
+
+ for(var/datum/surgery/S in all_surgeries)
if(!S.possible_locs.Find(selected_zone))
continue
if(affecting && S.requires_organic_bodypart && affecting.status == ORGAN_ROBOTIC)
@@ -33,7 +33,7 @@
break
var/P = input("Begin which procedure?", "Surgery", null, null) as null|anything in available_surgeries
- if(P && user.Adjacent(M) && (I in user))
+ if(P && user && user.Adjacent(M) && (I in user))
var/datum/surgery/S = available_surgeries[P]
var/datum/surgery/procedure = new S.type
if(procedure)
@@ -48,11 +48,21 @@
else
user << "You need to expose [M]'s [parse_zone(selected_zone)] first!"
- else if(current_surgery.status == 1 && !current_surgery.step_in_progress)
- M.surgeries -= current_surgery
- user.visible_message("[user] removes the drapes from [M]'s [parse_zone(selected_zone)].", \
- "You remove the drapes from [M]'s [parse_zone(selected_zone)].")
- qdel(current_surgery)
+ else if(!current_surgery.step_in_progress)
+ if(current_surgery.status == 1)
+ M.surgeries -= current_surgery
+ user.visible_message("[user] removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else if(istype(user.get_inactive_hand(), /obj/item/weapon/cautery) && current_surgery.can_cancel)
+ M.surgeries -= current_surgery
+ user.visible_message("[user] mends the incision and removes the drapes from [M]'s [parse_zone(selected_zone)].", \
+ "You mend the incision and remove the drapes from [M]'s [parse_zone(selected_zone)].")
+ qdel(current_surgery)
+ else if(current_surgery.can_cancel)
+ user << "You need to hold a cautery in inactive hand to stop [M]'s surgery!"
+
+
return 1
return 0
diff --git a/code/modules/surgery/limb augmentation.dm b/code/modules/surgery/limb augmentation.dm
index d7ff7340302..fc8e72bdb75 100644
--- a/code/modules/surgery/limb augmentation.dm
+++ b/code/modules/surgery/limb augmentation.dm
@@ -61,11 +61,10 @@
if("head")
H.organs += new /obj/item/organ/limb/robot/head(src)
if("chest")
- var/datum/surgery_step/xenomorph_removal/xeno_removal = new
- xeno_removal.remove_xeno(user, target) // remove an alien if there is one
- H.organs += new /obj/item/organ/limb/robot/chest(src)
- for(var/datum/disease/appendicitis/A in H.viruses) //If they already have Appendicitis, Remove it
- A.cure(1)
+ for(var/obj/item/organ/internal/I in target.getorganszone(target_zone, 1))
+ if(I.status == ORGAN_ORGANIC) // FLESH IS WEAK
+ I.Remove(target, special = 1)
+ qdel(I)
user.drop_item()
qdel(tool)
H.update_damage_overlays(0)
diff --git a/code/modules/surgery/organ_manipulation.dm b/code/modules/surgery/organ_manipulation.dm
new file mode 100644
index 00000000000..6a934c160d0
--- /dev/null
+++ b/code/modules/surgery/organ_manipulation.dm
@@ -0,0 +1,111 @@
+/datum/surgery/organ_manipulation
+ name = "organ manipulation"
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
+ species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
+ possible_locs = list("chest", "head")
+ requires_organic_bodypart = 0
+
+/datum/surgery/organ_manipulation/soft
+ possible_locs = list("groin", "eyes", "mouth")
+ steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/clamp_bleeders,
+ /datum/surgery_step/incise, /datum/surgery_step/manipulate_organs)
+
+/datum/surgery/organ_manipulation/alien
+ name = "alien organ manipulation"
+ possible_locs = list("chest", "head", "groin", "eyes", "mouth")
+ species = list(/mob/living/carbon/alien/humanoid)
+ steps = list(/datum/surgery_step/saw, /datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/manipulate_organs)
+
+
+
+
+/datum/surgery_step/manipulate_organs
+ time = 64
+ name = "manipulate organs"
+ implements = list(/obj/item/organ/internal = 100)
+ var/implements_extract = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/crowbar = 55)
+ var/implements_mend = list(/obj/item/weapon/cautery = 100, /obj/item/weapon/weldingtool = 70, /obj/item/weapon/lighter = 45, /obj/item/weapon/match = 20)
+ var/current_type
+ var/obj/item/organ/internal/I = null
+
+/datum/surgery_step/manipulate_organs/New()
+ ..()
+ implements = implements + implements_extract + implements_mend
+
+/datum/surgery_step/manipulate_organs/tool_check(mob/user, obj/item/tool)
+ if(istype(tool, /obj/item/weapon/weldingtool))
+ var/obj/item/weapon/weldingtool/WT = tool
+ if(!WT.isOn()) return 0
+
+ else if(istype(tool, /obj/item/weapon/lighter))
+ var/obj/item/weapon/lighter/L = tool
+ if(!L.lit) return 0
+
+ else if(istype(tool, /obj/item/weapon/match))
+ var/obj/item/weapon/match/M = tool
+ if(!M.lit) return 0
+
+ return 1
+
+
+/datum/surgery_step/manipulate_organs/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ I = null
+ if(isorgan(tool))
+ current_type = "insert"
+ I = tool
+ if(target_zone != I.zone || target.getorganslot(I.slot))
+ user << "There is no room for [I] in [target]'s [parse_zone(target_zone)]!"
+ return -1
+
+ user.visible_message("[user] begins to insert [tool] into [target]'s [parse_zone(target_zone)].",
+ "You begin to insert [tool] into [target]'s [parse_zone(target_zone)]...")
+
+ else if(implement_type in implements_extract)
+ current_type = "extract"
+ var/list/organs = target.getorganszone(target_zone)
+ if(!organs.len)
+ user << "There is no removeable organs in [target]'s [parse_zone(target_zone)]!"
+ return -1
+ else
+ for(var/obj/item/organ/internal/O in organs)
+ O.on_find(user)
+ organs -= O
+ organs[O.name] = O
+
+ I = input("Remove which organ?", "Surgery", null, null) as null|anything in organs
+ if(I && user && target && user.Adjacent(target) && user.get_active_hand() == tool)
+ I = organs[I]
+ if(!I) return -1
+ user.visible_message("[user] begins to extract [I] from [target]'s [parse_zone(target_zone)].",
+ "You begin to extract [I] from [target]'s [parse_zone(target_zone)]...")
+ else
+ return -1
+
+ else if(implement_type in implements_mend)
+ current_type = "mend"
+
+
+/datum/surgery_step/manipulate_organs/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
+ if(current_type == "mend")
+ user.visible_message("[user] mend the incision in [target]'s [parse_zone(target_zone)].",
+ "You mend the incision in [target]'s [parse_zone(target_zone)].")
+ return 1
+ else if(current_type == "insert")
+ I = tool
+ user.drop_item()
+ I.Insert(target)
+ user.visible_message("[user] inserts [tool] into [target]'s [parse_zone(target_zone)]!",
+ "You insert [tool] into [target]'s [parse_zone(target_zone)].")
+
+ else if(current_type == "extract")
+ if(I && I.owner == target)
+ user.visible_message("[user] successfully extracts [I] from [target]'s [parse_zone(target_zone)]!",
+ "You successfully extract [I] from [target]'s [parse_zone(target_zone)].")
+ add_logs(user, target, "surgically removed [I.name] from", addition="INTENT: [uppertext(user.a_intent)]")
+ I.Remove(target)
+ I.loc = get_turf(target)
+ else
+ user.visible_message("[user] can't seem to extract anything from [target]'s [parse_zone(target_zone)]!",
+ "You can't extract anything from [target]'s [parse_zone(target_zone)]!")
+ return 0
\ No newline at end of file
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index ab814cbf9df..4ef193183b1 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -121,7 +121,8 @@
origin_tech = "materials=4;biotech=3"
implant_color = "#101010"
flash_protect = 2
- // Welding with thermals will still hurt your eyes a bit.
+ aug_message = null
+ eye_color = "fff"
/obj/item/organ/internal/cyberimp/eyes/shield/emp_act(severity)
return
\ No newline at end of file
diff --git a/code/modules/surgery/organs/helpers.dm b/code/modules/surgery/organs/helpers.dm
index 18b4185ea52..a3f8d5de65b 100644
--- a/code/modules/surgery/organs/helpers.dm
+++ b/code/modules/surgery/organs/helpers.dm
@@ -11,8 +11,16 @@ mob/proc/getorganslot(slot)
mob/living/carbon/getorgan(typepath)
return (locate(typepath) in internal_organs)
-mob/living/carbon/getorganszone(zone)
+mob/living/carbon/getorganszone(zone, var/subzones = 0)
var/list/returnorg = list()
+ if(subzones)
+ if(zone == "head")
+ returnorg = getorganszone("eyes") + getorganszone("mouth")
+ // We don't have mouth organs now, but who knows?
+ if(zone == "chest")
+ returnorg = getorganszone("groin")
+
+
for(var/obj/item/organ/internal/O in internal_organs)
if(zone == O.zone)
returnorg += O
diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm
index ae4e1e00a55..f37761f55a2 100644
--- a/code/modules/surgery/organs/organ_internal.dm
+++ b/code/modules/surgery/organs/organ_internal.dm
@@ -1,12 +1,15 @@
/obj/item/organ/internal
origin_tech = "biotech=2"
+ force = 1
+ w_class = 2
+ throwforce = 0
var/zone = "chest"
var/slot
var/vital = 0
var/organ_action_name = null
-/obj/item/organ/internal/proc/Insert(var/mob/living/carbon/M, special = 0)
- if(!iscarbon(M) || owner)
+/obj/item/organ/internal/proc/Insert(mob/living/carbon/M, special = 0)
+ if(!iscarbon(M) || owner == M)
return
var/obj/item/organ/internal/replaced = M.getorganslot(slot)
@@ -19,7 +22,8 @@
if(organ_action_name)
action_button_name = organ_action_name
-/obj/item/organ/internal/proc/Remove(var/mob/living/carbon/M, special = 0)
+
+/obj/item/organ/internal/proc/Remove(mob/living/carbon/M, special = 0)
owner = null
if(M)
M.internal_organs -= src
@@ -29,14 +33,42 @@
if(organ_action_name)
action_button_name = null
+/obj/item/organ/internal/proc/on_find(mob/living/finder)
+ return
+
/obj/item/organ/internal/proc/on_life()
return
+/obj/item/organ/internal/proc/prepare_eat()
+ var/obj/item/weapon/reagent_containers/food/snacks/S = new
+ S.name = name
+ S.desc = desc
+ S.icon = icon
+ S.icon_state = icon_state
+ S.origin_tech = origin_tech
+ S.w_class = w_class
+ S.reagents.add_reagent("nutriment", 5)
+
+ return S
+
/obj/item/organ/internal/Destroy()
if(owner)
Remove(owner, 1)
..()
+/obj/item/organ/internal/attack(mob/living/carbon/M, mob/user)
+ if(M == user && ishuman(user))
+ var/mob/living/carbon/human/H = user
+ if(status == ORGAN_ORGANIC)
+ var/obj/item/weapon/reagent_containers/food/snacks/S = prepare_eat()
+ if(S)
+ H.drop_item()
+ H.put_in_active_hand(S)
+ S.attack(H, H)
+ qdel(src)
+ else
+ ..()
+
//Looking for brains?
//Try code/modules/mob/living/carbon/brain/brain_item.dm
@@ -57,17 +89,23 @@
else
icon_state = "heart-off"
-/obj/item/organ/internal/heart/Insert(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/heart/Insert(mob/living/carbon/M, special = 0)
..()
beating = 1
update_icon()
-/obj/item/organ/internal/heart/Remove(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/heart/Remove(mob/living/carbon/M, special = 0)
..()
spawn(120)
beating = 0
update_icon()
+/obj/item/organ/internal/heart/prepare_eat()
+ var/obj/S = ..()
+ S.icon_state = "heart-off"
+ return S
+
+
/obj/item/organ/internal/appendix
name = "appendix"
@@ -84,12 +122,20 @@
icon_state = "appendix"
name = "appendix"
-/obj/item/organ/internal/appendix/Remove(var/mob/living/carbon/M, special = 0)
- for(var/datum/disease/appendicitis in M.viruses)
- appendicitis.cure()
+/obj/item/organ/internal/appendix/Remove(mob/living/carbon/M, special = 0)
+ for(var/datum/disease/appendicitis/A in M.viruses)
+ A.cure()
+ inflamed = 1
+ update_icon()
..()
-/obj/item/organ/internal/appendix/Insert(var/mob/living/carbon/M, special = 0)
+/obj/item/organ/internal/appendix/Insert(mob/living/carbon/M, special = 0)
..()
if(inflamed)
- M.AddDisease(new /datum/disease/appendicitis)
\ No newline at end of file
+ M.AddDisease(new /datum/disease/appendicitis)
+
+/obj/item/organ/internal/appendix/prepare_eat()
+ var/obj/S = ..()
+ if(inflamed)
+ S.reagents.add_reagent("????", 5)
+ return S
\ No newline at end of file
diff --git a/code/modules/surgery/surgery.dm b/code/modules/surgery/surgery.dm
index 9a9196562fd..ecee25e7b13 100644
--- a/code/modules/surgery/surgery.dm
+++ b/code/modules/surgery/surgery.dm
@@ -3,9 +3,9 @@
var/status = 1
var/list/steps = list() //Steps in a surgery
var/step_in_progress = 0 //Actively performing a Surgery
+ var/can_cancel = 1 //Can cancel this surgery after step 1 with cautery
var/list/species = list(/mob/living/carbon/human) //Acceptable Species
var/location = "chest" //Surgery location
- var/target_must_be_dead = 0 //Needs to be dead
var/requires_organic_bodypart = 1 //Prevents you from performing an operation on robotic limbs
var/list/possible_locs = list() //Multiple locations -- c0
var/ignore_clothes = 0 //This surgery ignores clothes
diff --git a/code/modules/surgery/surgery_step.dm b/code/modules/surgery/surgery_step.dm
index bd442c7c5a7..0b9c9980668 100644
--- a/code/modules/surgery/surgery_step.dm
+++ b/code/modules/surgery/surgery_step.dm
@@ -38,9 +38,11 @@
/datum/surgery_step/proc/initiate(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
surgery.step_in_progress = 1
- preop(user, target, target_zone, tool, surgery)
- if(do_after(user, time, target = target))
+ if(preop(user, target, target_zone, tool, surgery) == -1)
+ surgery.step_in_progress = 0
+ return
+ if(do_after(user, time, target = target))
var/advance = 0
var/prob_chance = 100
diff --git a/code/modules/surgery/xenomorph_removal.dm b/code/modules/surgery/xenomorph_removal.dm
deleted file mode 100644
index 97cabb6d003..00000000000
--- a/code/modules/surgery/xenomorph_removal.dm
+++ /dev/null
@@ -1,50 +0,0 @@
-/datum/surgery/xenomorph_removal
- name = "xenomorph removal"
- steps = list(/datum/surgery_step/incise, /datum/surgery_step/retract_skin, /datum/surgery_step/saw, /datum/surgery_step/xenomorph_removal, /datum/surgery_step/close)
- species = list(/mob/living/carbon/human, /mob/living/carbon/monkey)
- possible_locs = list("chest")
-
-
-
-//remove xeno from premises
-/datum/surgery_step/xenomorph_removal
- name = "remove foregin body"
- implements = list(/obj/item/weapon/hemostat = 100, /obj/item/weapon/shovel/spade = 65, /obj/item/weapon/cultivator = 50, /obj/item/weapon/crowbar = 35)
- time = 64
-
-/datum/surgery_step/xenomorph_removal/preop(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- user.visible_message("[user] begins to search in [target]'s chest for a xenomorph embryo.", "You begin to search in [target]'s chest for a xenomorph embryo...")
-
-/datum/surgery_step/xenomorph_removal/success(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- if(remove_xeno(user, target))
- user.visible_message("[user] successfully extracts the xenomorph embryo from [target]!", "You successfully extract the xenomorph embryo from [target].")
- else
- user.visible_message("[user] can't seem to find anything in [target]'s chest!", "You can't find anything in [target]'s chest!")
- return 1
-
-/datum/surgery_step/xenomorph_removal/proc/remove_xeno(mob/user, mob/living/carbon/target)
- var/obj/item/organ/internal/body_egg/alien_embryo/A = target.getorgan(/obj/item/organ/internal/body_egg/alien_embryo)
- if(A)
- user << "You found an unknown alien organism in [target]'s chest!"
- if(A.stage < 4)
- user << "It's small and weak, barely the size of a foetus."
- else
- user << "It's grown quite large, and writhes slightly as you look at it."
- if(prob(10))
- A.AttemptGrow()
-
- A.Remove(target)
- A.loc = get_turf(target)
- return 1
-
-
-/datum/surgery_step/xenomorph_removal/failure(mob/user, mob/living/carbon/target, target_zone, obj/item/tool, datum/surgery/surgery)
- var/obj/item/organ/internal/body_egg/alien_embryo/A = target.getorgan(/obj/item/organ/internal/body_egg/alien_embryo)
- if(A)
- if(prob(50))
- A.AttemptGrow(0)
- user.visible_message("[user] accidentally pokes the xenomorph in [target]!", "You accidentally poke the xenomorph in [target]!")
- else
- target.adjustOxyLoss(30)
- user.visible_message("[user] accidentally pokes [target] in the lungs!", "You accidentally poke [target] in the lungs!")
- return 0
\ No newline at end of file
diff --git a/html/changelog.html b/html/changelog.html
index c9ef397204c..c36cdd27f70 100644
--- a/html/changelog.html
+++ b/html/changelog.html
@@ -55,6 +55,97 @@
-->
+
18 August 2015
+
CoreOverload updated:
+
+ - Added a new low-tech eye cyberimplant in RnD - welding shield implant.
+ - Implanter and empty implant case added to protolathe.
+ - You can sell tech disks and maxed reliability design disks in cargo for supply points.
+ - DA menu shows current research levels.
+ - You can print cyberimplants in updated mech fab.
+
+
Supermichael777 updated:
+
+ - Added an ooc hotkey for borgs = O. They simply didn't have one and it was a consistency issue
+ - Also added Ctrl+O as an any mode keycombo so you dont have to backspace and type ooc. Added to hotkey mode to remain consistent with all other Ctrl combos
+
+
bustygoku updated:
+
+ - Most backpacks now have 21 or more slots, but are still weight restricted. What this means is that you can have a lot of tiny weight items, but only 7 medium items just like before.
+
+
phil235 updated:
+
+ - Janicart rider no longer slip on wet floor or bananas. Moving on a floor tile with lube while buckled (chair, roller bed, etc) will make you fall off.
+
+
+
16 August 2015
+
Joan updated:
+
+ - Revenants will now occasionally spawn as an event.
+ - Revenants gain more energy from Harvesting, and can Harvest from people in crit.
+ - Revenant powers are more effective, and no longer freeze you in place, besides Harvest.
+ - Slain Revenants will respawn much faster.
+ - Fixed a whole bunch of revenant bugs, including one that caused the objective to always fail.
+
+
Kor updated:
+
+ - The wizard can now stop time.
+
+
MMMiracles updated:
+
+ - Revamps bioterror darts into a less-lethal, syringe form. Removed the coniine and spore toxins to keep it solely for quiet take-downs.
+
+
+
15 August 2015
+
Miauw updated:
+
+ - Changeling transformations have been upgraded to also include clothing instead of just DNA.
+ - Patches no longer work on dead people.
+ - Added 15-force edaggers that function like pens when off.
+
+
MrPerson updated:
+
+ - Objects being dragged will no longer get shoved out of your grasp by space wind. Retrieving dead bodies should be possible.
+
+
RemieRichards updated:
+
+ - Added Changeling Team Objectives, these are handed out to all lings, with the chance of a round having one being 20*number_of_lings% (3 lings = 60%)
+ - Impersonate Department (Team Objective): As many members of a department as can reasonably be picked are chosen for the lings to kill, replace and escape as
+ - Impersonate Heads (Team Objective): 3 to 6 Heads of Staff are chosen for the lings to kill, replace and escape as
+ - If the Changelings have a Team Objective, their usual Kill, Maroon, Etc. objectives will not pick other changelings, to discourage backstabbing in teamling
+ - Changeling Engorged Glands is now the default storage and regen rate, Engorged Glands remains for an extra boost
+ - Armblades can now be used to open powered doors, however it takes 10 seconds of the changeling standing still, Their ability to instantly open unpowered doors remains unchanged
+ - Debrain objective is no longer handed out to lings, it's as good as broken these days
+ - Changelings may now purchase a togglable version of the Chameleon Skin genetics mutation, for 2 DNA
+
+
+
13 August 2015
+
CoreOverload updated:
+
+ - Added a new 8TC traitor item: subspace storage implant. It allows you to store two box-sized items in (almost) undetectable storage.
+ - Changed the way most of the surgical operations work. See wiki for new steps.
+ - You can cancel step 2+ surgeries with drapes and cautery in inactive hand.
+ - Defib no longer works on humans who have no heart. Changeling/thrall/cult/strange reagent revives are still working, and this is intended.
+ - You can eat all organs raw now, with exception for brains and cyberimplants.
+ - Some xenos abilities are linked to their organs. Play with xenos' guts for fun and profit!
+
+
RemieRichards updated:
+
+ - Modifying a string (Text) variable with View Variables or View Variables Mass Modify now allows you to embed variables like real byond strings, For example the variable real_name; you could set a text var to [real_name] and it would be replaced with the actual contents of the var, This allows for Mass fixing of certain variables but it's also useful for badmin gimmickery
+
+
+
12 August 2015
+
CosmicScientist updated:
+
+ - Added Space Carp costume to the code, get it from an autodrobe near you.
+ - Added Ian costume to the code, take his place under the HoP's hand, get it from an autodrobe or corgi hide, keep it away from washing machines or it'll meat its end as clothing.
+ - Added Space Carp spacesuit to the code, I know what I'm praying for.
+
+
bgobandit updated:
+
+ - After multiple complaints from WaffleCo food activists, Nanotrasen has added real chocolate, berry juice and blue flavouring to its ice cream products.
+
+
09 August 2015
RemieRichards updated:
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 6cde492ebc3..52a113eb2ac 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -1530,3 +1530,95 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
crew!'
- rscadd: 'Kill Crewmembers: Do you suspect changelings? or dont feel you have enough
food rations? Just shoot somebody in the head, at any time!'
+2015-08-12:
+ CosmicScientist:
+ - rscadd: Added Space Carp costume to the code, get it from an autodrobe near you.
+ - rscadd: Added Ian costume to the code, take his place under the HoP's hand, get
+ it from an autodrobe or corgi hide, keep it away from washing machines or it'll
+ meat its end as clothing.
+ - rscadd: Added Space Carp spacesuit to the code, I know what I'm praying for.
+ bgobandit:
+ - rscadd: After multiple complaints from WaffleCo food activists, Nanotrasen has
+ added real chocolate, berry juice and blue flavouring to its ice cream products.
+2015-08-13:
+ CoreOverload:
+ - rscadd: 'Added a new 8TC traitor item: subspace storage implant. It allows you
+ to store two box-sized items in (almost) undetectable storage. '
+ - tweak: Changed the way most of the surgical operations work. See wiki for new
+ steps.
+ - tweak: You can cancel step 2+ surgeries with drapes and cautery in inactive hand.
+ - tweak: Defib no longer works on humans who have no heart. Changeling/thrall/cult/strange
+ reagent revives are still working, and this is intended.
+ - rscadd: You can eat all organs raw now, with exception for brains and cyberimplants.
+ - rscadd: Some xenos abilities are linked to their organs. Play with xenos' guts
+ for fun and profit!
+ RemieRichards:
+ - rscadd: Modifying a string (Text) variable with View Variables or View Variables
+ Mass Modify now allows you to embed variables like real byond strings, For example
+ the variable real_name; you could set a text var to [real_name] and it would
+ be replaced with the actual contents of the var, This allows for Mass fixing
+ of certain variables but it's also useful for badmin gimmickery
+2015-08-15:
+ Miauw:
+ - rscadd: Changeling transformations have been upgraded to also include clothing
+ instead of just DNA.
+ - tweak: Patches no longer work on dead people.
+ - rscadd: Added 15-force edaggers that function like pens when off.
+ MrPerson:
+ - rscadd: Objects being dragged will no longer get shoved out of your grasp by space
+ wind. Retrieving dead bodies should be possible.
+ RemieRichards:
+ - rscadd: Added Changeling Team Objectives, these are handed out to all lings, with
+ the chance of a round having one being 20*number_of_lings% (3 lings = 60%)
+ - rscadd: 'Impersonate Department (Team Objective): As many members of a department
+ as can reasonably be picked are chosen for the lings to kill, replace and escape
+ as'
+ - rscadd: 'Impersonate Heads (Team Objective): 3 to 6 Heads of Staff are chosen
+ for the lings to kill, replace and escape as'
+ - tweak: If the Changelings have a Team Objective, their usual Kill, Maroon, Etc.
+ objectives will not pick other changelings, to discourage backstabbing in teamling
+ - tweak: Changeling Engorged Glands is now the default storage and regen rate, Engorged
+ Glands remains for an extra boost
+ - rscadd: Armblades can now be used to open powered doors, however it takes 10 seconds
+ of the changeling standing still, Their ability to instantly open unpowered
+ doors remains unchanged
+ - rscdel: Debrain objective is no longer handed out to lings, it's as good as broken
+ these days
+ - rscadd: Changelings may now purchase a togglable version of the Chameleon Skin
+ genetics mutation, for 2 DNA
+2015-08-16:
+ Joan:
+ - rscadd: Revenants will now occasionally spawn as an event.
+ - tweak: Revenants gain more energy from Harvesting, and can Harvest from people
+ in crit.
+ - tweak: Revenant powers are more effective, and no longer freeze you in place,
+ besides Harvest.
+ - tweak: Slain Revenants will respawn much faster.
+ - bugfix: Fixed a whole bunch of revenant bugs, including one that caused the objective
+ to always fail.
+ Kor:
+ - rscadd: The wizard can now stop time.
+ MMMiracles:
+ - tweak: Revamps bioterror darts into a less-lethal, syringe form. Removed the coniine
+ and spore toxins to keep it solely for quiet take-downs.
+2015-08-18:
+ CoreOverload:
+ - rscadd: Added a new low-tech eye cyberimplant in RnD - welding shield implant.
+ - rscadd: Implanter and empty implant case added to protolathe.
+ - rscadd: You can sell tech disks and maxed reliability design disks in cargo for
+ supply points.
+ - tweak: DA menu shows current research levels.
+ - tweak: You can print cyberimplants in updated mech fab.
+ Supermichael777:
+ - bugfix: Added an ooc hotkey for borgs = O. They simply didn't have one and it
+ was a consistency issue
+ - rscadd: Also added Ctrl+O as an any mode keycombo so you dont have to backspace
+ and type ooc. Added to hotkey mode to remain consistent with all other Ctrl
+ combos
+ bustygoku:
+ - tweak: Most backpacks now have 21 or more slots, but are still weight restricted.
+ What this means is that you can have a lot of tiny weight items, but only 7
+ medium items just like before.
+ phil235:
+ - tweak: Janicart rider no longer slip on wet floor or bananas. Moving on a floor
+ tile with lube while buckled (chair, roller bed, etc) will make you fall off.
diff --git a/icons/mob/back.dmi b/icons/mob/back.dmi
index 1268062781d..2ee2ec8d082 100644
Binary files a/icons/mob/back.dmi and b/icons/mob/back.dmi differ
diff --git a/icons/mob/corgi_back.dmi b/icons/mob/corgi_back.dmi
index 657a7c01a54..616d8ab2061 100644
Binary files a/icons/mob/corgi_back.dmi and b/icons/mob/corgi_back.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 76941cba399..8e8051c6fe6 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi
index 1fab40186a8..3bee0482423 100644
Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index fded89b9805..3ac3986a3d8 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/obj/bedsheets.dmi b/icons/obj/bedsheets.dmi
index a91c635f502..4827268adf1 100644
Binary files a/icons/obj/bedsheets.dmi and b/icons/obj/bedsheets.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 7e46aa87a45..3f4db4e6217 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 74dade9bb5f..4719ce0006e 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 324c7d695b8..b419ee3a4d5 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/implants.dmi b/icons/obj/implants.dmi
index ed530528cc3..8dc2f08fdcb 100644
Binary files a/icons/obj/implants.dmi and b/icons/obj/implants.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index ce46721a855..92283417a29 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index e3a0165745f..e1f7fe92119 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/interface/interface.dm b/interface/interface.dm
index a97aa48e385..578e0f084fd 100644
--- a/interface/interface.dm
+++ b/interface/interface.dm
@@ -112,6 +112,7 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+e = equip
\tCtrl+r = throw
\tCtrl+b = resist
+\tCtrl+O = OOC
\tCtrl+x = swap-hand
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+f = cycle-intents-left
@@ -141,6 +142,7 @@ Hotkey-Mode: (hotkey-mode must be on)
\tw = up
\tq = unequip active module
\tt = say
+\to = OOC
\tx = cycle active modules
\tb = resist
\tz = activate held object (or y)
@@ -161,6 +163,7 @@ Any-Mode: (hotkey doesn't need to be on)
\tCtrl+q = unequip active module
\tCtrl+x = cycle active modules
\tCtrl+b = resist
+\tCtrl+o = OOC
\tCtrl+z = activate held object (or Ctrl+y)
\tCtrl+f = cycle-intents-left
\tCtrl+g = cycle-intents-right
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 7db57837c75..ef5ae3f9ebf 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -107,6 +107,14 @@ macro "borghotkeymode"
name = "CTRL+B"
command = "resist"
is-disabled = false
+ elem
+ name = "O"
+ command = "ooc"
+ is-disabled = false
+ elem
+ name = "CTRL+O"
+ command = "ooc"
+ is-disabled = false
elem
name = "D+REP"
command = ".east"
@@ -373,6 +381,10 @@ macro "macro"
name = "F5"
command = "Aghost"
is-disabled = false
+ elem
+ name = "CTRL+O"
+ command = "ooc"
+ is-disabled = false
elem
name = "F6"
command = "Player-Panel"
@@ -543,6 +555,10 @@ macro "hotkeymode"
name = "O"
command = "ooc"
is-disabled = false
+ elem
+ name = "CTRL+O"
+ command = "ooc"
+ is-disabled = false
elem
name = "Q"
command = ".northwest"
@@ -725,6 +741,10 @@ macro "borgmacro"
name = "CTRL+B"
command = "resist"
is-disabled = false
+ elem
+ name = "CTRL+O"
+ command = "ooc"
+ is-disabled = false
elem
name = "CTRL+D+REP"
command = ".east"
diff --git a/tgstation.dme b/tgstation.dme
index 9b1ff3e38d6..383abb503be 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -27,6 +27,7 @@
#include "code\__DEFINES\machines.dm"
#include "code\__DEFINES\math.dm"
#include "code\__DEFINES\misc.dm"
+#include "code\__DEFINES\pipe_construction.dm"
#include "code\__DEFINES\preferences.dm"
#include "code\__DEFINES\qdel.dm"
#include "code\__DEFINES\say.dm"
@@ -153,7 +154,6 @@
#include "code\controllers\subsystem\shuttles\supply.dm"
#include "code\datums\ai_laws.dm"
#include "code\datums\browser.dm"
-#include "code\datums\computerfiles.dm"
#include "code\datums\datacore.dm"
#include "code\datums\datumvars.dm"
#include "code\datums\debug.dm"
@@ -252,6 +252,8 @@
#include "code\datums\wires\explosive.dm"
#include "code\datums\wires\mulebot.dm"
#include "code\datums\wires\particle_accelerator.dm"
+#include "code\datums\wires\pizza_bomb.dm"
+#include "code\datums\wires\r_n_d.dm"
#include "code\datums\wires\radio.dm"
#include "code\datums\wires\robot.dm"
#include "code\datums\wires\syndicatebomb.dm"
@@ -308,6 +310,7 @@
#include "code\game\gamemodes\changeling\powers\absorb.dm"
#include "code\game\gamemodes\changeling\powers\adrenaline.dm"
#include "code\game\gamemodes\changeling\powers\augmented_eyesight.dm"
+#include "code\game\gamemodes\changeling\powers\chameleon_skin.dm"
#include "code\game\gamemodes\changeling\powers\digitalcamo.dm"
#include "code\game\gamemodes\changeling\powers\fakedeath.dm"
#include "code\game\gamemodes\changeling\powers\fleshmend.dm"
@@ -679,6 +682,7 @@
#include "code\game\objects\items\weapons\implants\implant_explosive.dm"
#include "code\game\objects\items\weapons\implants\implant_freedom.dm"
#include "code\game\objects\items\weapons\implants\implant_loyality.dm"
+#include "code\game\objects\items\weapons\implants\implant_storage.dm"
#include "code\game\objects\items\weapons\implants\implantcase.dm"
#include "code\game\objects\items\weapons\implants\implantchair.dm"
#include "code\game\objects\items\weapons\implants\implanter.dm"
@@ -694,6 +698,7 @@
#include "code\game\objects\items\weapons\storage\briefcase.dm"
#include "code\game\objects\items\weapons\storage\fancy.dm"
#include "code\game\objects\items\weapons\storage\firstaid.dm"
+#include "code\game\objects\items\weapons\storage\internal.dm"
#include "code\game\objects\items\weapons\storage\lockbox.dm"
#include "code\game\objects\items\weapons\storage\secure.dm"
#include "code\game\objects\items\weapons\storage\storage.dm"
@@ -1121,6 +1126,7 @@
#include "code\modules\mob\living\carbon\alien\life.dm"
#include "code\modules\mob\living\carbon\alien\login.dm"
#include "code\modules\mob\living\carbon\alien\logout.dm"
+#include "code\modules\mob\living\carbon\alien\organs.dm"
#include "code\modules\mob\living\carbon\alien\say.dm"
#include "code\modules\mob\living\carbon\alien\screen.dm"
#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
@@ -1487,11 +1493,8 @@
#include "code\modules\security levels\keycard authentication.dm"
#include "code\modules\security levels\security levels.dm"
#include "code\modules\shuttle\shuttle.dm"
-#include "code\modules\surgery\appendectomy.dm"
-#include "code\modules\surgery\brain_removal.dm"
#include "code\modules\surgery\cavity_implant.dm"
#include "code\modules\surgery\core_removal.dm"
-#include "code\modules\surgery\cybernetic_implants.dm"
#include "code\modules\surgery\dethrall.dm"
#include "code\modules\surgery\eye_surgery.dm"
#include "code\modules\surgery\gender_reassignment.dm"
@@ -1500,12 +1503,12 @@
#include "code\modules\surgery\implant_removal.dm"
#include "code\modules\surgery\limb augmentation.dm"
#include "code\modules\surgery\lipoplasty.dm"
+#include "code\modules\surgery\organ_manipulation.dm"
#include "code\modules\surgery\plastic_surgery.dm"
#include "code\modules\surgery\remove_embedded_object.dm"
#include "code\modules\surgery\surgery.dm"
#include "code\modules\surgery\surgery_step.dm"
#include "code\modules\surgery\tools.dm"
-#include "code\modules\surgery\xenomorph_removal.dm"
#include "code\modules\surgery\organs\augments_external.dm"
#include "code\modules\surgery\organs\augments_eyes.dm"
#include "code\modules\surgery\organs\augments_internal.dm"