1)
to_chat(user, SPAN_BOLDNOTICE("The display on \the [src] lights up: [dist]-[direction]"))
else
diff --git a/code/game/objects/items/devices/pinpointer.dm b/code/game/objects/items/devices/pinpointer.dm
index 7ec3118ef96b..8a624d616d5b 100644
--- a/code/game/objects/items/devices/pinpointer.dm
+++ b/code/game/objects/items/devices/pinpointer.dm
@@ -31,7 +31,7 @@
if(!the_disk)
icon_state = "pinonnull"
return
- setDir(get_dir(src,the_disk))
+ setDir(Get_Compass_Dir(src,the_disk))
switch(get_dist(src,the_disk))
if(0)
icon_state = "pinondirect"
@@ -80,7 +80,7 @@
if(!location)
icon_state = "pinonnull"
return
- setDir(get_dir(src,location))
+ setDir(Get_Compass_Dir(src,location))
switch(get_dist(src,location))
if(0)
icon_state = "pinondirect"
@@ -99,7 +99,7 @@
if(!target)
icon_state = "pinonnull"
return
- setDir(get_dir(src,target))
+ setDir(Get_Compass_Dir(src,target))
switch(get_dist(src,target))
if(0)
icon_state = "pinondirect"
diff --git a/code/game/objects/items/devices/portable_vendor.dm b/code/game/objects/items/devices/portable_vendor.dm
index 65e2128a02c0..29e1d06018ae 100644
--- a/code/game/objects/items/devices/portable_vendor.dm
+++ b/code/game/objects/items/devices/portable_vendor.dm
@@ -210,6 +210,7 @@
s.start()
/obj/item/device/portable_vendor/emp_act(severity)
+ . = ..()
if (broken)
return
if (prob(40*severity))
diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm
index 21aa96e971a1..fb8640eeaa71 100644
--- a/code/game/objects/items/devices/radio/headset.dm
+++ b/code/game/objects/items/devices/radio/headset.dm
@@ -849,6 +849,14 @@
"Corporate Liaison" = TRACKER_CL
)
+/obj/item/device/radio/headset/distress/cbrn
+ name = "\improper CBRN headset"
+ desc = "A headset given to CBRN marines. Channels are as follows: :g - public, :v - marine command, :a - alpha squad, :b - bravo squad, :c - charlie squad, :d - delta squad, :n - engineering, :m - medbay, :u - requisitions, :j - JTAC, :t - intel"
+ frequency = CBRN_FREQ
+ initial_keys = list(/obj/item/device/encryptionkey/public, /obj/item/device/encryptionkey/mcom)
+ ignore_z = TRUE
+ has_hud = TRUE
+
/obj/item/device/radio/headset/distress/pmc/hvh
desc = "A special headset used by corporate personnel. Channels are as follows: :o - colony."
initial_keys = list(/obj/item/device/encryptionkey/colony, /obj/item/device/encryptionkey/WY)
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 2092ffa108c6..c503edc8f94f 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -425,11 +425,11 @@
else return
/obj/item/device/radio/emp_act(severity)
+ . = ..()
broadcasting = FALSE
listening = FALSE
for (var/ch_name in channels)
channels[ch_name] = 0
- ..()
///////////////////////////////
//////////Borg Radios//////////
diff --git a/code/game/objects/items/explosives/mine.dm b/code/game/objects/items/explosives/mine.dm
index 742a5f314c4a..57dd23bf4e96 100644
--- a/code/game/objects/items/explosives/mine.dm
+++ b/code/game/objects/items/explosives/mine.dm
@@ -42,6 +42,7 @@
prime() //We don't care about how strong the explosion was.
/obj/item/explosive/mine/emp_act()
+ . = ..()
prime() //Same here. Don't care about the effect strength.
diff --git a/code/game/objects/items/explosives/plastic.dm b/code/game/objects/items/explosives/plastic.dm
index 830df9659070..ac0a2263cd5c 100644
--- a/code/game/objects/items/explosives/plastic.dm
+++ b/code/game/objects/items/explosives/plastic.dm
@@ -26,7 +26,7 @@
/obj/item/explosive/plastic/Destroy()
disarm()
- . = ..()
+ return ..()
/obj/item/explosive/plastic/explosion_throw(severity, direction, scatter_multiplier)
if(active)
@@ -156,7 +156,9 @@
plant_target.overlays -= overlay
qdel(overlay)
plant_target.contents -= src
- forceMove(get_turf(plant_target))
+ var/turf/plant_turf = get_turf(plant_target)
+ if(plant_turf)
+ forceMove(plant_turf)
plant_target = null
if(customizable)
if(active) //deactivate
diff --git a/code/game/objects/items/fulton.dm b/code/game/objects/items/fulton.dm
index 98987d1cd2b3..6a0e0f933144 100644
--- a/code/game/objects/items/fulton.dm
+++ b/code/game/objects/items/fulton.dm
@@ -90,7 +90,7 @@ var/global/list/deployed_fultons = list()
var/mob/living/carbon/human/H = target_atom
if(isyautja(H) && H.stat == DEAD)
can_attach = TRUE
- else if((H.stat != DEAD || H.mind && H.check_tod() && H.is_revivable()))
+ else if((H.stat != DEAD || H.check_tod() && H.is_revivable()))
to_chat(user, SPAN_WARNING("You can't attach [src] to [target_atom], they still have a chance!"))
return
else
diff --git a/code/game/objects/items/handcuffs.dm b/code/game/objects/items/handcuffs.dm
index 71fb02cf3f07..2137b41d86bf 100644
--- a/code/game/objects/items/handcuffs.dm
+++ b/code/game/objects/items/handcuffs.dm
@@ -29,20 +29,6 @@
if(!C.handcuffed)
place_handcuffs(C, user)
-/obj/item/handcuffs/obj/structure/MouseDrop(mob/living/carbon/human/H)
- var/mob/living/carbon/human/user = usr
- if (!istype(user))
- return
- if (user.stat || get_dist(user, src) > 1 || get_dist(user, H) > 1 || H.lying)
- return
- if (!istype(H))
- return
-
- if(!do_after(user, cuff_delay, INTERRUPT_ALL, BUSY_ICON_HOSTILE, H, INTERRUPT_MOVED, BUSY_ICON_GENERIC))
- return
-
- // TODO: apply handcuffs
-
/obj/item/handcuffs/get_mob_overlay(mob/user_mob, slot)
var/image/ret = ..()
diff --git a/code/game/objects/items/implants/implant.dm b/code/game/objects/items/implants/implant.dm
index d39b7e675452..e7ebe0391fae 100644
--- a/code/game/objects/items/implants/implant.dm
+++ b/code/game/objects/items/implants/implant.dm
@@ -82,6 +82,7 @@ Implant Specifics:
"}
return dat
/obj/item/implant/tracking/emp_act(severity)
+ . = ..()
if (malfunction) //no, dawg, you can't malfunction while you are malfunctioning
return
malfunction = MALFUNCTION_TEMPORARY
@@ -216,6 +217,7 @@ Implant Specifics:
"}
return 1
/obj/item/implant/explosive/emp_act(severity)
+ . = ..()
if (malfunction)
return
malfunction = MALFUNCTION_TEMPORARY
@@ -307,6 +309,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
return
/obj/item/implant/chem/emp_act(severity)
+ . = ..()
if (malfunction)
return
malfunction = MALFUNCTION_TEMPORARY
@@ -432,6 +435,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
STOP_PROCESSING(SSobj, src)
/obj/item/implant/death_alarm/emp_act(severity) //for some reason alarms stop going off in case they are emp'd, even without this
+ . = ..()
if (malfunction) //so I'm just going to add a meltdown chance here
return
malfunction = MALFUNCTION_TEMPORARY
diff --git a/code/game/objects/items/implants/implantneurostim.dm b/code/game/objects/items/implants/implantneurostim.dm
index a46cc31a2ca4..544cf70147e2 100644
--- a/code/game/objects/items/implants/implantneurostim.dm
+++ b/code/game/objects/items/implants/implantneurostim.dm
@@ -105,6 +105,7 @@
/obj/item/implant/neurostim/emp_act(severity)
+ . = ..()
if (malfunction)
return
if (prob(80))
diff --git a/code/game/objects/items/misc.dm b/code/game/objects/items/misc.dm
index abd8404d6e25..50c5cd75551b 100644
--- a/code/game/objects/items/misc.dm
+++ b/code/game/objects/items/misc.dm
@@ -141,13 +141,13 @@
. = ..()
/obj/item/weapon/pole/fancy_cane/this_is_a_knife/machete
- stored_item = new /obj/item/weapon/claymore/mercsword/machete
+ stored_item = new /obj/item/weapon/sword/machete
/obj/item/weapon/pole/fancy_cane/this_is_a_knife/ceremonial_sword
- stored_item = new /obj/item/weapon/claymore/mercsword/ceremonial
+ stored_item = new /obj/item/weapon/sword/ceremonial
/obj/item/weapon/pole/fancy_cane/this_is_a_knife/katana
- stored_item = new /obj/item/weapon/katana
+ stored_item = new /obj/item/weapon/sword/katana
// IN SHOTGUNS.DM!!
diff --git a/code/game/objects/items/props/helmetgarb.dm b/code/game/objects/items/props/helmetgarb.dm
index 661c8d422316..7860236d5d51 100644
--- a/code/game/objects/items/props/helmetgarb.dm
+++ b/code/game/objects/items/props/helmetgarb.dm
@@ -37,6 +37,11 @@
desc = "The more you fire these, the more you're reminded that a fragmentation grenade is probably more effective at fulfilling the same purpose. Say, aren't these supposed to eject from your gun?"
icon_state = "spent_flech"
+/obj/item/prop/helmetgarb/cartridge
+ name = "cartridge"
+ desc = "This is the bullet from a Type 71 Pulse Rifle. It is deformed from impact against an armored surface. It's been reduced to a lucky keepsake now."
+ icon_state = "cartridge"
+
/obj/item/prop/helmetgarb/prescription_bottle
name = "prescription medication"
desc = "Anti-anxiety meds? Amphetamines? The cure for Sudden Sleep Disorder? The label can't be read, leaving the now absent contents forever a mystery. The cap is screwed on tighter than any ID lock."
@@ -94,10 +99,8 @@
var/nvg_maxhealth = 125
var/nvg_health = 125
- var/nvg_maxcharge = 2500
- var/nvg_charge = 2500
- var/nvg_drain = 8 // has a 5 minute duration but byond may give it a couple of irl time due to lag
- var/infinite_charge = FALSE
+ /// How much charge the cell should have at most. -1 is infinite
+ var/cell_max_charge = 2500
var/activated = FALSE
var/nightvision = FALSE
@@ -112,6 +115,13 @@
var/mob/living/attached_mob
var/lighting_alpha = 100
+/obj/item/prop/helmetgarb/helmet_nvg/Initialize(mapload, ...)
+ . = ..()
+ if(shape != NVG_SHAPE_COSMETIC)
+ AddComponent(/datum/component/cell, cell_max_charge, TRUE, charge_drain = 8)
+ RegisterSignal(src, COMSIG_CELL_TRY_RECHARGING, PROC_REF(cell_try_recharge))
+ RegisterSignal(src, COMSIG_CELL_OUT_OF_CHARGE, PROC_REF(on_power_out))
+
/obj/item/prop/helmetgarb/helmet_nvg/on_enter_storage(obj/item/storage/internal/S)
..()
@@ -134,42 +144,30 @@
/obj/item/prop/helmetgarb/helmet_nvg/attackby(obj/item/A as obj, mob/user as mob)
- if(istype(A,/obj/item/cell))
- recharge(A, user)
-
if(HAS_TRAIT(A, TRAIT_TOOL_SCREWDRIVER))
repair(user)
else
..()
-/obj/item/prop/helmetgarb/helmet_nvg/proc/recharge(obj/item/cell/C, mob/user as mob)
+/obj/item/prop/helmetgarb/helmet_nvg/proc/cell_try_recharge(datum/source, mob/living/user)
+ SIGNAL_HANDLER
+
if(user.action_busy)
- return
+ return COMPONENT_CELL_NO_RECHARGE
+
if(src != user.get_inactive_hand())
- to_chat(user, SPAN_WARNING("You need to hold \the [src] in hand in order to recharge them."))
- return
+ to_chat(user, SPAN_WARNING("You need to hold [src] in hand in order to recharge them."))
+ return COMPONENT_CELL_NO_RECHARGE
+
if(shape == NVG_SHAPE_COSMETIC)
- to_chat(user, SPAN_WARNING("There is no connector for the power cell inside \the [src]."))
- return
+ to_chat(user, SPAN_WARNING("There is no connector for the power cell inside [src]."))
+ return COMPONENT_CELL_NO_RECHARGE
+
if(shape == NVG_SHAPE_BROKEN)
- to_chat(user, SPAN_WARNING("You need to repair \the [src] first."))
- return
- if(nvg_charge == nvg_maxcharge)
- to_chat(user, SPAN_WARNING("\The [src] are already fully charged."))
- return
+ to_chat(user, SPAN_WARNING("You need to repair [src] first."))
+ return COMPONENT_CELL_NO_RECHARGE
- while(nvg_charge < nvg_maxcharge)
- if(C.charge <= 0)
- to_chat(user, SPAN_WARNING("\The [C] is completely dry."))
- break
- if(!do_after(user, 1 SECONDS, (INTERRUPT_ALL & (~INTERRUPT_MOVED)), BUSY_ICON_BUILD, C, INTERRUPT_DIFF_LOC))
- to_chat(user, SPAN_WARNING("You were interrupted."))
- break
- var/to_transfer = min(400, C.charge, (nvg_maxcharge - nvg_charge))
- if(C.use(to_transfer))
- nvg_charge += to_transfer
- to_chat(user, "You transfer some power between \the [C] and \the [src]. The gauge now reads: [round(100.0*nvg_charge/nvg_maxcharge) ]%.")
/obj/item/prop/helmetgarb/helmet_nvg/proc/repair(mob/user as mob)
if(user.action_busy)
@@ -197,7 +195,6 @@
to_chat(user, "You successfully patch \the [src].")
nvg_maxhealth = 65
nvg_health = 65
- nvg_drain = initial(nvg_drain) * 2
return
else if(nvg_health == nvg_maxhealth)
@@ -239,9 +236,6 @@
else if(nvg_health_procent >= 0)
. += "They are falling apart."
- if (get_dist(user, src) <= 1 && (shape == NVG_SHAPE_FINE || shape == NVG_SHAPE_PATCHED))
- . += "A small gauge in the corner reads: Power: [round(100.0*nvg_charge/nvg_maxcharge) ]%."
-
/obj/item/prop/helmetgarb/helmet_nvg/on_exit_storage(obj/item/storage/S)
remove_attached_item()
return ..()
@@ -291,7 +285,7 @@
if(attached_mob != user && slot == WEAR_HEAD)
set_attached_mob(user)
- if(slot == WEAR_HEAD && !nightvision && activated && nvg_charge > 0 && shape > NVG_SHAPE_BROKEN)
+ if(slot == WEAR_HEAD && !nightvision && activated && !SEND_SIGNAL(src, COMSIG_CELL_CHECK_CHARGE) && shape > NVG_SHAPE_BROKEN)
enable_nvg(user)
else
remove_nvg()
@@ -314,7 +308,7 @@
attached_item.update_icon()
activation.update_button_icon()
- START_PROCESSING(SSobj, src)
+ SEND_SIGNAL(src, COMSIG_CELL_START_TICK_DRAIN)
/obj/item/prop/helmetgarb/helmet_nvg/proc/update_sight(mob/M)
@@ -348,20 +342,15 @@
attached_mob.update_sight()
- STOP_PROCESSING(SSobj, src)
+ SEND_SIGNAL(src, COMSIG_CELL_STOP_TICK_DRAIN)
/obj/item/prop/helmetgarb/helmet_nvg/process(delta_time)
- if(nvg_charge > 0 && !infinite_charge)
- nvg_charge = max(0, nvg_charge - nvg_drain * delta_time)
-
if(!attached_mob)
return PROCESS_KILL
- if(!activated || !attached_item || nvg_charge <= 0 || attached_mob.is_dead())
- if(activated && !attached_mob.is_dead())
- to_chat(attached_mob, SPAN_WARNING("\The [src] emit a low power warning and immediately shut down!"))
- remove_nvg()
+ if(!activated || !attached_item || attached_mob.is_dead())
+ on_power_out()
return
if(!attached_item.has_garb_overlay())
@@ -370,6 +359,13 @@
return
+/obj/item/prop/helmetgarb/helmet_nvg/proc/on_power_out(datum/source)
+ SIGNAL_HANDLER
+
+ if(activated && !attached_mob.is_dead())
+ to_chat(attached_mob, SPAN_WARNING("[src] emit a low power warning and immediately shut down!"))
+ remove_nvg()
+
/obj/item/prop/helmetgarb/helmet_nvg/ui_action_click(mob/owner, obj/item/holder)
toggle_nods(owner)
@@ -405,7 +401,7 @@
if(activated)
to_chat(user, SPAN_NOTICE("You flip the goggles down."))
icon_state = active_icon_state
- if(nvg_charge > 0 && user.head == attached_item && shape > NVG_SHAPE_BROKEN)
+ if(!SEND_SIGNAL(src, COMSIG_CELL_CHECK_CHARGE) && user.head == attached_item && shape > NVG_SHAPE_BROKEN)
enable_nvg(user)
else
icon_state = active_icon_state
@@ -457,7 +453,7 @@
/obj/item/prop/helmetgarb/helmet_nvg/marsoc //for Marine Raiders
name = "\improper Tactical M3 night vision goggles"
desc = "With an integrated self-recharging battery, nothing can stop you. Put them on your helmet and press the button and it's go-time."
- infinite_charge = TRUE
+ cell_max_charge = -1
#undef NVG_SHAPE_COSMETIC
#undef NVG_SHAPE_BROKEN
@@ -506,8 +502,8 @@
icon_state = "trimmed_wire"
/obj/item/prop/helmetgarb/bullet_pipe
- name = "10x99mm XM42B casing pipe"
- desc = "The XM42B was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable."
+ name = "10x99mm XM43E1 casing pipe"
+ desc = "The XM43E1 was an experimental weapons platform briefly fielded by the USCM and Wey-Yu PMC teams. It was manufactured by ARMAT systems at the Atlas weapons facility. Unfortunately the project had its funding pulled alongside the M5 integrated gasmask program. This spent casing has been converted into a pipe, but there is too much tar in the mouthpiece for it to be useable."
icon_state = "bullet_pipe"
/obj/item/prop/helmetgarb/chaplain_patch
@@ -515,3 +511,76 @@
desc = "This patch is all that remains of the Chaplaincy of the USS Almayer, along with the Chaplains themselves. Both no longer exist as a result of losses suffered during Operation Tychon Tackle."
icon_state = "chaplain_patch"
flags_obj = OBJ_NO_HELMET_BAND
+
+/obj/item/prop/helmetgarb/family_photo
+ name = "family photo"
+ desc = ""
+ icon = 'icons/obj/items/items.dmi'
+ icon_state = "photo"
+ ///The human who spawns with the photo
+ var/datum/weakref/owner
+ ///The belonging human name
+ var/owner_name
+ ///The belonging human faction
+ var/owner_faction
+ ///Text written on the back
+ var/scribble
+
+/obj/item/prop/helmetgarb/family_photo/pickup(mob/user, silent)
+ . = ..()
+ if(!owner)
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner), override = TRUE)
+
+
+///Sets the owner of the family photo to the human it spawns with, needs var/source for signals
+/obj/item/prop/helmetgarb/family_photo/proc/set_owner(datum/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, COMSIG_POST_SPAWN_UPDATE)
+ var/mob/living/carbon/human/user = source
+ owner = WEAKREF(user)
+ owner_name = user.name
+ owner_faction = user.faction
+
+/obj/item/prop/helmetgarb/family_photo/get_examine_text(mob/user)
+ . = ..()
+ if(scribble)
+ . += "\"[scribble]\" is written on the back of the photo."
+ if(user.weak_reference == owner)
+ . += "A photo of you and your family."
+ return
+ if(user.faction == owner_faction)
+ . += "A photo of [owner_name] and their family."
+ return
+ . += "A photo of a family you do not know."
+
+/obj/item/prop/helmetgarb/family_photo/attackby(obj/item/attacking_item, mob/user)
+ . = ..()
+ if(HAS_TRAIT(attacking_item, TRAIT_TOOL_PEN) || istype(attacking_item, /obj/item/toy/crayon))
+ if(scribble)
+ to_chat(user, SPAN_NOTICE("[src] has already been written on."))
+ return
+ var/new_text = copytext(strip_html(tgui_input_text(user, "What would you like to write on the back of [src]?", "Photo Writing")), 1, 128)
+
+ if(!loc == user)
+ to_chat(user, SPAN_NOTICE("You need to be holding [src] to write on it."))
+ return
+ if(!user.stat == CONSCIOUS)
+ to_chat(user, SPAN_NOTICE("You cannot write on [src] in this state."))
+ return
+ scribble = new_text
+ playsound(src, "paper_writing", 15, TRUE)
+ return TRUE
+
+/obj/item/prop/helmetgarb/compass
+ name = "compass"
+ desc = "It always faces north. Are you sure it is not broken?"
+ icon = 'icons/obj/items/items.dmi'
+ icon_state = "compass"
+ w_class = SIZE_SMALL
+
+/obj/item/prop/helmetgarb/bug_spray
+ name = "insect repellent"
+ desc = "A store-brand insect repellent, to keep any variety of pest or mosquito away from you."
+ icon = 'icons/obj/items/spray.dmi'
+ icon_state = "pestspray"
+ w_class = SIZE_SMALL
diff --git a/code/game/objects/items/reagent_containers/food/fortunecookie.dm b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
index a878ff589dc8..270bd4d7c44a 100644
--- a/code/game/objects/items/reagent_containers/food/fortunecookie.dm
+++ b/code/game/objects/items/reagent_containers/food/fortunecookie.dm
@@ -93,7 +93,7 @@
user.put_in_hands(cookiefortune)
cookiefortune = null
else
- to_chat(SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
+ to_chat(user, SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
else
. = ..()
@@ -109,7 +109,7 @@
user.put_in_hands(cookiefortune)
cookiefortune = null
else
- to_chat(SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
+ to_chat(user, SPAN_WARNING("You break open the fortune cookie, but there's no fortune inside! Oh no!"))
else
. = ..()
diff --git a/code/game/objects/items/reagent_containers/glass/bottle.dm b/code/game/objects/items/reagent_containers/glass/bottle.dm
index dd857d391b52..01eb751774e1 100644
--- a/code/game/objects/items/reagent_containers/glass/bottle.dm
+++ b/code/game/objects/items/reagent_containers/glass/bottle.dm
@@ -30,7 +30,7 @@
/obj/item/reagent_container/glass/bottle/Initialize()
. = ..()
if(!icon_state)
- icon_state = "bottle-[rand(1.4)]"
+ icon_state = "bottle-[rand(1,4)]"
/obj/item/reagent_container/glass/bottle/update_icon()
overlays.Cut()
diff --git a/code/game/objects/items/reagent_containers/reagent_container.dm b/code/game/objects/items/reagent_containers/reagent_container.dm
index e0561d5a7e3d..327f6ba1ce1c 100644
--- a/code/game/objects/items/reagent_containers/reagent_container.dm
+++ b/code/game/objects/items/reagent_containers/reagent_container.dm
@@ -67,12 +67,6 @@
if (N)
R.amount_per_transfer_from_this = N
-/obj/item/reagent_container/Initialize()
- . = ..()
- if (!possible_transfer_amounts)
- verbs -= /obj/item/reagent_container/verb/set_APTFT //which objects actually uses it?
- create_reagents(volume)
-
/obj/item/reagent_container/Destroy()
possible_transfer_amounts = null
return ..()
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 972898e6449b..6d0736f8aeb2 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -189,6 +189,13 @@
is_reinforced = 1
construction_options = list("One Direction", "Full Window", "Windoor")
+/obj/item/stack/sheet/glass/reinforced/medium_stack
+ amount = 25
+
+/obj/item/stack/sheet/glass/reinforced/large_stack
+ amount = 50
+
+
/obj/item/stack/sheet/glass/reinforced/cyborg
matter = null
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index d85e615bc1c8..82e091be9008 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -182,6 +182,11 @@ Also change the icon to reflect the amount of sheets, if possible.*/
to_chat(usr, SPAN_WARNING("The [R.title] cannot be built here!")) //might cause some friendly fire regarding other items like barbed wire, shouldn't be a problem?
return
+ var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in usr.loc
+ if(tunnel)
+ to_chat(usr, SPAN_WARNING("The [R.title] cannot be constructed on a tunnel!"))
+ return
+
if((R.flags & RESULT_REQUIRES_SNOW) && !(istype(usr.loc, /turf/open/snow) || istype(usr.loc, /turf/open/auto_turf/snow)))
to_chat(usr, SPAN_WARNING("The [R.title] must be built on snow!"))
return
@@ -308,6 +313,8 @@ Also change the icon to reflect the amount of sheets, if possible.*/
if(mods["alt"])
if(!CAN_PICKUP(user, src))
return
+ if(amount <= 1)
+ return
var/desired = tgui_input_number(user, "How much would you like to split off from this stack?", "How much?", 1, amount-1, 1)
if(!desired)
return
diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm
index 3b65811b05b3..966b18fc494b 100644
--- a/code/game/objects/items/storage/backpack.dm
+++ b/code/game/objects/items/storage/backpack.dm
@@ -72,9 +72,9 @@
return FALSE
// Create their vis object if needed
- if(!xeno.backpack_icon_carrier)
- xeno.backpack_icon_carrier = new(null, xeno)
- xeno.vis_contents += xeno.backpack_icon_carrier
+ if(!xeno.backpack_icon_holder)
+ xeno.backpack_icon_holder = new(null, xeno)
+ xeno.vis_contents += xeno.backpack_icon_holder
target_mob.put_in_back(src)
return FALSE
@@ -566,6 +566,18 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
/obj/item/storage/backpack/marine/satchel/rto/pickup(mob/user)
. = ..()
+ autoset_phone_id(user)
+
+/obj/item/storage/backpack/marine/satchel/rto/equipped(mob/user, slot)
+ . = ..()
+ autoset_phone_id(user)
+
+/// Automatically sets the phone_id based on the current or updated user
+/obj/item/storage/backpack/marine/satchel/rto/proc/autoset_phone_id(mob/user)
+ if(!user)
+ internal_transmitter.phone_id = "[src]"
+ internal_transmitter.enabled = FALSE
+ return
if(ishuman(user))
var/mob/living/carbon/human/H = user
if(H.comm_title)
@@ -579,13 +591,11 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
internal_transmitter.phone_id += " ([H.assigned_squad.name])"
else
internal_transmitter.phone_id = "[user]"
-
internal_transmitter.enabled = TRUE
/obj/item/storage/backpack/marine/satchel/rto/dropped(mob/user)
. = ..()
- internal_transmitter.phone_id = "[src]"
- internal_transmitter.enabled = FALSE
+ autoset_phone_id(null) // Disable phone when dropped
/obj/item/storage/backpack/marine/satchel/rto/proc/use_phone(mob/user)
internal_transmitter.attack_hand(user)
@@ -745,6 +755,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
RegisterSignal(H, COMSIG_GRENADE_PRE_PRIME, PROC_REF(cloak_grenade_callback))
RegisterSignal(H, COMSIG_HUMAN_EXTINGUISH, PROC_REF(wrapper_fizzle_camouflage))
+ RegisterSignal(H, COMSIG_MOB_EFFECT_CLOAK_CANCEL, PROC_REF(deactivate_camouflage))
camo_active = TRUE
ADD_TRAIT(H, TRAIT_CLOAKED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK))
@@ -774,12 +785,14 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
deactivate_camouflage(wearer, TRUE, TRUE)
/obj/item/storage/backpack/marine/satchel/scout_cloak/proc/deactivate_camouflage(mob/living/carbon/human/H, anim = TRUE, forced)
+ SIGNAL_HANDLER
if(!istype(H))
return FALSE
UnregisterSignal(H, list(
COMSIG_GRENADE_PRE_PRIME,
- COMSIG_HUMAN_EXTINGUISH
+ COMSIG_HUMAN_EXTINGUISH,
+ COMSIG_MOB_EFFECT_CLOAK_CANCEL,
))
if(forced)
@@ -1114,6 +1127,10 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r
max_storage_space = 21
camo_alpha = 10
+/obj/item/storage/backpack/marine/satchel/scout_cloak/upp/weak
+ desc = "A thermo-optic camouflage cloak commonly used by UPP commando units. This one is less effective than normal."
+ actions_types = null
+
//----------TWE SECTION----------
/obj/item/storage/backpack/rmc
has_gamemode_skin = FALSE
diff --git a/code/game/objects/items/storage/boxes.dm b/code/game/objects/items/storage/boxes.dm
index 6266f0eef77d..4a3afa00f368 100644
--- a/code/game/objects/items/storage/boxes.dm
+++ b/code/game/objects/items/storage/boxes.dm
@@ -151,6 +151,7 @@
RegisterSignal(SSdcs, COMSIG_GLOB_MODE_PRESETUP, PROC_REF(handle_delete_clash_contents))
/obj/item/storage/box/flashbangs/proc/handle_delete_clash_contents()
+ SIGNAL_HANDLER
if(MODE_HAS_FLAG(MODE_FACTION_CLASH))
var/grenade_count = 0
var/grenades_desired = 4
diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm
index b4a6c3a8c1af..27026165fc31 100644
--- a/code/game/objects/items/storage/large_holster.dm
+++ b/code/game/objects/items/storage/large_holster.dm
@@ -75,20 +75,20 @@
desc = "A large leather scabbard used to carry a M2132 machete. It can be strapped to the back or the armor."
icon_state = "machete_holster"
flags_equip_slot = SLOT_WAIST|SLOT_BACK
- can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+ can_hold = list(/obj/item/weapon/sword/machete)
/obj/item/storage/large_holster/machete/full/fill_preset_inventory()
- new /obj/item/weapon/claymore/mercsword/machete(src)
+ new /obj/item/weapon/sword/machete(src)
/obj/item/storage/large_holster/machete/arnold
name = "\improper QH20 pattern M2100 custom machete scabbard"
desc = "A large leather scabbard used to carry a M2100 \"Ngájhe\" machete. It can be strapped to the back or the armor."
icon_state = "arnold-machete-pouch"
flags_equip_slot = SLOT_WAIST|SLOT_BACK
- can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+ can_hold = list(/obj/item/weapon/sword/machete)
/obj/item/storage/large_holster/machete/arnold/full/fill_preset_inventory()
- new /obj/item/weapon/claymore/mercsword/machete/arnold(src)
+ new /obj/item/weapon/sword/machete/arnold(src)
/obj/item/storage/large_holster/katana
name = "\improper katana scabbard"
@@ -97,10 +97,10 @@
force = 12
attack_verb = list("bludgeoned", "struck", "cracked")
flags_equip_slot = SLOT_WAIST|SLOT_BACK
- can_hold = list(/obj/item/weapon/katana)
+ can_hold = list(/obj/item/weapon/sword/katana)
/obj/item/storage/large_holster/katana/full/fill_preset_inventory()
- new /obj/item/weapon/katana(src)
+ new /obj/item/weapon/sword/katana(src)
/obj/item/storage/large_holster/ceremonial_sword
name = "ceremonial sword scabbard"
@@ -108,10 +108,10 @@
icon_state = "ceremonial_sword_holster"//object icon is duplicate of katana holster, needs new icon at some point.
force = 12
flags_equip_slot = SLOT_WAIST
- can_hold = list(/obj/item/weapon/claymore/mercsword/ceremonial)
+ can_hold = list(/obj/item/weapon/sword/ceremonial)
/obj/item/storage/large_holster/ceremonial_sword/full/fill_preset_inventory()
- new /obj/item/weapon/claymore/mercsword/ceremonial(src)
+ new /obj/item/weapon/sword/ceremonial(src)
/obj/item/storage/large_holster/m39
name = "\improper M276 pattern M39 holster rig"
@@ -249,9 +249,13 @@
if(!ishuman(user) || user.is_mob_incapacitated())
return FALSE
- var/obj/item/weapon/gun/flamer/M240T/F = user.get_active_hand()
- if(!istype(F))
- to_chat(usr, "You must be holding the M240-T incinerator unit to use [src]")
+ if(user.back != src)
+ to_chat(user, "The [src] must be equipped before you can switch types")
+ return
+
+ var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand()
+ if(!istype(flamer))
+ to_chat(user, "You must be holding the M240-T incinerator unit to use [src]")
return
if(!active_fuel)
@@ -267,14 +271,13 @@
else
active_fuel = fuelB
- for(var/X in actions)
- var/datum/action/A = X
- A.update_button_icon()
+ for(var/datum/action/action_added as anything in actions)
+ action_added.update_button_icon()
to_chat(user, "You switch the fuel tank to [active_fuel.caliber]")
playsound(src, 'sound/machines/click.ogg', 25, TRUE)
- F.current_mag = active_fuel
- F.update_icon()
+ flamer.current_mag = active_fuel
+ flamer.update_icon()
return TRUE
diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm
index 48eb322f2093..acb87e988879 100644
--- a/code/game/objects/items/storage/pouch.dm
+++ b/code/game/objects/items/storage/pouch.dm
@@ -683,6 +683,18 @@
new /obj/item/reagent_container/hypospray/autoinjector/stimulant/redemption_stimulant(src)
new /obj/item/reagent_container/hypospray/autoinjector/stimulant/speed_stimulant(src)
+/obj/item/storage/pouch/medical/socmed/not_op/fill_preset_inventory()
+ new /obj/item/device/healthanalyzer(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/bicaridine(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/kelotane(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/oxycodone(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/emergency(src)
+ new /obj/item/reagent_container/hypospray/autoinjector/emergency(src)
+ new /obj/item/tool/extinguisher/mini(src)
+
/obj/item/storage/pouch/medical/socmed/dutch
name = "\improper Dutch's Medical Pouch"
desc = "A pouch bought from a black market trader by Dutch quite a few years ago. Rumoured to be stolen from secret USCM assets. Its contents have been slowly used up and replaced over the years."
@@ -833,6 +845,15 @@
new /obj/item/stack/medical/advanced/ointment(src)
new /obj/item/stack/medical/splint(src)
+/obj/item/storage/pouch/medkit/full/toxin/fill_preset_inventory()
+ new /obj/item/device/healthanalyzer(src)
+ new /obj/item/storage/pill_bottle/antitox(src)
+ new /obj/item/storage/pill_bottle/antitox(src)
+ new /obj/item/roller(src)
+ new /obj/item/stack/medical/splint(src)
+ new /obj/item/stack/medical/advanced/bruise_pack(src)
+ new /obj/item/stack/medical/advanced/ointment(src)
+
/obj/item/storage/pouch/pressurized_reagent_canister
name = "Pressurized Reagent Canister Pouch"
max_w_class = SIZE_SMALL
@@ -1372,7 +1393,7 @@
item_state = "machete_holster"
max_w_class = SIZE_LARGE
storage_flags = STORAGE_FLAGS_POUCH|STORAGE_USING_DRAWING_METHOD|STORAGE_ALLOW_QUICKDRAW
- can_hold = list(/obj/item/weapon/claymore/mercsword/machete)
+ can_hold = list(/obj/item/weapon/sword/machete)
var/sheathe_sound = 'sound/weapons/gun_rifle_draw.ogg'
var/draw_sound = 'sound/weapons/gun_rifle_draw.ogg'
@@ -1392,4 +1413,4 @@
playsound(src, draw_sound, vol = 15, vary = TRUE)
/obj/item/storage/pouch/machete/full/fill_preset_inventory()
- new /obj/item/weapon/claymore/mercsword/machete(src)
+ new /obj/item/weapon/sword/machete(src)
diff --git a/code/game/objects/items/storage/smartpack.dm b/code/game/objects/items/storage/smartpack.dm
index 8df079c92ca4..0b0fd05eac17 100644
--- a/code/game/objects/items/storage/smartpack.dm
+++ b/code/game/objects/items/storage/smartpack.dm
@@ -144,7 +144,7 @@
immobile_form = FALSE
M.status_flags |= CANPUSH
M.anchored = FALSE
- M.unfreeze()
+ REMOVE_TRAIT(M, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK))
..()
/obj/item/storage/backpack/marine/smartpack/attack_self(mob/user)
@@ -236,7 +236,7 @@
battery_charge -= IMMOBILE_COST
user.status_flags &= ~CANPUSH
user.anchored = TRUE
- user.frozen = TRUE
+ ADD_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK))
to_chat(user, SPAN_DANGER("[name] beeps, \"You are anchored in place and cannot be moved.\""))
to_chat(user, SPAN_INFO("The current charge reads [battery_charge]/[SMARTPACK_MAX_POWER_STORED]"))
@@ -248,7 +248,7 @@
else
user.status_flags |= CANPUSH
user.anchored = FALSE
- user.unfreeze()
+ REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_EQUIPMENT(WEAR_BACK))
to_chat(user, SPAN_DANGER("[name] beeps, \"You can now move again.\""))
user.remove_filter("synth_immobile_form")
diff --git a/code/game/objects/items/storage/storage.dm b/code/game/objects/items/storage/storage.dm
index e3fbe86c0e3b..6e7e891d6ba8 100644
--- a/code/game/objects/items/storage/storage.dm
+++ b/code/game/objects/items/storage/storage.dm
@@ -22,7 +22,7 @@
var/atom/movable/screen/storage/storage_start = null //storage UI
var/atom/movable/screen/storage/storage_continue = null
var/atom/movable/screen/storage/storage_end = null
- var/datum/item_storage_box/stored_ISB = null // This contains what previously was known as stored_start, stored_continue, and stored_end
+ var/datum/item_storage_box/stored_ISB //! This contains what previously was known as stored_start, stored_continue, and stored_end
var/atom/movable/screen/close/closer = null
var/foldable = null
var/use_sound = "rustle" //sound played when used. null for no sound.
@@ -212,16 +212,17 @@
if (storage_flags & STORAGE_SHOW_FULLNESS)
boxes.update_fullness(src)
-var/list/global/item_storage_box_cache = list()
+GLOBAL_LIST_EMPTY_TYPED(item_storage_box_cache, /datum/item_storage_box)
/datum/item_storage_box
- var/atom/movable/screen/storage/start = null
- var/atom/movable/screen/storage/continued = null
- var/atom/movable/screen/storage/end = null
- /// The index that indentifies me inside item_storage_box_cache
+ var/atom/movable/screen/storage/start
+ var/atom/movable/screen/storage/continued
+ var/atom/movable/screen/storage/end
+ /// The index that indentifies me inside GLOB.item_storage_box_cache
var/index
/datum/item_storage_box/New()
+ . = ..()
start = new()
start.icon_state = "stored_start"
continued = new()
@@ -233,7 +234,7 @@ var/list/global/item_storage_box_cache = list()
QDEL_NULL(start)
QDEL_NULL(continued)
QDEL_NULL(end)
- item_storage_box_cache[index] = null // Or would it be better to -= src?
+ GLOB.item_storage_box_cache -= index
return ..()
/obj/item/storage/proc/space_orient_objs(list/obj/item/display_contents)
@@ -271,7 +272,7 @@ var/list/global/item_storage_box_cache = list()
click_border_start.Add(startpoint)
click_border_end.Add(endpoint)
- if(!item_storage_box_cache[isb_index])
+ if(!GLOB.item_storage_box_cache[isb_index])
var/datum/item_storage_box/box = new()
var/matrix/M_start = matrix()
var/matrix/M_continue = matrix()
@@ -284,9 +285,9 @@ var/list/global/item_storage_box_cache = list()
box.continued.apply_transform(M_continue)
box.end.apply_transform(M_end)
box.index = isb_index
- item_storage_box_cache[isb_index] = box
+ GLOB.item_storage_box_cache[isb_index] = box
- var/datum/item_storage_box/ISB = item_storage_box_cache[isb_index]
+ var/datum/item_storage_box/ISB = GLOB.item_storage_box_cache[isb_index]
stored_ISB = ISB
storage_start.overlays += ISB.start
@@ -851,6 +852,7 @@ W is always an item. stop_warning prevents messaging. user may be null.**/
return ..()
/obj/item/storage/emp_act(severity)
+ . = ..()
if(!istype(src.loc, /mob/living))
for(var/obj/O in contents)
O.emp_act(severity)
diff --git a/code/game/objects/items/tools/flame_tools.dm b/code/game/objects/items/tools/flame_tools.dm
index 130bd567098b..7681e74a1d88 100644
--- a/code/game/objects/items/tools/flame_tools.dm
+++ b/code/game/objects/items/tools/flame_tools.dm
@@ -642,7 +642,39 @@ CIGARETTE PACKETS ARE IN FANCY.DM
icon_off = "cobpipeoff"
smoketime = 800 SECONDS
+/obj/item/clothing/mask/electronic_cigarette
+ name = "electronic cigarette"
+ desc = "An electronic cigarette by The American Tobacco Company, who also made Lucky Strikes."
+ icon_state = "cigoff"
+ item_state = "cigoff"
+ w_class = SIZE_SMALL
+ flags_equip_slot = SLOT_EAR|SLOT_FACE
+ var/icon_on = "cigon"
+ var/icon_off = "cigoff"
+ var/enabled = FALSE
+/obj/item/clothing/mask/electronic_cigarette/update_icon()
+ . = ..()
+ if(enabled)
+ icon_state = icon_on
+ item_state = icon_on
+ return
+ icon_state = icon_off
+ item_state = icon_off
+
+/obj/item/clothing/mask/electronic_cigarette/attack_self(mob/user)
+ . = ..()
+ to_chat(user, SPAN_NOTICE("You [enabled ? "disable" : "enable"] [src]."))
+ enabled = !enabled
+ update_icon()
+
+/obj/item/clothing/mask/electronic_cigarette/cigar
+ name = "electronic cigar"
+ desc = "A luxury electronic cigar, with its labels scratched off. Where could this be from?"
+ icon_state = "cigar_off"
+ item_state = "cigar_off"
+ icon_on = "cigar_on"
+ icon_off = "cigar_off"
/////////
//ZIPPO//
diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm
index b5be55eed540..f70f93497021 100644
--- a/code/game/objects/items/tools/misc_tools.dm
+++ b/code/game/objects/items/tools/misc_tools.dm
@@ -173,7 +173,7 @@
playsound(user.loc, "sound/items/pen_click_[on? "on": "off"].ogg", 100, 1, 5)
update_pen_state()
-/obj/item/tool/pen/Initialize()
+/obj/item/tool/pen/Initialize(mapload, ...)
. = ..()
update_pen_state()
@@ -284,21 +284,24 @@
matter = list("metal" = 20, "gold" = 10)
var/static/list/colour_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required
var/current_colour_index = 1
- var/owner = "hard to read text"
+ var/owner_name
-/obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user)
+/obj/item/tool/pen/fountain/pickup(mob/user, silent)
. = ..()
- var/turf/current_turf = get_turf(src)
- var/mob/living/carbon/human/new_owner = locate() in current_turf
- if(new_owner)
- owner = new_owner.real_name
- var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf
- if(new_owners_pod)
- owner = new_owners_pod.occupant?.real_name
+ if(!owner_name)
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(set_owner), override = TRUE)
+
+///Sets the owner of the pen to who it spawns with, requires var/source for signals
+/obj/item/tool/pen/fountain/proc/set_owner(datum/source)
+ SIGNAL_HANDLER
+ UnregisterSignal(source, COMSIG_POST_SPAWN_UPDATE)
+ var/mob/living/carbon/human/user = source
+ owner_name = user.name
/obj/item/tool/pen/fountain/get_examine_text(mob/user)
. = ..()
- . += "There's a laser engraving of [owner] on it."
+ if(owner_name)
+ . += "There's a laser engraving of [owner_name] on it."
/obj/item/tool/pen/fountain/attack_self(mob/living/carbon/human/user)
if(on)
diff --git a/code/game/objects/items/toys/cards.dm b/code/game/objects/items/toys/cards.dm
index b6e3bb558ec4..2debd83f9bab 100644
--- a/code/game/objects/items/toys/cards.dm
+++ b/code/game/objects/items/toys/cards.dm
@@ -21,7 +21,6 @@
icon = 'icons/obj/items/playing_cards.dmi'
icon_state = "deck"
w_class = SIZE_TINY
- flags_item = NOTABLEMERGE
var/base_icon = "deck"
var/max_cards = 52
@@ -262,7 +261,6 @@
icon = 'icons/obj/items/playing_cards.dmi'
icon_state = "empty"
w_class = SIZE_TINY
- flags_item = NOTABLEMERGE
var/concealed = FALSE
var/pile_state = FALSE
diff --git a/code/game/objects/items/toys/toys.dm b/code/game/objects/items/toys/toys.dm
index b2a66becd869..88946f5fa446 100644
--- a/code/game/objects/items/toys/toys.dm
+++ b/code/game/objects/items/toys/toys.dm
@@ -318,56 +318,6 @@
desc = "Mini-Mecha action figure! Collect them all! 11/11."
icon_state = "phazonprize"
-
-/obj/item/toy/therapy_red
- name = "red therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is red."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapyred"
- item_state = "egg4" // It's the red egg in items_left/righthand
- w_class = SIZE_TINY
-
-/obj/item/toy/therapy_purple
- name = "purple therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is purple."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapypurple"
- item_state = "egg1" // It's the magenta egg in items_left/righthand
- w_class = SIZE_TINY
-
-/obj/item/toy/therapy_blue
- name = "blue therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is blue."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapyblue"
- item_state = "egg2" // It's the blue egg in items_left/righthand
- w_class = SIZE_TINY
-
-/obj/item/toy/therapy_yellow
- name = "yellow therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is yellow."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapyyellow"
- item_state = "egg5" // It's the yellow egg in items_left/righthand
- w_class = SIZE_TINY
-
-/obj/item/toy/therapy_orange
- name = "orange therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is orange."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapyorange"
- item_state = "egg4" // It's the red one again, lacking an orange item_state and making a new one is pointless
- w_class = SIZE_TINY
-
-/obj/item/toy/therapy_green
- name = "green therapy doll"
- desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles. This one is green."
- icon = 'icons/obj/items/toy.dmi'
- icon_state = "therapygreen"
- item_state = "egg3" // It's the green egg in items_left/righthand
- w_class = SIZE_TINY
-
-
/obj/item/toy/inflatable_duck
name = "inflatable duck"
desc = "No bother to sink or swim when you can just float!"
@@ -377,7 +327,6 @@
flags_equip_slot = SLOT_WAIST
black_market_value = 20
-
/obj/item/toy/beach_ball
name = "beach ball"
icon_state = "beachball"
@@ -394,7 +343,6 @@
user.drop_held_item()
throw_atom(target, throw_range, throw_speed, user)
-
/obj/item/toy/dice
name = "d6"
desc = "A die with six sides."
@@ -427,10 +375,6 @@
SPAN_NOTICE("You throw [src]. It lands on a [result]. [comment]"), \
SPAN_NOTICE("You hear [src] landing on a [result]. [comment]"))
-
-
-
-
/obj/item/toy/bikehorn
name = "bike horn"
desc = "A horn off of a bicycle."
@@ -455,47 +399,6 @@
src.add_fingerprint(user)
addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 2 SECONDS)
-
-
-/obj/item/toy/farwadoll
- name = "Farwa plush doll"
- desc = "A Farwa plush doll. It's soft and comforting!"
- w_class = SIZE_TINY
- icon_state = "farwaplush"
- black_market_value = 25
- COOLDOWN_DECLARE(last_hug_time)
-
-/obj/item/toy/farwadoll/attack_self(mob/user)
- ..()
-
- if(COOLDOWN_FINISHED(src, last_hug_time))
- user.visible_message(SPAN_NOTICE("[user] hugs [src]! How cute! "), \
- SPAN_NOTICE("You hug [src]. Dawwww... "))
- COOLDOWN_START(src, last_hug_time, 5 SECONDS)
-
-/obj/item/toy/farwadoll/pred
- name = "strange plush doll"
- desc = "A plush doll depicting some sort of tall humanoid biped..?"
- w_class = SIZE_TINY
- icon_state = "predplush"
-
-/obj/item/toy/plushie_cade
- name = "plushie barricade"
- desc = "Great for squeezing whenever you're scared. Or lightly hurt. Or in any other situation."
- icon_state = "plushie_cade"
- item_state = "plushie_cade"
- w_class = SIZE_SMALL
- COOLDOWN_DECLARE(last_hug_time)
-
-/obj/item/toy/plushie_cade/attack_self(mob/user)
- ..()
-
- if(COOLDOWN_FINISHED(src, last_hug_time))
- user.visible_message(SPAN_NOTICE("[user] hugs [src] tightly!"), SPAN_NOTICE("You hug [src]. You feel safe."))
- playsound(user, "plush", 25, TRUE)
- COOLDOWN_START(src, last_hug_time, 2.5 SECONDS)
-
-
/obj/item/computer3_part
name = "computer part"
desc = "Holy jesus you donnit now"
@@ -567,3 +470,188 @@
/obj/item/toy/festivizer/xeno
name = "strange resin-covered festivizer decorator"
desc = "This bizarre festivizer is covered in goopy goop and schmuck. Ew! It's so sticky, *anything* could grab onto it! Grab it and touch other things to festivize them!"
+
+/obj/item/toy/plush
+ name = "generic plushie"
+ desc = "perfectly generic"
+ icon = 'icons/obj/items/plush.dmi'
+ icon_state = "debug"
+ w_class = SIZE_SMALL
+ COOLDOWN_DECLARE(last_hug_time)
+ black_market_value = 10
+
+/obj/item/toy/plush/attack_self(mob/user)
+ ..()
+ if(!COOLDOWN_FINISHED(src, last_hug_time))
+ return
+ user.visible_message(SPAN_NOTICE("[user] hugs [src] tightly!"), SPAN_NOTICE("You hug [src]."))
+ playsound(user, "plush", 25, TRUE)
+ COOLDOWN_START(src, last_hug_time, 2.5 SECONDS)
+
+/obj/item/toy/plush/farwa
+ name = "Farwa plush"
+ desc = "A Farwa plush doll. It's soft and comforting!"
+ icon_state = "farwa"
+ black_market_value = 25
+
+/obj/item/toy/plush/barricade
+ name = "plushie barricade"
+ desc = "Great for squeezing whenever you're scared. Or lightly hurt. Or in any other situation."
+ icon_state = "barricade"
+ item_state = "cade_plush"
+
+/obj/item/toy/plush/shark //A few more generic plushies to increase the size of the plushie loot pool
+ name = "shark plush"
+ desc = "A plushie depicting a somewhat cartoonish shark. The tag notes that it was made by an obscure furniture manufacturer in Scandinavia."
+ icon_state = "shark"
+
+/obj/item/toy/plush/bee
+ name = "bee plush"
+ desc = "A cute toy that awakens the warrior spirit in the most reserved marine."
+ icon_state = "bee"
+
+/obj/item/toy/plush/moth
+ name = "moth plush"
+ desc = "A plush doll of a bug."
+ icon_state = "moth"
+
+/obj/item/toy/plush/rock
+ name = "rock plush"
+ desc = "It says it is a plush on the tag, at least."
+ icon_state = "rock"
+
+/obj/item/toy/plush/therapy
+ name = "therapy plush"
+ desc = "A therapeutic toy to assist marines in recovering from mental and behavioral disorders after experiencing the trauma of battles."
+ icon_state = "therapy"
+
+/obj/item/toy/plush/therapy/red
+ name = "red therapy plush"
+ color = "#FC5274"
+
+/obj/item/toy/plush/therapy/blue
+ name = "blue therapy plush"
+ color = "#9EBAE0"
+
+/obj/item/toy/plush/therapy/green
+ name = "green therapy plush"
+ color = "#A3C940"
+
+/obj/item/toy/plush/therapy/orange
+ name = "orange therapy plush"
+ color = "#FD8535"
+
+/obj/item/toy/plush/therapy/purple
+ name = "purple therapy plush"
+ color = "#A26AC7"
+
+/obj/item/toy/plush/therapy/yellow
+ name = "yellow therapy plush"
+ color = "#FFE492"
+
+/obj/item/toy/plush/therapy/random_color
+ ///Hexadecimal 0-F (0-15)
+ var/static/list/hexadecimal = list("0", "1", "2", "3" , "4", "5", "6", "7", "8", "9", "A", "B", "C", "D", "E", "F")
+
+/obj/item/toy/plush/therapy/random_color/Initialize(mapload, ...)
+ . = ..()
+ var/color_code = "#[pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)][pick(hexadecimal)]" //This is dumb and I hope theres a better way I'm missing
+ color = color_code
+ desc = "A custom therapy plush, in a unique color."
+
+/obj/item/toy/plush/random_plushie //Not using an effect so it can fit into storage from loadout
+ name = "random plush"
+ desc = "This plush looks awfully standard and bland. Is it actually yours?"
+ /// Standard plushies for the spawner to pick from
+ var/list/plush_list = list(
+ /obj/item/toy/plush/farwa,
+ /obj/item/toy/plush/barricade,
+ /obj/item/toy/plush/bee,
+ /obj/item/toy/plush/shark,
+ /obj/item/toy/plush/moth,
+ /obj/item/toy/plush/rock,
+ )
+ ///Therapy plushies left separately to not flood the entire list
+ var/list/therapy_plush_list = list(
+ /obj/item/toy/plush/therapy,
+ /obj/item/toy/plush/therapy/red,
+ /obj/item/toy/plush/therapy/blue,
+ /obj/item/toy/plush/therapy/green,
+ /obj/item/toy/plush/therapy/orange,
+ /obj/item/toy/plush/therapy/purple,
+ /obj/item/toy/plush/therapy/yellow,
+ /obj/item/toy/plush/therapy/random_color,
+ )
+
+/obj/item/toy/plush/random_plushie/Initialize(mapload, ...)
+ . = ..()
+ if(mapload) //Placed in mapping, will be randomized instantly on spawn
+ create_plushie()
+ return INITIALIZE_HINT_QDEL
+
+/obj/item/toy/plush/random_plushie/pickup(mob/user, silent)
+ . = ..()
+ RegisterSignal(user, COMSIG_POST_SPAWN_UPDATE, PROC_REF(create_plushie), override = TRUE)
+
+///The randomizer picking and spawning a plushie on either the ground or in the humans backpack. Needs var/source due to signals
+/obj/item/toy/plush/random_plushie/proc/create_plushie(datum/source)
+ SIGNAL_HANDLER
+ if(source)
+ UnregisterSignal(source, COMSIG_POST_SPAWN_UPDATE)
+ var/turf/spawn_location = get_turf(src)
+ var/plush_list_variety = pick(60; plush_list, 40; therapy_plush_list)
+ var/random_plushie = pick(plush_list_variety)
+ var/obj/item/toy/plush/plush = new random_plushie(spawn_location) //Starts on floor by default
+ var/mob/living/carbon/human/user = source
+
+ if(!user) //If it didn't spawn on a humanoid
+ qdel(src)
+ return
+
+ var/obj/item/storage/backpack/storage = locate() in user //If the user has a backpack, put it there
+ if(storage?.can_be_inserted(plush, user, stop_messages = TRUE))
+ storage.attempt_item_insertion(plush, TRUE, user)
+ if(plush.loc == spawn_location) // Still on the ground
+ user.put_in_hands(plush, drop_on_fail = TRUE)
+ qdel(src)
+
+//Admin plushies
+/obj/item/toy/plush/yautja
+ name = "strange plush"
+ desc = "A plush doll depicting some sort of tall humanoid biped..?"
+ icon_state = "yautja"
+ black_market_value = 100
+
+/obj/item/toy/plush/runner
+ name = "\improper XX-121 therapy plush"
+ desc = "Don't be sad! Be glad (that you're alive)!"
+ icon_state = "runner"
+ /// If the runner is wearing a beret
+ var/beret = FALSE
+
+/obj/item/toy/plush/runner/Initialize(mapload, ...)
+ . = ..()
+ if(beret)
+ update_icon()
+
+/obj/item/toy/plush/runner/attackby(obj/item/attacking_object, mob/user)
+ . = ..()
+ if(beret)
+ return
+ if(!istypestrict(attacking_object, /obj/item/clothing/head/beret/marine/mp))
+ return
+ var/beret_attack = attacking_object
+ to_chat(user, SPAN_NOTICE("You put [beret_attack] on [src]."))
+ qdel(beret_attack)
+ beret = TRUE
+ update_icon()
+
+/obj/item/toy/plush/runner/update_icon()
+ . = ..()
+ if(beret)
+ icon_state = "runner_beret"
+ return
+ icon_state = "runner"
+
+/obj/item/toy/plush/shark/alt
+ icon_state = "shark_alt"
diff --git a/code/game/objects/items/weapons/blades.dm b/code/game/objects/items/weapons/blades.dm
index 4b4b31539064..2fe80f123bce 100644
--- a/code/game/objects/items/weapons/blades.dm
+++ b/code/game/objects/items/weapons/blades.dm
@@ -1,38 +1,36 @@
-/obj/item/weapon/claymore
- name = "claymore"
- desc = "What are you standing around staring at this for? Get to killing!"
- icon_state = "claymore"
- item_state = "claymore"
+/obj/item/weapon/sword
+ name = "combat sword"
+ desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage."
+ icon_state = "mercsword"
+ item_state = "machete"
flags_atom = FPRINT|CONDUCT
flags_equip_slot = SLOT_WAIST
force = MELEE_FORCE_STRONG
throwforce = MELEE_FORCE_WEAK
sharp = IS_SHARP_ITEM_BIG
edge = 1
- w_class = SIZE_MEDIUM
+ w_class = SIZE_LARGE
hitsound = 'sound/weapons/bladeslice.ogg'
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
attack_speed = 9
-/obj/item/weapon/claymore/mercsword
- name = "combat sword"
- desc = "A dusty sword commonly seen in historical museums. Where you got this is a mystery, for sure. Only a mercenary would be nuts enough to carry one of these. Sharpened to deal massive damage."
- icon_state = "mercsword"
- item_state = "machete"
+/obj/item/weapon/sword/claymore
+ name = "claymore"
+ desc = "What are you standing around staring at this for? Get to killing!"
+ icon_state = "claymore"
+ item_state = "claymore"
-/obj/item/weapon/claymore/mercsword/ceremonial
+/obj/item/weapon/sword/ceremonial
name = "Ceremonial Sword"
desc = "A fancy ceremonial sword passed down from generation to generation. Despite this, it has been very well cared for, and is in top condition."
icon_state = "ceremonial"
- item_state = "machete"
-/obj/item/weapon/claymore/mercsword/machete
+/obj/item/weapon/sword/machete
name = "\improper M2132 machete"
desc = "Latest issue of the USCM Machete. Great for clearing out jungle or brush on outlying colonies. Found commonly in the hands of scouts and trackers, but difficult to carry with the usual kit."
icon_state = "machete"
- w_class = SIZE_LARGE
-/obj/item/weapon/claymore/mercsword/machete/attack_self(mob/user)
+/obj/item/weapon/sword/machete/attack_self(mob/user)
if(user.action_busy)
return
@@ -49,14 +47,13 @@
return ..()
-/obj/item/weapon/claymore/mercsword/machete/arnold
+/obj/item/weapon/sword/machete/arnold
name = "\improper M2100 \"Ngájhe\" machete"
desc = "An older issue USCM machete, never left testing. Designed in the Central African Republic. The notching made it hard to clean, and as such the USCM refused to adopt it - despite the superior bludgeoning power offered. Difficult to carry with the usual kit."
icon_state = "arnold-machete"
- w_class = SIZE_LARGE
force = MELEE_FORCE_TIER_11
-/obj/item/weapon/claymore/hefa
+/obj/item/weapon/sword/hefa
name = "HEFA sword"
icon_state = "hefasword"
item_state = "hefasword"
@@ -65,7 +62,7 @@
var/primed = FALSE
-/obj/item/weapon/claymore/hefa/proc/apply_explosion_overlay()
+/obj/item/weapon/sword/hefa/proc/apply_explosion_overlay()
var/obj/effect/overlay/O = new /obj/effect/overlay(loc)
O.name = "grenade"
O.icon = 'icons/effects/explosion.dmi'
@@ -73,7 +70,7 @@
QDEL_IN(O, 7)
return
-/obj/item/weapon/claymore/hefa/attack_self(mob/user)
+/obj/item/weapon/sword/hefa/attack_self(mob/user)
..()
primed = !primed
@@ -82,7 +79,7 @@
msg = "You de-activate \the [src]!"
to_chat(user, SPAN_NOTICE(msg))
-/obj/item/weapon/claymore/hefa/attack(mob/target, mob/user)
+/obj/item/weapon/sword/hefa/attack(mob/target, mob/user)
. = ..()
if(!primed)
return
@@ -97,22 +94,15 @@
cell_explosion(epicenter, 40, 18, EXPLOSION_FALLOFF_SHAPE_LINEAR, user.dir, cause_data)
qdel(src)
-/obj/item/weapon/katana
+/obj/item/weapon/sword/katana
name = "katana"
desc = "A finely made Japanese sword, with a well sharpened blade. The blade has been filed to a molecular edge, and is extremely deadly. Commonly found in the hands of mercenaries and yakuza."
icon_state = "katana"
- flags_atom = FPRINT|CONDUCT
+ item_state = "katana"
force = MELEE_FORCE_VERY_STRONG
- throwforce = MELEE_FORCE_WEAK
- sharp = IS_SHARP_ITEM_BIG
- edge = 1
- w_class = SIZE_MEDIUM
- hitsound = 'sound/weapons/bladeslice.ogg'
- attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
- attack_speed = 9
//To do: replace the toys.
-/obj/item/weapon/katana/replica
+/obj/item/weapon/sword/katana/replica
name = "replica katana"
desc = "A cheap knock-off commonly found in regular knife stores. Can still do some damage."
force = MELEE_FORCE_WEAK
@@ -246,3 +236,142 @@
WEAR_L_HAND = 'icons/mob/humans/onmob/items_lefthand_64.dmi',
WEAR_R_HAND = 'icons/mob/humans/onmob/items_righthand_64.dmi'
)
+
+/obj/item/weapon/straight_razor
+ name = "straight razor"
+ desc = "The commandant's favorite weapon against marines who dare break the grooming standards."
+ icon_state = "razor"
+ hitsound = 'sound/weapons/genhit3.ogg'
+ force = MELEE_FORCE_TIER_1
+ throwforce = MELEE_FORCE_TIER_1
+ throw_speed = SPEED_VERY_FAST
+ throw_range = 6
+ ///Icon state for opened razor
+ var/enabled_icon = "razor"
+ ///Icon state for closed razor
+ var/disabled_icon = "razor_off"
+ ///If the razor is able to be used
+ var/razor_opened = FALSE
+ ///Time taken to open/close the razor
+ var/interaction_time = 3 SECONDS
+
+/obj/item/weapon/straight_razor/Initialize(mapload, ...)
+ . = ..()
+ RegisterSignal(src, COMSIG_ITEM_ATTEMPTING_EQUIP, PROC_REF(can_fit_in_shoe))
+ change_razor_state(razor_opened)
+ if(prob(1))
+ desc += " There is phrase etched into it, \"It can guarantee the closest shave you'll ever know.\"..."
+
+/obj/item/weapon/straight_razor/update_icon()
+ . = ..()
+ if(razor_opened)
+ icon_state = enabled_icon
+ return
+ icon_state = disabled_icon
+
+/obj/item/weapon/straight_razor/attack_hand(mob/user)
+ if(loc != user) //Only do unique stuff if you are holding it
+ return ..()
+
+ if(!do_after(user, interaction_time, INTERRUPT_INCAPACITATED, BUSY_ICON_HOSTILE))
+ return
+ playsound(user, 'sound/weapons/flipblade.ogg', 15, 1)
+ change_razor_state(!razor_opened)
+ to_chat(user, SPAN_NOTICE("You [razor_opened ? "reveal" : "hide"] [src]'s blade."))
+
+///Check if the item can fit as a boot knife, var/source for signals
+/obj/item/weapon/straight_razor/proc/can_fit_in_shoe(source = src, mob/user, slot)
+ if(slot != WEAR_IN_SHOES) //Only check if you try putting it in a shoe
+ return
+ if(razor_opened)
+ to_chat(user, SPAN_NOTICE("You cannot store [src] in your shoes until the blade is hidden."))
+ return COMPONENT_CANCEL_EQUIP
+
+///Changes all the vars for the straight razor
+/obj/item/weapon/straight_razor/proc/change_razor_state(opening = FALSE)
+ razor_opened = opening
+ update_icon()
+ if(opening)
+ force = MELEE_FORCE_NORMAL
+ throwforce = MELEE_FORCE_NORMAL
+ sharp = IS_SHARP_ITEM_ACCURATE
+ edge = TRUE
+ attack_verb = list("slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
+ hitsound = 'sound/weapons/slash.ogg'
+ if(!(flags_item & CAN_DIG_SHRAPNEL))
+ flags_item |= CAN_DIG_SHRAPNEL
+ return
+ force = MELEE_FORCE_TIER_1
+ throwforce = MELEE_FORCE_TIER_1
+ sharp = FALSE
+ edge = FALSE
+ attack_verb = list("smashed", "beaten", "slammed", "struck", "smashed", "battered", "cracked")
+ hitsound = 'sound/weapons/genhit3.ogg'
+ if(flags_item & CAN_DIG_SHRAPNEL)
+ flags_item &= ~CAN_DIG_SHRAPNEL
+
+/obj/item/weapon/straight_razor/verb/change_hair_style()
+ set name = "Change Hair Style"
+ set desc = "Change your hair style"
+ set category = "Object"
+ set src in usr
+
+ var/mob/living/carbon/human/human_user = usr
+ if(!istype(human_user))
+ return
+
+ if(!razor_opened)
+ to_chat(human_user, SPAN_NOTICE("You need to reveal [src]'s blade to change your hairstyle."))
+ return
+
+ var/list/species_facial_hair = GLOB.facial_hair_styles_list
+ var/list/species_hair = GLOB.hair_styles_list
+
+ if(human_user.species) //Facial hair
+ species_facial_hair = list()
+ for(var/current_style in GLOB.facial_hair_styles_list)
+ var/datum/sprite_accessory/facial_hair/temp_beard_style = GLOB.facial_hair_styles_list[current_style]
+ if(!(human_user.species.name in temp_beard_style.species_allowed))
+ continue
+ if(!temp_beard_style.selectable)
+ continue
+ species_facial_hair += current_style
+
+ if(human_user.species) //Hair
+ species_hair = list()
+ for(var/current_style in GLOB.hair_styles_list)
+ var/datum/sprite_accessory/hair/temp_hair_style = GLOB.hair_styles_list[current_style]
+ if(!(human_user.species.name in temp_hair_style.species_allowed))
+ continue
+ if(!temp_hair_style.selectable)
+ continue
+ species_hair += current_style
+
+ var/new_beard_style
+ var/new_hair_style
+ if(human_user.gender == MALE)
+ new_beard_style = tgui_input_list(human_user, "Select a facial hair style", "Grooming", species_facial_hair)
+ new_hair_style = tgui_input_list(human_user, "Select a hair style", "Grooming", species_hair)
+
+ if(loc != human_user)
+ to_chat(human_user, SPAN_NOTICE("You are too far from [src] to change your hair styles."))
+ return
+
+ if(!new_beard_style && !new_hair_style)
+ return
+
+ if(!do_after(human_user, interaction_time, INTERRUPT_ALL, BUSY_ICON_GENERIC))
+ return
+
+ if(!razor_opened)
+ to_chat(human_user, SPAN_NOTICE("You need to reveal [src]'s blade to change your hairstyle."))
+ return
+
+ if(new_beard_style)
+ human_user.f_style = new_beard_style
+ if(new_hair_style)
+ human_user.h_style = new_hair_style
+
+ human_user.apply_damage(rand(1,5), BRUTE, "head", src)
+ human_user.update_hair()
+
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 20bf8ac951e9..0497a410a373 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -89,7 +89,7 @@
/obj/item/weapon/shield/riot/attackby(obj/item/W as obj, mob/user as mob)
if(cooldown < world.time - 25)
- if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/claymore) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/katana) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
+ if(istype(W, /obj/item/weapon/baton) || istype(W, /obj/item/weapon/sword) || istype(W, /obj/item/weapon/baseballbat) || istype(W, /obj/item/weapon/twohanded/fireaxe) || istype(W, /obj/item/weapon/chainofcommand))
user.visible_message(SPAN_WARNING("[user] bashes [src] with [W]!"))
playsound(user.loc, 'sound/effects/shieldbash.ogg', 25, 1)
cooldown = world.time
diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm
index 6cb9f58aae37..82fdf30f0fc4 100644
--- a/code/game/objects/items/weapons/stunbaton.dm
+++ b/code/game/objects/items/weapons/stunbaton.dm
@@ -197,9 +197,9 @@
return TRUE
/obj/item/weapon/baton/emp_act(severity)
+ . = ..()
if(bcell)
bcell.emp_act(severity) //let's not duplicate code everywhere if we don't have to please.
- ..()
//secborg stun baton module
/obj/item/weapon/baton/robot/attack_self(mob/user)
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index aaa2a33d4e63..efa898ba9937 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -167,7 +167,7 @@
update_icon(user)
-/obj/item/weapon/katana/sharp
+/obj/item/weapon/sword/katana/sharp
name = "absurdly sharp katana"
desc = "That's it. I'm sick of all this \"Masterwork Bastard Sword\" bullshit that's going on in CM-SS13 right now. Katanas deserve much better than that. Much, much better than that.
\
I should know what I'm talking about. I myself commissioned a genuine katana in Japan for 2,400,000 Yen (that's about $20,000) and have been practicing with it for almost 2 years now. I can even cut slabs of solid steel with my katana.
\
@@ -190,7 +190,7 @@
attack_verb = list("sliced", "diced", "cut")
-/obj/item/weapon/katana/sharp/attack(mob/living/M, mob/living/user)
+/obj/item/weapon/sword/katana/sharp/attack(mob/living/M, mob/living/user)
if(flags_item & NOBLUDGEON)
return
@@ -223,7 +223,7 @@
//if the target also has a katana (and we aren't attacking ourselves), we add some suspense
- if( ( istype(M.get_active_hand(), /obj/item/weapon/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/katana) ) && M != user )
+ if( ( istype(M.get_active_hand(), /obj/item/weapon/sword/katana) || istype(M.get_inactive_hand(), /obj/item/weapon/sword/katana) ) && M != user )
if(prob(50))
user.visible_message(SPAN_DANGER("[M] and [user] cross blades!"))
diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm
index e59c24b30d5f..c067a9730e70 100644
--- a/code/game/objects/prop.dm
+++ b/code/game/objects/prop.dm
@@ -11,6 +11,66 @@
w_class = SIZE_SMALL
garbage = TRUE
+/obj/item/prop/geiger_counter
+ name = "geiger counter"
+ desc = "A geiger counter measures the radiation it receives. This type automatically records and transfers any information it reads, provided it has a battery, with no user input required beyond being enabled."
+ icon = 'icons/obj/items/devices.dmi'
+ icon_state = "geiger"
+ item_state = ""
+ w_class = SIZE_SMALL
+ flags_equip_slot = SLOT_WAIST
+ ///Whether the geiger counter is on or off
+ var/toggled_on = FALSE
+ ///Iconstate of geiger counter when on
+ var/enabled_state = "geiger_on"
+ ///Iconstate of geiger counter when off
+ var/disabled_state = "geiger"
+ ///New battery it will spawn with
+ var/starting_battery = /obj/item/cell/crap
+ ///Battery inside geiger counter
+ var/obj/item/cell/battery //It doesn't drain the battery, but it has a battery for emergency use
+
+/obj/item/prop/geiger_counter/Initialize(mapload, ...)
+ . = ..()
+ if(!starting_battery)
+ return
+ battery = new starting_battery(src)
+
+/obj/item/prop/geiger_counter/Destroy()
+ . = ..()
+ if(battery)
+ qdel(battery)
+
+/obj/item/prop/geiger_counter/attack_self(mob/user)
+ . = ..()
+ toggled_on = !toggled_on
+ if(!battery)
+ to_chat(user, SPAN_NOTICE("[src] is missing a battery."))
+ return
+ to_chat(user, SPAN_NOTICE("You [toggled_on ? "enable" : "disable"] [src]."))
+ update_icon()
+
+/obj/item/prop/geiger_counter/attackby(obj/item/attacking_item, mob/user)
+ . = ..()
+ if(!HAS_TRAIT(attacking_item, TRAIT_TOOL_SCREWDRIVER) && !HAS_TRAIT(attacking_item, TRAIT_TOOL_CROWBAR))
+ return
+
+ if(!battery)
+ to_chat(user, SPAN_NOTICE("There is no battery for you to remove."))
+ return
+ to_chat(user, SPAN_NOTICE("You jam [battery] out of [src] with [attacking_item], prying it out irreversibly."))
+ user.put_in_hands(battery)
+ battery = null
+ update_icon()
+
+/obj/item/prop/geiger_counter/update_icon()
+ . = ..()
+
+ if(battery && toggled_on)
+ icon_state = enabled_state
+ return
+ icon_state = disabled_state
+
/obj/item/prop/tableflag
name = "United Americas table flag"
icon = 'icons/obj/items/items.dmi'
diff --git a/code/game/objects/structures/blocker.dm b/code/game/objects/structures/blocker.dm
index 284daf0028aa..f85b1e65fff5 100644
--- a/code/game/objects/structures/blocker.dm
+++ b/code/game/objects/structures/blocker.dm
@@ -105,9 +105,21 @@
/obj/structure/blocker/forcefield/vehicles
types = list(/obj/vehicle/)
+
+/obj/structure/blocker/forcefield/vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle)
+ if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS)
+ return TRUE
+ return FALSE
+
/obj/structure/blocker/forcefield/multitile_vehicles
types = list(/obj/vehicle/multitile/)
+
+/obj/structure/blocker/forcefield/multitile_vehicles/handle_vehicle_bump(obj/vehicle/multitile/multitile_vehicle)
+ if(multitile_vehicle.vehicle_flags & VEHICLE_BYPASS_BLOCKERS)
+ return TRUE
+ return FALSE
+
/obj/structure/blocker/forcefield/human
types = list(/mob/living/carbon/human)
icon_state = "purple_line"
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm
index 093aac33f7d0..487ffd546d8e 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet/level_red.dm
@@ -59,6 +59,13 @@
. = ..()
new /obj/item/storage/box/guncase/m41aMK1(src)
+//4 MK1 (with AP) cabinet(using guncase because it fit well here it seem)
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap
+
+/obj/structure/closet/secure_closet/guncabinet/red/cic_armory_mk1_rifle_ap/Initialize()
+ . = ..()
+ new /obj/item/storage/box/guncase/m41aMK1AP(src)
+
// UPPER MEDBAY ARMORY
//1 shotgun armory closet 2 guns and 4 mags
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
index e290a23a61e9..331cb884bd59 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
@@ -30,6 +30,7 @@
return 0
/obj/structure/closet/secure_closet/emp_act(severity)
+ . = ..()
for(var/obj/O in src)
O.emp_act(severity)
if(!broken)
@@ -42,7 +43,6 @@
else
src.req_access = list()
src.req_access += pick(get_access(ACCESS_LIST_MARINE_MAIN))
- ..()
/obj/structure/closet/secure_closet/proc/togglelock(mob/living/user)
if(src.opened)
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 9f0417ccb372..119615ab7aed 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -12,6 +12,19 @@
throwpass = 1 //prevents moving crates by hurling things at them
store_mobs = FALSE
var/rigged = 0
+ /// Types this crate can be made into
+ var/list/crate_customizing_types = list(
+ "Plain" = /obj/structure/closet/crate,
+ "Weapons" = /obj/structure/closet/crate/weapon,
+ "Supply" = /obj/structure/closet/crate/supply,
+ "Ammo" = /obj/structure/closet/crate/ammo,
+ "Construction" = /obj/structure/closet/crate/construction,
+ "Explosives" = /obj/structure/closet/crate/explosives,
+ "Alpha" = /obj/structure/closet/crate/alpha,
+ "Bravo" = /obj/structure/closet/crate/bravo,
+ "Charlie" = /obj/structure/closet/crate/charlie,
+ "Delta" = /obj/structure/closet/crate/delta,
+ )
/obj/structure/closet/crate/initialize_pass_flags(datum/pass_flags_container/PF)
..()
@@ -207,6 +220,7 @@
icon_state = "closed_freezer"
icon_opened = "open_freezer"
icon_closed = "closed_freezer"
+ crate_customizing_types = null
var/target_temp = T0C - 40
var/cooling_power = 40
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 2f2877ba7539..f1b58e6f657b 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -28,9 +28,8 @@
material_sheet = new parts_type(current_turf, 2)
// Move the objects back to the turf, above the crate material
- for(var/atom/movable/moving_atom in contents)
- var/atom/movable/current_atom = contents[1]
- current_atom.forceMove(current_turf)
+ for(var/atom/movable/moving_atom as anything in contents)
+ moving_atom.forceMove(current_turf)
deconstruct(TRUE)
diff --git a/code/game/objects/structures/crates_lockers/secure_crates.dm b/code/game/objects/structures/crates_lockers/secure_crates.dm
index a308c4c0a21c..28a77e0c81c0 100644
--- a/code/game/objects/structures/crates_lockers/secure_crates.dm
+++ b/code/game/objects/structures/crates_lockers/secure_crates.dm
@@ -4,6 +4,7 @@
icon_state = "secure_locked_basic"
icon_opened = "secure_open_basic"
icon_closed = "secure_locked_basic"
+ crate_customizing_types = null
var/icon_locked = "secure_locked_basic"
var/icon_unlocked = "secure_unlocked_basic"
var/sparks = "securecratesparks"
@@ -86,6 +87,7 @@
..()
/obj/structure/closet/crate/secure/emp_act(severity)
+ . = ..()
for(var/obj/O in src)
O.emp_act(severity)
if(!broken && !opened && prob(50/severity))
@@ -105,7 +107,6 @@
else
src.req_access = list()
src.req_access += pick(get_access(ACCESS_LIST_MARINE_MAIN))
- ..()
//------------------------------------
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 7b54f0447fae..e4ee4a1b662b 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -5,13 +5,15 @@
icon_state = "extinguisher"
anchored = TRUE
density = FALSE
- var/obj/item/tool/extinguisher/has_extinguisher = new/obj/item/tool/extinguisher
+ var/obj/item/tool/extinguisher/has_extinguisher
var/opened = 0
var/base_icon
/obj/structure/extinguisher_cabinet/Initialize()
. = ..()
base_icon = initial(icon_state)
+ has_extinguisher = new /obj/item/tool/extinguisher()
+ has_extinguisher.forceMove(src)
/obj/structure/extinguisher_cabinet/lifeboat
name = "extinguisher cabinet"
@@ -21,15 +23,15 @@
/obj/structure/extinguisher_cabinet/alt
icon_state = "extinguisher_alt"
-/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user)
+/obj/structure/extinguisher_cabinet/attackby(obj/item/item, mob/user)
if(isrobot(user))
return
- if(istype(O, /obj/item/tool/extinguisher))
+ if(istype(item, /obj/item/tool/extinguisher))
if(!has_extinguisher && opened)
user.drop_held_item()
- contents += O
- has_extinguisher = O
- to_chat(user, SPAN_NOTICE("You place [O] in [src]."))
+ item.forceMove(src)
+ has_extinguisher = item
+ to_chat(user, SPAN_NOTICE("You place [item] in [src]."))
else
opened = !opened
else
@@ -45,7 +47,7 @@
user.put_in_hands(has_extinguisher)
to_chat(user, SPAN_NOTICE("You take [has_extinguisher] from [src]."))
has_extinguisher = null
- opened = 1
+ opened = TRUE
else
opened = !opened
update_icon()
diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm
index 9c1f46de50d5..b1e950dd18f0 100644
--- a/code/game/objects/structures/flora.dm
+++ b/code/game/objects/structures/flora.dm
@@ -72,6 +72,7 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down
addtimer(CALLBACK(src, PROC_REF(burn_up)), spread_time + 5 SECONDS)
/obj/structure/flora/proc/spread_fire()
+ SIGNAL_HANDLER
for(var/D in cardinal) //Spread fire
var/turf/T = get_step(src.loc, D)
if(T)
@@ -82,6 +83,7 @@ PLANT_CUT_MACHETE = 3 = Needs at least a machete to be cut down
new /obj/flamer_fire(T, create_cause_data("wildfire"))
/obj/structure/flora/proc/burn_up()
+ SIGNAL_HANDLER
new /obj/effect/decal/cleanable/dirt(loc)
if(center)
new /obj/effect/decal/cleanable/dirt(loc) //Produces more ash at the center
@@ -717,7 +719,7 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE.
//hatchets and shiet can clear away undergrowth
if(I && (I.sharp >= IS_SHARP_ITEM_ACCURATE) && !stump)
var/damage = rand(2,5)
- if(istype(I,/obj/item/weapon/claymore/mercsword))
+ if(istype(I,/obj/item/weapon/sword))
damage = rand(8,18)
if(indestructable)
//this bush marks the edge of the map, you can't destroy it
diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm
index e719359ab439..6cd6a5cd0300 100644
--- a/code/game/objects/structures/girders.dm
+++ b/code/game/objects/structures/girders.dm
@@ -173,6 +173,14 @@
return do_reinforced_wall(W, user)
if(STATE_DISPLACED)
if(HAS_TRAIT(W, TRAIT_TOOL_CROWBAR))
+ var/turf/open/floor = loc
+ if(!floor.allow_construction)
+ to_chat(user, SPAN_WARNING("The girder must be secured on a proper surface!"))
+ return
+ var/obj/structure/tunnel/tunnel = locate(/obj/structure/tunnel) in loc
+ if(tunnel)
+ to_chat(user, SPAN_WARNING("The girder cannot be secured on a tunnel!"))
+ return
playsound(loc, 'sound/items/Crowbar.ogg', 25, 1)
to_chat(user, SPAN_NOTICE("Now securing the girder..."))
if(!do_after(user, 40 * user.get_skill_duration_multiplier(SKILL_CONSTRUCTION), INTERRUPT_ALL|BEHAVIOR_IMMOBILE, BUSY_ICON_BUILD))
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index dc8cf08d13f1..b3fb2423008a 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -113,7 +113,7 @@
else
. = ..()
-/obj/structure/morgue/relaymove(mob/user)
+/obj/structure/morgue/relaymove(mob/living/user)
if(user.is_mob_incapacitated())
return
if(exit_stun)
diff --git a/code/game/objects/structures/props.dm b/code/game/objects/structures/props.dm
index bd5610487ea0..f465e1535d68 100644
--- a/code/game/objects/structures/props.dm
+++ b/code/game/objects/structures/props.dm
@@ -805,14 +805,14 @@
/obj/structure/prop/brazier/campfire/attackby(obj/item/attacking_item, mob/user)
if(!istype(attacking_item, /obj/item/stack/sheet/wood))
- to_chat(SPAN_NOTICE("You cannot fuel [src] with [attacking_item]."))
+ to_chat(user, SPAN_NOTICE("You cannot fuel [src] with [attacking_item]."))
return
var/obj/item/stack/sheet/wood/fuel = attacking_item
if(remaining_fuel >= initial(remaining_fuel))
to_chat(user, SPAN_NOTICE("You cannot fuel [src] further."))
return
if(!fuel.use(1))
- to_chat(SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
+ to_chat(user, SPAN_NOTICE("You do not have enough [attacking_item] to fuel [src]."))
return
visible_message(SPAN_NOTICE("[user] fuels [src] with [fuel]."))
remaining_fuel++
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index ec277929facb..adabf0c54141 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -570,7 +570,7 @@
/obj/structure/sign/ROsign
name = "\improper USCM Requisitions Office Guidelines"
- desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cyrosleep underwear is non-permissible.\n 3. The Requsitions Officer has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
+ desc = " 1. You are not entitled to service or equipment. Attachments are a privilege, not a right.\n 2. You must be fully dressed to obtain service. Cryosleep underwear is non-permissible.\n 3. The Quartermaster has the final say and the right to decline service. Only the Acting Commanding Officer may override their decisions.\n 4. Please treat your Requsitions staff with respect. They work hard."
icon_state = "roplaque"
/obj/structure/sign/prop1
diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
index 7979994915f4..bc3b4ad7f4d0 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -404,7 +404,17 @@ var/global/list/activated_medevac_stretchers = list()
//bedroll
/obj/structure/bed/bedroll
- name = "bedroll"
- desc = "bedroll"
+ name = "unfolded bedroll"
+ desc = "Perfect for those long missions, when there's nowhere else to sleep, you remembered to bring at least one thing of comfort."
+ icon = 'icons/monkey_icos.dmi'
icon_state = "bedroll_o"
+ buckling_y = 0
+ foldabletype = /obj/item/roller/bedroll
+ accepts_bodybag = FALSE
+
+/obj/item/roller/bedroll
+ name = "folded bedroll"
+ desc = "A standard issue USCMC bedroll, They've been in service for as long as you can remember. The tag on it states to unfold it before rest, but who needs rules anyway, right?"
icon = 'icons/monkey_icos.dmi'
+ icon_state = "bedroll"
+ rollertype = /obj/structure/bed/bedroll
diff --git a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
index 7a4274c2c16e..6375fcd13823 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/xeno_nest.dm
@@ -53,7 +53,7 @@
current_mob.pixel_y = buckling_y["[dir]"]
current_mob.pixel_x = buckling_x["[dir]"]
current_mob.dir = turn(dir, 180)
- current_mob.density = FALSE
+ ADD_TRAIT(current_mob, TRAIT_UNDENSE, XENO_NEST_TRAIT)
pixel_y = buckling_y["[dir]"]
pixel_x = buckling_x["[dir]"]
if(dir == SOUTH)
@@ -67,7 +67,7 @@
current_mob.pixel_y = initial(buckled_mob.pixel_y)
current_mob.pixel_x = initial(buckled_mob.pixel_x)
- current_mob.density = !(current_mob.lying || current_mob.stat == DEAD)
+ REMOVE_TRAIT(current_mob, TRAIT_UNDENSE, XENO_NEST_TRAIT)
if(dir == SOUTH)
current_mob.layer = initial(current_mob.layer)
if(!ishuman(current_mob))
diff --git a/code/game/objects/structures/surface.dm b/code/game/objects/structures/surface.dm
index efc69002424f..13a81af2dc3d 100644
--- a/code/game/objects/structures/surface.dm
+++ b/code/game/objects/structures/surface.dm
@@ -1,159 +1,20 @@
//Surface structures are structures that can have items placed on them
/obj/structure/surface
health = 100
- var/list/update_types = list(
- /obj/item/reagent_container/glass,
- /obj/item/storage,
- /obj/item/reagent_container/food/snacks
- )
- //add items there that behave like structures for whatever dumb reason
- var/list/blacklisted_item_types = list(
- /obj/item/device/radio/intercom,
- /obj/item/device/sentry_computer
- )
-/obj/structure/surface/Initialize()
- . = ..()
- return INITIALIZE_HINT_LATELOAD
-
-/obj/structure/surface/LateInitialize()
- attach_all()
- update_icon()
-
-/obj/structure/surface/Destroy()
- detach_all()
- . = ..()
-
-/obj/structure/surface/ex_act(severity, direction, datum/cause_data/cause_data)
- health -= severity
- if(health <= 0)
- var/location = get_turf(src)
- handle_debris(severity, direction)
- detach_all()
- for(var/obj/item/O in loc)
- O.explosion_throw(severity, direction)
- qdel(src)
- if(prob(66))
- create_shrapnel(location, rand(1,4), direction, , /datum/ammo/bullet/shrapnel/light, cause_data)
- return TRUE
-
-/obj/structure/surface/proc/attach_all()
- for(var/obj/item/O in loc)
- if(in_blacklist(O))
- continue
- attach_item(O, FALSE)
- draw_item_overlays()
-
-/obj/structure/surface/proc/in_blacklist(obj/item/O)
- for(var/allowed_type in blacklisted_item_types)
- if(istype(O, allowed_type))
- return TRUE
- return FALSE
-
-/obj/structure/surface/proc/attach_item(obj/item/O, update = TRUE)
- if(!O)
+/obj/structure/surface/attackby(obj/item/attacking_item, mob/user, click_data)
+ if(!user.drop_inv_item_to_loc(attacking_item, loc))
return
- if(O.luminosity) //it can't make light as an overlay
- return
- O.forceMove(src)
- RegisterSignal(O, COMSIG_ATOM_DECORATED, PROC_REF(decorate_update))
- if(update)
- draw_item_overlays()
-
-/obj/structure/surface/proc/detach_item(obj/item/O)
- O.scatter_item()
- UnregisterSignal(O, COMSIG_ATOM_DECORATED)
- draw_item_overlays()
- return
-
-/obj/structure/surface/proc/decorate_update(obj/item/O)
- SIGNAL_HANDLER
- draw_item_overlays()
-/obj/structure/surface/proc/detach_all()
- overlays.Cut()
- for(var/obj/item/O in contents)
- UnregisterSignal(O, COMSIG_ATOM_DECORATED)
- O.forceMove(loc)
+ auto_align(attacking_item, click_data)
+ user.next_move = world.time + 2
+ return TRUE
-/obj/structure/surface/proc/get_item(list/click_data)
- var/i = LAZYLEN(contents)
- if(!click_data)
- return
- if(i < 1)
- return FALSE
- for(i, i >= 1, i--)//starting from the end because that's where the topmost is
- var/obj/item/O = contents[i]
- var/bounds_x = text2num(click_data["icon-x"])-1 - O.pixel_x
- var/bounds_y = text2num(click_data["icon-y"])-1 - O.pixel_y
- if(bounds_x < 0 || bounds_y < 0)
- continue
- var/icon/I = icon(O.icon, O.icon_state)
- var/p = I.GetPixel(bounds_x, bounds_y)
- if(p)
- return O
- return FALSE
-
-/obj/structure/surface/proc/draw_item_overlays()
- overlays.Cut()
- for(var/obj/item/O in contents)
- var/image/I = image(O.icon)
- I.appearance = O.appearance
- I.appearance_flags |= RESET_COLOR
- I.overlays = O.overlays
- LAZYADD(overlays, I)
-
-/obj/structure/surface/clicked(mob/user, list/mods)
- if(mods["shift"] && !mods["middle"])
- var/obj/item/O = get_item(mods)
- if(!O)
- return ..()
- if(O.can_examine(user))
- O.examine(user)
- return TRUE
- ..()
-
-/obj/structure/surface/proc/try_to_open_container(mob/user, mods)
- if(!Adjacent(user))
- return
-
- if(ishuman(user) || isrobot(user))
- var/obj/item/O = get_item(mods)
- if(O && isstorage(O))
- var/obj/item/storage/S = O
- S.open(usr)
- return TRUE
-
-/obj/structure/surface/attack_hand(mob/user, click_data)
- . = ..()
- if(click_data && click_data["alt"])
- return
- var/obj/item/O = get_item(click_data)
- if(!O)
- return
- O.attack_hand(user)
- if(!LAZYISIN(contents, O))//in case attack_hand did not pick up the item
- detach_item(O)
-
-/obj/structure/surface/attackby(obj/item/W, mob/user, click_data)
- var/obj/item/O = get_item(click_data)
- if(!O || click_data["ctrl"])//holding the ctrl key will force it to place the object
- // Placing stuff on tables
- if(user.drop_inv_item_to_loc(W, loc))
- auto_align(W, click_data)
- user.next_move = world.time + 2
- return TRUE
- else if(!O.attackby(W, user))
- W.afterattack(O, user, TRUE)
- for(var/type in update_types)
- if(istype(O, type))
- draw_item_overlays()
-
-/obj/structure/surface/proc/auto_align(obj/item/W, click_data)
- if(!W.center_of_mass) // Clothing, material stacks, generally items with large sprites where exact placement would be unhandy.
- W.pixel_x = rand(-W.randpixel, W.randpixel)
- W.pixel_y = rand(-W.randpixel, W.randpixel)
- W.pixel_z = 0
+/obj/structure/surface/proc/auto_align(obj/item/new_item, click_data)
+ if(!new_item.center_of_mass) // Clothing, material stacks, generally items with large sprites where exact placement would be unhandy.
+ new_item.pixel_x = rand(-new_item.randpixel, new_item.randpixel)
+ new_item.pixel_y = rand(-new_item.randpixel, new_item.randpixel)
+ new_item.pixel_z = 0
return
if(!click_data)
@@ -169,16 +30,8 @@
var/cell_x = Clamp(round(mouse_x/CELLSIZE), 0, CELLS-1) // Ranging from 0 to CELLS-1
var/cell_y = Clamp(round(mouse_y/CELLSIZE), 0, CELLS-1)
- var/list/center = cached_key_number_decode(W.center_of_mass)
-
- W.pixel_x = (CELLSIZE * (cell_x + 0.5)) - center["x"]
- W.pixel_y = (CELLSIZE * (cell_y + 0.5)) - center["y"]
- W.pixel_z = 0
-
- if(!(W.flags_item & NOTABLEMERGE))
- attach_item(W)
+ var/list/center = cached_key_number_decode(new_item.center_of_mass)
-/obj/structure/surface/MouseDrop(atom/over)
- . = ..()
- if(over == usr && usr && usr.client && usr.client.lmb_last_mousedown_mods)
- return try_to_open_container(usr, usr.client.lmb_last_mousedown_mods)
+ new_item.pixel_x = (CELLSIZE * (cell_x + 0.5)) - center["x"]
+ new_item.pixel_y = (CELLSIZE * (cell_y + 0.5)) - center["y"]
+ new_item.pixel_z = 0
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index db3ce98339a3..8d6441293f86 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -434,8 +434,6 @@
verbs -= /obj/structure/surface/table/verb/do_flip
verbs += /obj/structure/surface/table/proc/do_put
- detach_all()
-
var/list/targets = list(get_step(src, dir), get_step(src, turn(dir, 45)), get_step(src, turn(dir, -45)))
for(var/atom/movable/movable_on_table in get_turf(src))
if(!movable_on_table.anchored)
@@ -479,7 +477,6 @@
var/obj/structure/surface/table/T = locate() in get_step(src.loc,D)
if(T && T.flipped && T.dir == src.dir)
T.unflip()
- attach_all()
update_icon()
update_adjacent()
diff --git a/code/game/objects/structures/vulture_spotter.dm b/code/game/objects/structures/vulture_spotter.dm
index 50505ab239b8..44efd5ce84ea 100644
--- a/code/game/objects/structures/vulture_spotter.dm
+++ b/code/game/objects/structures/vulture_spotter.dm
@@ -92,7 +92,7 @@
user.lighting_alpha = 127
user.sync_lighting_plane_alpha()
user.overlay_fullscreen("vulture_spotter", /atom/movable/screen/fullscreen/vulture/spotter)
- user.freeze()
+ ADD_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Vulture spotter"))
user.status_flags |= IMMOBILE_ACTION
user.visible_message(SPAN_NOTICE("[user] looks through [src]."),SPAN_NOTICE("You look through [src], ready to go!"))
user.forceMove(loc)
@@ -105,7 +105,7 @@
/obj/structure/vulture_spotter_tripod/on_unset_interaction(mob/user)
user.status_flags &= ~IMMOBILE_ACTION
user.visible_message(SPAN_NOTICE("[user] looks up from [src]."),SPAN_NOTICE("You look up from [src]."))
- user.unfreeze()
+ REMOVE_TRAIT(user, TRAIT_IMMOBILIZED, TRAIT_SOURCE_ABILITY("Vulture spotter"))
user.reset_view(null)
user.Move(get_step(src, reverse_direction(src.dir)))
user.client?.change_view(world_view_size, src)
diff --git a/code/game/supplyshuttle.dm b/code/game/supplyshuttle.dm
index e8f40c1d52b3..422a42c66541 100644
--- a/code/game/supplyshuttle.dm
+++ b/code/game/supplyshuttle.dm
@@ -327,7 +327,7 @@ var/datum/controller/supply/supply_controller = new()
M.count_niche_stat(STATISTICS_NICHE_CRATES)
playsound(C.loc,'sound/effects/bamf.ogg', 50, 1) //Ehh
- var/obj/structure/droppod/supply/pod = new()
+ var/obj/structure/droppod/supply/pod = new(null, C)
C.forceMove(pod)
pod.launch(T)
visible_message("[icon2html(src, viewers(src))] [SPAN_BOLDNOTICE("'[C.name]' supply drop launched! Another launch will be available in five minutes.")]")
@@ -1315,6 +1315,14 @@ var/datum/controller/supply/supply_controller = new()
/datum/vehicle_order/tank/has_vehicle_lock()
return
+/datum/vehicle_order/tank/broken
+ name = "Smashed M34A2 Longstreet Light Tank"
+ ordered_vehicle = /obj/effect/vehicle_spawner/tank/hull/broken
+
+/datum/vehicle_order/tank/plain
+ name = "M34A2 Longstreet Light Tank"
+ ordered_vehicle = /obj/effect/vehicle_spawner/tank
+
/datum/vehicle_order/apc
name = "M577 Armored Personnel Carrier"
ordered_vehicle = /obj/effect/vehicle_spawner/apc/decrepit
@@ -1327,18 +1335,19 @@ var/datum/controller/supply/supply_controller = new()
name = "M577-CMD Armored Personnel Carrier"
ordered_vehicle = /obj/effect/vehicle_spawner/apc_cmd/decrepit
+/datum/vehicle_order/apc/empty
+ name = "Barebones M577 Armored Personal Carrier"
+ ordered_vehicle = /obj/effect/vehicle_spawner/apc/unarmed/broken
+
/obj/structure/machinery/computer/supplycomp/vehicle/Initialize()
. = ..()
vehicles = list(
- /datum/vehicle_order/apc,
- /datum/vehicle_order/apc/med,
- /datum/vehicle_order/apc/cmd,
+ new /datum/vehicle_order/apc(),
+ new /datum/vehicle_order/apc/med(),
+ new /datum/vehicle_order/apc/cmd(),
)
- for(var/order as anything in vehicles)
- new order
-
if(!VehicleElevatorConsole)
VehicleElevatorConsole = src
@@ -1408,6 +1417,7 @@ var/datum/controller/supply/supply_controller = new()
return
if(!is_admin_level(SSshuttle.vehicle_elevator.z))
+ to_chat(usr, SPAN_WARNING("The elevator needs to be in the cargo bay dock to call a vehicle up. Ask someone to send it away."))
return
if(ismaintdrone(usr))
diff --git a/code/game/turfs/floor_types.dm b/code/game/turfs/floor_types.dm
index 4e47fd004f74..e9c6b9a2048e 100644
--- a/code/game/turfs/floor_types.dm
+++ b/code/game/turfs/floor_types.dm
@@ -203,6 +203,13 @@
icon_state = "default"
plating_type = /turf/open/floor/plating/almayer
+/// Admin level thunderdome floor. Doesn't get damaged by explosions and such for pristine testing
+/turf/open/floor/tdome
+ icon = 'icons/turf/almayer.dmi'
+ icon_state = "plating"
+ plating_type = /turf/open/floor/tdome
+ hull_floor = TRUE
+
//Cargo elevator
/turf/open/floor/almayer/empty
name = "empty space"
diff --git a/code/game/turfs/open.dm b/code/game/turfs/open.dm
index a4781e1a6609..93eb45c3b79c 100644
--- a/code/game/turfs/open.dm
+++ b/code/game/turfs/open.dm
@@ -185,6 +185,7 @@
name = "cave"
icon = 'icons/turf/floors/bigred.dmi'
icon_state = "mars_cave_1"
+ is_groundmap_turf = TRUE
/turf/open/mars_cave/Initialize(mapload, ...)
@@ -283,6 +284,7 @@
name = "ground dirt"
icon = 'icons/turf/ground_map.dmi'
icon_state = "desert"
+ is_groundmap_turf = TRUE
/turf/open/gm/attackby(obj/item/I, mob/user)
@@ -646,6 +648,7 @@
baseturfs = /turf/open/gm/riverdeep
supports_surgery = FALSE
minimap_color = MINIMAP_WATER
+ is_groundmap_turf = FALSE // Not real ground
/turf/open/gm/riverdeep/Initialize(mapload, ...)
@@ -724,6 +727,7 @@
allow_construction = FALSE
var/bushes_spawn = 1
var/plants_spawn = 1
+ is_groundmap_turf = TRUE
name = "wet grass"
desc = "Thick, long, wet grass."
icon = 'icons/turf/floors/jungle.dmi'
diff --git a/code/game/turfs/walls/wall_types.dm b/code/game/turfs/walls/wall_types.dm
index 1b4091eb2aab..f976da220b29 100644
--- a/code/game/turfs/walls/wall_types.dm
+++ b/code/game/turfs/walls/wall_types.dm
@@ -28,15 +28,23 @@
/obj/structure/machinery/cm_vending/sorted/cargo_guns/cargo/blend,
)
+ /// The type of wall decoration we use, to avoid the wall changing icon all the time
+ var/decoration_type
+
+/turf/closed/wall/almayer/Initialize(mapload, ...)
+ if(!special_icon && prob(20))
+ decoration_type = rand(0,3)
+ return ..()
+
/turf/closed/wall/almayer/update_icon()
- ..()
- if(special_icon)
- return
+ if(decoration_type == null)
+ return ..()
if(neighbors_list in list(EAST|WEST))
- var/r1 = rand(0,10) //Make a random chance for this to happen
- var/r2 = rand(0,3) // Which wall if we do choose it
- if(r1 >= 9)
- overlays += image(icon, icon_state = "almayer_deco_wall[r2]")
+ special_icon = TRUE
+ icon_state = "almayer_deco_wall[decoration_type]"
+ else // Wall connection was broken, return to normality
+ special_icon = FALSE
+ return ..()
/turf/closed/wall/almayer/take_damage(dam, mob/M)
var/damage_check = max(0, damage + dam)
diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm
index 8a249d297cbe..faa857f8518f 100644
--- a/code/game/verbs/who.dm
+++ b/code/game/verbs/who.dm
@@ -160,7 +160,7 @@
if(CONFIG_GET(flag/show_manager))
LAZYSET(mappings, "Management", R_PERMISSIONS)
if(CONFIG_GET(flag/show_devs))
- LAZYSET(mappings, "Maintainers", R_PROFILER)
+ LAZYSET(mappings, "Maintainers", R_PROFILER)
LAZYSET(mappings, "Admins", R_ADMIN)
if(CONFIG_GET(flag/show_mods))
LAZYSET(mappings, "Moderators", R_MOD)
diff --git a/code/game/world.dm b/code/game/world.dm
index fce40ca468ae..f5388ed6fd52 100644
--- a/code/game/world.dm
+++ b/code/game/world.dm
@@ -71,8 +71,6 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
RoleAuthority = new /datum/authority/branch/role()
to_world(SPAN_DANGER("\b Job setup complete"))
- if(!EvacuationAuthority) EvacuationAuthority = new
-
initiate_minimap_icons()
change_tick_lag(CONFIG_GET(number/ticklag))
@@ -91,8 +89,8 @@ var/list/reboot_sfx = file2list("config/reboot_sfx.txt")
update_status()
//Scramble the coords obsfucator
- obfs_x = rand(-500, 500) //A number between -100 and 100
- obfs_y = rand(-500, 500) //A number between -100 and 100
+ GLOB.obfs_x = rand(-500, 500) //A number between -100 and 100
+ GLOB.obfs_y = rand(-500, 500) //A number between -100 and 100
spawn(3000) //so we aren't adding to the round-start lag
if(CONFIG_GET(flag/ToRban))
@@ -174,11 +172,6 @@ var/world_topic_spam_protect_time = world.timeofday
response["response"] = "Payload too large"
return json_encode(response)
- if(SSfail_to_topic?.IsRateLimited(addr))
- response["statuscode"] = 429
- response["response"] = "Rate limited"
- return json_encode(response)
-
var/logging = CONFIG_GET(flag/log_world_topic)
var/topic_decoded = rustg_url_decode(T)
if(!rustg_json_is_valid(topic_decoded))
diff --git a/code/global.dm b/code/global.dm
index bdde529a9af8..e329cbdd00d5 100644
--- a/code/global.dm
+++ b/code/global.dm
@@ -153,14 +153,6 @@ var/list/nato_phonetic_alphabet = list("Alpha", "Bravo", "Charlie", "Delta", "Ec
var/distress_cancel = 0
var/destroy_cancel = 0
-//Coordinate obsfucator
-//Used by the rangefinders and linked systems to prevent coords collection/prefiring
-
-/// A number between -500 and 500.
-var/global/obfs_x = 0
-/// A number between -500 and 500.
-var/global/obfs_y = 0
-
// Which lobby art is on display
// This is updated by the lobby art turf when it initializes
var/displayed_lobby_art = -1
diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm
index 5042167023e6..38b63b94570c 100644
--- a/code/modules/admin/admin.dm
+++ b/code/modules/admin/admin.dm
@@ -261,7 +261,7 @@
if("Remove")
if(!GLOB.trait_name_map)
GLOB.trait_name_map = generate_trait_name_map()
- for(var/trait in D.status_traits)
+ for(var/trait in D._status_traits)
var/name = GLOB.trait_name_map[trait] || trait
available_traits[name] = trait
@@ -282,7 +282,7 @@
if("All")
source = null
if("Specific")
- source = input("Source to be removed","Trait Remove/Add") as null|anything in sort_list(D.status_traits[chosen_trait])
+ source = input("Source to be removed","Trait Remove/Add") as null|anything in sort_list(D._status_traits[chosen_trait])
if(!source)
return
REMOVE_TRAIT(D,chosen_trait,source)
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index 7d9127313094..207eebd3e409 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -69,6 +69,7 @@ var/list/admin_verbs_default = list(
/client/proc/toggle_ares_ping,
/client/proc/cmd_admin_say, /*staff-only ooc chat*/
/client/proc/cmd_mod_say, /* alternate way of typing asay, no different than cmd_admin_say */
+ /client/proc/cmd_admin_tacmaps_panel,
)
var/list/admin_verbs_admin = list(
@@ -99,10 +100,8 @@ var/list/admin_verbs_ban = list(
)
var/list/admin_verbs_sounds = list(
- /client/proc/play_web_sound,
- /client/proc/play_sound,
- /client/proc/stop_web_sound,
- /client/proc/stop_sound,
+ /client/proc/play_admin_sound,
+ /client/proc/stop_admin_sound,
/client/proc/cmd_admin_vox_panel
)
diff --git a/code/modules/admin/fax_templates.dm b/code/modules/admin/fax_templates.dm
index 91b23abb2422..459ab675d3a3 100644
--- a/code/modules/admin/fax_templates.dm
+++ b/code/modules/admin/fax_templates.dm
@@ -1,11 +1,13 @@
/proc/generate_templated_fax(show_wy_logo, fax_header, fax_subject, addressed_to, message_body, sent_by, sent_title, sent_department)
+ var/datum/asset/asset = get_asset_datum(/datum/asset/simple/paper)
+
var/dat = ""
dat += "