"
+ dat += "
Initiated Procedures"
for(var/datum/surgery/procedure in patient.surgeries)
dat += "[capitalize(procedure.name)]
"
+ var/datum/surgery_step/surgery_step = procedure.get_surgery_step()
+ dat += "Next step: [capitalize(surgery_step.name)]
"
dat += "
"
return dat
\ No newline at end of file
diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm
index 661a8d78fe5..860d26968e1 100644
--- a/code/game/machinery/computer/arcade.dm
+++ b/code/game/machinery/computer/arcade.dm
@@ -80,6 +80,9 @@
explosion(src.loc, -1, 0, 1+num_of_prizes, flame_range = 1+num_of_prizes)
+// ** BATTLE ** //
+
+
/obj/machinery/computer/arcade/battle
name = "arcade machine"
desc = "Does not support Pinball."
@@ -292,7 +295,7 @@
src.updateUsrDialog()
-
+// *** THE ORION TRAIL ** //
/obj/machinery/computer/arcade/orion_trail
@@ -722,4 +725,4 @@
sleep(3.6)
src.visible_message("
[src] explodes!")
explosion(src.loc, 1,2,4, flame_range = 3)
- qdel(src)
+ qdel(src)
\ No newline at end of file
diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm
index d49f0c1cee5..4d30422e833 100644
--- a/code/game/machinery/computer/buildandrepair.dm
+++ b/code/game/machinery/computer/buildandrepair.dm
@@ -128,7 +128,7 @@
build_path = /obj/machinery/computer/arcade/battle
origin_tech = "programming=1"
/obj/item/weapon/circuitboard/arcade/orion_trail
- name = "circuit board (Orion_Trail)"
+ name = "circuit board (Orion Trail)"
build_path = /obj/machinery/computer/arcade/orion_trail
/obj/item/weapon/circuitboard/turbine_control
name = "circuit board (Turbine control)"
diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm
index 3f2c3d52e75..cbbe3ed233f 100644
--- a/code/game/machinery/computer/crew.dm
+++ b/code/game/machinery/computer/crew.dm
@@ -256,7 +256,7 @@ var/global/datum/crewmonitor/crewmonitor = new
spawn
for (var/z = 1 to world.maxz) src.generateMiniMap(z)
- NOTICE("MINIMAP: All minimaps have been generated.")
+ world << "
All minimaps have been generated."
for (var/client/C in clients)
src.sendResources(C)
@@ -345,7 +345,6 @@ var/global/datum/crewmonitor/crewmonitor = new
ASSERT(map_icon.Width() == MAX_ICON_DIMENSION && map_icon.Height() == MAX_ICON_DIMENSION)
- NOTICE("MINIMAP: Generating minimap for z-level [z].")
var/i = 0
var/icon/turf_icon
@@ -411,12 +410,9 @@ var/global/datum/crewmonitor/crewmonitor = new
if ((++i) % 512 == 0) sleep(1) // deliberate delay to avoid lag spikes
- if ((i % 1024) == 0) NOTICE("MINIMAP: Generated [i] of [tiles.len] tiles.")
else
sleep(-1) // avoid sleeping if possible: prioritize pending procs
- NOTICE("MINIMAP: Generated [tiles.len] of [tiles.len] tiles.")
-
// BYOND BUG: map_icon now contains 4 directions? Create a new icon with only a single state.
var/icon/result_icon = new/icon()
diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm
index d351c5f7ec4..4288620d25e 100644
--- a/code/game/machinery/constructable_frame.dm
+++ b/code/game/machinery/constructable_frame.dm
@@ -254,6 +254,15 @@ to destroy them and players will be able to make replacements.
user << "You set the board to [names_paths[build_path]]."
req_components = list(text2path("/obj/item/weapon/vending_refill/[copytext("[build_path]", 24)]") = 3) //Never before has i used a method as horrible as this one, im so sorry
+/obj/item/weapon/circuitboard/announcement_system
+ name = "circuit board (Announcement System)"
+ build_path = /obj/machinery/announcement_system
+ board_type = "machine"
+ origin_tech = "programming=3;bluespace=2"
+ req_components = list(
+ /obj/item/stack/cable_coil = 2,
+ /obj/item/weapon/stock_parts/console_screen = 1)
+
/obj/item/weapon/circuitboard/smes
name = "circuit board (SMES)"
build_path = /obj/machinery/power/smes
diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm
index e023131b2f6..245b949cb79 100644
--- a/code/game/machinery/doors/airlock.dm
+++ b/code/game/machinery/doors/airlock.dm
@@ -86,7 +86,7 @@
/obj/machinery/door/airlock/centcom
icon = 'icons/obj/doors/Doorele.dmi'
opacity = 1
- doortype = null //(centcom) there's no door assembly sprites for this one.
+ doortype = /obj/structure/door_assembly/door_assembly_centcom
/obj/machinery/door/airlock/vault
name = "vault door"
@@ -980,6 +980,9 @@ About the new airlock wires panel:
if(src.doortype)
var/obj/structure/door_assembly/A = new src.doortype(src.loc)
A.heat_proof_finished = src.heat_proof //tracks whether there's rglass in
+ else
+ new /obj/structure/door_assembly/door_assembly_0(src.loc)
+ //If you come across a null doortype, it will produce the default assembly instead of disintegrating.
if(emagged)
user << "You discard the damaged electronics."
diff --git a/code/game/machinery/embedded_controller/access_controller.dm b/code/game/machinery/embedded_controller/access_controller.dm
index 218c4c50ddc..bba22799b5f 100644
--- a/code/game/machinery/embedded_controller/access_controller.dm
+++ b/code/game/machinery/embedded_controller/access_controller.dm
@@ -21,6 +21,14 @@
/obj/machinery/doorButtons/initialize()
findObjsByTag()
+/obj/machinery/doorButtons/emag_act(mob/user)
+ if(!emagged)
+ emagged = 1
+ req_access = list()
+ req_one_access = list()
+ playsound(src.loc, "sparks", 100, 1)
+ user << "You short out the access controller."
+
/obj/machinery/doorButtons/proc/removeMe()
diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm
index 7029c01bfbe..004c1cf5383 100644
--- a/code/game/machinery/requests_console.dm
+++ b/code/game/machinery/requests_console.dm
@@ -431,7 +431,7 @@ var/list/obj/machinery/requests_console/allConsoles = list()
/obj/machinery/say_quote(input, list/spans)
var/ending = copytext(input, length(input) - 2)
if (ending == "!!!")
- return "blares, \"attach_spans(input, spans)\""
+ return "blares, \"[attach_spans(input, spans)]\""
return ..()
diff --git a/code/game/mecha/combat/phazon.dm b/code/game/mecha/combat/phazon.dm
index a3f27aa2759..0eb7cf4e577 100644
--- a/code/game/mecha/combat/phazon.dm
+++ b/code/game/mecha/combat/phazon.dm
@@ -21,7 +21,7 @@
var/datum/action/mecha/mech_toggle_phasing/phasing_action = new
/obj/mecha/combat/phazon/Bump(atom/obstacle)
- if(phasing && get_charge()>=phasing_energy_drain)
+ if(phasing && get_charge()>=phasing_energy_drain && !throwing)
spawn()
if(can_move)
can_move = 0
diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm
index 337dd01132e..6ce6246dbad 100644
--- a/code/game/mecha/equipment/weapons/weapons.dm
+++ b/code/game/mecha/equipment/weapons/weapons.dm
@@ -29,9 +29,6 @@
return 0
set_ready_state(0)
- chassis.can_move = 0
- spawn(shot_delay*projectiles_per_shot)
- chassis.can_move = 1
for(var/i=1 to get_shot_amount())
var/obj/item/projectile/A = new projectile(curloc)
A.firer = chassis.occupant
diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
index 757497403de..0e178a4218e 100644
--- a/code/game/mecha/mecha.dm
+++ b/code/game/mecha/mecha.dm
@@ -445,23 +445,17 @@
playsound(src,stepsound,40,1)
return result
-/obj/mecha/Bump(var/atom/obstacle)
-// src.inertia_dir = null
- if(istype(obstacle, /obj))
- var/obj/O = obstacle
- if(istype(O, /obj/effect/portal)) //derpfix
- anchored = 0
- O.Crossed(src)
- src.anchored = 1
- else if(!O.anchored)
+/obj/mecha/Bump(var/atom/obstacle, yes)
+ if(yes)
+ if(..()) //mech was thrown
+ return
+ if(istype(obstacle, /obj))
+ var/obj/O = obstacle
+ if(!O.anchored)
+ step(obstacle, dir)
+ else if(istype(obstacle, /mob))
step(obstacle, dir)
- else //I have no idea why I disabled this
- obstacle.Bumped(src)
- else if(istype(obstacle, /mob))
- step(obstacle, dir)
- else
- obstacle.Bumped(src)
- return
+
///////////////////////////////////
//////// Internal damage ////////
diff --git a/code/game/objects/effects/decals/crayon.dm b/code/game/objects/effects/decals/crayon.dm
index 2d89998c4d7..780f45e5ffd 100644
--- a/code/game/objects/effects/decals/crayon.dm
+++ b/code/game/objects/effects/decals/crayon.dm
@@ -43,7 +43,6 @@
color = G.color_hex
icon_state = G.name
G.territory_new |= list(territory.type = territory.name)
- G.territory_lost -= territory.type
..(location, color, icon_state, e_name, rotation)
@@ -51,6 +50,7 @@
var/area/territory = get_area(src)
if(gang)
+ gang.territory -= territory.type
gang.territory_new -= territory.type
gang.territory_lost |= list(territory.type = territory.name)
..()
\ No newline at end of file
diff --git a/code/game/objects/effects/effect_system/effects_foam.dm b/code/game/objects/effects/effect_system/effects_foam.dm
index bb68ce45f04..aa1abe7ae6c 100644
--- a/code/game/objects/effects/effect_system/effects_foam.dm
+++ b/code/game/objects/effects/effect_system/effects_foam.dm
@@ -29,7 +29,7 @@
/obj/effect/effect/foam/New(loc)
..(loc)
create_reagents(1000) //limited by the size of the reagent holder anyway.
- SSobj.processing.Add(src)
+ SSobj.processing |= src
playsound(src, 'sound/effects/bubbles2.ogg', 80, 1, -3)
/obj/effect/effect/foam/Destroy()
diff --git a/code/game/objects/effects/effect_system/effects_smoke.dm b/code/game/objects/effects/effect_system/effects_smoke.dm
index b2fcf48b72c..b1e6b6dde79 100644
--- a/code/game/objects/effects/effect_system/effects_smoke.dm
+++ b/code/game/objects/effects/effect_system/effects_smoke.dm
@@ -31,7 +31,7 @@
/obj/effect/effect/smoke/New()
..()
create_reagents(500)
- SSobj.processing.Add(src)
+ SSobj.processing |= src
lifetime += rand(-1,1)
/obj/effect/effect/smoke/Destroy()
@@ -276,8 +276,9 @@
lifetime = 10
/obj/effect/effect/smoke/sleeping/process()
- for(var/mob/living/carbon/M in range(1,src))
- smoke_mob(M)
+ if(..())
+ for(var/mob/living/carbon/M in range(1,src))
+ smoke_mob(M)
/obj/effect/effect/smoke/sleeping/smoke_mob(mob/living/carbon/M)
if(..())
diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm
index e01861deec9..3cd61feaf1f 100644
--- a/code/game/objects/effects/spiders.dm
+++ b/code/game/objects/effects/spiders.dm
@@ -77,6 +77,8 @@
icon_state = "eggs"
var/amount_grown = 0
var/player_spiders = 0
+ var/poison_type = "toxin"
+ var/poison_per_bite = 5
/obj/effect/spider/eggcluster/New()
pixel_x = rand(3,-3)
@@ -89,6 +91,8 @@
var/num = rand(3,12)
for(var/i=0, i[src] stares up at you with friendly eyes."
+ if(!owned)
+ user << "
You pet [src]. You swear it looks up at you."
owner = user
- owned = 0
+ owned = 1
return ..()
/obj/item/toy/carpplushie/dehy_carp/afterattack(obj/O, mob/user,proximity)
if(!proximity) return
if(istype(O,/obj/structure/sink))
- user << "
You place [src] under a stream of water..."
user.drop_item()
loc = get_turf(O)
return Swell()
@@ -45,4 +44,8 @@
if(F == "neutral")
factions -= F
C.faction = factions
+ if (!owner || owner.faction != C.faction)
+ visible_message("
You have a bad feeling about this.") // welcome to the hostile carp enjoy your die
+ else
+ visible_message("
The newly grown carp looks up at you with friendly eyes.")
qdel(src)
\ 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 12e6db99f6e..16769bb4b99 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -192,7 +192,7 @@ MASS SPECTROMETER
user << "
Blood level [blood_percent] %, [blood_volume] cl, type: [blood_type]"
var/implant_detect
- for(var/obj/item/cybernetic_implant/CI in H.internal_organs)
+ for(var/obj/item/organ/internal/cyberimp/CI in H.internal_organs)
implant_detect += "[H.name] is modified with a [CI.name].
"
if(implant_detect)
user.show_message("
Detected cybernetic modifications:")
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index 5ab56ea942b..790815844be 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -43,7 +43,6 @@ var/global/list/datum/stack_recipe/rod_recipes = list ( \
if(WT.remove_fuel(0,user))
var/obj/item/stack/sheet/metal/new_item = new(usr.loc)
- new_item.add_to_stacks(usr)
user.visible_message("[user.name] shaped [src] into metal with the welding tool.", \
"
You shape [src] into metal with the welding tool.", \
"
You hear welding.")
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 3881915f99d..c12fa7dc3a2 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -42,7 +42,6 @@
if (V.get_amount() >= 1 && src.get_amount() >= 1)
var/obj/item/stack/sheet/rglass/RG = new (user.loc)
RG.add_fingerprint(user)
- RG.add_to_stacks(user)
var/obj/item/stack/sheet/glass/G = src
src = null
var/replace = (user.get_inactive_hand()==G)
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 3feb6b0dff3..a18fb047f3d 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -133,7 +133,6 @@
if (R.max_res_amount > 1)
var/obj/item/stack/new_item = O
new_item.amount = R.res_amount*multiplier
- new_item.add_to_stacks(usr) //try to merge with existing stacks on current tile
if(new_item.amount <= 0)//if the stack is empty, i.e it has been merged with an existing stack and has been garbage collected
return
@@ -196,21 +195,27 @@
src.amount += amount
update_icon()
-/obj/item/stack/proc/add_to_stacks(mob/usr)
- var/obj/item/stack/oldsrc = src
- src = null
- for (var/obj/item/stack/item in usr.loc)
- if (item==oldsrc)
- continue
- if (!istype(item, oldsrc.type))
- continue
- if (item.amount>=item.max_amount)
- continue
- oldsrc.attackby(item, usr)
- usr << "
You add new [item.singular_name] to the stack. It now contains [item.amount] [item.singular_name]\s."
- if(oldsrc.amount <= 0)
- break
- oldsrc.update_icon()
+/obj/item/stack/proc/merge(obj/item/stack/S) //Merge src into S, as much as possible
+ var/transfer = get_amount()
+ if(S.is_cyborg)
+ transfer = min(transfer, round((S.source.max_energy - S.source.energy) / S.cost))
+ else
+ transfer = min(transfer, S.max_amount - S.amount)
+ if(pulledby)
+ pulledby.start_pulling(S)
+ S.copy_evidences(src)
+ use(transfer)
+ S.add(transfer)
+
+/obj/item/stack/Crossed(obj/o)
+ if(istype(o, src.type) && !o.throwing)
+ merge(o)
+ return ..()
+
+/obj/item/stack/hitby(atom/movable/AM, skip, hitpush)
+ if(istype(AM, src.type))
+ merge(AM)
+ return ..()
/obj/item/stack/attack_hand(mob/user)
if (user.get_inactive_hand() == src)
@@ -228,34 +233,10 @@
return
/obj/item/stack/attackby(obj/item/W, mob/user, params)
-
- if (istype(W, src.type))
- if(zero_amount()) return
+ if(istype(W, src.type))
var/obj/item/stack/S = W
- if (S.is_cyborg)
- var/to_transfer = min(src.amount, round((S.source.max_energy - S.source.energy) / S.cost))
- S.add(to_transfer)
- if (S && usr.machine==S)
- spawn(0) S.interact(usr)
- src.use(to_transfer)
- if (src && usr.machine==src)
- spawn(0) src.interact(usr)
- else
- if (S.amount >= max_amount)
- return
- var/to_transfer as num
- if (user.get_inactive_hand()==src)
- to_transfer = 1
- else
- to_transfer = min(src.amount, S.max_amount-S.amount)
- S.amount+=to_transfer
- if (S && usr.machine==S)
- spawn(0) S.interact(usr)
- src.use(to_transfer)
- if (src && usr.machine==src)
- spawn(0) src.interact(usr)
- S.update_icon()
-
+ merge(S)
+ user << "
Your [S.name] stack now contains [S.get_amount()] [S.singular_name]\s."
else
..()
diff --git a/code/game/objects/items/stacks/tiles/tile_types.dm b/code/game/objects/items/stacks/tiles/tile_types.dm
index 63b826797ef..27424a95a17 100644
--- a/code/game/objects/items/stacks/tiles/tile_types.dm
+++ b/code/game/objects/items/stacks/tiles/tile_types.dm
@@ -40,7 +40,6 @@
if (mineralType == "metal")
var/obj/item/stack/sheet/metal/new_item = new(user.loc)
- new_item.add_to_stacks(user)
user.visible_message("[user.name] shaped [src] into metal with the weldingtool.", \
"
You shaped [src] into metal with the weldingtool.", \
"
You hear welding.")
@@ -54,7 +53,6 @@
else
var/sheet_type = text2path("/obj/item/stack/sheet/mineral/[mineralType]")
var/obj/item/stack/sheet/mineral/new_item = new sheet_type(user.loc)
- new_item.add_to_stacks(user)
user.visible_message("[user.name] shaped [src] into a sheet with the weldingtool.", \
"
You shaped [src] into a sheet with the weldingtool.", \
"
You hear welding.")
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index a340ca49274..780de85afed 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -1132,6 +1132,7 @@
// Attack self
/obj/item/toy/carpplushie/attack_self(mob/user)
playsound(src.loc, bitesound, 20, 1)
+ user << "
You pet [src]. D'awww."
return ..()
/*
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index fd1c0971718..5266cb9077e 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -323,12 +323,6 @@
else
return 1
-/obj/item/weapon/twohanded/shockpaddles/Topic(href, href_list)
- if(href_list["reenter"])
- var/mob/dead/observer/ghost = usr
- if(istype(ghost))
- ghost.reenter_corpse(ghost)
-
/obj/item/weapon/twohanded/shockpaddles/attack(mob/M, mob/user)
var/halfwaycritdeath = (config.health_threshold_crit + config.health_threshold_dead) / 2
@@ -404,10 +398,8 @@
busy = 0
update_icon()
return
- var/mob/dead/observer/ghost = H.get_ghost()
- if(ghost)
- ghost << "
Your heart is being defibrillated. Re-enter your corpse if you want to be revived! (Click to re-enter)"
- ghost << 'sound/effects/genetics.ogg'
+ H.notify_ghost_cloning("Your heart is being defibrillated. Re-enter your corpse if you want to be revived!")
+
user.visible_message("
[user] begins to place [src] on [M.name]'s chest.", "
You begin to place [src] on [M.name]'s chest...")
busy = 1
update_icon()
@@ -432,11 +424,10 @@
M.visible_message("
[M]'s body convulses a bit.")
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
- for(var/obj/item/organ/limb/O in H.organs)
- total_brute += O.brute_dam
- total_burn += O.burn_dam
- ghost = H.get_ghost()
- if(total_burn <= 180 && total_brute <= 180 && !H.suiciding && !ghost && tplus < tlimit && !(NOCLONE in H.mutations))
+ 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))
//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)
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index cab57a23a05..0e7fd19d6c9 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -3,17 +3,19 @@
icon = 'icons/obj/implants.dmi'
icon_state = "generic" //Shows up as the action button icon
action_button_is_hands_free = 1
+ origin_tech = "materials=2;biotech=3;programming=2"
+
var/activated = 1 //1 for implant types that can be activated, 0 for ones that are "always on" like loyalty implants
var/implanted = null
var/mob/living/imp_in = null
item_color = "b"
- var/allow_reagents = 0
+ var/allow_multiple = 0
+ var/uses = -1
/obj/item/weapon/implant/proc/trigger(emote, mob/source)
return
-
/obj/item/weapon/implant/proc/activate()
return
@@ -22,16 +24,53 @@
//What does the implant do upon injection?
-//return 0 if the implant fails (ex. Revhead and loyalty implant.)
-//return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.)
-/obj/item/weapon/implant/proc/implanted(mob/source)
+//return 1 if the implant injects
+//return -1 if the implant fails to inject
+//return 0 if there is no room for implant
+/obj/item/weapon/implant/proc/implant(var/mob/source, var/mob/user)
+ var/obj/item/weapon/implant/imp_e = locate(src.type) in source
+ if(!allow_multiple && imp_e && imp_e != src)
+ if(imp_e.uses < initial(imp_e.uses)*2)
+ if(uses == -1)
+ imp_e.uses = -1
+ else
+ imp_e.uses = min(imp_e.uses + uses, initial(imp_e.uses)*2)
+ qdel(src)
+ return 1
+ else
+ return 0
+
+
if(activated)
action_button_name = "Activate [src.name]"
+ src.loc = source
+ imp_in = source
+ implanted = 1
if(istype(source, /mob/living/carbon/human))
var/mob/living/carbon/human/H = source
H.sec_hud_set_implants()
+
+ if(user)
+ add_logs(user, source, "implanted", object="[name]")
+
return 1
+/obj/item/weapon/implant/proc/removed(var/mob/source)
+ src.loc = null
+ imp_in = null
+ implanted = 0
+
+ if(istype(source, /mob/living/carbon/human))
+ var/mob/living/carbon/human/H = source
+ H.sec_hud_set_implants()
+
+ return 1
+
+/obj/item/weapon/implant/Destroy()
+ if(imp_in)
+ removed(imp_in)
+ ..()
+
/obj/item/weapon/implant/proc/get_data()
return "No information available"
@@ -45,6 +84,7 @@
name = "tracking implant"
desc = "Track with this."
activated = 0
+ origin_tech = "materials=2;magnets=2;programming=2;biotech=2"
var/id = 1.0
/obj/item/weapon/implant/tracking/get_data()
@@ -68,6 +108,7 @@
name = "firearms authentication implant"
desc = "Lets you shoot your guns"
icon_state = "auth"
+ origin_tech = "materials=2;magnets=2;programming=2;biotech=5;syndicate=5"
activated = 0
/obj/item/weapon/implant/weapons_auth/get_data()
@@ -78,181 +119,13 @@
Function: Allows operation of implant-locked weaponry, preventing equipment from falling into enemy hands."}
return dat
-/obj/item/weapon/implant/explosive
- name = "microbomb implant"
- desc = "And boom goes the weasel."
- icon_state = "explosive"
- var/weak = 1.6
- var/medium = 0.8
- var/heavy = 0.4
- var/delay = 7
-
-/obj/item/weapon/implant/explosive/get_data()
- var/dat = {"Implant Specifications:
- Name: Robust Corp RX-78 Employee Management Implant
- Life: Activates upon death.
- Important Notes: Explodes
-
- Implant Details:
- Function: Contains a compact, electrically detonated explosive that detonates upon receiving a specially encoded signal or upon host death.
- Special Features: Explodes
- Integrity: Implant will occasionally be degraded by the body's immune system and thus will occasionally malfunction."}
- return dat
-
-/obj/item/weapon/implant/explosive/trigger(emote, mob/source)
- if(emote == "deathgasp")
- activate("death")
-
-/obj/item/weapon/implant/explosive/activate(cause)
- if(!cause || !imp_in) return 0
- if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes")
- return 0
- for(var/obj/item/weapon/implant/explosive/E in imp_in)
- heavy += 0.4
- medium += 0.8
- weak += 1.6
- delay += 7
- if(E != src)
- qdel(E)
- heavy = round(heavy)
- medium = round(medium)
- weak = round(weak)
- imp_in << "You activate your microbomb implant."
-//If the delay is short, just blow up already jeez
- if(delay <= 7)
- imp_in.gib()
- explosion(src,heavy,medium,weak,weak, flame_range = weak)
- qdel(src)
- return
- timed_explosion()
-
-/obj/item/weapon/implant/explosive/proc/timed_explosion()
- imp_in.visible_message("[imp_in] starts beeping ominously!")
- playsound(loc, 'sound/items/timer.ogg', 30, 0)
- sleep(delay/4)
- if(imp_in.stat)
- imp_in.visible_message("[imp_in] doubles over in pain!")
- imp_in.Weaken(7)
- playsound(loc, 'sound/items/timer.ogg', 30, 0)
- sleep(delay/4)
- playsound(loc, 'sound/items/timer.ogg', 30, 0)
- sleep(delay/4)
- playsound(loc, 'sound/items/timer.ogg', 30, 0)
- sleep(delay/4)
- imp_in.gib()
- explosion(src,heavy,medium,weak,weak, flame_range = weak)
- qdel(src)
-
-/obj/item/weapon/implant/explosive/macro
- name = "macrobomb implant"
- desc = "And boom goes the weasel. And everything else nearby."
- icon_state = "explosive"
- weak = 16
- medium = 8
- heavy = 4
- delay = 70
-
-/obj/item/weapon/implant/explosive/macro/activate(cause)
- if(!cause || !imp_in) return 0
- if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes")
- return 0
- for(var/obj/item/weapon/implant/explosive/macro/E in imp_in)
- if(E != src)
- qdel(E)
- imp_in << "You activate your macrobomb implant."
- timed_explosion()
-
-/obj/item/weapon/implant/chem
- name = "chem implant"
- desc = "Injects things."
- icon_state = "reagents"
- allow_reagents = 1
-
-/obj/item/weapon/implant/chem/get_data()
- var/dat = {"Implant Specifications:
- Name: Robust Corp MJ-420 Prisoner Management Implant
- Life: Deactivates upon death but remains within the body.
- Important Notes: Due to the system functioning off of nutrients in the implanted subject's body, the subject
- will suffer from an increased appetite.
-
- Implant Details:
- Function: Contains a small capsule that can contain various chemicals. Upon receiving a specially encoded signal
- the implant releases the chemicals directly into the blood stream.
- Special Features:
- Micro-Capsule- Can be loaded with any sort of chemical agent via the common syringe and can hold 50 units.
- Can only be loaded while still in its original case.
- Integrity: Implant will last so long as the subject is alive. However, if the subject suffers from malnutrition,
- the implant may become unstable and either pre-maturely inject the subject or simply break."}
- return dat
-
-/obj/item/weapon/implant/chem/New()
- ..()
- create_reagents(50)
-
-/obj/item/weapon/implant/chem/trigger(emote, mob/source)
- if(emote == "deathgasp")
- activate(reagents.total_volume)
-
-/obj/item/weapon/implant/chem/activate(cause)
- if(!cause || !imp_in) return 0
- var/mob/living/carbon/R = imp_in
- var/injectamount = null
- if (cause == "action_button")
- injectamount = reagents.total_volume
- else
- injectamount = cause
- reagents.trans_to(R, injectamount)
- R << "You hear a faint beep."
- if(!reagents.total_volume)
- R << "You hear a faint click from your chest."
- qdel(src)
-
-
-/obj/item/weapon/implant/loyalty
- name = "loyalty implant"
- desc = "Makes you loyal or such."
- activated = 0
-
-/obj/item/weapon/implant/loyalty/get_data()
- var/dat = {"Implant Specifications:
- Name: Nanotrasen Employee Management Implant
- Life: Ten years.
- Important Notes: Personnel injected with this device tend to be much more loyal to the company.
-
- Implant Details:
- Function: Contains a small pod of nanobots that manipulate the host's mental functions.
- Special Features: Will prevent and cure most forms of brainwashing.
- Integrity: Implant will last so long as the nanobots are inside the bloodstream."}
- return dat
-
-
-/obj/item/weapon/implant/loyalty/implanted(mob/target)
- ..()
- 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!")
- return 0
- 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.")
- return 0
- if(target.mind in ticker.mode.revolutionaries)
- ticker.mode.remove_revolutionary(target.mind)
- if(target.mind in ticker.mode.cult)
- target << "You feel the corporate tendrils of Nanotrasen try to invade your mind!"
- else
- target << "You feel a surge of loyalty towards Nanotrasen."
- return 1
-
-/obj/item/weapon/implant/loyalty/Destroy()
- if(imp_in.stat != DEAD)
- imp_in << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
- ..()
/obj/item/weapon/implant/adrenalin
name = "adrenal implant"
desc = "Removes all stuns and knockdowns."
icon_state = "adrenal"
- var/uses = 3
+ origin_tech = "materials=2;biotech=4;combat=3;syndicate=4"
+ uses = 3
/obj/item/weapon/implant/adrenalin/get_data()
var/dat = {"Implant Specifications:
@@ -285,8 +158,8 @@
name = "emp implant"
desc = "Triggers an EMP."
icon_state = "emp"
-
- var/uses = 2
+ origin_tech = "materials=2;biotech=3;magnets=4;syndicate=4"
+ uses = 2
/obj/item/weapon/implant/emp/activate()
if (src.uses < 1) return 0
diff --git a/code/game/objects/items/weapons/implants/implant_chem.dm b/code/game/objects/items/weapons/implants/implant_chem.dm
new file mode 100644
index 00000000000..6f85742039b
--- /dev/null
+++ b/code/game/objects/items/weapons/implants/implant_chem.dm
@@ -0,0 +1,53 @@
+/obj/item/weapon/implant/chem
+ name = "chem implant"
+ desc = "Injects things."
+ icon_state = "reagents"
+ origin_tech = "materials=3;biotech=4"
+ flags = OPENCONTAINER
+
+/obj/item/weapon/implant/chem/get_data()
+ var/dat = {"Implant Specifications:
+ Name: Robust Corp MJ-420 Prisoner Management Implant
+ Life: Deactivates upon death but remains within the body.
+ Important Notes: Due to the system functioning off of nutrients in the implanted subject's body, the subject
+ will suffer from an increased appetite.
+
+ Implant Details:
+ Function: Contains a small capsule that can contain various chemicals. Upon receiving a specially encoded signal
+ the implant releases the chemicals directly into the blood stream.
+ Special Features:
+ Micro-Capsule- Can be loaded with any sort of chemical agent via the common syringe and can hold 50 units.
+ Can only be loaded while still in its original case.
+ Integrity: Implant will last so long as the subject is alive."}
+ return dat
+
+/obj/item/weapon/implant/chem/New()
+ ..()
+ create_reagents(50)
+
+/obj/item/weapon/implant/chem/trigger(emote, mob/source)
+ if(emote == "deathgasp")
+ activate(reagents.total_volume)
+
+/obj/item/weapon/implant/chem/activate(cause)
+ if(!cause || !imp_in) return 0
+ var/mob/living/carbon/R = imp_in
+ var/injectamount = null
+ if (cause == "action_button")
+ injectamount = reagents.total_volume
+ else
+ injectamount = cause
+ reagents.trans_to(R, injectamount)
+ R << "You hear a faint beep."
+ if(!reagents.total_volume)
+ R << "You hear a faint click from your chest."
+ qdel(src)
+
+
+/obj/item/weapon/implantcase/chem
+ name = "implant case - 'Remote Chemical'"
+ desc = "A glass case containing a remote chemical implant."
+
+/obj/item/weapon/implantcase/chem/New()
+ imp = new /obj/item/weapon/implant/chem(src)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/implants/implant_explosive.dm b/code/game/objects/items/weapons/implants/implant_explosive.dm
new file mode 100644
index 00000000000..719666b47b2
--- /dev/null
+++ b/code/game/objects/items/weapons/implants/implant_explosive.dm
@@ -0,0 +1,119 @@
+/obj/item/weapon/implant/explosive
+ name = "microbomb implant"
+ desc = "And boom goes the weasel."
+ icon_state = "explosive"
+ origin_tech = "materials=2;combat=3;biotech=4;syndicate=4"
+ var/weak = 1.6
+ var/medium = 0.8
+ var/heavy = 0.4
+ var/delay = 7
+
+/obj/item/weapon/implant/explosive/get_data()
+ var/dat = {"Implant Specifications:
+ Name: Robust Corp RX-78 Employee Management Implant
+ Life: Activates upon death.
+ Important Notes: Explodes
+
+ Implant Details:
+ Function: Contains a compact, electrically detonated explosive that detonates upon receiving a specially encoded signal or upon host death.
+ Special Features: Explodes
+ "}
+ return dat
+
+/obj/item/weapon/implant/explosive/trigger(emote, mob/source)
+ if(emote == "deathgasp")
+ activate("death")
+
+/obj/item/weapon/implant/explosive/activate(cause)
+ if(!cause || !imp_in) return 0
+ if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your microbomb implant? This will cause you to explode!", "Microbomb Implant Confirmation", "Yes", "No") != "Yes")
+ return 0
+ heavy = round(heavy)
+ medium = round(medium)
+ weak = round(weak)
+ imp_in << "You activate your microbomb implant."
+//If the delay is short, just blow up already jeez
+ if(delay <= 7)
+ explosion(src,heavy,medium,weak,weak, flame_range = weak)
+ imp_in.gib()
+ qdel(src)
+ return
+ timed_explosion()
+
+/obj/item/weapon/implant/explosive/implant(mob/source)
+ var/obj/item/weapon/implant/explosive/imp_e = locate(src.type) in source
+ if(imp_e)
+ imp_e.heavy += heavy
+ imp_e.medium += medium
+ imp_e.weak += weak
+ imp_e.delay += delay
+ qdel(src)
+ return 1
+
+ return ..()
+
+/obj/item/weapon/implant/explosive/proc/timed_explosion()
+ imp_in.visible_message("[imp_in] starts beeping ominously!")
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ if(imp_in && imp_in.stat)
+ imp_in.visible_message("[imp_in] doubles over in pain!")
+ imp_in.Weaken(7)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ playsound(loc, 'sound/items/timer.ogg', 30, 0)
+ sleep(delay/4)
+ explosion(src,heavy,medium,weak,weak, flame_range = weak)
+ if(imp_in)
+ imp_in.gib()
+ qdel(src)
+
+/obj/item/weapon/implant/explosive/macro
+ name = "macrobomb implant"
+ desc = "And boom goes the weasel. And everything else nearby."
+ icon_state = "explosive"
+ origin_tech = "materials=3;combat=5;biotech=4;syndicate=5"
+ weak = 16
+ medium = 8
+ heavy = 4
+ delay = 70
+
+/obj/item/weapon/implant/explosive/macro/activate(cause)
+ if(!cause || !imp_in) return 0
+ if(cause == "action_button" && alert(imp_in, "Are you sure you want to activate your macrobomb implant? This will cause you to explode and gib!", "Macrobomb Implant Confirmation", "Yes", "No") != "Yes")
+ return 0
+ imp_in << "You activate your macrobomb implant."
+ timed_explosion()
+
+/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)
+ return 0
+ imp_e = locate(/obj/item/weapon/implant/explosive) in source
+ if(imp_e)
+ heavy += imp_e.heavy
+ medium += imp_e.medium
+ weak += imp_e.weak
+ delay += imp_e.delay
+ qdel(imp_e)
+
+ return ..()
+
+
+/obj/item/weapon/implanter/explosive
+ name = "implanter (explosive)"
+
+/obj/item/weapon/implanter/explosive/New()
+ imp = new /obj/item/weapon/implant/explosive(src)
+ ..()
+
+
+/obj/item/weapon/implantcase/explosive
+ name = "implant case - 'Explosive'"
+ desc = "A glass case containing an explosive implant."
+
+/obj/item/weapon/implantcase/explosive/New()
+ imp = new /obj/item/weapon/implant/explosive(src)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/implants/implantfreedom.dm b/code/game/objects/items/weapons/implants/implant_freedom.dm
similarity index 61%
rename from code/game/objects/items/weapons/implants/implantfreedom.dm
rename to code/game/objects/items/weapons/implants/implant_freedom.dm
index 821cec4c572..e3e70e982a2 100644
--- a/code/game/objects/items/weapons/implants/implantfreedom.dm
+++ b/code/game/objects/items/weapons/implants/implant_freedom.dm
@@ -1,37 +1,50 @@
-//This file was auto-corrected by findeclaration.exe on 25.5.2012 20:42:32
-
-/obj/item/weapon/implant/freedom
- name = "freedom implant"
- desc = "Use this to escape from those evil Red Shirts."
- icon_state = "freedom"
- item_color = "r"
- var/uses = 4.0
-
-
-/obj/item/weapon/implant/freedom/activate()
- if (src.uses < 1) return 0
- src.uses--
- imp_in << "You feel a faint click."
- if(iscarbon(imp_in))
- var/mob/living/carbon/C_imp_in = imp_in
- C_imp_in.uncuff()
-
-
-/obj/item/weapon/implant/freedom/get_data()
- var/dat = {"
-Implant Specifications:
-Name: Freedom Beacon
-Life: optimum 5 uses
-Important Notes: Illegal
-
-Implant Details:
-Function: Transmits a specialized cluster of signals to override handcuff locking
-mechanisms
-Special Features:
-Neuro-Scan- Analyzes certain shadow signals in the nervous system
-Integrity: The battery is extremely weak and commonly after injection its
-life can drive down to only 1 use.
-No Implant Specifics"}
- return dat
-
-
+/obj/item/weapon/implant/freedom
+ name = "freedom implant"
+ desc = "Use this to escape from those evil Red Shirts."
+ icon_state = "freedom"
+ item_color = "r"
+ origin_tech = "materials=2;magnets=3;biotech=3;syndicate=4"
+ uses = 4
+
+
+/obj/item/weapon/implant/freedom/activate()
+ if(uses == 0) return 0
+ if(uses != -1) uses--
+ imp_in << "You feel a faint click."
+ if(iscarbon(imp_in))
+ var/mob/living/carbon/C_imp_in = imp_in
+ C_imp_in.uncuff()
+
+
+/obj/item/weapon/implant/freedom/get_data()
+ var/dat = {"
+Implant Specifications:
+Name: Freedom Beacon
+Life: optimum 5 uses
+Important Notes: Illegal
+
+Implant Details:
+Function: Transmits a specialized cluster of signals to override handcuff locking
+mechanisms
+Special Features:
+Neuro-Scan- Analyzes certain shadow signals in the nervous system
+
+No Implant Specifics"}
+ return dat
+
+
+/obj/item/weapon/implanter/freedom
+ name = "implanter (freedom)"
+
+/obj/item/weapon/implanter/freedom/New()
+ imp = new /obj/item/weapon/implant/freedom(src)
+ ..()
+
+
+/obj/item/weapon/implantcase/freedom
+ name = "implant case - 'Freedom'"
+ desc = "A glass case containing a freedom implant."
+
+/obj/item/weapon/implantcase/freedom/New()
+ imp = new /obj/item/weapon/implant/freedom(src)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/implants/implant_loyality.dm b/code/game/objects/items/weapons/implants/implant_loyality.dm
new file mode 100644
index 00000000000..3751cd63343
--- /dev/null
+++ b/code/game/objects/items/weapons/implants/implant_loyality.dm
@@ -0,0 +1,65 @@
+/obj/item/weapon/implant/loyalty
+ name = "loyalty implant"
+ desc = "Makes you loyal or such."
+ origin_tech = "materials=2;biotech=4;programming=4"
+ activated = 0
+
+/obj/item/weapon/implant/loyalty/get_data()
+ var/dat = {"Implant Specifications:
+ Name: Nanotrasen Employee Management Implant
+ Life: Ten years.
+ Important Notes: Personnel injected with this device tend to be much more loyal to the company.
+
+ Implant Details:
+ Function: Contains a small pod of nanobots that manipulate the host's mental functions.
+ Special Features: Will prevent and cure most forms of brainwashing.
+ Integrity: Implant will last so long as the nanobots are inside the bloodstream."}
+ return dat
+
+
+/obj/item/weapon/implant/loyalty/implant(mob/target)
+ 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
+ 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
+ qdel(src)
+ return -1
+ if(target.mind in ticker.mode.revolutionaries)
+ ticker.mode.remove_revolutionary(target.mind)
+ if(target.mind in ticker.mode.cult)
+ target << "You feel the corporate tendrils of Nanotrasen try to invade your mind!"
+ else
+ target << "You feel a surge of loyalty towards Nanotrasen."
+ return 1
+ return 0
+
+/obj/item/weapon/implant/loyalty/removed(mob/target)
+ if(..())
+ if(target.stat != DEAD)
+ target << "You feel a sense of liberation as Nanotrasen's grip on your mind fades away."
+ return 1
+ return 0
+
+
+/obj/item/weapon/implanter/loyalty
+ name = "implanter (loyalty)"
+
+/obj/item/weapon/implanter/loyalty/New()
+ imp = new /obj/item/weapon/implant/loyalty(src)
+ ..()
+ update_icon()
+
+
+/obj/item/weapon/implantcase/loyalty
+ name = "implant case - 'Loyalty'"
+ desc = "A glass case containing a loyalty implant."
+
+/obj/item/weapon/implantcase/loyalty/New()
+ imp = new /obj/item/weapon/implant/loyalty(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 5da2cd828bc..b38dbaea378 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -1,19 +1,28 @@
/obj/item/weapon/implantcase
- name = "glass case"
- desc = "A case containing an implant."
+ name = "implant case"
+ desc = "A glass case containing an implant."
+ icon = 'icons/obj/items.dmi'
icon_state = "implantcase-0"
item_state = "implantcase"
throw_speed = 2
throw_range = 5
w_class = 1.0
+ origin_tech = "materials=1;biotech=2"
+ materials = list(MAT_GLASS=500)
var/obj/item/weapon/implant/imp = null
/obj/item/weapon/implantcase/update_icon()
if(imp)
icon_state = "implantcase-[imp.item_color]"
+ origin_tech = imp.origin_tech
+ flags = imp.flags
+ reagents = imp.reagents
else
icon_state = "implantcase-0"
+ origin_tech = initial(origin_tech)
+ flags = initial(flags)
+ reagents = null
/obj/item/weapon/implantcase/attackby(obj/item/weapon/W, mob/user, params)
@@ -25,21 +34,13 @@
if(!in_range(src, user) && loc != user)
return
if(t)
- name = "glass case- '[t]'"
+ name = "implant case - '[t]'"
else
- name = "glass case"
- else if(istype(W, /obj/item/weapon/reagent_containers/syringe))
- if(!imp) return
- if(!imp.allow_reagents) return
- if(imp.reagents.total_volume >= imp.reagents.maximum_volume)
- user << "[src] is full."
- else
- W.reagents.trans_to(imp, 5)
- user << "You inject 5 units of the solution. The syringe now contains [W.reagents.total_volume] units."
+ name = "implant case"
else if(istype(W, /obj/item/weapon/implanter))
var/obj/item/weapon/implanter/I = W
if(I.imp)
- if((imp || I.imp.implanted))
+ if(imp || I.imp.implanted)
return
I.imp.loc = src
imp = I.imp
@@ -56,55 +57,28 @@
update_icon()
I.update_icon()
+ /*else if(istype(W, /obj/item/ammo_casing/shotgun/implanter))
+ var/obj/item/ammo_casing/shotgun/implanter/I = W
+ if(I.implanter)
+ src.attackby(I.implanter, user, params) */ // COMING SOON -- c0
+
+/obj/item/weapon/implantcase/New()
+ ..()
+ update_icon()
+
/obj/item/weapon/implantcase/tracking
- name = "glass case- 'Tracking'"
- desc = "A case containing a tracking implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-b"
+ name = "implant case - 'Tracking'"
+ desc = "A glass case containing a tracking implant."
/obj/item/weapon/implantcase/tracking/New()
imp = new /obj/item/weapon/implant/tracking(src)
..()
-/obj/item/weapon/implantcase/explosive
- name = "glass case- 'Explosive'"
- desc = "A case containing an explosive implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-r"
-
-/obj/item/weapon/implantcase/explosive/New()
- imp = new /obj/item/weapon/implant/explosive(src)
- ..()
-
-
-/obj/item/weapon/implantcase/chem
- name = "glass case- 'Chem'"
- desc = "A case containing a chemical implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-b"
-
-/obj/item/weapon/implantcase/chem/New()
- imp = new /obj/item/weapon/implant/chem(src)
- ..()
-
-
-/obj/item/weapon/implantcase/loyalty
- name = "glass case- 'Loyalty'"
- desc = "A case containing a loyalty implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-r"
-
-/obj/item/weapon/implantcase/loyalty/New()
- imp = new /obj/item/weapon/implant/loyalty(src)
- ..()
-
/obj/item/weapon/implantcase/weapons_auth
- name = "glass case- 'Firearms Authentication'"
- desc = "A case containing a firearms authentication implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-r"
+ name = "implant case - 'Firearms Authentication'"
+ desc = "A glass case containing a firearms authentication implant."
/obj/item/weapon/implantcase/weapons_auth/New()
imp = new /obj/item/weapon/implant/weapons_auth(src)
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 72aca3d4a66..5b36e5337ae 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -132,11 +132,8 @@
if(istype(imp, /obj/item/weapon/implant/loyalty))
M.visible_message("[M] has been implanted by the [src.name].")
- if(imp.implanted(M))
- imp.loc = M
- imp.imp_in = M
- imp.implanted = 1
- implant_list -= imp
+ if(imp.implant(M))
+ implant_list -= imp
break
return
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index cb54e6386b1..034e31ac510 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -1,82 +1,74 @@
/obj/item/weapon/implanter
name = "implanter"
+ desc = "A sterile automatic implant injector."
icon = 'icons/obj/items.dmi'
icon_state = "implanter0"
item_state = "syringe_0"
throw_speed = 3
throw_range = 5
w_class = 2.0
+ origin_tech = "materials=1;biotech=3;programming=2"
+ materials = list(MAT_METAL=600, MAT_GLASS=200)
var/obj/item/weapon/implant/imp = null
/obj/item/weapon/implanter/update_icon()
if(imp)
icon_state = "implanter1"
+ origin_tech = imp.origin_tech
else
icon_state = "implanter0"
+ origin_tech = initial(origin_tech)
/obj/item/weapon/implanter/attack(mob/living/carbon/M, mob/user)
if(!iscarbon(M))
return
if(user && imp)
- if(M.head && (M.head.flags & THICKMATERIAL))
- user << "[M]'s [M.head.name] is in the way! Take it off first!"
- return
- M.visible_message("[user] is attemping to implant [M].")
+ if(M != user)
+ M.visible_message("[user] is attemping to implant [M].")
var/turf/T = get_turf(M)
- if(T && (M == user || do_after(user, 50, target = M)))
+ if(T && (M == user || do_after(user, 50)))
if(user && M && (get_turf(M) == T) && src && imp)
- if(M.head && (M.head.flags & THICKMATERIAL))
- return
- M.visible_message("[user] has implanted [M].", "[user] implants you with the implant.")
- add_logs(user, M, "implanted", src)
- user << "You implant the implant into [M]."
- if(imp.implanted(M))
- imp.loc = M
- imp.imp_in = M
- imp.implanted = 1
+ if(imp.implant(M, user))
+ user << "You implant the implant into [M]."
+ M.visible_message("[user] has implanted [M].", "[user] implants you with the implant.")
+ imp = null
+ update_icon()
- imp = null
- update_icon()
- if(istype(M, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = M
- H.sec_hud_set_implants()
-
-
-
-/obj/item/weapon/implanter/loyalty
- name = "implanter-loyalty"
-
-/obj/item/weapon/implanter/loyalty/New()
- imp = new /obj/item/weapon/implant/loyalty(src)
+/obj/item/weapon/implanter/attackby(obj/item/weapon/W, mob/user, params)
..()
- update_icon()
+ if(istype(W, /obj/item/weapon/pen))
+ var/t = stripped_input(user, "What would you like the label to be?", name, null)
+ if(user.get_active_hand() != W)
+ return
+ if(!in_range(src, user) && loc != user)
+ return
+ if(t)
+ name = "implanter ([t])"
+ else
+ name = "implanter"
-
-/obj/item/weapon/implanter/explosive
- name = "implanter-explosive"
-
-/obj/item/weapon/implanter/explosive/New()
- imp = new /obj/item/weapon/implant/explosive(src)
+/obj/item/weapon/implanter/New()
..()
- update_icon()
+ spawn(1)
+ update_icon()
+
+
/obj/item/weapon/implanter/adrenalin
- name = "implanter-adrenalin"
+ name = "implanter (adrenalin)"
/obj/item/weapon/implanter/adrenalin/New()
imp = new /obj/item/weapon/implant/adrenalin(src)
..()
- update_icon()
/obj/item/weapon/implanter/emp
- name = "implanter-EMP"
+ name = "implanter (EMP)"
/obj/item/weapon/implanter/emp/New()
imp = new /obj/item/weapon/implant/emp(src)
..()
- update_icon()
diff --git a/code/game/objects/items/weapons/implants/implantuplink.dm b/code/game/objects/items/weapons/implants/implantuplink.dm
index 74a2b365aa9..b19bb66d995 100644
--- a/code/game/objects/items/weapons/implants/implantuplink.dm
+++ b/code/game/objects/items/weapons/implants/implantuplink.dm
@@ -3,18 +3,33 @@
desc = "Summon things."
icon = 'icons/obj/radio.dmi'
icon_state = "radio"
+ origin_tech = "materials=2;magnets=4;programming=4;biotech=4;syndicate=8;bluespace=5"
/obj/item/weapon/implant/uplink/New()
hidden_uplink = new(src)
hidden_uplink.uses = 10
..()
-/obj/item/weapon/implant/uplink/implanted(mob/source)
- ..()
- hidden_uplink.uplink_owner="[source.key]"
- return 1
+/obj/item/weapon/implant/uplink/implant(mob/source)
+ var/obj/item/weapon/implant/imp_e = locate(src.type) in source
+ if(imp_e)
+ imp_e.hidden_uplink.uses += hidden_uplink.uses
+ qdel(src)
+ return 1
+ if(..())
+ hidden_uplink.uplink_owner="[source.key]"
+ return 1
+ return 0
/obj/item/weapon/implant/uplink/activate()
if(hidden_uplink)
- hidden_uplink.check_trigger(imp_in)
\ No newline at end of file
+ hidden_uplink.check_trigger(imp_in)
+
+
+/obj/item/weapon/implanter/uplink
+ name = "implanter (uplink)"
+
+/obj/item/weapon/implanter/uplink/New()
+ imp = new /obj/item/weapon/implant/uplink(src)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 1e95e040502..25bbb762e03 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -205,6 +205,7 @@
/obj/item/weapon/gun/projectile/revolver,
/obj/item/ammo_box,
)
+ alternate_worn_layer = UNDER_SUIT_LAYER
/obj/item/weapon/storage/belt/fannypack
name = "fannypack"
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index 463528288b0..72664925ca2 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -115,7 +115,8 @@
/obj/item/weapon/storage/fancy/cigarettes/remove_from_storage(obj/item/W, atom/new_location)
if(istype(W,/obj/item/clothing/mask/cigarette))
- reagents.trans_to(W,(reagents.total_volume/contents.len))
+ if(reagents)
+ reagents.trans_to(W,(reagents.total_volume/contents.len))
..()
/obj/item/weapon/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index 82758639261..e28daa43953 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -1,8 +1,8 @@
-// To clarify:
-// For use_to_pickup and allow_quick_gather functionality,
-// see item/attackby() (/game/objects/items.dm)
-// Do not remove this functionality without good reason, cough reagent_containers cough.
-// -Sayu
+// External storage-related logic:
+// /mob/proc/ClickOn() in /_onclick/click.dm - clicking items in storages
+// /mob/living/Move() in /modules/mob/living/living.dm - hiding storage boxes on mob movement
+// /item/attackby() in /game/objects/items.dm - use_to_pickup and allow_quick_gather functionality
+// -- c0
/obj/item/weapon/storage
@@ -42,11 +42,11 @@
show_to(M)
return
- if(!( M.restrained() ) && !( M.stat ))
- if(!( istype(over_object, /obj/screen) ))
+ if(!M.restrained() && !M.stat)
+ if(!istype(over_object, /obj/screen))
return content_can_dump(over_object, M)
- if(!(loc == usr) || (loc && loc.loc == usr))
+ if(loc != usr || (loc && loc.loc == usr))
return
playsound(loc, "rustle", 50, 1, -5)
@@ -107,7 +107,7 @@
is_seeing |= user
-/obj/item/weapon/storage/throw_at(atom/target, range, speed)
+/obj/item/weapon/storage/throw_at(atom/target, range, speed, mob/thrower, spin)
close_all()
return ..()
@@ -168,6 +168,7 @@
if(display_contents_with_number)
for(var/datum/numbered_display/ND in display_contents)
+ ND.sample_object.mouse_opacity = 2
ND.sample_object.screen_loc = "[cx]:16,[cy]:16"
ND.sample_object.maptext = "[(ND.number > 1)? "[ND.number]" : ""]"
ND.sample_object.layer = 20
@@ -177,6 +178,7 @@
cy--
else
for(var/obj/O in contents)
+ O.mouse_opacity = 2 //This is here so storage items that spawn with contents correctly have the "click around item to equip"
O.screen_loc = "[cx]:16,[cy]:16"
O.maptext = ""
O.layer = 20
@@ -310,6 +312,7 @@
orient2hud(usr)
for(var/mob/M in can_see_contents())
show_to(M)
+ W.mouse_opacity = 2 //So you can click on the area around the item to equip it, instead of having to pixel hunt
update_icon()
return 1
@@ -339,6 +342,7 @@
W.maptext = ""
W.on_exit_storage(src)
update_icon()
+ W.mouse_opacity = initial(W.mouse_opacity)
return 1
diff --git a/code/game/objects/items/weapons/storage/toolbox.dm b/code/game/objects/items/weapons/storage/toolbox.dm
index 41b143a4e93..703a17807d5 100644
--- a/code/game/objects/items/weapons/storage/toolbox.dm
+++ b/code/game/objects/items/weapons/storage/toolbox.dm
@@ -80,9 +80,9 @@
new /obj/item/weapon/wrench(src)
new /obj/item/weapon/weldingtool/largetank(src)
new /obj/item/weapon/crowbar/red(src)
- new /obj/item/stack/cable_coil(src, 30, "red")
new /obj/item/weapon/wirecutters(src, "red")
new /obj/item/device/multitool(src)
+ new /obj/item/clothing/gloves/color/red/insulated(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 1ceaaa88648..becd01a5308 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -53,17 +53,11 @@
return
if("implant")
- var/obj/item/weapon/implanter/F = new /obj/item/weapon/implanter(src)
- F.imp = new /obj/item/weapon/implant/freedom(F)
- var/obj/item/weapon/implanter/U = new /obj/item/weapon/implanter(src)
- U.imp = new /obj/item/weapon/implant/uplink(U)
- var/obj/item/weapon/implanter/C = new /obj/item/weapon/implanter(src)
- C.imp = new /obj/item/weapon/implant/emp(C)
- var/obj/item/weapon/implanter/K = new /obj/item/weapon/implanter(src)
- K.imp = new /obj/item/weapon/implant/adrenalin(K)
- var/obj/item/weapon/implanter/S = new /obj/item/weapon/implanter(src)
- S.imp = new /obj/item/weapon/implant/explosive(S)
- S.name += " (explosive)"
+ new /obj/item/weapon/implanter/freedom(src)
+ new /obj/item/weapon/implanter/uplink(src)
+ new /obj/item/weapon/implanter/emp(src)
+ new /obj/item/weapon/implanter/adrenalin(src)
+ new /obj/item/weapon/implanter/explosive(src)
return
if("hacker")
@@ -173,8 +167,8 @@
..()
new /obj/item/weapon/grenade/empgrenade(src)
new /obj/item/weapon/grenade/empgrenade(src)
- new /obj/item/weapon/implanter/emp/(src)
- new /obj/item/device/flashlight/emp/(src)
+ new /obj/item/weapon/implanter/emp(src)
+ new /obj/item/device/flashlight/emp(src)
return
/obj/item/weapon/storage/box/syndie_kit/chemical
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index 27c6aaebef1..32ad17dc3c7 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -7,8 +7,8 @@ LINEN BINS
/obj/item/weapon/bedsheet
name = "bedsheet"
desc = "A surprisingly soft linen bedsheet."
- icon = 'icons/obj/items.dmi'
- icon_state = "sheet"
+ icon = 'icons/obj/bedsheets.dmi'
+ icon_state = "white"
item_state = "bedsheet"
slot_flags = SLOT_BACK
layer = 4.0
@@ -41,129 +41,133 @@ LINEN BINS
..()
/obj/item/weapon/bedsheet/blue
- icon_state = "sheetblue"
+ icon_state = "blue"
item_color = "blue"
/obj/item/weapon/bedsheet/green
- icon_state = "sheetgreen"
+ icon_state = "green"
item_color = "green"
/obj/item/weapon/bedsheet/orange
- icon_state = "sheetorange"
+ icon_state = "orange"
item_color = "orange"
/obj/item/weapon/bedsheet/purple
- icon_state = "sheetpurple"
+ icon_state = "purple"
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 = "sheetUSA"
+ icon_state = "USA"
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 = "sheetrainbow"
+ desc = "A multicolored blanket. It's actually several different sheets cut up and sewn together."
+ icon_state = "rainbow"
item_color = "rainbow"
/obj/item/weapon/bedsheet/red
- icon_state = "sheetred"
+ icon_state = "red"
item_color = "red"
/obj/item/weapon/bedsheet/yellow
- icon_state = "sheetyellow"
+ icon_state = "yellow"
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 = "sheetmime"
+ icon_state = "mime"
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 = "sheetclown"
+ desc = "A rainbow blanket with a clown mask woven in. It smells faintly of bananas."
+ icon_state = "clown"
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 = "sheetcaptain"
+ icon_state = "captain"
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 = "sheetrd"
+ icon_state = "rd"
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 = "sheetmedical"
+ icon_state = "medical"
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 = "sheetcmo"
+ desc = "It's a sterilized blanket that has a cross emblem. There's some cat fur on it, likely from Runtime."
+ icon_state = "cmo"
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 = "sheethos"
+ desc = "It is decorated with a shield emblem. While crime doesn't sleep, you do, but you are still THE LAW!"
+ icon_state = "hos"
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 = "sheethop"
+ 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"
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 = "sheetce"
+ 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"
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 = "sheetqm"
+ icon_state = "qm"
item_color = "qm"
/obj/item/weapon/bedsheet/brown
- icon_state = "sheetbrown"
+ icon_state = "brown"
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 = "sheetcentcom"
+ icon_state = "centcom"
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 = "sheetsyndie"
+ icon_state = "syndie"
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 = "sheetcult"
+ 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"
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 = "sheetwiz"
+ desc = "A special fabric enchanted with magic so you can have an enchanted night. It even glows!"
+ icon_state = "wiz"
item_color = "wiz"
+/obj/item/weapon/bedsheet/ian
+ icon_state = "ian"
+ item_color = "ian"
+
/obj/structure/bedsheetbin
name = "linen bin"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
index 0203442b693..4552fb78ff5 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/medical.dm
@@ -72,7 +72,7 @@
new /obj/item/weapon/storage/belt/medical(src)
new /obj/item/device/flash/handheld(src)
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
- new /obj/item/cybernetic_implant/eyes/hud/medical(src)
+ new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
/obj/structure/closet/secure_closet/animal
name = "animal control"
diff --git a/code/game/objects/structures/door_assembly.dm b/code/game/objects/structures/door_assembly.dm
index 6f5809891e2..e130ef5811a 100644
--- a/code/game/objects/structures/door_assembly.dm
+++ b/code/game/objects/structures/door_assembly.dm
@@ -25,7 +25,6 @@
icon_state = "door_as_1"
airlock_type = /obj/machinery/door/airlock
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_com
@@ -37,7 +36,6 @@
glass_type = /obj/machinery/door/airlock/glass_command
airlock_type = /obj/machinery/door/airlock/command
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_com/glass
@@ -53,7 +51,6 @@
glass_type = /obj/machinery/door/airlock/glass_security
airlock_type = /obj/machinery/door/airlock/security
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_sec/glass
@@ -69,7 +66,6 @@
glass_type = /obj/machinery/door/airlock/glass_engineering
airlock_type = /obj/machinery/door/airlock/engineering
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_eng/glass
@@ -85,7 +81,6 @@
glass_type = /obj/machinery/door/airlock/glass_mining
airlock_type = /obj/machinery/door/airlock/mining
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_min/glass
@@ -101,7 +96,6 @@
glass_type = /obj/machinery/door/airlock/glass_atmos
airlock_type = /obj/machinery/door/airlock/atmos
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_atmo/glass
@@ -117,7 +111,6 @@
glass_type = /obj/machinery/door/airlock/glass_research
airlock_type = /obj/machinery/door/airlock/research
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_research/glass
@@ -133,7 +126,6 @@
glass_type = /obj/machinery/door/airlock/glass_science
airlock_type = /obj/machinery/door/airlock/science
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_science/glass
@@ -149,7 +141,6 @@
glass_type = /obj/machinery/door/airlock/glass_medical
airlock_type = /obj/machinery/door/airlock/medical
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_med/glass
@@ -163,7 +154,6 @@
icontext = "mai"
airlock_type = /obj/machinery/door/airlock/maintenance
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_ext
@@ -173,7 +163,6 @@
icontext = "ext"
airlock_type = /obj/machinery/door/airlock/external
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_fre
@@ -183,7 +172,6 @@
icontext = "fre"
airlock_type = /obj/machinery/door/airlock/freezer
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_hatch
@@ -193,7 +181,6 @@
icontext = "hatch"
airlock_type = /obj/machinery/door/airlock/hatch
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_mhatch
@@ -203,7 +190,6 @@
icontext = "mhatch"
airlock_type = /obj/machinery/door/airlock/maintenance_hatch
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_glass
@@ -211,7 +197,6 @@
icon_state = "door_as_g1"
airlock_type = /obj/machinery/door/airlock/glass
anchored = 1
- density = 1
state = 1
mineral = "glass"
@@ -220,7 +205,6 @@
icon_state = "door_as_gold1"
airlock_type = /obj/machinery/door/airlock/gold
anchored = 1
- density = 1
state = 1
mineral = "gold"
@@ -229,7 +213,6 @@
icon_state = "door_as_silver1"
airlock_type = /obj/machinery/door/airlock/silver
anchored = 1
- density = 1
state = 1
mineral = "silver"
@@ -238,7 +221,6 @@
icon_state = "door_as_diamond1"
airlock_type = /obj/machinery/door/airlock/diamond
anchored = 1
- density = 1
state = 1
mineral = "diamond"
@@ -247,7 +229,6 @@
icon_state = "door_as_uranium1"
airlock_type = /obj/machinery/door/airlock/uranium
anchored = 1
- density = 1
state = 1
mineral = "uranium"
@@ -256,7 +237,6 @@
icon_state = "door_as_plasma1"
airlock_type = /obj/machinery/door/airlock/plasma
anchored = 1
- density = 1
state = 1
mineral = "plasma"
@@ -266,7 +246,6 @@
icon_state = "door_as_clown1"
airlock_type = /obj/machinery/door/airlock/clown
anchored = 1
- density = 1
state = 1
mineral = "bananium"
@@ -275,7 +254,6 @@
icon_state = "door_as_sandstone1"
airlock_type = /obj/machinery/door/airlock/sandstone
anchored = 1
- density = 1
state = 1
mineral = "sandstone"
@@ -286,7 +264,6 @@
icontext = "highsec"
airlock_type = /obj/machinery/door/airlock/highsecurity
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_vault
@@ -296,7 +273,6 @@
icontext = "vault"
airlock_type = /obj/machinery/door/airlock/vault
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_shuttle
@@ -306,7 +282,6 @@
icontext = "shuttle"
airlock_type = /obj/machinery/door/airlock/shuttle
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_wood
@@ -314,7 +289,6 @@
icon_state = "door_as_wood1"
airlock_type = /obj/machinery/door/airlock/wood
anchored = 1
- density = 1
state = 1
mineral = "wood"
@@ -327,13 +301,20 @@
glass_type = /obj/machinery/door/airlock/glass_virology
airlock_type = /obj/machinery/door/airlock/virology
anchored = 1
- density = 1
state = 1
/obj/structure/door_assembly/door_assembly_viro/glass
mineral = "glass"
icon_state = "door_as_gviro1"
+/obj/structure/door_assembly/door_assembly_centcom
+ icon_state = "door_as_ele1"
+ typetext = "centcom"
+ icontext = "ele"
+ airlock_type = /obj/machinery/door/airlock/centcom
+ anchored = 1
+ state = 1
+
/obj/structure/door_assembly/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/weapon/pen))
var/t = stripped_input(user, "Enter the name for the door.", src.name, src.created_name,MAX_NAME_LEN)
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index 8638ab62db3..1e72ad484a0 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -102,7 +102,7 @@
return
user << "You start building a false wall..."
if(do_after(user, 20, target = src))
- if(!src.loc || !S || S.amount < 2)
+ if(!src.loc || !S || S.get_amount() < 2)
return
S.use(2)
user << "You create a false wall. Push on it to open or close the passage."
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index 58ff54da606..22f4ae79d1b 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -233,7 +233,7 @@
if(user.stat || user.stunned || user.weakened || user.paralysis)
unbuckle_mob()
if(istype(user.l_hand, keytype) || istype(user.r_hand, keytype))
- if(!Process_Spacemove(direction) || !has_gravity(src.loc) || move_delay)
+ if(!Process_Spacemove(direction) || !has_gravity(src.loc) || move_delay || !isturf(loc))
return
step(src, direction)
update_mob()
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index d9035cb568a..2bcfe8d976f 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -268,7 +268,7 @@
return(2)
/turf/proc/can_have_cabling()
- return !density
+ return 1
/turf/proc/can_lay_cable()
return can_have_cabling() & !intact
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index bd5cd555a65..2a1efc9735e 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -1,4 +1,3 @@
-
/client/verb/who()
set name = "Who"
set category = "OOC"
@@ -8,11 +7,40 @@
var/list/Lines = list()
if(holder)
- for(var/client/C in clients)
- var/entry = "\t[C.key]"
- if(C.holder && C.holder.fakekey)
- entry += " (as [C.holder.fakekey])"
- Lines += entry
+ if (check_rights(R_ADMIN,0) && isobserver(src.mob))//If they have +ADMIN and are a ghost they can see players IC names and statuses.
+ var/mob/dead/observer/G = src.mob
+ if(!G.started_as_observer)//If you aghost to do this, KorPhaeron will deadmin you in your sleep.
+ log_admin("[key_name(usr)] checked advanced who in-round")
+ for(var/client/C in clients)
+ var/entry = "\t[C.key]"
+ if(C.holder && C.holder.fakekey)
+ entry += " (as [C.holder.fakekey])"
+ if (isnewplayer(C.mob))
+ entry += " - In Lobby"
+ else
+ entry += " - Playing as [C.mob.real_name]"
+ switch(C.mob.stat)
+ if(UNCONSCIOUS)
+ entry += " - Unconscious"
+ if(DEAD)
+ if(isobserver(C.mob))
+ var/mob/dead/observer/O = C.mob
+ if(O.started_as_observer)
+ entry += " - Observing"
+ else
+ entry += " - DEAD"
+ else
+ entry += " - DEAD"
+ if(is_special_character(C.mob))
+ entry += " - Antagonist"
+ entry += " (?)"
+ Lines += entry
+ else//If they don't have +ADMIN, only show hidden admins
+ for(var/client/C in clients)
+ var/entry = "\t[C.key]"
+ if(C.holder && C.holder.fakekey)
+ entry += " (as [C.holder.fakekey])"
+ Lines += entry
else
for(var/client/C in clients)
if(C.holder && C.holder.fakekey)
diff --git a/code/modules/admin/admin_memo.dm b/code/modules/admin/admin_memo.dm
index 774f55ce6ae..7c40c3aa53a 100644
--- a/code/modules/admin/admin_memo.dm
+++ b/code/modules/admin/admin_memo.dm
@@ -1,13 +1,32 @@
-/client/proc/admin_memo(task in list("Show","Write","Edit","Remove"))
+/client/proc/admin_memo()
set name = "Memo"
set category = "Server"
if(!check_rights(0)) return
if(!dbcon.IsConnected())
- usr << "Failed to establish database connection."
+ src << "Failed to establish database connection."
+ return
+ var/memotask = input(usr,"Choose task.","Memo") in list("Show","Write","Edit","Remove")
+ if(!memotask)
+ return
+ admin_memo_output(memotask)
+
+/client/proc/admin_memo_output(task)
+ if(!task)
+ return
+ if(!dbcon.IsConnected())
+ src << "Failed to establish database connection."
return
var/sql_ckey = sanitizeSQL(src.ckey)
switch(task)
if("Write")
+ var/DBQuery/query_memocheck = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")] WHERE (ckey = '[sql_ckey]')")
+ if(!query_memocheck.Execute())
+ var/err = query_memocheck.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
+ return
+ if(query_memocheck.NextRow())
+ src << "You already have set a memo."
+ return
var/memotext = input(src,"Write your Memo","Memo") as text|null
if(!memotext)
return
@@ -26,13 +45,13 @@
var/err = query_memolist.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
return
- if(!query_memolist.NextRow())
- src << "No memos found in database."
- return
var/list/memolist = list()
while(query_memolist.NextRow())
- var/ckey = query_memolist.item[2]
- memolist += "[ckey]"
+ var/lkey = query_memolist.item[1]
+ memolist += "[lkey]"
+ if(!memolist.len)
+ src << "No memos found in database."
+ return
var/target_ckey = input(src, "Select whose memo to edit", "Select memo") as null|anything in memolist
if(!target_ckey)
return
@@ -43,14 +62,14 @@
log_game("SQL ERROR obtaining ckey, memotext from memo table. Error : \[[err]\]\n")
return
if(query_memofind.NextRow())
- var/old_memo = query_memofind.item[3]
+ var/old_memo = query_memofind.item[2]
var/new_memo = input("Input new memo", "New Memo", "[old_memo]", null) as null|text
if(!new_memo)
return
new_memo = sanitizeSQL(new_memo)
var/edit_text = "Edited by [sql_ckey] on [SQLtime()] from
[old_memo]
to
[new_memo]
"
edit_text = sanitizeSQL(edit_text)
- var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(edits,'[edit_text]') WHERE (ckey = '[target_sql_ckey]')")
+ var/DBQuery/update_query = dbcon.NewQuery("UPDATE [format_table_name("memo")] SET memotext = '[new_memo]', last_editor = '[sql_ckey]', edits = CONCAT(IFNULL(edits,''),'[edit_text]') WHERE (ckey = '[target_sql_ckey]')")
if(!update_query.Execute())
var/err = update_query.ErrorMsg()
log_game("SQL ERROR editing memo. Error : \[[err]\]\n")
@@ -62,18 +81,24 @@
log_admin("[key_name(src)] has edited [target_sql_ckey]'s memo from [old_memo] to [new_memo]")
message_admins("[key_name_admin(src)] has edited [target_sql_ckey]'s memo from
[old_memo]
to
[new_memo]")
if("Show")
- var/DBQuery/query_memoshow = dbcon.NewQuery("SELECT id, ckey, memotext, timestamp, last_editor FROM [format_table_name("memo")])")
- var/output
+ var/DBQuery/query_memoshow = dbcon.NewQuery("SELECT ckey, memotext, timestamp, last_editor FROM [format_table_name("memo")]")
+ if(!query_memoshow.Execute())
+ var/err = query_memoshow.ErrorMsg()
+ log_game("SQL ERROR obtaining ckey, memotext, timestamp, last_editor from memo table. Error : \[[err]\]\n")
+ return
+ var/output = null
while(query_memoshow.NextRow())
- var/id = query_memoshow.item[1]
- var/ckey = query_memoshow.item[2]
- var/memotext = query_memoshow.item[3]
- var/timestamp = query_memoshow.item[4]
- var/last_editor = query_memoshow.item[5]
- output += "Memo by [ckey] on [timestamp]:"
+ var/ckey = query_memoshow.item[1]
+ var/memotext = query_memoshow.item[2]
+ var/timestamp = query_memoshow.item[3]
+ var/last_editor = query_memoshow.item[4]
+ output += "Memo by [ckey] on [timestamp]"
if(last_editor)
- output += "
Last edit by [last_editor] (Click here to see edit log)"
+ output += "
Last edit by [last_editor] (Click here to see edit log)"
output += "
[memotext]
"
+ if(!output)
+ src << "No memos found in database."
+ return
src << output
if("Remove")
var/DBQuery/query_memodellist = dbcon.NewQuery("SELECT ckey FROM [format_table_name("memo")]")
@@ -81,13 +106,13 @@
var/err = query_memodellist.ErrorMsg()
log_game("SQL ERROR obtaining ckey from memo table. Error : \[[err]\]\n")
return
- if(!query_memodellist.NextRow())
- src << "No memos found in database."
- return
var/list/memolist = list()
while(query_memodellist.NextRow())
- var/ckey = query_memodellist.item[2]
+ var/ckey = query_memodellist.item[1]
memolist += "[ckey]"
+ if(!memolist.len)
+ src << "No memos found in database."
+ return
var/target_ckey = input(src, "Select whose memo to delete", "Select memo") as null|anything in memolist
if(!target_ckey)
return
diff --git a/code/modules/admin/player_panel.dm b/code/modules/admin/player_panel.dm
index 1320ae695c2..7fdf3adb2d7 100644
--- a/code/modules/admin/player_panel.dm
+++ b/code/modules/admin/player_panel.dm
@@ -264,7 +264,11 @@
M_job = "New player"
else if(isobserver(M))
- M_job = "Ghost"
+ var/mob/dead/observer/O = M
+ if(O.started_as_observer)//Did they get BTFO or are they just not trying?
+ M_job = "Observer"
+ else
+ M_job = "Ghost"
var/M_name = html_encode(M.name)
var/M_rname = html_encode(M.real_name)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index 6f0493a0f86..b1ce38e14d7 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2058,10 +2058,14 @@
src.access_news_network()
else if(href_list["memoeditlist"])
- var/DBQuery/query_memoedits = dbcon.NewQuery("SELECT edits FROM [format_table_name("memo")] WHERE (id = '[href_list["id"]]")
- query_memoedits.Execute()
+ var/sql_key = sanitizeSQL("[href_list["memoeditlist"]]")
+ var/DBQuery/query_memoedits = dbcon.NewQuery("SELECT edits FROM [format_table_name("memo")] WHERE (ckey = '[sql_key]')")
+ if(!query_memoedits.Execute())
+ var/err = query_memoedits.ErrorMsg()
+ log_game("SQL ERROR obtaining edits from memo table. Error : \[[err]\]\n")
+ return
if(query_memoedits.NextRow())
- var/edit_log = query_memoedits.item[6]
+ var/edit_log = query_memoedits.item[1]
usr << browse(edit_log,"window=memoeditlist")
else if(href_list["check_antagonist"])
diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm
index dce6bbf8659..107c5310770 100644
--- a/code/modules/admin/verbs/cinematic.dm
+++ b/code/modules/admin/verbs/cinematic.dm
@@ -10,7 +10,7 @@
var/override
switch(parameter)
if(1)
- override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","no override")
+ override = input(src,"mode = ?","Enter Parameter",null) as anything in list("nuclear emergency","gang war","fake","no override")
if(0)
override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","nuclear emergency","AI malfunction","no override")
ticker.station_explosion_cinematic(parameter,override)
diff --git a/code/modules/admin/verbs/debug.dm b/code/modules/admin/verbs/debug.dm
index d7497060491..976ce7085e3 100644
--- a/code/modules/admin/verbs/debug.dm
+++ b/code/modules/admin/verbs/debug.dm
@@ -40,7 +40,12 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
switch(alert("Proc owned by something?",,"Yes","No"))
if("Yes")
targetselected = 1
- class = input("Proc owned by...","Owner",null) as null|anything in list("Obj","Mob","Area or Turf","Client")
+ if(src.holder && src.holder.marked_datum)
+ class = input("Proc owned by...","Owner",null) as null|anything in list("Obj","Mob","Area or Turf","Client","Marked datum ([holder.marked_datum.type])")
+ if(class == "Marked datum ([holder.marked_datum.type])")
+ class = "Marked datum"
+ else
+ class = input("Proc owned by...","Owner",null) as null|anything in list("Obj","Mob","Area or Turf","Client")
switch(class)
if("Obj")
target = input("Enter target:","Target",usr) as obj in world
@@ -53,6 +58,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
for(var/client/C)
keys += C
target = input("Please, select a player!", "Selection", null, null) as null|anything in keys
+ if("Marked datum")
+ target = holder.marked_datum
else
return
if("No")
@@ -61,7 +68,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/procname = input("Proc path, eg: /proc/fake_blood","Path:", null) as text|null
if(!procname) return
-
+ if(targetselected && !hascall(target,procname))
+ usr << "Error: callproc(): target has no such call [procname]."
+ return
var/list/lst = get_callproc_args()
if(!lst)
return
@@ -70,9 +79,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!target)
usr << "Error: callproc(): owner of proc no longer exists."
return
- if(!hascall(target,procname))
- usr << "Error: callproc(): target has no such call [procname]."
- return
log_admin("[key_name(src)] called [target]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
returnval = call(target,procname)(arglist(lst)) // Pass the lst as an argument list to the proc
else
@@ -93,7 +99,9 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
var/procname = input("Proc name, eg: fake_blood","Proc:", null) as text|null
if(!procname)
return
-
+ if(!hascall(A,procname))
+ usr << "Error: callproc_datum(): target has no such call [procname]."
+ return
var/list/lst = get_callproc_args()
if(!lst)
return
@@ -101,9 +109,6 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if(!A || !IsValidSrc(A))
usr << "Error: callproc_datum(): owner of proc no longer exists."
return
- if(!hascall(A,procname))
- usr << "Error: callproc_datum(): target has no such call [procname]."
- return
log_admin("[key_name(src)] called [A]'s [procname]() with [lst.len ? "the arguments [list2params(lst)]":"no arguments"].")
spawn()
@@ -115,15 +120,21 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
/client/proc/get_callproc_args()
var/argnum = input("Number of arguments","Number:",0) as num|null
if(!argnum && (argnum!=0)) return
-
+
var/list/lst = list()
//TODO: make a list to store whether each argument was initialised as null.
//Reason: So we can abort the proccall if say, one of our arguments was a mob which no longer exists
//this will protect us from a fair few errors ~Carn
while(argnum--)
+ var/class = null
// Make a list with each index containing one variable, to be given to the proc
- var/class = input("What kind of variable?","Variable Type") in list("text","num","type","reference","mob reference","icon","file","client","mob's area","CANCEL")
+ if(src.holder && src.holder.marked_datum)
+ class = input("What kind of variable?","Variable Type") in list("text","num","type","reference","mob reference","icon","file","client","mob's area","Marked datum ([holder.marked_datum.type])","CANCEL")
+ if(holder.marked_datum && class == "Marked datum ([holder.marked_datum.type])")
+ class = "Marked datum"
+ else
+ class = input("What kind of variable?","Variable Type") in list("text","num","type","reference","mob reference","icon","file","client","mob's area","CANCEL")
switch(class)
if("CANCEL")
return null
@@ -158,6 +169,8 @@ But you can call procs that are of type /mob/living/carbon/human/proc/ for that
if("mob's area")
var/mob/temp = input("Select mob", "Selection", usr) as mob in world
lst += temp.loc
+ if("Marked datum")
+ lst += holder.marked_datum
return lst
@@ -400,6 +413,7 @@ var/list/TYPES_SHORTCUTS = list(
/obj/machinery/portable_atmospherics = "PORT_ATMOS",
/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/missile_rack = "MECHA_MISSILE_RACK",
/obj/item/mecha_parts/mecha_equipment = "MECHA_EQUIP",
+ /obj/item/organ/internal = "ORGAN_INT",
)
var/global/list/g_fancy_list_of_types = null
diff --git a/code/modules/admin/verbs/manipulate_organs.dm b/code/modules/admin/verbs/manipulate_organs.dm
new file mode 100644
index 00000000000..ae500213e59
--- /dev/null
+++ b/code/modules/admin/verbs/manipulate_organs.dm
@@ -0,0 +1,56 @@
+/client/proc/manipulate_organs(mob/living/carbon/C in world)
+ set name = "Manipulate Organs"
+ set category = "Debug"
+ var/operation = input("Select organ operation.", "Organ Manipulation", "cancel") in list("add organ", "add implant", "drop organ/implant", "remove organ/implant", "cancel")
+
+ var/list/organs = list()
+ switch(operation)
+ if("add organ")
+ for(var/path in typesof(/obj/item/organ/internal) - /obj/item/organ/internal)
+ var/dat = replacetext("[path]", "/obj/item/organ/internal/", ":")
+ organs[dat] = path
+
+ var/obj/item/organ/internal/organ = input("Select organ type:", "Organ Manipulation", null) in organs
+ organ = organs[organ]
+ organ = new organ
+ organ.Insert(C)
+
+ if("add implant")
+ for(var/path in typesof(/obj/item/weapon/implant) - /obj/item/weapon/implant)
+ var/dat = replacetext("[path]", "/obj/item/weapon/implant/", ":")
+ organs[dat] = path
+
+ var/obj/item/weapon/implant/organ = input("Select implant type:", "Organ Manipulation", null) in organs
+ organ = organs[organ]
+ organ = new organ
+ organ.implant(C)
+
+ if("drop organ/implant", "remove organ/implant")
+ for(var/obj/item/organ/internal/I in C.internal_organs)
+ organs["[I.name] ([I.type])"] = I
+
+ for(var/obj/item/weapon/implant/I in C)
+ organs["[I.name] ([I.type])"] = I
+
+ var/obj/item/organ = input("Select organ/implant:", "Organ Manipulation", null) in organs
+ organ = organs[organ]
+ if(!organ) return
+ var/obj/item/organ/internal/O
+ var/obj/item/weapon/implant/I
+
+ if(isorgan(organ))
+ O = organ
+ O.Remove(C)
+ else
+ I = organ
+ I.removed(C)
+
+ organ.loc = get_turf(C)
+
+ if(operation == "remove organ/implant")
+ qdel(organ)
+ else if(I) // Put the implant in case.
+ var/obj/item/weapon/implantcase/case = new(get_turf(C))
+ case.imp = I
+ I.loc = case
+ case.update_icon()
\ No newline at end of file
diff --git a/code/modules/admin/verbs/mapping.dm b/code/modules/admin/verbs/mapping.dm
index d947599c6d5..5152ab29436 100644
--- a/code/modules/admin/verbs/mapping.dm
+++ b/code/modules/admin/verbs/mapping.dm
@@ -159,6 +159,8 @@ var/intercom_range_display_status = 0
src.verbs += /client/proc/print_pointers
src.verbs += /client/proc/count_movable_instances
src.verbs += /client/proc/cmd_show_at_list
+ src.verbs += /client/proc/cmd_show_at_list
+ src.verbs += /client/proc/manipulate_organs
//src.verbs += /client/proc/cmd_admin_rejuvenate
feedback_add_details("admin_verb","mDV") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc!
diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm
index 5cdf335ed49..25b84838539 100644
--- a/code/modules/admin/verbs/one_click_antag.dm
+++ b/code/modules/admin/verbs/one_click_antag.dm
@@ -450,17 +450,17 @@
// CENTCOM RESPONSE TEAM
/datum/admins/proc/makeEmergencyresponseteam()
- var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT", "Amber: Full ERT", "Red: Elite ERT", "Delta: Deathsquad")
+ var/alert = input("Which team should we send?", "Select Response Level") as null|anything in list("Green: Centcom Official", "Blue: Light ERT (No Armoury Access)", "Amber: Full ERT (Armoury Access)", "Red: Elite ERT (Armoury Access + Pulse Weapons)", "Delta: Deathsquad")
if(!alert)
return
switch(alert)
if("Delta: Deathsquad")
return makeDeathsquad()
- if("Red: Elite ERT")
+ if("Red: Elite ERT (Armoury Access + Pulse Weapons)")
alert = "Red"
- if("Amber: Full ERT")
+ if("Amber: Full ERT (Armoury Access)")
alert = "Amber"
- if("Blue: Light ERT")
+ if("Blue: Light ERT (No Armoury Access)")
alert = "Blue"
if("Green: Centcom Official")
return makeOfficial()
diff --git a/code/modules/awaymissions/exile.dm b/code/modules/awaymissions/exile.dm
index 7e36cf7e04a..4e6a69d591b 100644
--- a/code/modules/awaymissions/exile.dm
+++ b/code/modules/awaymissions/exile.dm
@@ -1,18 +1,10 @@
//Exile implants will allow you to use the station gate, but not return home.
//This will allow security to exile badguys/for badguys to exile their kill targets
-/obj/item/weapon/implanter/exile
- name = "implanter-exile"
-
-/obj/item/weapon/implanter/exile/New()
- imp = new /obj/item/weapon/implant/exile( src )
- ..()
- update_icon()
-
-
/obj/item/weapon/implant/exile
name = "exile implant"
desc = "Prevents you from returning from away missions"
+ origin_tech = "materials=2;biotech=3;magnets=2;bluespace=3"
activated = 0
/obj/item/weapon/implant/exile/get_data()
@@ -22,11 +14,16 @@
return dat
+/obj/item/weapon/implanter/exile
+ name = "implanter (exile)"
+
+/obj/item/weapon/implanter/exile/New()
+ imp = new /obj/item/weapon/implant/exile( src )
+ ..()
+
/obj/item/weapon/implantcase/exile
- name = "glass case- 'Exile'"
- desc = "A case containing an exile implant."
- icon = 'icons/obj/items.dmi'
- icon_state = "implantcase-r"
+ name = "implant case - 'Exile'"
+ desc = "A glass case containing an exile implant."
/obj/item/weapon/implantcase/exile/New()
imp = new /obj/item/weapon/implant/exile(src)
diff --git a/code/modules/client/client procs.dm b/code/modules/client/client procs.dm
index 4e07e0d8a3c..15de84c0369 100644
--- a/code/modules/client/client procs.dm
+++ b/code/modules/client/client procs.dm
@@ -128,7 +128,7 @@ var/next_external_rsc = 0
if(holder)
add_admin_verbs()
- admin_memo("Show")
+ admin_memo_output("Show")
if((global.comms_key == "default_pwd" || length(global.comms_key) <= 6) && global.comms_allowed) //It's the default value or less than 6 characters long, but it somehow didn't disable comms.
src << "The server's API key is either too short or is the default value! Consider changing it immediately!"
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index d351a3e0890..d0119b29ec5 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -1045,14 +1045,6 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
character.real_name = real_name
character.name = character.real_name
- if(character.dna)
- character.dna.real_name = character.real_name
- if(pref_species != /datum/species/human && config.mutant_races)
- hardset_dna(character, null, null, null, null, pref_species.type, features)
- else
- hardset_dna(character, null, null, null, null, /datum/species/human, features)
- character.update_mutcolor()
-
character.gender = gender
character.age = age
character.blood_type = blood_type
@@ -1072,5 +1064,15 @@ var/global/list/special_roles = list( //keep synced with the defines BE_* in set
character.backbag = backbag
- character.update_body()
- character.update_hair()
+ if(character.dna)
+ var/datum/species/chosen_species
+
+ character.dna.real_name = character.real_name
+ if(pref_species != /datum/species/human && config.mutant_races)
+ chosen_species = pref_species.type
+ else
+ chosen_species = /datum/species/human
+ hardset_dna(character, null, null, null, null, chosen_species, features)
+ else
+ character.update_body()
+ character.update_hair()
\ No newline at end of file
diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
index 18f5c7937f4..ced08b92025 100644
--- a/code/modules/clothing/gloves/color.dm
+++ b/code/modules/clothing/gloves/color.dm
@@ -66,6 +66,13 @@
item_state = "redgloves"
item_color = "red"
+/obj/item/clothing/gloves/color/red/insulated
+ name = "insulated gloves"
+ desc = "These gloves will protect the wearer from electric shock."
+ siemens_coefficient = 0
+ permeability_coefficient = 0.05
+ burn_state = -1 //Won't burn in fires
+
/obj/item/clothing/gloves/color/rainbow
name = "rainbow gloves"
desc = "A pair of gloves, they don't look special in any way."
diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm
index 6f9bc4c6228..ccb288dd6cc 100644
--- a/code/modules/clothing/head/misc.dm
+++ b/code/modules/clothing/head/misc.dm
@@ -228,3 +228,8 @@
name = "jester hat"
desc = "A hat with bells, to add some merryness to the suit."
icon_state = "jester_hat"
+
+/obj/item/clothing/head/rice_hat
+ name = "rice hat"
+ desc = "Welcome to the rice fields, motherfucker."
+ icon_state = "rice_hat"
\ No newline at end of file
diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm
index 9237f31d8f2..cc3435554d5 100644
--- a/code/modules/clothing/under/jobs/civilian.dm
+++ b/code/modules/clothing/under/jobs/civilian.dm
@@ -3,9 +3,9 @@
/obj/item/clothing/under/rank/bartender
desc = "It looks like it could use some more flair."
name = "bartender's uniform"
- icon_state = "bar_suit"
+ icon_state = "barman"
item_state = "bar_suit"
- item_color = "bar_suit"
+ item_color = "barman"
/obj/item/clothing/under/rank/captain //Alright, technically not a 'civilian' but its better then giving a .dm file for a single define.
diff --git a/code/modules/events/spontaneous_appendicitis.dm b/code/modules/events/spontaneous_appendicitis.dm
index 6219d1fda69..11e8d74923e 100644
--- a/code/modules/events/spontaneous_appendicitis.dm
+++ b/code/modules/events/spontaneous_appendicitis.dm
@@ -14,5 +14,5 @@
continue
var/datum/disease/D = new /datum/disease/appendicitis
- H.AddDisease(D)
+ H.ForceContractDisease(D)
break
\ No newline at end of file
diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
index 8ad8c75980a..756d7608141 100644
--- a/code/modules/flufftext/Hallucination.dm
+++ b/code/modules/flufftext/Hallucination.dm
@@ -15,7 +15,7 @@ Gunshots/explosions/opening doors/less rare audio (done)
var/image/halimage
var/image/halbody
var/obj/halitem
- var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator
+ var/hal_screwyhud = 0 //1 - critical, 2 - dead, 3 - oxygen indicator, 4 - toxin indicator, 5 - perfect health
var/handling_hal = 0
var/hal_crit = 0
diff --git a/code/modules/food&drinks/drinks/drinks/bottle.dm b/code/modules/food&drinks/drinks/drinks/bottle.dm
index 9fa1cbe5555..8f003e6fb75 100644
--- a/code/modules/food&drinks/drinks/drinks/bottle.dm
+++ b/code/modules/food&drinks/drinks/drinks/bottle.dm
@@ -300,6 +300,11 @@
/obj/item/weapon/reagent_containers/food/drinks/bottle/molotov/attackby(obj/item/I, mob/user, params)
if(is_hot(I) && !active)
active = 1
+ var/turf/bombturf = get_turf(src)
+ var/area/bombarea = get_area(bombturf)
+ message_admins("[key_name(user)]? has primed a [name] for detonation at [bombarea] (JMP).")
+ log_game("[key_name(user)] has primed a [name] for detonation at [bombarea] ([bombturf.x],[bombturf.y],[bombturf.z]).")
+
user << "You light \the [src] on fire."
overlays += fire_overlay
if(!isGlass)
@@ -324,4 +329,4 @@
return
user << "You snuff out the flame on \the [src]."
overlays -= fire_overlay
- active = 0
\ No newline at end of file
+ active = 0
diff --git a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
index 54c0ed1c52e..ef5f43f7495 100644
--- a/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
+++ b/code/modules/food&drinks/recipes/tablecraft/recipes_burger.dm
@@ -36,7 +36,7 @@
/datum/table_recipe/appendixburger
name = "Appendix burger"
reqs = list(
- /obj/item/organ/appendix = 1,
+ /obj/item/organ/internal/appendix = 1,
/obj/item/weapon/reagent_containers/food/snacks/bun = 1
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/appendix
diff --git a/code/modules/hydroponics/biogenerator.dm b/code/modules/hydroponics/biogenerator.dm
index 82734bf827c..334cc5f671c 100644
--- a/code/modules/hydroponics/biogenerator.dm
+++ b/code/modules/hydroponics/biogenerator.dm
@@ -171,6 +171,7 @@
dat += "Leather Satchel: Make ([400/efficiency])
"
dat += "Leather Jacket: Make ([500/efficiency])
"
dat += "Leather Overcoat: Make ([1000/efficiency])
"
+ dat += "Rice Hat: Make ([300/efficiency])
"
dat += "No container inside, please insert container.
"
@@ -309,9 +310,9 @@
if("overcoat")
if (check_cost(1000/efficiency)) return 0
else new/obj/item/clothing/suit/jacket/leather/overcoat(src.loc)
- //if("monkey")
- // if (check_cost(500)) return 0
- // else new/mob/living/carbon/monkey(src.loc)
+ if("rice_hat")
+ if (check_cost(300/efficiency)) return 0
+ else new/obj/item/clothing/head/rice_hat(src.loc)
processing = 0
menustat = "complete"
update_icon()
diff --git a/code/modules/mining/abandoned_crates.dm b/code/modules/mining/abandoned_crates.dm
index b7552f60814..81a3f2a4cf5 100644
--- a/code/modules/mining/abandoned_crates.dm
+++ b/code/modules/mining/abandoned_crates.dm
@@ -114,7 +114,7 @@
if(89)
new /obj/item/organ/brain/alien(src)
if(90)
- new /obj/item/organ/heart(src)
+ new /obj/item/organ/internal/heart(src)
if(91)
new /obj/item/device/soulstone/anybody(src)
if(92)
diff --git a/code/modules/mining/equipment_locker.dm b/code/modules/mining/equipment_locker.dm
index 85d0eaa50f0..f0e699253be 100644
--- a/code/modules/mining/equipment_locker.dm
+++ b/code/modules/mining/equipment_locker.dm
@@ -623,7 +623,7 @@
if(istype(I, /obj/item/weapon/weldingtool))
var/obj/item/weapon/weldingtool/W = I
if(W.welding && !stat)
- if(stance != HOSTILE_STANCE_IDLE)
+ if(AIStatus == AI_ON)
user << "