В набор СпИИ входит:
@@ -548,7 +548,7 @@
5.Термальное зрение для пИИ
"}
-/obj/item/paper/pai_upgrade/update_icon()
+/obj/item/paper/pai_upgrade/update_icon_state()
return
/obj/item/storage/box/syndie_kit/pai
diff --git a/code/game/objects/items/devices/pizza_bomb.dm b/code/game/objects/items/devices/pizza_bomb.dm
index b49b1012c89..481b8a83772 100644
--- a/code/game/objects/items/devices/pizza_bomb.dm
+++ b/code/game/objects/items/devices/pizza_bomb.dm
@@ -5,22 +5,53 @@
icon_state = "pizzabox1"
throw_range = 1
var/timer = 10 //Adjustable timer
- var/timer_set = 0
- var/primed = 0
- var/disarmed = 0
+ var/timer_set = FALSE
+ var/primed = FALSE
+ var/disarmed = FALSE
var/wires = list("orange", "green", "blue", "yellow", "aqua", "purple")
var/correct_wire
var/armer //Used for admin purposes
+
+/obj/item/pizza_bomb/update_icon_state()
+ if(disarmed)
+ icon_state = "pizzabox_bomb_[correct_wire]"
+ return
+ if(primed || !timer_set)
+ icon_state = "pizzabox_bomb"
+ return
+ icon_state = "pizzabox1"
+
+
+/obj/item/pizza_bomb/update_name(updates)
+ . = ..()
+ if(timer_set && !disarmed)
+ name = "pizza box"
+ else
+ name = "pizza bomb"
+
+
+/obj/item/pizza_bomb/update_desc(updates)
+ . = ..()
+ if(disarmed)
+ desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed."
+ return
+ if(primed)
+ desc = "OH GOD THAT'S NOT A PIZZA"
+ return
+ if(timer_set)
+ desc = "A box suited for pizzas."
+ else
+ desc = "It seems inactive."
+
+
/obj/item/pizza_bomb/attack_self(mob/user)
if(disarmed)
to_chat(user, "\The [src] is disarmed.")
return
+
if(!timer_set)
- name = "pizza bomb"
- desc = "It seems inactive."
- icon_state = "pizzabox_bomb"
- timer_set = 1
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
timer = (input(user, "Set a timer, from one second to ten seconds.", "Timer", "[timer]") as num) * 10
if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained())
timer_set = 0
@@ -29,25 +60,23 @@
icon_state = "pizzabox1"
return
timer = clamp(timer, 10, 100)
- icon_state = "pizzabox1"
+ timer_set = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
to_chat(user, "You set the timer to [timer / 10] before activating the payload and closing \the [src].")
message_admins("[key_name_admin(usr)] has set a timer on a pizza bomb to [timer/10] seconds at [ADMIN_COORDJMP(loc)].")
add_game_logs("has set the timer on a pizza bomb to [timer/10] seconds [COORD(loc)].", usr)
armer = usr
- name = "pizza box"
- desc = "A box suited for pizzas."
return
+
if(!primed)
- name = "pizza bomb"
- desc = "OH GOD THAT'S NOT A PIZZA"
- icon_state = "pizzabox_bomb"
audible_message("[bicon(src)] *beep* *beep*")
to_chat(user, "That's no pizza! That's a bomb!")
message_admins("[key_name_admin(usr)] has triggered a pizza bomb armed by [armer] at [ADMIN_COORDJMP(loc)].")
add_game_logs("has triggered a pizza bomb armed by [armer] [COORD(loc)].", usr)
- primed = 1
- sleep(timer)
- return go_boom()
+ primed = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
+ addtimer(CALLBACK(src, PROC_REF(go_boom)), timer)
+
/obj/item/pizza_bomb/proc/go_boom()
if(disarmed)
@@ -58,8 +87,9 @@
explosion(src.loc,1,2,4,flame_range = 2) //Identical to a minibomb
qdel(src)
-/obj/item/pizza_bomb/attackby(var/obj/item/I, var/mob/user, params)
- if(istype(I, /obj/item/wirecutters) && primed)
+
+/obj/item/pizza_bomb/attackby(obj/item/I, mob/user, params)
+ if(I.tool_behaviour == TOOL_WIRECUTTER && primed)
to_chat(user, "Oh God, what wire do you cut?!")
var/chosen_wire = input(user, "OH GOD OH GOD", "WHAT WIRE?!") in wires
if(!in_range(src, usr) || issilicon(usr) || !usr.canmove || usr.restrained())
@@ -68,19 +98,17 @@
user.visible_message("[user] cuts the [chosen_wire] wire!", "You cut the [chosen_wire] wire!")
sleep(5)
if(chosen_wire == correct_wire)
- src.audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.")
+ audible_message("[bicon(src)] \The [src] suddenly stops beeping and seems lifeless.")
to_chat(user, "You did it!")
- icon_state = "pizzabox_bomb_[correct_wire]"
- name = "pizza bomb"
- desc = "A devious contraption, made of a small explosive payload hooked up to pressure-sensitive wires. It's disarmed."
- disarmed = 1
- primed = 0
+ disarmed = TRUE
+ primed = FALSE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
return
else
to_chat(user, "WRONG WIRE!")
go_boom()
return
- if(istype(I, /obj/item/wirecutters) && disarmed)
+ if(I.tool_behaviour == TOOL_WIRECUTTER && disarmed)
if(!in_range(user, src))
to_chat(user, "You can't see the box well enough to cut the wires out.")
return
diff --git a/code/game/objects/items/devices/powersink.dm b/code/game/objects/items/devices/powersink.dm
index 60260b00bbb..6d471e726bd 100644
--- a/code/game/objects/items/devices/powersink.dm
+++ b/code/game/objects/items/devices/powersink.dm
@@ -30,7 +30,7 @@
attached = null
return ..()
-/obj/item/powersink/update_icon()
+/obj/item/powersink/update_icon_state()
icon_state = "powersink[mode == OPERATING]"
/obj/item/powersink/proc/set_mode(value)
@@ -60,7 +60,7 @@
density = TRUE
mode = value
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
set_light(0)
/obj/item/powersink/screwdriver_act(mob/user, obj/item/I)
@@ -135,8 +135,8 @@
if(A.operating && A.cell)
A.cell.charge = max(0, A.cell.charge - 50)
power_drained += 50
- if(A.charging == 2) // If the cell was full
- A.charging = 1 // It's no longer full
+ if(A.charging == APC_FULLY_CHARGED) // If the cell was full
+ A.charging = APC_IS_CHARGING // It's no longer full
if(drained >= drain_rate)
break
diff --git a/code/game/objects/items/devices/radio/intercom.dm b/code/game/objects/items/devices/radio/intercom.dm
index 5ffd2ae7b7d..5f5ea340c48 100644
--- a/code/game/objects/items/devices/radio/intercom.dm
+++ b/code/game/objects/items/devices/radio/intercom.dm
@@ -2,14 +2,16 @@
name = "station intercom (General)"
desc = "Talk through this."
icon_state = "intercom"
- anchored = 1
+ anchored = TRUE
w_class = WEIGHT_CLASS_BULKY
canhear_range = 2
flags = CONDUCT
- var/circuitry_installed = 1
+ blocks_emissive = FALSE
+ var/circuitry_installed = TRUE
var/buildstage = 0
dog_fashion = null
+
/obj/item/radio/intercom/custom
name = "station intercom (Custom)"
broadcasting = 0
@@ -53,8 +55,8 @@
if(direction)
setDir(direction)
set_pixel_offsets_from_dir(28, -28, 28, -28)
- b_stat=1
- on = 0
+ b_stat = TRUE
+ on = FALSE
GLOB.global_intercoms.Add(src)
update_icon()
@@ -66,7 +68,7 @@
..()
internal_channels = list(
num2text(PUB_FREQ) = list(),
- num2text(SEC_I_FREQ) = list(ACCESS_SECURITY)
+ num2text(SEC_I_FREQ) = list(ACCESS_SECURITY),
)
/obj/item/radio/intercom/syndicate
@@ -173,12 +175,12 @@
return
if(!I.use_tool(src, user, 10, volume = I.tool_volume) || buildstage != 2)
return
- update_icon()
- on = 1
- b_stat = 0
+ update_icon(UPDATE_ICON_STATE)
+ on = TRUE
+ b_stat = FALSE
buildstage = 3
to_chat(user, "You secure the electronics!")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
update_operating_status()
for(var/i, i<= 5, i++)
wires.on_cut(i, 1)
@@ -191,8 +193,8 @@
return
WIRECUTTER_SNIP_MESSAGE
new /obj/item/stack/cable_coil(get_turf(src),5)
- on = 0
- b_stat = 1
+ on = FALSE
+ b_stat = TRUE
buildstage = 1
update_icon()
update_operating_status(FALSE)
@@ -209,12 +211,18 @@
new /obj/item/mounted/frame/intercom(get_turf(src))
qdel(src)
-/obj/item/radio/intercom/update_icon()
+/obj/item/radio/intercom/update_icon_state()
if(!circuitry_installed)
icon_state="intercom-frame"
return
icon_state = "intercom[!on?"-p":""][b_stat ? "-open":""]"
+/obj/item/radio/intercom/update_overlays()
+ . = ..()
+ underlays.Cut()
+ if(on && buildstage == 3)
+ underlays += emissive_appearance(icon, "intercom_lightmask")
+
/obj/item/radio/intercom/proc/update_operating_status(on = TRUE)
var/area/current_area = get_area(src)
if(!current_area)
@@ -236,8 +244,10 @@
var/area/current_area = get_area(src)
if(!current_area)
on = FALSE
+ set_light(0)
else
on = current_area.powered(EQUIP) // set "on" to the equipment power status of our area.
+ set_light(1, LIGHTING_MINIMUM_POWER)
update_icon()
/obj/item/intercom_electronics
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index 49de0c3c080..928bb79a3a1 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -11,21 +11,22 @@ REAGENT SCANNER
desc = "A terahertz-ray emitter and scanner used to detect underfloor objects such as cables and pipes."
icon = 'icons/obj/device.dmi'
icon_state = "t-ray0"
- var/on = 0
+ base_icon_state = "t-ray"
+ var/on = FALSE
slot_flags = SLOT_BELT
- w_class = 2
w_class = WEIGHT_CLASS_SMALL
item_state = "electronic"
materials = list(MAT_METAL=150)
origin_tech = "magnets=1;engineering=1"
var/scan_range = 1
- var/pulse_duration = 10
+ var/pulse_duration = 1 SECONDS
/obj/item/t_scanner/extended_range
name = "T-ray сканер расширенной дальности"
desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \
\nДанная модель обладает расширенным радиусом действия."
icon_state = "t-ray-range0"
+ base_icon_state = "t-ray-range"
scan_range = 3
origin_tech = "magnets=3;engineering=3"
materials = list(MAT_METAL=300)
@@ -35,7 +36,8 @@ REAGENT SCANNER
desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \
\nДанная модель способна генерировать более продолжительные импульсы."
icon_state = "t-ray-pulse0"
- pulse_duration = 50
+ base_icon_state = "t-ray-pulse"
+ pulse_duration = 5 SECONDS
origin_tech = "magnets=5;engineering=3"
materials = list(MAT_METAL=300)
@@ -44,8 +46,9 @@ REAGENT SCANNER
desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \
\nДанная модель способна генерировать более продолжительные импульсы и обладает расширенным радиусом действия."
icon_state = "t-ray-advanced0"
+ base_icon_state = "t-ray-advanced"
scan_range = 3
- pulse_duration = 50
+ pulse_duration = 5 SECONDS
origin_tech = "magnets=7;engineering=3"
materials = list(MAT_METAL=300)
@@ -54,8 +57,9 @@ REAGENT SCANNER
desc = "Излучатель и сканер терагерцевого излучения, используемый для обнаружения скрытых объектов и объектов под полом, таких как кабели и трубы. \
\nВысокотехнологичная модель, способная генерировать очень продолжительные импульсы в пределах большого радиуса."
icon_state = "t-ray-science0"
+ base_icon_state = "t-ray-science"
scan_range = 5
- pulse_duration = 100
+ pulse_duration = 10 SECONDS
origin_tech = "magnets=8;engineering=5"
materials = list(MAT_METAL=500)
@@ -65,8 +69,9 @@ REAGENT SCANNER
\nЭкспериментальный образец, обладающий расширенным радиусом действия и более продолжительным импульсом. \
\nСудя по его виду, эта вещь была собрана безумными учеными в ходе спонтанных экспериментов."
icon_state = "t-ray-experimental0"
+ base_icon_state = "t-ray-experimental"
scan_range = 3
- pulse_duration = 80
+ pulse_duration = 8 SECONDS
origin_tech = null
materials = list()
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -76,14 +81,19 @@ REAGENT SCANNER
STOP_PROCESSING(SSobj, src)
return ..()
-/obj/item/t_scanner/attack_self(mob/user)
+/obj/item/t_scanner/update_icon_state()
+ icon_state = "[base_icon_state][on]"
+/obj/item/t_scanner/proc/toggle_mode()
on = !on
- icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
-
+ update_icon(UPDATE_ICON_STATE)
if(on)
START_PROCESSING(SSobj, src)
+ else
+ STOP_PROCESSING(SSobj, src)
+/obj/item/t_scanner/attack_self(mob/user)
+ toggle_mode()
/obj/item/t_scanner/process()
if(!on)
@@ -92,48 +102,41 @@ REAGENT SCANNER
scan()
/obj/item/t_scanner/proc/scan()
+ t_ray_scan(loc, pulse_duration, scan_range)
- for(var/turf/scan_turf in range(scan_range, src.loc) )
-
- if(!scan_turf.intact)
+/proc/t_ray_scan(mob/viewer, flick_time, distance)
+ if(!ismob(viewer) || !viewer.client)
+ return
+ var/list/t_ray_images = list()
+ for(var/atom/movable/in_turf_atom in orange(distance, viewer))
+ if(!isobj(in_turf_atom) && !isliving(in_turf_atom))
continue
- for(var/obj/in_turf_object in scan_turf.contents)
-
+ if(isobj(in_turf_atom))
+ var/obj/in_turf_object = in_turf_atom
if(in_turf_object.level != 1)
continue
- var/temp_invisibility = in_turf_object.invisibility
- var/temp_alpha = in_turf_object.alpha
- if(temp_invisibility == INVISIBILITY_ABSTRACT || temp_invisibility == INVISIBILITY_ANOMALY)
- in_turf_object.invisibility = 0
- in_turf_object.alpha = 128
- in_turf_object.drain_act_protected = TRUE
- if(in_turf_object.layer < TURF_LAYER)
- in_turf_object.layer += TRAY_SCAN_LAYER_OFFSET
- spawn(pulse_duration)
- in_turf_object.plane = GAME_PLANE
- if(in_turf_object)
- var/turf/objects_turf = in_turf_object.loc
- if(objects_turf && objects_turf.intact)
- in_turf_object.invisibility = temp_invisibility
- in_turf_object.alpha = temp_alpha
- in_turf_object.drain_act_protected = FALSE
- for(var/mob/living/in_turf_mob in scan_turf.contents)
- var/oldalpha = in_turf_mob.alpha
- if(in_turf_mob.alpha < 255 && istype(in_turf_mob))
- in_turf_mob.alpha = 255
- spawn(10)
- if(in_turf_mob)
- in_turf_mob.alpha = oldalpha
-
- var/mob/living/in_turf_mob = locate() in scan_turf
-
- if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO)
- in_turf_mob.invisibility = 0
- spawn(2)
- if(in_turf_mob)
- in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO
+ if(in_turf_object.invisibility != INVISIBILITY_MAXIMUM && in_turf_object.invisibility != INVISIBILITY_ANOMALY)
+ continue
+
+ if(isliving(in_turf_atom))
+ var/mob/living/in_turf_living = in_turf_atom
+ if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO))
+ continue
+
+ var/image/I = new(loc = get_turf(in_turf_atom))
+ var/mutable_appearance/MA = new(in_turf_atom)
+ MA.alpha = isliving(in_turf_atom) ? 255 : 128
+ MA.dir = in_turf_atom.dir
+ if(MA.layer < TURF_LAYER)
+ MA.layer += TRAY_SCAN_LAYER_OFFSET
+ MA.plane = GAME_PLANE
+ I.appearance = MA
+ t_ray_images += I
+
+ if(length(t_ray_images))
+ flick_overlay(t_ray_images, list(viewer.client), flick_time)
/obj/item/t_scanner/security
name = "Противо-маскировочное ТГц устройство"
@@ -143,13 +146,14 @@ REAGENT SCANNER
righthand_file = 'icons/mob/inhands/items_righthand.dmi'
item_state = "sb_t-ray"
icon_state = "sb_t-ray0"
+ base_icon_state = "sb_t-ray"
scan_range = 2
- pulse_duration = 30
var/was_alerted = FALSE // Protection against spam alerts from this scanner
var/burnt = FALSE // Did emp break us?
var/datum/effect_system/spark_spread/spark_system //The spark system, used for generating... sparks?
origin_tech = "combat=3;magnets=5;biotech=5"
+
/obj/item/t_scanner/security/Initialize()
. = ..()
//Sets up a spark system
@@ -157,43 +161,67 @@ REAGENT SCANNER
spark_system.set_up(5, 0, src)
spark_system.attach(src)
+
+/obj/item/t_scanner/security/update_icon_state()
+ if(burnt)
+ icon_state = "[base_icon_state]_burnt"
+ return
+ icon_state = "[base_icon_state][on]"
+
+
+/obj/item/t_scanner/security/update_desc(updates = ALL)
+ . = ..()
+ if(!burnt)
+ desc = initial(desc)
+ return
+ desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..."
+
+
/obj/item/t_scanner/security/attack_self(mob/user)
if(!burnt)
on = !on
- icon_state = copytext(icon_state, 1, length(icon_state))+"[on]"
+ update_icon(UPDATE_ICON_STATE)
if(on)
- START_PROCESSING(SSobj, src)
+ START_PROCESSING(SSprocessing, src)
+ else
+ STOP_PROCESSING(SSprocessing, src)
+
/obj/item/t_scanner/security/emp_act(severity)
. = ..()
if(prob(25) && !burnt)
burnt = TRUE
- on = FALSE;
- icon_state = copytext(icon_state, 1, length(icon_state))+"_burnt"
- desc = "Излучатель терагерцевого типа используемый для сканирования области на наличие замаскированных биоорганизмов. Устройство сгорело, теперь можно обнаружить разве что крошки от пончика оставшиеся на нём..."
+ on = FALSE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_DESC)
playsound(loc, "sparks", 50, TRUE, 5)
spark_system.start()
-/obj/item/t_scanner/security/scan()
+/obj/item/t_scanner/security/scan()
+ var/mob/viewer = loc
+ if(!ismob(viewer) || !viewer.client)
+ return
new /obj/effect/temp_visual/scan(get_turf(src))
- var/list/mobs_in_range = viewers(scan_range, get_turf(src))
- for(var/mob/living/in_turf_mob in mobs_in_range)
- var/oldalpha = in_turf_mob.alpha
- if(in_turf_mob.alpha < 255 && istype(in_turf_mob))
- in_turf_mob.alpha = 255
- alert_searchers(in_turf_mob)
- spawn(pulse_duration)
- if(in_turf_mob)
- in_turf_mob.alpha = oldalpha
- if(in_turf_mob && in_turf_mob.invisibility == INVISIBILITY_LEVEL_TWO)
- in_turf_mob.invisibility = 0
- alert_searchers(in_turf_mob)
- spawn(pulse_duration)
- if(in_turf_mob)
- in_turf_mob.invisibility = INVISIBILITY_LEVEL_TWO
+ var/list/t_ray_images = list()
+ for(var/mob/living/in_turf_living in viewers(scan_range, get_turf(src)))
+ if(!(in_turf_living.alpha < 255 || in_turf_living.invisibility == INVISIBILITY_LEVEL_TWO))
+ continue
+
+ var/image/I = new(loc = get_turf(in_turf_living))
+ var/mutable_appearance/MA = new(in_turf_living)
+ MA.alpha = 255
+ MA.dir = in_turf_living.dir
+ if(MA.layer < TURF_LAYER)
+ MA.layer += TRAY_SCAN_LAYER_OFFSET
+ MA.plane = GAME_PLANE
+ I.appearance = MA
+ t_ray_images += I
+ alert_searchers(in_turf_living)
+
+ if(length(t_ray_images))
+ flick_overlay(t_ray_images, list(viewer.client), pulse_duration)
/obj/item/t_scanner/security/proc/alert_searchers(mob/living/found_mob)
var/list/alerted = viewers(7, found_mob)
@@ -601,6 +629,13 @@ REAGENT SCANNER
if(0)
to_chat(usr, "Сканер больше не показывает повреждения конечностей.")
+
+/obj/item/healthanalyzer/update_overlays()
+ . = ..()
+ if(advanced)
+ . += "advanced"
+
+
/obj/item/healthanalyzer/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/healthupgrade))
if(advanced)
@@ -608,9 +643,9 @@ REAGENT SCANNER
else
if(user.drop_transfer_item_to_loc(I, src))
to_chat(user, "Вы установили модуль обновления на [src].")
- add_overlay("advanced")
playsound(loc, I.usesound, 50, 1)
advanced = TRUE
+ update_icon(UPDATE_OVERLAYS)
qdel(I)
return
return ..()
@@ -620,7 +655,7 @@ REAGENT SCANNER
/obj/item/healthanalyzer/advanced/Initialize(mapload)
. = ..()
- add_overlay("advanced")
+ update_icon(UPDATE_OVERLAYS)
/obj/item/healthupgrade
@@ -787,6 +822,7 @@ REAGENT SCANNER
var/obj/item/stock_parts/cell/cell
var/cell_type = /obj/item/stock_parts/cell/upgraded
var/ready = TRUE // Ready to scan
+ var/printing = FALSE
var/time_to_use = 0 // How much time remaining before next scan is available.
var/usecharge = 750
var/scan_time = 10 SECONDS //how long does it take to scan
@@ -817,17 +853,24 @@ REAGENT SCANNER
playsound(src, 'sound/machines/defib_saftyon.ogg', 50, 0)
update_icon()
-/obj/item/bodyanalyzer/update_icon(printing = FALSE)
- overlays.Cut()
- var/percent = cell.percent()
+
+/obj/item/bodyanalyzer/update_icon_state()
+ if(!cell)
+ icon_state = "bodyanalyzer_0"
+ return
if(ready)
icon_state = "bodyanalyzer_1"
else
icon_state = "bodyanalyzer_2"
+
+/obj/item/bodyanalyzer/update_overlays()
+ . = ..()
+ var/percent = cell.percent()
var/overlayid = round(percent / 10)
- overlayid = "bodyanalyzer_charge[overlayid]"
- overlays += icon(icon, overlayid)
+ . += "bodyanalyzer_charge[overlayid]"
+ if(printing)
+ . += "bodyanalyzer_printing"
/obj/item/bodyanalyzer/attack(mob/living/M, mob/living/carbon/human/user)
@@ -845,6 +888,7 @@ REAGENT SCANNER
to_chat(user, "The scanner beeps angrily at you! It's out of charge!")
playsound(user.loc, 'sound/machines/buzz-sigh.ogg', 50, 1)
+
/obj/item/bodyanalyzer/borg/attack(mob/living/M, mob/living/silicon/robot/user)
if(user.incapacitated() || !user.Adjacent(M))
return
@@ -858,6 +902,7 @@ REAGENT SCANNER
else
to_chat(user, "You need to recharge before you can use [src]")
+
/obj/item/bodyanalyzer/proc/mobScan(mob/living/M, mob/user)
if(ishuman(M))
var/report = generate_printing_text(M, user)
@@ -867,8 +912,6 @@ REAGENT SCANNER
printout.info = report
printout.name = "Scan report - [M.name]"
playsound(user.loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
- flick("bodyanalyzer_anim", src)
- sleep(3 SECONDS)
user.put_in_hands(printout, ignore_anim = FALSE)
time_to_use = world.time + scan_cd
if(isrobot(user))
@@ -877,14 +920,16 @@ REAGENT SCANNER
else
cell.use(usecharge)
ready = FALSE
- update_icon(TRUE)
+ printing = TRUE
+ update_icon()
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 20)
-
+ addtimer(VARSET_CALLBACK(src, printing, FALSE), 1.4 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1.5 SECONDS)
else if(iscorgi(M) && M.stat == DEAD)
to_chat(user, "You wonder if [M.p_they()] was a good dog. [src] tells you they were the best...") // :'(
playsound(loc, 'sound/machines/ping.ogg', 50, 0)
ready = FALSE
+ update_icon(UPDATE_ICON_STATE)
addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/bodyanalyzer, setReady)), scan_cd)
time_to_use = world.time + scan_cd
else
diff --git a/code/game/objects/items/devices/sensor_device.dm b/code/game/objects/items/devices/sensor_device.dm
index d0a65408d5b..4a81ccd38d1 100644
--- a/code/game/objects/items/devices/sensor_device.dm
+++ b/code/game/objects/items/devices/sensor_device.dm
@@ -17,23 +17,20 @@
QDEL_NULL(crew_monitor)
return ..()
-/obj/item/sensor_device/attack_self(mob/user as mob)
+/obj/item/sensor_device/attack_self(mob/user)
ui_interact(user)
-/obj/item/sensor_device/MouseDrop(atom/over)
+/obj/item/sensor_device/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(istype(over, /obj/screen))
- return FALSE
-
if(user.incapacitated() || !ishuman(user))
return FALSE
- if(over == user)
+ if(over_object == user)
attack_self(user)
return TRUE
diff --git a/code/game/objects/items/devices/signmaker.dm b/code/game/objects/items/devices/signmaker.dm
index 64da2cfc406..6d163a7105e 100644
--- a/code/game/objects/items/devices/signmaker.dm
+++ b/code/game/objects/items/devices/signmaker.dm
@@ -29,22 +29,25 @@
return
qdel(sign)
sign = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/signmaker/proc/icon_flick()
set waitfor = FALSE
- icon_state = "signmaker_clown_on"
pointer_busy = TRUE
- sleep(10)
+ update_icon(UPDATE_ICON_STATE)
+ sleep(1 SECONDS)
pointer_busy = FALSE
- icon_state = "signmaker_clown_off"
+ update_icon(UPDATE_ICON_STATE)
+
-/obj/item/signmaker/update_icon()
- if(sign)
- icon_state = "signmaker_clown_on"
- else
+/obj/item/signmaker/update_icon_state()
+ if(pointer_busy)
icon_state = "signmaker_clown_off"
+ return
+ icon_state = "signmaker_clown_[sign ? "on" : "off"]]"
+
/obj/item/signmaker/emag_act(mob/user)
add_attack_logs(user, src, "emagged")
diff --git a/code/game/objects/items/devices/taperecorder.dm b/code/game/objects/items/devices/taperecorder.dm
index 98c77e2f95a..218f4d6e7b3 100644
--- a/code/game/objects/items/devices/taperecorder.dm
+++ b/code/game/objects/items/devices/taperecorder.dm
@@ -36,7 +36,7 @@
..()
if(starts_with_tape)
mytape = new /obj/item/tape/random(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
soundloop = new(list(src))
@@ -60,7 +60,7 @@
. += span_notice("[mytape] has [mytape.remaining_capacity] seconds remaining.") // to avoid having 0 minutes
else
. += span_notice("[mytape] has [seconds_to_time(mytape.remaining_capacity)] remaining.")
- . += span_notice("Alt-Click to access the tape.")
+ . += span_info("Alt-Click to access the tape.")
/obj/item/taperecorder/proc/update_sound()
@@ -70,7 +70,7 @@
soundloop.start()
-/obj/item/taperecorder/update_icon()
+/obj/item/taperecorder/update_icon_state()
if(!mytape)
icon_state = "taperecorder_empty"
else if(recording)
@@ -82,7 +82,7 @@
/obj/item/taperecorder/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
- mytape.ruin() //Fires destroy the tape
+ mytape?.ruin() //Fires destroy the tape
return ..()
@@ -91,7 +91,7 @@
mytape = I
to_chat(user, span_notice("You insert [I] into [src]."))
playsound(src, 'sound/items/taperecorder/taperecorder_close.ogg', 50, FALSE)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/taperecorder/attack_hand(mob/user)
@@ -150,7 +150,7 @@
mytape.forceMove_turf()
user.put_in_hands(mytape, ignore_anim = FALSE)
mytape = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/taperecorder/proc/record()
@@ -167,7 +167,7 @@
recording = TRUE
recorder_say("Запись началась.")
update_sound()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
mytape.timestamp += mytape.used_capacity
var/datum/tape_piece/piece = new()
piece.time = mytape.used_capacity
@@ -209,7 +209,7 @@
if(!playback_override)
recorder_say("Проигрывание остановлено.")
playing = FALSE
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
update_sound()
@@ -229,7 +229,7 @@
return
playing = TRUE
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
update_sound()
recorder_say("Проигрывание началось.")
playsound(src, 'sound/items/taperecorder/taperecorder_play.ogg', 50, FALSE)
@@ -317,18 +317,18 @@
var/obj/item/paper/transcript = new /obj/item/paper(drop_location())
- var/t1 = "Transcript:
"
+ var/list/paper_info = list("Transcript:
")
for(var/i = 1, length(mytape.storedinfo) >= i, i++)
var/datum/tape_piece/piece = mytape.storedinfo[i]
- t1 += "\[[time2text(piece.time * 10,"mm:ss")]\] "
+ paper_info += "\[[time2text(piece.time * 10,"mm:ss")]\] "
if(piece.speaker_name)
- t1 += "[piece.speaker_name] "
+ paper_info += "[piece.speaker_name] "
if(piece.message_verb)
- t1 += "[piece.message_verb], \"[piece.message]\" "
+ paper_info += "[piece.message_verb], \"[replace_characters(piece.message, list("+"))]\" "
else
- t1 += "[piece.message] "
+ paper_info += "[replace_characters(piece.message, list("+"))] "
- transcript.info = t1
+ transcript.info = paper_info.Join("")
transcript.name = "paper- 'Transcript'"
cooldown = world.time + 3 SECONDS
@@ -377,6 +377,12 @@
. += span_notice("It has [seconds_to_time(remaining_capacity)] remaining.")
+/obj/item/tape/update_overlays()
+ . = ..()
+ if(ruined)
+ . += "ribbonoverlay"
+
+
/obj/item/tape/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
ruin()
@@ -414,14 +420,14 @@
to_chat(user, span_notice("You pull the tape out of [src]."))
if(!ruined)
- overlays += "ribbonoverlay"
ruined = TRUE
+ update_icon(UPDATE_OVERLAYS)
/obj/item/tape/proc/fix()
if(ruined)
- overlays -= "ribbonoverlay"
ruined = FALSE
+ update_icon(UPDATE_OVERLAYS)
/obj/item/tape/verb/wipe()
diff --git a/code/game/objects/items/devices/traitordevices.dm b/code/game/objects/items/devices/traitordevices.dm
index 43f06e5b5dd..c0d5b223e9d 100644
--- a/code/game/objects/items/devices/traitordevices.dm
+++ b/code/game/objects/items/devices/traitordevices.dm
@@ -29,15 +29,17 @@ effective or pretty fucking useless.
var/charges = 3
+
/obj/item/batterer/examine(mob/user)
. = ..()
- . += "[src] has [charges] charges left."
+ . += span_notice("[src] has [charges] charges left.")
+
/obj/item/batterer/attack_self(mob/living/carbon/user, flag = 0, emp = 0)
if(!user)
return
if(charges == 0)
- to_chat(user, "The mind batterer is out of charge!")
+ to_chat(user, span_danger("The mind batterer is out of charge!"))
return
@@ -46,17 +48,18 @@ effective or pretty fucking useless.
M.Weaken(rand(2,6) SECONDS)
M.adjustStaminaLoss(rand(35, 60))
add_attack_logs(user, M, "Stunned with [src]")
- to_chat(M, "You feel a tremendous, paralyzing wave flood your mind.")
+ to_chat(M, span_danger("You feel a tremendous, paralyzing wave flood your mind."))
else
- to_chat(M, "You feel a sudden, electric jolt travel through your head.")
+ to_chat(M, span_danger("You feel a sudden, electric jolt travel through your head."))
M.Slowed(10 SECONDS)
M.Confused(6 SECONDS)
playsound(loc, 'sound/misc/interference.ogg', 50, 1)
charges--
- to_chat(user, "You trigger [src]. It has [charges] charges left.")
+ to_chat(user,span_notice("You trigger [src]. It has [charges] charges left."))
addtimer(CALLBACK(src, PROC_REF(recharge)), 3 MINUTES)
+
/obj/item/batterer/proc/recharge()
charges++
@@ -92,31 +95,43 @@ effective or pretty fucking useless.
var/wavelength = 10 // time it takes for the radiation to kick in, in seconds
var/used = 0 // is it cooling down?
-/obj/item/rad_laser/attack(mob/living/M, mob/living/user)
- if(!used)
- add_attack_logs(user, M, "Irradiated by [src]")
- user.visible_message("[user] analyzes [M]'s vitals.")
- var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
- used = 1
- icon_state = "health1"
- handle_cooldown(cooldown) // splits off to handle the cooldown while handling wavelength
- spawn((wavelength+(intensity*4))*10)
- if(M)
- if(intensity >= 5)
- M.Paralyse(intensity * 40/3 SECONDS)
- M.apply_effect(intensity * 10, IRRADIATE)
- else
- to_chat(user, "The radioactive microlaser is still recharging.")
-/obj/item/rad_laser/proc/handle_cooldown(cooldown)
- spawn(cooldown)
- used = 0
- icon_state = "health2"
+/obj/item/rad_laser/update_icon_state()
+ icon_state = used ? "health1" : "health2"
+
+
+/obj/item/rad_laser/attack(mob/living/target, mob/living/user)
+ if(used)
+ to_chat(user, span_warning("The radioactive microlaser is still recharging."))
+ return
+
+ add_attack_logs(user, target, "Irradiated by [src]")
+ user.visible_message(span_notice("[user] analyzes [target]'s vitals."))
+ var/cooldown = round(max(100,(((intensity*8)-(wavelength/2))+(intensity*2))*10))
+ used = TRUE
+ update_icon(UPDATE_ICON_STATE)
+ addtimer(CALLBACK(src, PROC_REF(reset_cooldown)), cooldown)
+ addtimer(CALLBACK(src, PROC_REF(delayed_effect), target), (wavelength + (intensity * 4)) SECONDS)
+
+
+/obj/item/rad_laser/proc/reset_cooldown()
+ used = FALSE
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/rad_laser/proc/delayed_effect(mob/living/target)
+ if(QDELETED(target))
+ return
+ if(intensity >= 5)
+ target.Paralyse((intensity * 40 / 3) SECONDS)
+ target.apply_effect(intensity * 10, IRRADIATE)
+
/obj/item/rad_laser/attack_self(mob/user)
..()
interact(user)
+
/obj/item/rad_laser/interact(mob/user)
user.set_machine(src)
@@ -131,6 +146,7 @@ effective or pretty fucking useless.
popup.set_content(dat)
popup.open()
+
/obj/item/rad_laser/Topic(href, href_list)
if(..())
return 1
@@ -149,7 +165,8 @@ effective or pretty fucking useless.
attack_self(usr)
add_fingerprint(usr)
- return
+
+
/obj/item/jammer
name = "radio jammer"
@@ -159,12 +176,14 @@ effective or pretty fucking useless.
var/active = FALSE
var/range = 12
+
/obj/item/jammer/Destroy()
GLOB.active_jammers -= src
return ..()
+
/obj/item/jammer/attack_self(mob/user)
- to_chat(user,"You [active ? "deactivate" : "activate"] the [src].")
+ to_chat(user, span_notice("You [active ? "deactivate" : "activate"] the [src]."))
active = !active
if(active)
GLOB.active_jammers |= src
@@ -175,7 +194,8 @@ effective or pretty fucking useless.
name = "Syndicate teleporter"
desc = "A strange syndicate version of a cult veil shifter. Warranty voided if exposed to EMP."
icon = 'icons/obj/device.dmi'
- icon_state = "syndi-tele"
+ icon_state = "syndi-tele-4"
+ base_icon_state = "syndi-tele"
throwforce = 5
w_class = WEIGHT_CLASS_SMALL
throw_speed = 4
@@ -190,87 +210,122 @@ effective or pretty fucking useless.
var/saving_throw_distance = 3
var/flawless = FALSE
-/obj/item/teleporter/Initialize(mapload, ...)
- . = ..()
- START_PROCESSING(SSobj, src)
/obj/item/teleporter/Destroy()
- STOP_PROCESSING(SSobj, src)
+ if(isprocessing)
+ STOP_PROCESSING(SSobj, src)
return ..()
+
/obj/item/teleporter/examine(mob/user)
. = ..()
- . += "[src] has [charges] out of [max_charges] charges left."
+ . += span_notice("[src] has [charges] out of [max_charges] charges left.")
+
+
+/obj/item/teleporter/update_icon_state()
+ icon_state = "[base_icon_state]-[charges]"
+
/obj/item/teleporter/attack_self(mob/user)
attempt_teleport(user, FALSE)
+
/obj/item/teleporter/process()
- if(prob(10) && charges < max_charges)
+ if(charges >= max_charges)
+ return PROCESS_KILL
+
+ if(prob(10))
charges++
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/teleporter/emp_act(severity)
- if(prob(50 / severity))
- if(istype(loc, /mob/living/carbon/human))
- var/mob/living/carbon/human/user = loc
- to_chat(user, "The [src] buzzes and activates!")
- attempt_teleport(user, TRUE)
- else
- visible_message(" The [src] activates and blinks out of existence!")
- do_sparks(2, 1, src)
- qdel(src)
+ if(!prob(50 / severity))
+ return
+
+ if(ishuman(loc))
+ var/mob/living/carbon/human/user = loc
+ to_chat(user, span_danger("The [src] buzzes and activates!"))
+ attempt_teleport(user, TRUE)
+ return
+
+ // Well, it either is on a floor / locker, and won't teleport someone,
+ // OR it's in someones bag. As such, we need to check the turf to see if people are there.
+ var/teleported_something = FALSE
+ var/turf/teleport_turf = get_turf(src)
+ for(var/mob/living/user in teleport_turf)
+ teleported_something = TRUE
+ attempt_teleport(user, TRUE)
+
+ if(teleported_something)
+ teleport_turf.visible_message(span_danger("[src] activates sporadically, teleporting everyone around it!"))
+ return
+
+ visible_message(span_warning("The [src] activates and blinks out of existence!"))
+ do_sparks(2, TRUE, src)
+ qdel(src)
+
-/obj/item/teleporter/proc/attempt_teleport(mob/user, EMP_D = FALSE)
+/obj/item/teleporter/proc/attempt_teleport(mob/living/user, EMP_D = FALSE)
+ for(var/obj/item/grab/G in user)
+ qdel(G)
dir_correction(user)
- if(!charges)
- to_chat(user, "The [src] is recharging still.")
+ if(!charges && !EMP_D) //If it's empd, you are moving no matter what.
+ to_chat(user, span_warning("[src] is still recharging."))
return
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
- var/list/turfs = new/list()
+ var/turf/mobloc = get_turf(user)
+ var/list/turfs = list()
var/found_turf = FALSE
var/list/bagholding = user.search_contents_for(/obj/item/storage/backpack/holding)
- for(var/turf/T in range(user, tp_range))
- if(!is_teleport_allowed(T.z))
+ for(var/turf/check in range(user, tp_range))
+ if(!is_teleport_allowed(check.z))
break
if(!(length(bagholding) && !flawless)) //Chaos if you have a bag of holding
- if(get_dir(C, T) != C.dir)
+ if(get_dir(user, check) != user.dir)
continue
- if(T in range(user, inner_tp_range))
+ if(check in range(user, inner_tp_range))
continue
- if(T.x > world.maxx-tp_range || T.x < tp_range)
+ if(check.x > world.maxx-tp_range || check.x < tp_range)
continue //putting them at the edge is dumb
- if(T.y > world.maxy-tp_range || T.y < tp_range)
+ if(check.y > world.maxy-tp_range || check.y < tp_range)
continue
- turfs += T
+ turfs += check
found_turf = TRUE
- if(found_turf)
- if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff
- to_chat(C, "The [src] will not work here!")
+ if(!found_turf)
+ to_chat(user, span_danger("[src] will not work here!"))
+ return
+
+ if(user.loc != mobloc) // No locker / mech / sleeper teleporting, that breaks stuff
+ to_chat(user, span_danger("[src] will not work here!"))
+
+ if(charges > 0) //While we want EMP triggered teleports to drain charge, we also do not want it to go negative charge, as such we need this check here
charges--
- var/turf/destination = pick(turfs)
- if(tile_check(destination) || flawless) // Why is there so many bloody floor types
- var/turf/fragging_location = destination
- telefrag(fragging_location, user)
- C.forceMove(destination)
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
- playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination)
- else if (EMP_D == FALSE && !(bagholding.len && !flawless)) // This is where the fun begins
- var/direction = get_dir(user, destination)
- panic_teleport(user, destination, direction)
- else // Emp activated? Bag of holding? No saving throw for you
- get_fragged(user, destination)
- else
- to_chat(C, "The [src] will not work here!")
+ update_icon(UPDATE_ICON_STATE)
+ if(!isprocessing)
+ START_PROCESSING(SSobj, src)
+
+ var/turf/destination = pick(turfs)
+ if(tile_check(destination) || flawless) // Why is there so many bloody floor types
+ var/turf/fragging_location = destination
+ telefrag(fragging_location, user)
+ user.forceMove(destination)
+ playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
+ playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ new/obj/effect/temp_visual/teleport_abductor/syndi_teleporter(destination)
+ else if(EMP_D == FALSE && !(length(bagholding) && !flawless)) // This is where the fun begins
+ var/direction = get_dir(user, destination)
+ panic_teleport(user, destination, direction)
+ else // Emp activated? Bag of holding? No saving throw for you
+ get_fragged(user, destination)
+
+
+/obj/item/teleporter/proc/tile_check(turf/check_turf)
+ return isfloorturf(check_turf) || isspaceturf(check_turf)
-/obj/item/teleporter/proc/tile_check(turf/T)
- if(istype(T, /turf/simulated/floor) || istype(T, /turf/space) || istype(T, /turf/simulated/floor/shuttle) || istype(T, /turf/simulated/floor/shuttle/objective_check) || istype(T, /turf/simulated/floor/shuttle/plating))
- return TRUE
/obj/item/teleporter/proc/dir_correction(mob/user) //Direction movement, screws with teleport distance and saving throw, and thus must be removed first
var/temp_direction = user.dir
@@ -280,7 +335,8 @@ effective or pretty fucking useless.
if(NORTHWEST, SOUTHWEST)
user.dir = WEST
-/obj/item/teleporter/proc/panic_teleport(mob/user, turf/destination, direction = NORTH)
+
+/obj/item/teleporter/proc/panic_teleport(mob/living/user, turf/destination, direction = NORTH)
var/saving_throw
switch(direction)
if(NORTH, SOUTH)
@@ -296,33 +352,33 @@ effective or pretty fucking useless.
else
saving_throw = NORTH // just in case
- var/mob/living/carbon/C = user
- var/turf/mobloc = get_turf(C)
+ var/turf/mobloc = get_turf(user)
var/list/turfs = list()
var/found_turf = FALSE
- for(var/turf/T in range(destination, saving_throw_distance))
- if(get_dir(destination, T) != saving_throw)
+ for(var/turf/check in range(destination, saving_throw_distance))
+ if(get_dir(destination, check) != saving_throw)
continue
- if(T.x > world.maxx-saving_throw_distance || T.x < saving_throw_distance)
+ if(check.x > world.maxx-saving_throw_distance || check.x < saving_throw_distance)
continue //putting them at the edge is dumb
- if(T.y > world.maxy-saving_throw_distance || T.y < saving_throw_distance)
+ if(check.y > world.maxy-saving_throw_distance || check.y < saving_throw_distance)
continue
- if(!tile_check(T))
+ if(!tile_check(check))
continue // We are only looking for safe tiles on the saving throw, since we are nice
- turfs += T
+ turfs += check
found_turf = TRUE
- if(found_turf)
- var/turf/new_destination = pick(turfs)
- var/turf/fragging_location = new_destination
- telefrag(fragging_location, user)
- C.forceMove(new_destination)
- playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
- new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination)
- playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- else //We tried to save. We failed. Death time.
- get_fragged(user, destination)
+ if(!found_turf)
+ get_fragged(user, destination) //We tried to save. We failed. Death time.
+ return
+
+ var/turf/new_destination = pick(turfs)
+ var/turf/fragging_location = new_destination
+ telefrag(fragging_location, user)
+ user.forceMove(new_destination)
+ playsound(mobloc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(mobloc)
+ new /obj/effect/temp_visual/teleport_abductor/syndi_teleporter(new_destination)
+ playsound(new_destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
/obj/item/teleporter/proc/get_fragged(mob/user, turf/destination)
@@ -334,19 +390,19 @@ effective or pretty fucking useless.
playsound(destination, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
playsound(destination, "sound/magic/disintegrate.ogg", 50, TRUE)
destination.ex_act(rand(1,2))
- for(var/obj/item/W in user)
- if(istype(W, /obj/item/organ)|| istype(W, /obj/item/implant))
- continue
- if(!user.drop_item_ground(W))
- qdel(W)
- to_chat(user, "You teleport into the wall, the teleporter tries to save you, but--")
+ for(var/obj/item/thing as anything in user.get_equipped_items(TRUE, TRUE))
+ if(!user.drop_item_ground(thing))
+ qdel(thing)
+ to_chat(user, span_dangerbigger("You teleport into the wall, the teleporter tries to save you, but--"))
user.gib()
+
/obj/item/teleporter/proc/telefrag(turf/fragging_location, mob/user)
- for(var/mob/living/M in fragging_location)//Hit everything in the turf
- M.apply_damage(20, BRUTE)
- M.Weaken(6 SECONDS)
- to_chat(M, "[user] teleports into you, knocking you to the floor with the bluespace wave!")
+ for(var/mob/living/target in fragging_location)//Hit everything in the turf
+ target.apply_damage(20, BRUTE)
+ target.Weaken(6 SECONDS)
+ to_chat(target, span_warning("[user] teleports into you, knocking you to the floor with the bluespace wave!"))
+
/obj/item/paper/teleporter
name = "Teleporter Guide"
@@ -361,18 +417,25 @@ effective or pretty fucking useless.
Do not expose the teleporter to electromagnetic pulses or attempt to use with a bag of holding, unwanted malfunctions may occur.
"}
+
+
/obj/item/storage/box/syndie_kit/teleporter
name = "syndicate teleporter kit"
+
/obj/item/storage/box/syndie_kit/teleporter/populate_contents()
new /obj/item/teleporter(src)
new /obj/item/paper/teleporter(src)
new /obj/item/clothing/glasses/chameleon/meson(src)
+
+
/obj/effect/temp_visual/teleport_abductor/syndi_teleporter
duration = 5
+
/obj/item/teleporter/admin
desc = "A strange syndicate version of a cult veil shifter. \n This one seems EMP proof, and with much better saftey protocols."
charges = 8
max_charges = 8
flawless = TRUE
+
diff --git a/code/game/objects/items/devices/transfer_valve.dm b/code/game/objects/items/devices/transfer_valve.dm
index 57fa49d5bf4..ad810bee5e0 100644
--- a/code/game/objects/items/devices/transfer_valve.dm
+++ b/code/game/objects/items/devices/transfer_valve.dm
@@ -110,7 +110,8 @@
if(tank_one)
split_gases()
valve_open = FALSE
- tank_one.forceMove(get_turf(src))
+ tank_one.forceMove_turf()
+ usr?.put_in_hands(tank_one, ignore_anim = FALSE)
tank_one = null
update_icon()
if((!tank_two || tank_two.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
@@ -119,7 +120,8 @@
if(tank_two)
split_gases()
valve_open = FALSE
- tank_two.forceMove(get_turf(src))
+ tank_two.forceMove_turf()
+ usr?.put_in_hands(tank_two, ignore_anim = FALSE)
tank_two = null
update_icon()
if((!tank_one || tank_one.w_class < WEIGHT_CLASS_BULKY) && (w_class > WEIGHT_CLASS_NORMAL))
@@ -131,7 +133,8 @@
attached_device.attack_self(usr)
if("remove_device")
if(attached_device)
- attached_device.forceMove(get_turf(src))
+ attached_device.forceMove_turf()
+ usr?.put_in_hands(attached_device, ignore_anim = FALSE)
attached_device.holder = null
attached_device = null
qdel(GetComponent(/datum/component/proximity_monitor))
@@ -145,28 +148,32 @@
/obj/item/transfer_valve/proc/process_activation(obj/item/D, normal = TRUE, special = TRUE, mob/user)
if(toggle)
- toggle = 0
+ toggle = FALSE
toggle_valve(user)
- spawn(50) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
- toggle = 1
+ addtimer(VARSET_CALLBACK(src, toggle, TRUE), 5 SECONDS) // To stop a signal being spammed from a proxy sensor constantly going off or whatever
-/obj/item/transfer_valve/update_icon()
- overlays.Cut()
- underlays = null
+/obj/item/transfer_valve/update_icon_state()
if(!tank_one && !tank_two && !attached_device)
icon_state = "valve_1"
- return
- icon_state = "valve"
+ else
+ icon_state = "valve"
+
+/obj/item/transfer_valve/update_overlays()
+ . = ..()
+ underlays.Cut()
+ if(!tank_one && !tank_two && !attached_device)
+ return
if(tank_one)
- overlays += "[tank_one.icon_state]"
+ . += "[tank_one.icon_state]"
if(tank_two)
var/icon/J = new(icon, icon_state = "[tank_two.icon_state]")
J.Shift(WEST, 13)
underlays += J
if(attached_device)
- overlays += "device"
+ . += "device"
+
/obj/item/transfer_valve/proc/merge_gases()
tank_two.air_contents.volume += tank_one.air_contents.volume
@@ -190,7 +197,7 @@
/obj/item/transfer_valve/proc/toggle_valve(mob/user)
if(!valve_open && tank_one && tank_two)
- valve_open = 1
+ valve_open = TRUE
var/turf/bombturf = get_turf(src)
@@ -202,13 +209,17 @@
if(user)
add_attack_logs(user, src, "Bomb valve opened with [attached_device ? attached_device : "no device"], attached by [key_name_log(attacher)]. Last touched by: [key_name_log(mob)]", ATKLOG_FEW)
merge_gases()
- spawn(20) // In case one tank bursts
- for(var/i in 1 to 5)
- update_icon()
- sleep(10)
- update_icon()
+ addtimer(CALLBACK(src, PROC_REF(toggle_process)), 2 SECONDS) // In case one tank bursts
else if(valve_open && tank_one && tank_two)
split_gases()
- valve_open = 0
+ valve_open = FALSE
update_icon()
+
+
+/obj/item/transfer_valve/proc/toggle_process()
+ for(var/i in 1 to 5)
+ update_icon()
+ sleep(1 SECONDS)
+ update_icon()
+
diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm
index 32341ad3b27..7d369dbb619 100644
--- a/code/game/objects/items/devices/uplinks.dm
+++ b/code/game/objects/items/devices/uplinks.dm
@@ -246,7 +246,8 @@ GLOBAL_LIST_EMPTY(world_uplinks)
"age" = html_encode(L.fields["age"]),
"species" = html_encode(L.fields["species"]),
"rank" = html_encode(L.fields["rank"]),
- "fingerprint" = html_encode(L.fields["fingerprint"])
+ "fingerprint" = html_encode(L.fields["fingerprint"]),
+ "exploit_record" = html_encode(L.fields["exploit_record"]),
))
data["exploitable"] = exploitable
diff --git a/code/game/objects/items/devices/window_painter.dm b/code/game/objects/items/devices/window_painter.dm
index a44f0d13a09..8aa104f4cd8 100644
--- a/code/game/objects/items/devices/window_painter.dm
+++ b/code/game/objects/items/devices/window_painter.dm
@@ -11,9 +11,10 @@
/obj/structure/window/full/basic,
/obj/machinery/door/window)
-/obj/item/pipe_painter/window_painter/New()
+
+/obj/item/pipe_painter/window_painter/Initialize(mapload)
. = ..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
mode = "paint"
@@ -25,11 +26,12 @@
if("Choose Color")
mode = "paint"
colour = input(user,"Choose Color") as color
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if("Color Presets")
mode = "paint"
colour = input("Which color do you want to use?", name, colour) in GLOB.pipe_colors
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/pipe_painter/window_painter/afterattack(atom/A, mob/user as mob)
if(!is_type_in_list(A, paintable_windows) || !in_range(user, A))
@@ -43,10 +45,10 @@
colour = W.color
mode = "paint"
to_chat(user, span_notice("You copy color of this window."))
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/pipe_painter/window_painter/update_overlays()
+ . = ..()
+ . += mutable_appearance(icon, icon_state = "window_painter_colour", color = colour)
-/obj/item/pipe_painter/window_painter/update_icon()
- overlays.Cut()
- var/image/colour_image = image('icons/obj/device.dmi', "window_painter_colour")
- colour_image.color = colour
- overlays += colour_image
diff --git a/code/game/objects/items/flag.dm b/code/game/objects/items/flag.dm
index acbd3fc6722..6e1d9a05e4d 100644
--- a/code/game/objects/items/flag.dm
+++ b/code/game/objects/items/flag.dm
@@ -9,6 +9,7 @@
w_class = WEIGHT_CLASS_BULKY
max_integrity = 40
resistance_flags = FLAMMABLE
+ custom_fire_overlay = "fire"
var/rolled = FALSE
/obj/item/flag/attackby(obj/item/W, mob/user, params)
@@ -20,36 +21,34 @@
/obj/item/flag/attack_self(mob/user)
rolled = !rolled
user.visible_message("[user] [rolled ? "rolls up" : "unfurls"] [src].", "You [rolled ? "roll up" : "unfurl"] [src].", "You hear fabric rustling.")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/flag/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = FALSE)
..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/flag/extinguish()
..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/item/flag/update_icon()
- overlays.Cut()
+
+/obj/item/flag/update_icon_state()
updateFlagIcon()
item_state = icon_state
if(rolled)
icon_state = "[icon_state]_rolled"
+ custom_fire_overlay = "fire_rolled"
+ else
+ custom_fire_overlay = initial(custom_fire_overlay)
if(resistance_flags & ON_FIRE)
item_state = "[item_state]_fire"
- if((resistance_flags & ON_FIRE) && rolled)
- overlays += image('icons/obj/flag.dmi', src , "fire_rolled")
- else if((resistance_flags & ON_FIRE) && !rolled)
- overlays += image('icons/obj/flag.dmi', src , "fire")
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_r_hand()
- M.update_inv_l_hand()
+ update_equipped_item()
+
/obj/item/flag/proc/updateFlagIcon()
icon_state = initial(icon_state)
+
/obj/item/flag/nt
name = "Nanotrasen flag"
desc = "A flag proudly boasting the logo of NT."
@@ -219,9 +218,16 @@
var/obj/item/grenade/boobytrap = null
var/mob/trapper = null
-/obj/item/flag/chameleon/New()
+
+/obj/item/flag/chameleon/Initialize(mapload)
updated_icon_state = icon_state
- ..()
+ . = ..()
+
+
+/obj/item/flag/chameleon/Destroy()
+ QDEL_NULL(boobytrap)
+ return ..()
+
/obj/item/flag/chameleon/attack_self(mob/user)
if(used)
diff --git a/code/game/objects/items/hourglass.dm b/code/game/objects/items/hourglass.dm
index 0dc486cc5c2..410b6efd85c 100644
--- a/code/game/objects/items/hourglass.dm
+++ b/code/game/objects/items/hourglass.dm
@@ -29,9 +29,10 @@
to_chat(user,span_notice("You stop the [src].")) //Sand magically flows back because that's more convinient to use.
stop()
-/obj/item/hourglass/update_icon()
+
+/obj/item/hourglass/update_icon_state()
icon_state = "hourglass_[timing_id ? "active" : "idle"]"
- return ..()
+
/obj/item/hourglass/proc/start()
finish_time = world.time + time
@@ -52,7 +53,7 @@
countdown.stop()
finish_time = null
animate(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/hourglass/proc/finish()
visible_message(span_notice("[src] stops."))
diff --git a/code/game/objects/items/mixing_bowl.dm b/code/game/objects/items/mixing_bowl.dm
index 8eed9480fb6..c29b18236f0 100644
--- a/code/game/objects/items/mixing_bowl.dm
+++ b/code/game/objects/items/mixing_bowl.dm
@@ -155,12 +155,12 @@
if(prob(chance))
dirty = TRUE
flags = null
- icon_state = dirty_icon
+ update_icon(UPDATE_ICON_STATE)
/obj/item/mixing_bowl/proc/clean()
dirty = FALSE
flags = OPENCONTAINER
- icon_state = clean_icon
+ update_icon(UPDATE_ICON_STATE)
/obj/item/mixing_bowl/wash(mob/user, atom/source)
if(..())
@@ -187,3 +187,8 @@
ffuu.reagents.add_reagent("carbon", amount)
ffuu.reagents.add_reagent("????", amount/10)
make_dirty(75)
+
+
+/obj/item/mixing_bowl/update_icon_state()
+ icon_state = dirty ? dirty_icon : clean_icon
+
diff --git a/code/game/objects/items/mountable_frames/frames.dm b/code/game/objects/items/mountable_frames/frames.dm
index 179684139fc..66b185f4148 100644
--- a/code/game/objects/items/mountable_frames/frames.dm
+++ b/code/game/objects/items/mountable_frames/frames.dm
@@ -9,7 +9,7 @@
/obj/item/mounted/frame/attackby(obj/item/W, mob/user)
..()
- if(istype(W, /obj/item/wrench) && sheets_refunded)
+ if(W.tool_behaviour == TOOL_WRENCH && sheets_refunded)
new /obj/item/stack/sheet/metal(get_turf(src), sheets_refunded)
qdel(src)
diff --git a/code/game/objects/items/random_items.dm b/code/game/objects/items/random_items.dm
index 3b9caa6fed6..adb72017165 100644
--- a/code/game/objects/items/random_items.dm
+++ b/code/game/objects/items/random_items.dm
@@ -31,7 +31,16 @@
/obj/item/stack/sheet/animalhide/random/New()
..()
- var/htype = pick(/obj/item/stack/sheet/animalhide/cat,/obj/item/stack/sheet/animalhide/corgi,/obj/item/stack/sheet/animalhide/human,/obj/item/stack/sheet/animalhide/lizard,/obj/item/stack/sheet/animalhide/monkey)
+ var/htype = pick(/obj/item/stack/sheet/animalhide/cat, \
+ /obj/item/stack/sheet/animalhide/corgi, \
+ /obj/item/stack/sheet/animalhide/human, \
+ /obj/item/stack/sheet/animalhide/lizard, \
+ /obj/item/stack/sheet/animalhide/monkey, \
+ /obj/item/stack/sheet/animalhide/wolpin, \
+ /obj/item/stack/sheet/animalhide/stok, \
+ /obj/item/stack/sheet/animalhide/neara, \
+ /obj/item/stack/sheet/animalhide/farwa \
+ )
new htype(loc, amount)
qdel(src)
@@ -262,7 +271,7 @@
desc = "What could it be?"
/obj/structure/largecrate/evil/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+ if(W.tool_behaviour == TOOL_CROWBAR)
var/list/menace = pick( /mob/living/simple_animal/hostile/carp,/mob/living/simple_animal/hostile/faithless,/mob/living/simple_animal/hostile/pirate,
/mob/living/simple_animal/hostile/creature,/mob/living/simple_animal/hostile/pirate/ranged,
/mob/living/simple_animal/hostile/hivebot,/mob/living/simple_animal/hostile/viscerator,/mob/living/simple_animal/hostile/pirate)
@@ -294,7 +303,7 @@
desc = "What happens if you open it?"
/obj/structure/largecrate/schrodinger/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+ if(W.tool_behaviour == TOOL_CROWBAR)
add_fingerprint(user)
sleep(2)
var/mob/living/simple_animal/pet/cat/Cat = new(loc)
diff --git a/code/game/objects/items/robot/robot_parts.dm b/code/game/objects/items/robot/robot_parts.dm
index caf8c3b9b69..2bf19296d14 100644
--- a/code/game/objects/items/robot/robot_parts.dm
+++ b/code/game/objects/items/robot/robot_parts.dm
@@ -204,7 +204,7 @@
else
to_chat(user, "You need to attach a flash to it first!")
- if(istype(W, /obj/item/multitool))
+ if(W.tool_behaviour == TOOL_MULTITOOL)
if(check_completion())
Interact(user)
else
@@ -366,7 +366,7 @@
if(living_user.lying || living_user.stat || living_user.IsStunned() || !Adjacent(living_user))
return
var/obj/item/item_in_hand = living_user.get_active_hand()
- if(!istype(item_in_hand, /obj/item/multitool))
+ if(item_in_hand.tool_behaviour != TOOL_MULTITOOL)
to_chat(living_user, "You need a multitool!")
return
diff --git a/code/game/objects/items/stacks/rods.dm b/code/game/objects/items/stacks/rods.dm
index ee05a126338..ded789270b3 100644
--- a/code/game/objects/items/stacks/rods.dm
+++ b/code/game/objects/items/stacks/rods.dm
@@ -46,12 +46,10 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
. = ..()
recipes = GLOB.rod_recipes
-/obj/item/stack/rods/update_icon()
+/obj/item/stack/rods/update_icon_state()
var/amount = get_amount()
- if((amount <= 5) && (amount > 0))
- icon_state = "rods-[amount]"
- else
- icon_state = "rods"
+ icon_state = "rods-[clamp(amount, 1, 5)]"
+
/obj/item/stack/rods/welder_act(mob/user, obj/item/I)
if(get_amount() < 2)
@@ -79,8 +77,8 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
is_cyborg = 1
cyborg_construction_stack = /obj/item/stack/rods
-/obj/item/stack/rods/cyborg/update_icon()
- return
+/obj/item/stack/rods/cyborg/update_icon_state()
+ return // icon_state should always be a full stack of rods.
/obj/item/stack/fireproof_rods
name = "fireproof rods"
@@ -103,10 +101,12 @@ GLOBAL_LIST_INIT(rod_recipes, list ( \
toolspeed = 1
usesound = 'sound/items/deconstruct.ogg'
-/obj/item/stack/fireproof_rods/update_icon()
+
+/obj/item/stack/fireproof_rods/twentyfive
+ amount = 25
+
+
+/obj/item/stack/fireproof_rods/update_icon_state()
var/amount = get_amount()
- if((amount <= 5) && (amount > 0))
- icon_state = "f_rods-[amount]"
- else
- icon_state = "f_rods"
+ icon_state = "f_rods-[clamp(amount, 1, 5)]"
diff --git a/code/game/objects/items/stacks/sheets/leather.dm b/code/game/objects/items/stacks/sheets/leather.dm
index a7401ef97ee..6dde09bc9d8 100644
--- a/code/game/objects/items/stacks/sheets/leather.dm
+++ b/code/game/objects/items/stacks/sheets/leather.dm
@@ -42,6 +42,30 @@ GLOBAL_LIST_INIT(human_recipes, list( \
singular_name = "monkey hide piece"
icon_state = "sheet-monkey"
+/obj/item/stack/sheet/animalhide/wolpin
+ name = "wolpin hide"
+ desc = "The by-product of wolpin farming."
+ singular_name = "wolpin hide piece"
+ icon_state = "sheet-wolpin"
+
+/obj/item/stack/sheet/animalhide/stok
+ name = "stok hide"
+ desc = "The by-product of stok farming."
+ singular_name = "stok hide piece"
+ icon_state = "sheet-lizzard"
+
+/obj/item/stack/sheet/animalhide/neara
+ name = "neara hide"
+ desc = "The by-product of neara farming."
+ singular_name = "neara hide piece"
+ icon_state = "sheet-neara"
+
+/obj/item/stack/sheet/animalhide/farwa
+ name = "farwa hide"
+ desc = "The by-product of farwa farming."
+ singular_name = "farwa hide piece"
+ icon_state = "sheet-farwa"
+
/obj/item/stack/sheet/animalhide/lizard
name = "lizard skin"
desc = "Sssssss..."
@@ -168,17 +192,18 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
/obj/item/clothing/head/hooded/explorer,
/obj/item/clothing/head/helmet/space/plasmaman/mining,
))
+
/obj/item/stack/sheet/animalhide/goliath_hide/afterattack(atom/target, mob/user, proximity_flag)
if(!proximity_flag)
return
- if(is_type_in_typecache(target, goliath_platable_armor_typecache) || is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache))
+ var/platable_armor_with_icon = is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache)
+ if(is_type_in_typecache(target, goliath_platable_armor_typecache) || platable_armor_with_icon)
var/obj/item/clothing/C = target
var/datum/armor/current_armor = C.armor
-
- if(current_armor.getRating("melee") < 60)
- C.armor = current_armor.setRating(melee_value = min(current_armor.getRating("melee") + 10, 60))
- if(is_type_in_typecache(target, goliath_platable_armor_with_icon_typecache))
- switch(C.armor.getRating("melee"))
+ if(current_armor.getRating(MELEE) < 60)
+ C.armor = current_armor.setRating(melee_value = min(current_armor.getRating(MELEE) + 10, 60))
+ if(platable_armor_with_icon)
+ switch(C.armor.getRating(MELEE))
if(40, 50)
C.icon_state = "[initial(C.icon_state)]_reinf"
C.item_color = "[initial(C.item_color)]_reinf"
@@ -200,11 +225,11 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
var/obj/mecha/working/ripley/D = target
if(D.hides < 3)
D.hides++
- D.armor = D.armor.setRating(melee_value = min(D.armor.getRating("melee") + 10, 70))
- D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50))
- D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50))
+ D.armor = D.armor.setRating(melee_value = min(D.armor.getRating(MELEE) + 10, 70))
+ D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating(BULLET) + 5, 50))
+ D.armor = D.armor.setRating(laser_value = min(D.armor.getRating(LASER) + 5, 50))
to_chat(user, "You strengthen [target], improving its resistance against melee attacks.")
- D.update_icon()
+ D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS)
use(1)
else
to_chat(user, "You can't improve [D] any further!")
@@ -230,7 +255,7 @@ GLOBAL_LIST_INIT(sinew_recipes, list ( \
D.armor = D.armor.setRating(bullet_value = min(D.armor.getRating("bullet") + 5, 50))
D.armor = D.armor.setRating(laser_value = min(D.armor.getRating("laser") + 5, 50))
to_chat(user, "Вы нашли куда суется [name] и пихнули её на экзокостюм, усиливая защиту против атак.")
- D.update_icon()
+ D.update_appearance(UPDATE_DESC|UPDATE_OVERLAYS)
use(1)
else
to_chat(user, "Вы больше не можете найти куда [name] пристраивается!")
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 0c035c6161b..e735f797078 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -275,6 +275,7 @@ GLOBAL_LIST_INIT(cloth_recipes, list(
new /datum/stack_recipe("Bio bag", /obj/item/storage/bag/bio, 4),
new /datum/stack_recipe("Book bag", /obj/item/storage/bag/books, 4),
new /datum/stack_recipe("Chemistry bag", /obj/item/storage/bag/chemistry, 4),
+ new /datum/stack_recipe("Construction bag", /obj/item/storage/bag/construction, 4),
new /datum/stack_recipe("Fish bag", /obj/item/storage/bag/fish, 4),
new /datum/stack_recipe("Mining satchel", /obj/item/storage/bag/ore, 4),
new /datum/stack_recipe("Plant bag", /obj/item/storage/bag/plants, 4),
diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm
index 9a5f7cf8d49..3c4757454f6 100644
--- a/code/game/objects/items/stacks/stack.dm
+++ b/code/game/objects/items/stacks/stack.dm
@@ -202,7 +202,7 @@
to_chat(usr, "This area already has beacon!")
return FALSE
if(R.result_type == /obj/structure/clockwork/functional/cogscarab_fabricator)
- if(MAX_COG_FABRICATORS >= GLOB.clockwork_fabricators.len)
+ if(GLOB.clockwork_fabricators.len >= MAX_COG_FABRICATORS)
to_chat(usr, "You can't build more than [MAX_COG_FABRICATORS] fabricators!")
return FALSE
if(usr.type == /mob/living/silicon/robot/cogscarab)
diff --git a/code/game/objects/items/stacks/stack_recipe.dm b/code/game/objects/items/stacks/stack_recipe.dm
index 3a5f5ba019a..47061ddc8c1 100644
--- a/code/game/objects/items/stacks/stack_recipe.dm
+++ b/code/game/objects/items/stacks/stack_recipe.dm
@@ -37,25 +37,7 @@
/datum/stack_recipe/cable_restraints/post_build(obj/item/stack/S, obj/result)
var/obj/item/restraints/handcuffs/cable/cable_restraints = result
if(istype(cable_restraints))
- var/color = "white"
-
- switch(S.color)
- if(WIRE_COLOR_BLUE)
- color = "blue"
- if(WIRE_COLOR_CYAN)
- color = "cyan"
- if(WIRE_COLOR_GREEN)
- color = "green"
- if(WIRE_COLOR_ORANGE)
- color = "orange"
- if(WIRE_COLOR_PINK)
- color = "pink"
- if(WIRE_COLOR_RED)
- color = "red"
- if(WIRE_COLOR_YELLOW)
- color = "yellow"
-
- cable_restraints.icon_state = "cuff_[color]"
+ cable_restraints.cable_color(S.color)
..()
diff --git a/code/game/objects/items/stacks/telecrystal.dm b/code/game/objects/items/stacks/telecrystal.dm
index 40e6d1947fa..1f146003c3d 100644
--- a/code/game/objects/items/stacks/telecrystal.dm
+++ b/code/game/objects/items/stacks/telecrystal.dm
@@ -40,8 +40,8 @@
/obj/item/stack/telecrystal/twenty_five
amount = 25
-/obj/item/stack/telecrystal/hundread
+/obj/item/stack/telecrystal/hundred
amount = 100
-/obj/item/stack/telecrystal/twohundread_fifty
+/obj/item/stack/telecrystal/twohundred_fifty
amount = 250
diff --git a/code/game/objects/items/theft_items.dm b/code/game/objects/items/theft_items.dm
index 898ceb055b5..3c0f7d84752 100644
--- a/code/game/objects/items/theft_items.dm
+++ b/code/game/objects/items/theft_items.dm
@@ -82,6 +82,17 @@
else // Not cracked or dented.
. += "Fine print on the box reads \"Cybersun Industries secure container, guaranteed thermite proof, assistant proof, and explosive resistant.\""
+
+/obj/item/nuke_core_container/update_icon_state()
+ if(sealed)
+ icon_state = "core_container_sealed"
+ return
+ if(core)
+ icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded"
+ else
+ icon_state = cracked ? "core_container_cracked_empty" : "core_container_empty"
+
+
/obj/item/nuke_core_container/attack_hand(mob/user)
if(cracked && core)
unload(user)
@@ -93,7 +104,7 @@
return
new_core.forceMove(src)
core = new_core
- icon_state = "core_container_loaded"
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "Container is sealing...")
addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS)
@@ -101,14 +112,14 @@
core.add_fingerprint(user)
user.put_in_active_hand(core)
core = null
- icon_state = "core_container_cracked_empty"
+ update_icon(UPDATE_ICON_STATE)
/obj/item/nuke_core_container/proc/seal()
if(!QDELETED(core))
STOP_PROCESSING(SSobj, core)
ADD_TRAIT(core, TRAIT_BLOCK_RADIATION, src)
- icon_state = "core_container_sealed"
sealed = TRUE
+ update_icon(UPDATE_ICON_STATE)
playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE)
if(ismob(loc))
to_chat(loc, "[src] is permanently sealed, [core]'s radiation is contained.")
@@ -116,7 +127,6 @@
/obj/item/nuke_core_container/attackby(obj/item/nuke_core/plutonium/core, mob/user)
if(!istype(core) || cracked)
return ..()
-
if(!user.drop_item_ground(core))
to_chat(user, "[core] is stuck to your hand!")
return
@@ -128,11 +138,8 @@
if(core)
START_PROCESSING(SSobj, core)
REMOVE_TRAIT(core, TRAIT_BLOCK_RADIATION, src)
- icon_state = "core_container_cracked_loaded"
- else
- icon_state = "core_container_cracked_empty"
- icon_state = "core_container_cracked_empty"
cracked = TRUE
+ update_icon(UPDATE_ICON_STATE)
/obj/item/paper/guides/antag/nuke_instructions
info = "Как вскрыть ядерную боеголовку Нанотрейзен и вытащить из нее плутониевое ядро: \
@@ -182,8 +189,8 @@
return FALSE
forceMove(tongs)
tongs.sliver = src
- tongs.icon_state = "supermatter_tongs_loaded"
- tongs.item_state = "supermatter_tongs_loaded"
+ tongs.update_icon(UPDATE_ICON_STATE)
+
to_chat(user, "You carefully pick up [src] with [tongs].")
else if(istype(I, /obj/item/scalpel/supermatter) || istype(I, /obj/item/nuke_core_container/supermatter)) // we don't want it to dust
return
@@ -243,15 +250,30 @@
QDEL_NULL(sliver)
return ..()
+
+/obj/item/nuke_core_container/supermatter/update_name(updates = ALL)
+ . = ..()
+ name = cracked ? "broken supermatter bin" : initial(name)
+
+
+/obj/item/nuke_core_container/supermatter/update_icon_state()
+ if(sealed)
+ icon_state = "supermatter_container_sealed"
+ return
+ if(sliver)
+ icon_state = cracked ? "core_container_cracked_loaded" : "core_container_loaded"
+ else
+ icon_state = "core_container_cracked_empty"
+
+
/obj/item/nuke_core_container/supermatter/load(obj/item/retractor/supermatter/I, mob/user)
if(!istype(I) || !I.sliver || sliver)
return
I.sliver.forceMove(src)
sliver = I.sliver
I.sliver = null
- I.icon_state = "supermatter_tongs"
- I.item_state = "supermatter_tongs"
- icon_state = "supermatter_container_loaded"
+ I.update_icon(UPDATE_ICON_STATE)
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "Container is sealing...")
addtimer(CALLBACK(src, PROC_REF(seal)), 10 SECONDS)
@@ -259,9 +281,9 @@
if(!QDELETED(sliver))
STOP_PROCESSING(SSobj, sliver)
ADD_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src)
- icon_state = "supermatter_container_sealed"
playsound(src, 'sound/items/deconstruct.ogg', 60, TRUE)
sealed = TRUE
+ update_icon(UPDATE_ICON_STATE)
if(ismob(loc))
to_chat(loc, "[src] is permanently sealed, [sliver] is safely contained.")
@@ -271,9 +293,8 @@
sliver.forceMove(I)
I.sliver = sliver
sliver = null
- I.icon_state = "supermatter_tongs_loaded"
- I.item_state = "supermatter_tongs_loaded"
- icon_state = "core_container_cracked_empty"
+ I.update_icon(UPDATE_ICON_STATE)
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "You carefully pick up [I.sliver] with [I].")
/obj/item/nuke_core_container/supermatter/attackby(obj/item/retractor/supermatter/tongs, mob/user)
@@ -300,9 +321,8 @@
message_admins("[sliver] has consumed [key_name_admin(user)] [ADMIN_JMP(src)].")
investigate_log("has consumed [key_name(user)].", "supermatter")
user.gib()
- icon_state = "core_container_cracked_empty"
- qdel(sliver)
- sliver = null
+ QDEL_NULL(sliver)
+ update_icon(UPDATE_ICON_STATE)
else
return ..()
@@ -312,11 +332,8 @@
if(sliver)
START_PROCESSING(SSobj, sliver)
REMOVE_TRAIT(sliver, TRAIT_BLOCK_RADIATION, src)
- icon_state = "supermatter_container_cracked_loaded"
- else
- icon_state = "core_container_cracked_empty"
- name = "broken supermatter bin"
cracked = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
/obj/item/scalpel/supermatter
name = "supermatter scalpel"
@@ -348,6 +365,12 @@
QDEL_NULL(sliver)
return ..()
+
+/obj/item/retractor/supermatter/update_icon_state()
+ icon_state = "supermatter_tongs[sliver ? "_loaded" : ""]"
+ item_state = "supermatter_tongs[sliver ? "_loaded" : ""]"
+
+
/obj/item/retractor/supermatter/afterattack(atom/O, mob/user, proximity)
. = ..()
if(!sliver)
@@ -360,8 +383,7 @@
sliver.forceMove(loc)
visible_message("[sliver] falls out of [src] as it hits the ground.")
sliver = null
- icon_state = "supermatter_tongs"
- item_state = "supermatter_tongs"
+ update_icon(UPDATE_ICON_STATE)
return ..()
/obj/item/retractor/supermatter/proc/Consume(atom/movable/AM, mob/living/user)
@@ -393,5 +415,5 @@
L.apply_effect(60, IRRADIATE)
playsound(src, 'sound/effects/supermatter.ogg', 50, TRUE)
QDEL_NULL(sliver)
- icon_state = "supermatter_tongs"
- item_state = "supermatter_tongs"
+ update_icon(UPDATE_ICON_STATE)
+
diff --git a/code/game/objects/items/tools/multitool.dm b/code/game/objects/items/tools/multitool.dm
index c02177c1463..e8748f77bdb 100644
--- a/code/game/objects/items/tools/multitool.dm
+++ b/code/game/objects/items/tools/multitool.dm
@@ -74,12 +74,17 @@
STOP_PROCESSING(SSobj, src)
return ..()
+
+/obj/item/multitool/ai_detect/update_icon_state()
+ icon_state = "[initial(icon_state)][detect_state]"
+
+
/obj/item/multitool/ai_detect/process()
if(track_cooldown > world.time)
return
detect_state = PROXIMITY_NONE
multitool_detect()
- icon_state = "[initial(icon_state)][detect_state]"
+ update_icon(UPDATE_ICON_STATE)
track_cooldown = world.time + track_delay
/obj/item/multitool/ai_detect/proc/multitool_detect()
diff --git a/code/game/objects/items/tools/tool_behaviour.dm b/code/game/objects/items/tools/tool_behaviour.dm
index b68de693855..c0afaafb462 100644
--- a/code/game/objects/items/tools/tool_behaviour.dm
+++ b/code/game/objects/items/tools/tool_behaviour.dm
@@ -43,7 +43,7 @@
return tool_use_check(user, amount)
// A check called by tool_start_check once, and by use_tool on every tick of delay.
-/obj/item/proc/tool_use_check(mob/living/user, amount)
+/obj/item/proc/tool_use_check(mob/living/user, amount, silent = FALSE)
return !amount
/obj/item/proc/play_tool_sound(atom/target, volume = tool_volume)
diff --git a/code/game/objects/items/tools/welder.dm b/code/game/objects/items/tools/welder.dm
index 2e75f52fbdf..7fcc4f70406 100644
--- a/code/game/objects/items/tools/welder.dm
+++ b/code/game/objects/items/tools/welder.dm
@@ -115,14 +115,16 @@
M.update_inv_l_hand()
// If welding tool ran out of fuel during a construction task, construction fails.
-/obj/item/weldingtool/tool_use_check(mob/living/user, amount)
+/obj/item/weldingtool/tool_use_check(mob/living/user, amount, silent = FALSE)
if(!tool_enabled)
- to_chat(user, "[src] has to be on to complete this task!")
+ if(!silent)
+ to_chat(user, "[src] has to be on to complete this task!")
return FALSE
if(GET_FUEL >= amount * requires_fuel)
return TRUE
else
- to_chat(user, "You need more welding fuel to complete this task!")
+ if(!silent)
+ to_chat(user, "You need more welding fuel to complete this task!")
return FALSE
// When welding is about to start, run a normal tool_use_check, then flash a mob if it succeeds.
@@ -174,15 +176,8 @@
else
to_chat(user, "There's not enough fuel in [A] to refuel [src]!")
-/obj/item/weldingtool/proc/update_torch()
- overlays.Cut()
- if(tool_enabled)
- overlays += "[initial(icon_state)]-on"
- item_state = "[initial(item_state)]1"
- else
- item_state = "[initial(item_state)]"
-/obj/item/weldingtool/update_icon()
+/obj/item/weldingtool/update_icon_state()
if(low_fuel_changes_icon)
var/ratio = GET_FUEL / maximum_fuel
ratio = CEILING(ratio*4, 1) * 25
@@ -190,8 +185,16 @@
icon_state = initial(icon_state)
else
icon_state = "[initial(icon_state)][ratio]"
- update_torch()
- ..()
+ if(tool_enabled)
+ item_state = "[initial(item_state)]1"
+ else
+ item_state = "[initial(item_state)]"
+
+
+/obj/item/weldingtool/update_overlays()
+ . = ..()
+ if(tool_enabled)
+ . += "[initial(icon_state)]-on"
/obj/item/weldingtool/largetank
diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
index b9b13cbc6cc..77db10a3288 100644
--- a/code/game/objects/items/toys.dm
+++ b/code/game/objects/items/toys.dm
@@ -53,13 +53,16 @@
icon_state = "waterballoon-e"
item_state = "waterballoon-e"
+
/obj/item/toy/balloon/New()
..()
create_reagents(10)
+
/obj/item/toy/balloon/attack(mob/living/carbon/human/M as mob, mob/user as mob)
return
+
/obj/item/toy/balloon/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
@@ -73,17 +76,18 @@
A.reagents.trans_to(src, 10)
to_chat(user, "You fill the balloon with the contents of [A].")
desc = "A translucent balloon with some form of liquid sloshing around in it."
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/toy/balloon/wash(mob/user, atom/source)
if(reagents.total_volume < 10)
reagents.add_reagent("water", min(10-reagents.total_volume, 10))
to_chat(user, "You fill the balloon from the [source].")
desc = "A translucent balloon with some form of liquid sloshing around in it."
- update_icon()
- return
+ update_icon(UPDATE_ICON_STATE)
+
-/obj/item/toy/balloon/attackby(obj/O as obj, mob/user as mob, params)
+/obj/item/toy/balloon/attackby(obj/O, mob/user, params)
if(istype(O, /obj/item/reagent_containers/glass) || istype(O, /obj/item/reagent_containers/food/drinks/drinkingglass))
if(O.reagents)
if(O.reagents.total_volume < 1)
@@ -97,8 +101,8 @@
desc = "A translucent balloon with some form of liquid sloshing around in it."
to_chat(user, "You fill the balloon with the contents of [O].")
O.reagents.trans_to(src, 10)
- update_icon()
- return
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/toy/balloon/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(reagents.total_volume >= 1)
@@ -110,16 +114,17 @@
spawn(5)
if(src)
qdel(src)
- return
-/obj/item/toy/balloon/update_icon()
- if(src.reagents.total_volume >= 1)
+
+/obj/item/toy/balloon/update_icon_state()
+ if(reagents.total_volume >= 1)
icon_state = "waterballoon"
item_state = "waterballoon"
else
icon_state = "waterballoon-e"
item_state = "waterballoon-e"
+
/obj/item/toy/syndicateballoon
name = "syndicate balloon"
desc = "There is a tag on the back that reads \"FUK NT!11!\"."
@@ -420,12 +425,6 @@
desc = "Mini-Mecha action figure! Collect them all! 11/11. This one is the mysterious Phazon combat mecha! Nobody's safe!"
icon_state = "phazonprize"
-
-
-/*
-|| A Deck of Cards for playing various games of chance ||
-*/
-
/obj/item/toy/nuke
name = "\improper Nuclear Fission Explosive toy"
desc = "A plastic model of a Nuclear Fission Explosive."
@@ -433,22 +432,41 @@
icon_state = "nuketoyidle"
w_class = WEIGHT_CLASS_SMALL
var/cooldown = 0
+ var/animation_stage = 0
+
+
+/obj/item/toy/nuke/update_icon_state()
+ switch(animation_stage)
+ if(1)
+ icon_state = "nuketoy"
+ if(2)
+ icon_state = "nuketoycool"
+ else
+ icon_state = initial(icon_state)
+
/obj/item/toy/nuke/attack_self(mob/user)
if(cooldown < world.time)
- cooldown = world.time + 1800 //3 minutes
+ cooldown = world.time + 3 MINUTES
user.visible_message("[user] presses a button on [src]", "You activate [src], it plays a loud noise!", "You hear the click of a button.")
- spawn(5) //gia said so
- icon_state = "nuketoy"
- playsound(src, 'sound/machines/alarm.ogg', 100, 0, 0)
- sleep(135)
- icon_state = "nuketoycool"
- sleep(cooldown - world.time)
- icon_state = "nuketoyidle"
+ INVOKE_ASYNC(src, PROC_REF(async_animation))
else
var/timeleft = (cooldown - world.time)
to_chat(user, "Nothing happens, and '[round(timeleft/10)]' appears on a small display.")
+
+/obj/item/toy/nuke/proc/async_animation()
+ animation_stage++
+ update_icon(UPDATE_ICON_STATE)
+ playsound(src, 'sound/machines/alarm.ogg', 100, FALSE, 0)
+ sleep(13 SECONDS)
+ animation_stage++
+ update_icon(UPDATE_ICON_STATE)
+ sleep(cooldown - world.time)
+ animation_stage = 0
+ update_icon(UPDATE_ICON_STATE)
+
+
/obj/item/toy/therapy
name = "therapy doll"
desc = "A toy for therapeutic and recreational purposes."
@@ -949,25 +967,39 @@
icon_state = "ninja_plushie_green"
item_state = "ninja_plushie_green"
var/cooldown = 0
+ var/plushie_color
+
+
+/obj/item/toy/plushie/ninja/update_icon_state()
+ switch(plushie_color)
+ if("green")
+ icon_state = "ninja_plushie_green"
+ item_state = "ninja_plushie_green"
+ if("blue")
+ icon_state = "ninja_plushie_blue"
+ item_state = "ninja_plushie_blue"
+ if("red")
+ icon_state = "ninja_plushie_red"
+ item_state = "ninja_plushie_red"
+ else
+ icon_state = initial(icon_state)
+ item_state = initial(item_state)
+
/obj/item/toy/plushie/ninja/attack_self(mob/user as mob)
. = ..()
if(cooldown < world.time)
cooldown = (world.time + 30) //3 second cooldown
var/plushie_color = pick("green","blue","red")
- switch (plushie_color)
+ update_icon(UPDATE_ICON_STATE)
+ switch(plushie_color)
if("green")
- icon_state = "ninja_plushie_green"
- item_state = "ninja_plushie_green"
user.visible_message(span_notice("[bicon(src)] The [name] says \"I am not afraid of the darkness! I am the darkness!\""))
if("blue")
- icon_state = "ninja_plushie_blue"
- item_state = "ninja_plushie_blue"
user.visible_message(span_notice("[bicon(src)] The [name] says \"Your simple light won't stop me!\""))
if("red")
- icon_state = "ninja_plushie_red"
- item_state = "ninja_plushie_red"
user.visible_message(span_notice("[bicon(src)] The [name] says \"You can run, but you can't hide!\""))
+ plushie_color = null
//New toys from another builds
/obj/item/toy/plushie/nianplushie/beeplushie
@@ -1038,9 +1070,6 @@
/obj/item/toy/plushie/blahaj/twohanded/Initialize(mapload)
. = ..()
- apply_twohanded_component()
-
-/obj/item/toy/plushie/blahaj/twohanded/proc/apply_twohanded_component()
AddComponent(/datum/component/two_handed, require_twohands = TRUE)
/obj/item/toy/plushie/blahaj/twohanded/attack_self(mob/user)
@@ -1175,13 +1204,13 @@
desc = "Watch out for angry voxes!"
-/obj/item/toy/plushie/pig/MouseDrop(atom/over)
+/obj/item/toy/plushie/pig/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(over != user || user.incapacitated() || !ishuman(user))
+ if(over_object != user || user.incapacitated() || !ishuman(user))
return FALSE
if(user.put_in_hands(src, ignore_anim = FALSE))
@@ -1541,22 +1570,33 @@
w_class = WEIGHT_CLASS_SMALL
bubble_icon = "alien"
var/cooldown = 0
+ var/animating = FALSE
+
+
+/obj/item/toy/toy_xeno/update_icon_state()
+ icon_state = animating ? "[initial(icon_state)]_used" : initial(icon_state)
+
/obj/item/toy/toy_xeno/attack_self(mob/user)
if(cooldown <= world.time)
cooldown = (world.time + 50) //5 second cooldown
user.visible_message("[user] pulls back the string on [src].")
- icon_state = "[initial(icon_state)]_used"
- sleep(5)
- atom_say("Hiss!")
- var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
- playsound(get_turf(src), pick(possible_sounds), 50, 1)
- spawn(45)
- if(src)
- icon_state = "[initial(icon_state)]"
+ INVOKE_ASYNC(src, PROC_REF(async_animation))
else
to_chat(user, "The string on [src] hasn't rewound all the way!")
- return
+
+
+/obj/item/toy/toy_xeno/proc/async_animation()
+ animating = TRUE
+ update_icon(UPDATE_ICON_STATE)
+ sleep(0.5 SECONDS)
+ atom_say("Hiss!")
+ var/list/possible_sounds = list('sound/voice/hiss1.ogg', 'sound/voice/hiss2.ogg', 'sound/voice/hiss3.ogg', 'sound/voice/hiss4.ogg')
+ playsound(get_turf(src), pick(possible_sounds), 50, TRUE)
+ sleep(4.5 SECONDS)
+ animating = FALSE
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/toy/russian_revolver
name = "russian revolver"
@@ -1669,11 +1709,8 @@
wieldsound = 'sound/weapons/chainsawstart.ogg'
attack_verb = list("sawed", "cut", "hacked", "carved", "cleaved", "butchered", "felled", "timbered")
-/obj/item/twohanded/toy/chainsaw/update_icon()
- if(wielded)
- icon_state = "chainsaw[wielded]"
- else
- icon_state = "chainsaw0"
+/obj/item/twohanded/toy/chainsaw/update_icon_state()
+ icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]"
/*
* Cat Toy
@@ -1994,7 +2031,7 @@
var/on = 0
var/activation_sound = 'sound/items/buttonclick.ogg'
-/obj/item/toy/desk/update_icon()
+/obj/item/toy/desk/update_icon_state()
if(on)
icon_state = "[initial(icon_state)]-on"
else
@@ -2004,8 +2041,8 @@
on = !on
if(activation_sound)
playsound(src.loc, activation_sound, 75, 1)
- update_icon()
- return 1
+ update_icon(UPDATE_ICON_STATE)
+ return TRUE
/obj/item/toy/desk/verb/rotate()
set name = "Rotate"
@@ -2046,7 +2083,7 @@
/obj/item/toy/desk/newtoncradle/attack_self(mob/user)
on = !on
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
if(on)
soundloop.start()
else
@@ -2064,7 +2101,7 @@
/obj/item/toy/desk/fan/attack_self(mob/user)
on = !on
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
if(on)
soundloop.start()
else
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index 8558fe64716..7d66c8d6d30 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -35,7 +35,7 @@ AI MODULES
to_chat(usr, "You haven't selected an AI to transmit laws to!")
return
- if(comp.current.stat == DEAD || comp.current.control_disabled == 1)
+ if(comp.current.stat == DEAD || comp.current.control_disabled)
to_chat(usr, "Upload failed. No signal is being detected from the AI.")
else if(comp.current.see_in_dark == 0)
to_chat(usr, "Upload failed. Only a faint signal is being detected from the AI, and it is not responding to our requests. It may be low on power.")
diff --git a/code/game/objects/items/weapons/RCL.dm b/code/game/objects/items/weapons/RCL.dm
index 48d606cabc7..08cdb091a93 100644
--- a/code/game/objects/items/weapons/RCL.dm
+++ b/code/game/objects/items/weapons/RCL.dm
@@ -34,7 +34,7 @@
loaded.amount = amount
else
return
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "You add the cables to the [src]. It now contains [loaded.amount].")
else
..()
@@ -58,7 +58,7 @@
loaded.forceMove(user.loc)
user.put_in_hands(loaded)
loaded = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/twohanded/rcl/examine(mob/user)
. = ..()
@@ -71,7 +71,8 @@
active = 0
return ..()
-/obj/item/twohanded/rcl/update_icon()
+
+/obj/item/twohanded/rcl/update_icon_state()
if(!loaded)
icon_state = "rcl-0"
item_state = "rcl-0"
@@ -89,10 +90,10 @@
else
icon_state = "rcl-0"
item_state = "rcl-0"
- ..()
+
/obj/item/twohanded/rcl/proc/is_empty(mob/user, loud = 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
if(!loaded || !loaded.amount)
if(loud)
to_chat(user, "The last of the cables unreel from [src].")
@@ -151,4 +152,4 @@
loaded = new()
loaded.max_amount = max_amount
loaded.amount = max_amount
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
diff --git a/code/game/objects/items/weapons/RSF.dm b/code/game/objects/items/weapons/RSF.dm
index f28abbee5e6..14eef7e85fb 100644
--- a/code/game/objects/items/weapons/RSF.dm
+++ b/code/game/objects/items/weapons/RSF.dm
@@ -31,7 +31,7 @@ RSF
list("Deck of cards", 50, /obj/item/deck/cards),
list("Prize ticket", 250, /obj/item/stack/tickets/five)
)
- update_desc()
+ update_appearance(UPDATE_DESC)
/obj/item/rsf/rff
name = "\improper Rapid-Food-Fabricator"
@@ -50,7 +50,7 @@ RSF
list("Chimichanga", 3000, /obj/item/reagent_containers/food/snacks/chimichanga),
list("Ikura sushi", 3000, /obj/item/reagent_containers/food/snacks/sushi_Ikura)
)
- update_desc()
+ update_appearance(UPDATE_DESC)
/obj/item/rsf/attackby(obj/item/W as obj, mob/user as mob, params)
..()
@@ -72,9 +72,9 @@ RSF
else
mode++
to_chat(user, "Changed dispensing mode to '" + configured_items[mode][1] + "'")
- update_desc()
+ update_appearance(UPDATE_DESC)
-/obj/item/rsf/update_desc()
+/obj/item/rsf/update_desc(updates = ALL)
. = ..()
desc = initial(desc) + " Currently set to dispense '[configured_items[mode][1]]'."
diff --git a/code/game/objects/items/weapons/anomaly_extract.dm b/code/game/objects/items/weapons/anomaly_extract.dm
index db8ce528f67..3ef0cf4d80d 100644
--- a/code/game/objects/items/weapons/anomaly_extract.dm
+++ b/code/game/objects/items/weapons/anomaly_extract.dm
@@ -1,3 +1,5 @@
+#define COOLDOWN_TO_SLIMEPERSON (10 SECONDS)
+#define COOLDOWN_TO_SLIME_MOB (40 SECONDS)
/obj/item/anomaly_extract
name = "Strange syringe"
desc = "Syringe with a blunt needle."
@@ -41,7 +43,7 @@
sound = 'sound/effects/mob_effects/slime_squish.ogg'
human_req = FALSE
clothes_req = FALSE
- base_cooldown = 1 MINUTES
+ base_cooldown = COOLDOWN_TO_SLIMEPERSON
var/is_transformed = FALSE
var/mob/living/carbon/human/original_body
@@ -84,9 +86,9 @@
/obj/effect/proc_holder/spell/slime_degradation/before_cast(list/targets, mob/user)
. = ..()
if(is_transformed)
- cooldown_handler.recharge_duration = 10 MINUTES
+ cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB
else
- cooldown_handler.recharge_duration = 1 MINUTES
+ cooldown_handler.recharge_duration = COOLDOWN_TO_SLIMEPERSON
/obj/effect/proc_holder/spell/slime_degradation/cast(list/targets, mob/living/carbon/human/user = usr)
@@ -142,7 +144,7 @@
var/self_message = death_provoked ? span_userdanger("You can't take the strain of sustaining [user]'s shape in this condition, it begins to fall apart!") : span_notice("You start to transform back into human.")
user.visible_message(span_warning("[user] shape becomes fuzzy before it takes human form!"), self_message, span_notice("You hear something squishing..."))
if(death_provoked)
- cooldown_handler.recharge_duration = 10 MINUTES
+ cooldown_handler.recharge_duration = COOLDOWN_TO_SLIME_MOB
cooldown_handler.start_recharge()
playsound(get_turf(usr), sound, 50, TRUE)
user.density = FALSE
@@ -237,3 +239,6 @@
M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_degradation)
M.mind.RemoveSpell(/obj/effect/proc_holder/spell/slime_selfheat)
. = ..()
+
+#undef COOLDOWN_TO_SLIMEPERSON
+#undef COOLDOWN_TO_SLIME_MOB
diff --git a/code/game/objects/items/weapons/cash.dm b/code/game/objects/items/weapons/cash.dm
index 02482326efa..0e3ab7cd767 100644
--- a/code/game/objects/items/weapons/cash.dm
+++ b/code/game/objects/items/weapons/cash.dm
@@ -22,8 +22,7 @@
max_amount = CASHMAX
merge_type = /obj/item/stack/spacecash
-/obj/item/stack/spacecash/update_icon()
- ..()
+/obj/item/stack/spacecash/update_icon_state()
name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Credit[amount > 1 ? "s" : ""]"
switch(amount)
if(CASH1 to CASH2 - 1)
@@ -114,8 +113,7 @@
..()
update_icon()
-/obj/item/stack/spacecash/ussp/update_icon()
- ..()
+/obj/item/stack/spacecash/ussp/update_icon_state()
name = "[amount == CASHMAX ? "[CASHMAX]" : amount] Ruble[amount > 1 ? "s" : ""]"
switch(amount)
if(CASH1 to CASH2 - 1)
diff --git a/code/game/objects/items/weapons/chrono_eraser.dm b/code/game/objects/items/weapons/chrono_eraser.dm
index 2635469cbb5..3144ffb2f15 100644
--- a/code/game/objects/items/weapons/chrono_eraser.dm
+++ b/code/game/objects/items/weapons/chrono_eraser.dm
@@ -63,8 +63,8 @@
TED = new(src.loc)
qdel(src)
-/obj/item/gun/energy/chrono_gun/update_icon()
- return
+/obj/item/gun/energy/chrono_gun/update_overlays()
+ return list()
/obj/item/gun/energy/chrono_gun/process_fire(atom/target as mob|obj|turf, mob/living/user as mob|obj, message = 1, params, zone_override, bonus_spread = 0)
if(field)
@@ -177,7 +177,7 @@
cached_icon.Insert(mob_icon, "frame[i]")
mob_underlay = mutable_appearance(cached_icon, "frame1")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
desc = initial(desc) + " It appears to contain [target.name]."
START_PROCESSING(SSobj, src)
@@ -191,7 +191,7 @@
/obj/structure/chrono_field/has_prints()
return FALSE
-/obj/structure/chrono_field/update_icon()
+/obj/structure/chrono_field/update_icon_state()
var/ttk_frame = 1 - (tickstokill / initial(tickstokill))
ttk_frame = clamp(CEILING(ttk_frame * CHRONO_FRAME_COUNT, 1), 1, CHRONO_FRAME_COUNT)
if(ttk_frame != RPpos)
@@ -220,7 +220,7 @@
captured.Paralyse(8 SECONDS)
if(captured.loc != src)
captured.forceMove(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
if(gun)
if(gun.field_check(src))
tickstokill--
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index f30408adbf3..be4efb96aa6 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -151,12 +151,6 @@ LIGHTERS ARE IN LIGHTERS.DM
light("[user] lights [user.p_their()] [name] with [N]. Someone please give [user.p_their()] zippo..")
- //can't think of any other way to update the overlays :<
- user.update_inv_wear_mask()
- user.update_inv_l_hand()
- user.update_inv_r_hand()
-
-
/obj/item/clothing/mask/cigarette/afterattack(obj/item/reagent_containers/glass/glass, mob/user, proximity)
..()
if(!proximity)
@@ -172,46 +166,59 @@ LIGHTERS ARE IN LIGHTERS.DM
to_chat(user, "[src] is full.")
+/obj/item/clothing/mask/cigarette/update_icon_state()
+ icon_state = lit ? icon_on : icon_off
+ item_state = lit ? icon_on : initial(item_state)
+ update_equipped_item()
+
+
+/obj/item/clothing/mask/cigarette/update_name(updates = ALL)
+ . = ..()
+ name = lit ? "lit [initial(name)]" : initial(name)
+
+
/obj/item/clothing/mask/cigarette/proc/light(flavor_text = null)
- if(!lit)
- lit = TRUE
- name = "lit [name]"
- attack_verb = list("burnt", "singed")
- hitsound = 'sound/items/welder.ogg'
- damtype = "fire"
- force = 4
- if(reagents.get_reagent_amount("plasma")) // the plasma explodes when exposed to fire
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("plasma") / 2.5, 1), get_turf(src), 0, 0)
- e.start()
- if(ismob(loc))
- var/mob/M = loc
- M.temporarily_remove_item_from_inventory(src, force = TRUE)
- qdel(src)
- return
- if(reagents.get_reagent_amount("fuel")) // the fuel explodes, too, but much less violently
- var/datum/effect_system/reagents_explosion/e = new()
- e.set_up(round(reagents.get_reagent_amount("fuel") / 5, 1), get_turf(src), 0, 0)
- e.start()
- if(ismob(loc))
- var/mob/M = loc
- M.temporarily_remove_item_from_inventory(src, force = TRUE)
- qdel(src)
- return
- reagents.set_reacting(TRUE)
- reagents.handle_reactions()
- icon_state = icon_on
- item_state = icon_on
- if(flavor_text)
- var/turf/T = get_turf(src)
- T.visible_message(flavor_text)
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- if(H.wear_mask == src) // Don't update if it's just in their hand
- H.wear_mask_update(src)
- set_light(2, 0.25, "#E38F46")
- START_PROCESSING(SSobj, src)
- playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE)
+ if(lit)
+ return
+
+ lit = TRUE
+ attack_verb = list("burnt", "singed")
+ hitsound = 'sound/items/welder.ogg'
+ damtype = FIRE
+ force = 4
+
+ if(check_reagents_explosion())
+ return
+
+ reagents.set_reacting(TRUE)
+ reagents.handle_reactions()
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
+ if(flavor_text)
+ var/turf/T = get_turf(src)
+ T.visible_message(flavor_text)
+ set_light(2, 0.25, "#E38F46")
+ START_PROCESSING(SSobj, src)
+ playsound(src, 'sound/items/lighter/light.ogg', 25, TRUE)
+
+
+/obj/item/clothing/mask/cigarette/proc/check_reagents_explosion()
+ var/reagent = ""
+ var/reagent_divisor = 2.5
+ if(reagents.get_reagent_amount("plasma"))
+ reagent = "plasma"
+ else if(reagents.get_reagent_amount("fuel"))
+ reagent = "fuel"
+ reagent_divisor = 5
+ if(!reagent)
+ return FALSE
+
+ var/datum/effect_system/reagents_explosion/explosion = new
+ explosion.set_up(round(reagents.get_reagent_amount(reagent) / reagent_divisor, 1), get_turf(src), 0, 0)
+ if(ismob(loc))
+ var/mob/user = loc
+ user.temporarily_remove_item_from_inventory(src, force = TRUE)
+ qdel(src)
+ return TRUE
/obj/item/clothing/mask/cigarette/process()
@@ -403,16 +410,11 @@ LIGHTERS ARE IN LIGHTERS.DM
/obj/item/clothing/mask/cigarette/pipe/light(flavor_text = null)
if(!lit)
lit = TRUE
- damtype = "fire"
- icon_state = icon_on
- item_state = icon_on
+ damtype = FIRE
+ update_icon(UPDATE_ICON_STATE)
if(flavor_text)
var/turf/T = get_turf(src)
T.visible_message(flavor_text)
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- if(H.wear_mask == src) // Don't update if it's just in their hand
- H.wear_mask_update(src)
START_PROCESSING(SSobj, src)
/obj/item/clothing/mask/cigarette/pipe/process()
@@ -420,13 +422,11 @@ LIGHTERS ARE IN LIGHTERS.DM
smoketime--
if(smoketime < 1)
new /obj/effect/decal/cleanable/ash(location)
+ lit = FALSE
+ update_icon(UPDATE_ICON_STATE)
if(ismob(loc))
var/mob/living/M = loc
to_chat(M, "Your [name] goes out, and you empty the ash.")
- lit = FALSE
- icon_state = icon_off
- item_state = icon_off
- M.update_inv_wear_mask()
STOP_PROCESSING(SSobj, src)
return
smoke()
@@ -435,8 +435,7 @@ LIGHTERS ARE IN LIGHTERS.DM
if(lit)
user.visible_message("[user] puts out [src].")
lit = FALSE
- icon_state = icon_off
- item_state = icon_off
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
return
if(smoketime <= 0)
diff --git a/code/game/objects/items/weapons/conversion_kit.dm b/code/game/objects/items/weapons/conversion_kit.dm
index 4eb09ff6f6e..98d4fe87dd3 100644
--- a/code/game/objects/items/weapons/conversion_kit.dm
+++ b/code/game/objects/items/weapons/conversion_kit.dm
@@ -2,20 +2,19 @@
/obj/item/conversion_kit
name = "\improper Revolver Conversion Kit"
desc = "A professional conversion kit used to convert any knock off revolver into the real deal capable of shooting lethal .357 rounds without the possibility of catastrophic failure."
- icon_state = "kit"
+ icon_state = "kit_0"
flags = CONDUCT
w_class = WEIGHT_CLASS_SMALL
origin_tech = "combat=2"
- var/open = 0
+ var/open = FALSE
-/obj/item/conversion_kit/New()
- ..()
- update_icon()
-/obj/item/conversion_kit/update_icon()
- icon_state = "[initial(icon_state)]_[open]"
+/obj/item/conversion_kit/update_icon_state()
+ icon_state = "kit_[open]"
+
/obj/item/conversion_kit/attack_self(mob/user)
open = !open
to_chat(user, "You [open ? "open" : "close"] the conversion kit.")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
diff --git a/code/game/objects/items/weapons/cosmetics.dm b/code/game/objects/items/weapons/cosmetics.dm
index 68407db2445..03e5bee0d3f 100644
--- a/code/game/objects/items/weapons/cosmetics.dm
+++ b/code/game/objects/items/weapons/cosmetics.dm
@@ -58,17 +58,23 @@
colour = pick(lipstick_colors)
name = "[colour] lipstick"
+
+/obj/item/lipstick/update_icon_state()
+ . = ..()
+ icon_state = "lipstick[open ? "_uncap" : ""]"
+
+
+/obj/item/lipstick/update_overlays()
+ . = ..()
+ if(open)
+ . += mutable_appearance(icon, icon_state = "lipstick_uncap_color", color = lipstick_colors[colour])
+
+
/obj/item/lipstick/attack_self(mob/user)
- cut_overlays()
to_chat(user, "You twist \the [src] [open ? "closed" : "open"].")
open = !open
- if(open)
- var/mutable_appearance/colored = mutable_appearance('icons/obj/items.dmi', "lipstick_uncap_color")
- colored.color = lipstick_colors[colour]
- icon_state = "lipstick_uncap"
- add_overlay(colored)
- else
- icon_state = "lipstick"
+ update_icon()
+
/obj/item/lipstick/attack(mob/M, mob/user)
if(!open || !istype(M))
diff --git a/code/game/objects/items/weapons/defib.dm b/code/game/objects/items/weapons/defib.dm
index 0a01992d56f..8a368909ce8 100644
--- a/code/game/objects/items/weapons/defib.dm
+++ b/code/game/objects/items/weapons/defib.dm
@@ -26,33 +26,41 @@
/// Type of paddles that should be attached to this defib.
var/obj/item/twohanded/shockpaddles/paddle_type = /obj/item/twohanded/shockpaddles
-/obj/item/defibrillator/get_cell()
- return cell
-/obj/item/defibrillator/New() //starts without a cell for rnd
- ..()
+/obj/item/defibrillator/Initialize(mapload) // Base version starts without a cell for rnd
+ . = ..()
paddles = new paddle_type(src)
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/defibrillator/loaded/New() //starts with hicap
- ..()
+
+/obj/item/defibrillator/Destroy()
+ if(!paddles_on_defib)
+ var/holder = get(paddles.loc, /mob/living/carbon/human)
+ retrieve_paddles(holder)
+ QDEL_NULL(paddles)
+ QDEL_NULL(cell)
+ return ..()
+
+
+/obj/item/defibrillator/loaded/Initialize(mapload) // Loaded version starts with high-capacity cell.
+ . = ..()
cell = new(src)
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
+
-/obj/item/defibrillator/update_icon()
+/obj/item/defibrillator/get_cell()
+ return cell
+
+
+/obj/item/defibrillator/update_icon(updates = ALL)
update_power()
- update_overlays()
- update_charge()
+ ..()
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
/obj/item/defibrillator/examine(mob/user)
. = ..()
- . += "Ctrl-click to remove the paddles from the defibrillator."
+ . += span_info("Ctrl-Click to remove the paddles from the defibrillator.")
+
/obj/item/defibrillator/proc/update_power()
if(cell)
@@ -63,190 +71,192 @@
else
powered = FALSE
+
/obj/item/defibrillator/update_overlays()
- overlays.Cut()
+ . = ..()
if(paddles_on_defib)
- overlays += "[icon_state]-paddles"
+ . += "[icon_state]-paddles"
if(powered)
- overlays += "[icon_state]-powered"
- if(!cell)
- overlays += "[icon_state]-nocell"
+ . += "[icon_state]-powered"
if(!safety)
- overlays += "[icon_state]-emagged"
-
-/obj/item/defibrillator/proc/update_charge()
- if(powered && cell) //so it doesn't show charge if it's unpowered
+ . += "[icon_state]-emagged"
+ if(powered && cell)
var/ratio = cell.charge / cell.maxcharge
ratio = CEILING(ratio*4, 1) * 25
- overlays += "[icon_state]-charge[ratio]"
+ . += "[icon_state]-charge[ratio]"
+ if(!cell)
+ . += "[icon_state]-nocell"
+
/obj/item/defibrillator/CheckParts(list/parts_list)
..()
cell = locate(/obj/item/stock_parts/cell) in contents
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/ui_action_click(mob/user)
if(!ishuman(user) || !Adjacent(user))
return
- toggle_paddles()
+ toggle_paddles(user)
/obj/item/defibrillator/CtrlClick(mob/user)
if(!ishuman(user) || !Adjacent(user))
return
- toggle_paddles()
+ toggle_paddles(user)
/obj/item/defibrillator/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/stock_parts/cell))
var/obj/item/stock_parts/cell/C = W
if(cell)
- to_chat(user, "[src] already has a cell.")
+ to_chat(user, span_notice("[src] already has a cell."))
else
if(C.maxcharge < paddles.revivecost)
- to_chat(user, "[src] requires a higher capacity cell.")
+ to_chat(user, span_notice("[src] requires a higher capacity cell."))
return
if(!user.drop_transfer_item_to_loc(W, src))
return
cell = W
- to_chat(user, "You install a cell in [src].")
-
- else if(istype(W, /obj/item/screwdriver))
- if(cell)
- cell.update_icon()
- cell.loc = get_turf(loc)
- cell = null
- to_chat(user, "You remove the cell from the [src].")
+ update_icon(UPDATE_OVERLAYS)
+ to_chat(user, span_notice("You install a cell in [src]."))
else if(W == paddles)
- toggle_paddles()
+ toggle_paddles(user)
+
+ else
+ return ..()
+
- update_icon()
- return
+/obj/item/defibrillator/screwdriver_act(mob/living/user, obj/item/I)
+ if(!cell)
+ to_chat(user, span_notice("[src] doesn't have a cell."))
+ return
+
+ // we want an infinite power cell to stay inside (used in advanced compact defib)
+ if(istype(cell, /obj/item/stock_parts/cell/infinite))
+ to_chat(user, span_notice("[src] somehow resists your attempt to remove a cell."))
+ return
+
+ cell.update_icon()
+ cell.forceMove_turf()
+ cell = null
+ I.play_tool_sound(src)
+ to_chat(user, span_notice("You remove the cell from [src]."))
+ update_icon(UPDATE_OVERLAYS)
+ return TRUE
-/obj/item/defibrillator/emag_act(mob/user)
+
+/obj/item/defibrillator/emag_act(user)
if(safety)
add_attack_logs(user, src, "emagged")
safety = FALSE
if(user)
- to_chat(user, "You silently disable [src]'s safety protocols with the card.")
+ to_chat(user, span_warning("You silently disable [src]'s safety protocols with the card."))
else
add_attack_logs(user, src, "un-emagged")
safety = TRUE
- if(user)
- to_chat(user, "You silently enable [src]'s safety protocols with the card.")
- update_icon()
+ to_chat(user, span_notice("You silently enable [src]'s safety protocols with the card."))
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/defibrillator/emp_act(severity)
if(cell)
deductcharge(1000 / severity)
if(safety)
safety = FALSE
- visible_message("[src] beeps: Safety protocols disabled!")
- playsound(get_turf(src), 'sound/machines/defib_saftyoff.ogg', 50, 0)
+ visible_message(span_notice("[src] beeps: Safety protocols disabled!"))
+ playsound(get_turf(src), 'sound/machines/defib_saftyoff.ogg', 50, FALSE)
else
safety = TRUE
- visible_message("[src] beeps: Safety protocols enabled!")
- playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, 0)
- update_icon()
+ visible_message(span_notice("[src] beeps: Safety protocols enabled!"))
+ playsound(get_turf(src), 'sound/machines/defib_saftyon.ogg', 50, FALSE)
+ update_icon(UPDATE_OVERLAYS)
..()
-/obj/item/defibrillator/verb/toggle_paddles()
+
+/obj/item/defibrillator/verb/toggle_paddles_verb()
set name = "Toggle Paddles"
set category = "Object"
+ set src in oview(1)
+
+ toggle_paddles(usr)
+
+/obj/item/defibrillator/proc/toggle_paddles(mob/living/carbon/human/user = usr)
if(!paddles)
- to_chat(usr, span_warning("[src] has no paddles!"))
+ to_chat(user, span_warning("[src] has no paddles!"))
return
if(paddles_on_defib)
- //Detach the paddles into the user's hands
+ dispence_paddles(user)
+ else
+ retrieve_paddles(user)
- var/mob/living/carbon/human/user = usr
- var/obj/item/organ/external/temp2 = user.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND]
- var/obj/item/organ/external/temp = user.bodyparts_by_name[BODY_ZONE_PRECISE_L_HAND]
+ for(var/datum/action/action as anything in actions)
+ action.UpdateButtonIcon()
- if(user.incapacitated())
- return
- if(!temp || !temp.is_usable() && !temp2 || !temp2.is_usable())
- to_chat(user, span_warning("You can't use your hand to take out the paddles!"))
- return
+/obj/item/defibrillator/proc/dispence_paddles(mob/living/carbon/human/user)
+ if(!paddles || !paddles_on_defib || !ishuman(user) || user.incapacitated())
+ return
- if((user.r_hand != null && user.l_hand != null))
- to_chat(user, span_warning("You need a free hand to hold the paddles!"))
- return
+ //Detach the paddles into the user's hands
+ var/obj/item/organ/external/hand_left = user.get_organ(BODY_ZONE_PRECISE_L_HAND)
+ var/obj/item/organ/external/hand_right = user.get_organ(BODY_ZONE_PRECISE_R_HAND)
+
+ if((!hand_left || !hand_left.is_usable()) && (!hand_right || !hand_right.is_usable()))
+ to_chat(user, span_warning("You can't use your hands to take out the paddles!"))
+ return
- //We need to do this like that since defib paddles have their own behavior on dropped()
- if(!is_on_user(user))
- paddles.forceMove_turf()
+ paddles.loc = get_turf(src) // we need this to play animation properly
+ if(!user.put_in_hands(paddles, ignore_anim = FALSE))
+ paddles.loc = src
+ to_chat(user, span_warning("You need a free hand to hold the paddles!"))
+ return
- if(!user.put_in_hands(paddles, ignore_anim = FALSE))
- paddles.forceMove(src)
- to_chat(user, span_warning("You need a free hand to hold the paddles!"))
- return
+ paddles_on_defib = FALSE
+ paddles.update_icon(UPDATE_ICON_STATE)
+ update_icon(UPDATE_OVERLAYS)
- paddles_on_defib = FALSE
- else //remove in any case because some automatic shit
- remove_paddles(usr)
- update_icon()
+/obj/item/defibrillator/proc/retrieve_paddles(mob/user)
+ if(!paddles || paddles_on_defib)
+ return
+ if(user?.is_in_hands(paddles))
+ user.drop_item_ground(paddles)
+ paddles.do_pickup_animation(src)
+ paddles.forceMove(src)
+ paddles_on_defib = TRUE
+ update_icon(UPDATE_OVERLAYS)
+ paddles.update_icon(UPDATE_ICON_STATE)
/obj/item/defibrillator/equipped(mob/user, slot)
- ..()
+ . = ..()
if(slot != slot_back)
- remove_paddles(user)
- update_icon()
+ retrieve_paddles(user)
-/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
- if(slot == slot_back)
- return TRUE
-
-/obj/item/defibrillator/proc/remove_paddles(mob/user) // from your hands
- if(user.is_in_hands(paddles))
- return user.drop_item_ground(paddles)
- return TRUE
+/obj/item/defibrillator/item_action_slot_check(slot, mob/user)
+ return slot == slot_back
-/obj/item/defibrillator/Destroy()
- if(!paddles_on_defib)
- var/M = get(paddles, /mob)
- remove_paddles(M)
- QDEL_NULL(paddles)
- QDEL_NULL(cell)
- return ..()
-/obj/item/defibrillator/proc/deductcharge(var/chrgdeductamt)
+/obj/item/defibrillator/proc/deductcharge(chrgdeductamt)
if(cell)
if(cell.charge < (paddles.revivecost+chrgdeductamt))
powered = FALSE
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if(cell.use(chrgdeductamt))
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return TRUE
else
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return FALSE
-/obj/item/defibrillator/proc/cooldowncheck(var/mob/user)
- paddles.update_icon()
- spawn(50)
- if(cell)
- if(cell.charge >= paddles.revivecost)
- user.visible_message("[src] beeps: Unit ready.")
- playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
- else
- user.visible_message("[src] beeps: Charge depleted.")
- playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
- paddles.cooldown = FALSE
- paddles.update_icon()
- update_icon()
-
/obj/item/defibrillator/compact
name = "compact defibrillator"
desc = "A belt-equipped defibrillator that can be rapidly deployed."
@@ -260,11 +270,10 @@
if(slot == slot_belt)
return TRUE
-/obj/item/defibrillator/compact/loaded/New()
- ..()
+/obj/item/defibrillator/compact/loaded/Initialize(mapload)
+ . = ..()
cell = new(src)
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/compact/combat
name = "combat defibrillator"
@@ -275,11 +284,10 @@
combat = TRUE
safety = FALSE
-/obj/item/defibrillator/compact/combat/loaded/New()
- ..()
+/obj/item/defibrillator/compact/combat/loaded/Initialize(mapload)
+ . = ..()
cell = new(src)
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
/obj/item/defibrillator/compact/advanced
name = "advanced compact defibrillator"
@@ -292,15 +300,17 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF //Objective item, better not have it destroyed.
var/next_emp_message //to prevent spam from the emagging message on the advanced defibrillator
+
/obj/item/defibrillator/compact/advanced/attackby(obj/item/W, mob/user, params)
if(W == paddles)
- toggle_paddles()
- update_icon()
+ toggle_paddles(user)
-/obj/item/defibrillator/compact/advanced/loaded/New()
- ..()
+
+/obj/item/defibrillator/compact/advanced/loaded/Initialize(mapload)
+ . = ..()
cell = new /obj/item/stock_parts/cell/infinite(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/defibrillator/compact/advanced/emp_act(severity)
if(world.time > next_emp_message)
@@ -339,62 +349,71 @@
icon_state = "syndiepaddles"
item_state = "syndiepaddles"
+
/obj/item/twohanded/shockpaddles/New(mainunit)
..()
- if(check_defib_exists(mainunit, src))
- defib = mainunit
- loc = defib
- busy = FALSE
- update_icon()
- return
+ check_defib_exists(mainunit)
+
/obj/item/twohanded/shockpaddles/proc/spend_charge()
defib.deductcharge(revivecost)
+
/obj/item/twohanded/shockpaddles/proc/trigger_cooldown(mob/user)
cooldown = TRUE
- defib.cooldowncheck(user)
+ update_icon(UPDATE_ICON_STATE)
+ addtimer(CALLBACK(src, PROC_REF(on_cooldown_end), user), 5 SECONDS)
+
+
+/obj/item/twohanded/shockpaddles/proc/on_cooldown_end(mob/living/silicon/robot/user)
+ var/check_cell = isrobot(user) ? user.cell.charge : defib.cell.charge
+ if(check_cell >= revivecost)
+ user.visible_message(span_notice("[src] beeps: Unit ready."))
+ playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50)
+ else
+ user.visible_message(span_notice("[src] beeps: Charge depleted."))
+ playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50)
+ cooldown = FALSE
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/twohanded/shockpaddles/update_icon_state()
+ var/is_wielded = HAS_TRAIT(src, TRAIT_WIELDED)
+ icon_state = "[initial(icon_state)][is_wielded][cooldown ? "_cooldown" : ""]"
+ item_state = "[initial(icon_state)][is_wielded]"
-/obj/item/twohanded/shockpaddles/update_icon()
- icon_state = "[initial(icon_state)][wielded]"
- item_state = "[initial(icon_state)][wielded]"
- if(cooldown)
- icon_state = "[initial(icon_state)][wielded]_cooldown"
/obj/item/twohanded/shockpaddles/suicide_act(mob/user)
- user.visible_message("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide.")
+ user.visible_message(span_suicide("[user] is putting the live paddles on [user.p_their()] chest! It looks like [user.p_theyre()] trying to commit suicide."))
defib.deductcharge(revivecost)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
return OXYLOSS
+
/obj/item/twohanded/shockpaddles/dropped(mob/user, silent = FALSE)
- update_icon()
+ . = ..()
if(defib)
- to_chat(user, span_notice("The paddles snap back into the main unit."))
- if(!defib.is_on_user(user))
- do_pickup_animation(defib)
- forceMove(defib)
- defib.paddles_on_defib = TRUE
- defib.update_icon()
- else
- return ..()
+ defib.toggle_paddles(user)
+ if(!silent)
+ to_chat(user, span_notice("The paddles snap back into the main unit."))
/obj/item/twohanded/shockpaddles/equip_to_best_slot(mob/user, force = FALSE)
- user.drop_item_ground(src)
+ user.drop_item_ground(src)
/obj/item/twohanded/shockpaddles/on_mob_move(dir, mob/user)
if(defib && !in_range(defib, src))
user.drop_item_ground(src, force = TRUE)
-/obj/item/twohanded/shockpaddles/proc/check_defib_exists(mainunit, var/mob/living/carbon/human/M, var/obj/O)
- if(!mainunit || !istype(mainunit, /obj/item/defibrillator)) //To avoid weird issues from admin spawns
- M.temporarily_remove_item_from_inventory(O, TRUE)
- qdel(O)
- return FALSE
- else
- return TRUE
+
+/obj/item/twohanded/shockpaddles/proc/check_defib_exists(obj/item/defibrillator/mainunit)
+ if(!mainunit || !istype(mainunit)) //To avoid weird issues from admin spawns
+ qdel(src)
+ return
+ loc = mainunit
+ defib = mainunit
+
/obj/item/twohanded/shockpaddles/attack(mob/M, mob/user)
var/tobehealed
@@ -411,20 +430,20 @@
if(busy)
return
if(!isrobot(user) && !defib.powered)
- user.visible_message("[defib] beeps: Unit is unpowered.")
+ user.visible_message(span_notice("[defib] beeps: Unit is unpowered."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
return
if(!isrobot(user) && !wielded)
- to_chat(user, "You need to wield the paddles in both hands before you can use them on someone!")
+ to_chat(user, span_boldnotice("You need to wield the paddles in both hands before you can use them on someone!"))
return
if(cooldown)
- to_chat(user, "[defib || src] is recharging.")
+ to_chat(user, span_notice("[defib || src] is recharging."))
return
if(!ishuman(M))
if(isrobot(user))
- to_chat(user, "This unit is only designed to work on humanoid lifeforms.")
+ to_chat(user, span_notice("This unit is only designed to work on humanoid lifeforms."))
else
- to_chat(user, "The instructions on [defib] don't mention how to revive that...")
+ to_chat(user, span_notice("The instructions on [defib] don't mention how to revive that..."))
return
else
var/can_harm
@@ -436,8 +455,10 @@
if(user.a_intent == INTENT_HARM && can_harm)
busy = TRUE
- H.visible_message("[user] has touched [H.name] with [src]!", \
- "[user] has touched [H.name] with [src]!")
+ H.visible_message(
+ span_danger("[user] has touched [H.name] with [src]!"),
+ span_userdanger("[user] has touched [H.name] with [src]!"),
+ )
H.adjustStaminaLoss(50)
H.Weaken(4 SECONDS)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
@@ -450,10 +471,16 @@
spend_charge(user)
trigger_cooldown(user)
return
- user.visible_message("[user] begins to place [src] on [M.name]'s chest.", "You begin to place [src] on [M.name]'s chest.")
+ user.visible_message(
+ span_warning("[user] begins to place [src] on [M.name]'s chest."),
+ span_warning("You begin to place [src] on [M.name]'s chest."),
+ )
busy = TRUE
if(do_after(user, 30 * toolspeed * gettoolspeedmod(user), target = M)) //beginning to place the paddles on patient's chest to allow some time for people to move away to stop the process
- user.visible_message("[user] places [src] on [M.name]'s chest.", "You place [src] on [M.name]'s chest.")
+ user.visible_message(
+ span_notice("[user] places [src] on [M.name]'s chest."),
+ span_warning("You place [src] on [M.name]'s chest."),
+ )
playsound(get_turf(src), 'sound/machines/defib_charge.ogg', 50, 0)
var/mob/dead/observer/ghost = H.get_ghost(TRUE)
if(ghost && !ghost.client)
@@ -469,27 +496,27 @@
for(var/obj/item/carried_item in H.contents)
if(istype(carried_item, /obj/item/clothing/suit/space))
if(!ignores_hardsuits)
- user.visible_message("[defib || src] buzzes: Patient's chest is obscured. Operation aborted.")
+ user.visible_message(span_notice("[defib || src] buzzes: Patient's chest is obscured. Operation aborted."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
return
if(H.undergoing_cardiac_arrest())
if(!H.get_int_organ(/obj/item/organ/internal/heart) && !H.get_int_organ(/obj/item/organ/internal/brain/slime)) //prevents defibing someone still alive suffering from a heart attack attack if they lack a heart
- user.visible_message("[defib || src] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity.")
+ user.visible_message(span_boldnotice("[defib || src] buzzes: Resuscitation failed - Failed to pick up any heart electrical activity."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
return
else
var/obj/item/organ/internal/heart/heart = H.get_int_organ(/obj/item/organ/internal/heart)
if(heart.is_dead())
- user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart necrosis detected.")
+ user.visible_message(span_boldnotice("[defib || src] buzzes: Resuscitation failed - Heart necrosis detected."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
return
H.set_heartattack(FALSE)
H.shock_internal_organs(100)
- user.visible_message("[defib || src] pings: Cardiac arrhythmia corrected.")
- M.visible_message("[M]'s body convulses a bit.")
+ user.visible_message(span_boldnotice("[defib || src] pings: Cardiac arrhythmia corrected."))
+ M.visible_message(span_warning("[M]'s body convulses a bit."))
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
@@ -499,7 +526,7 @@
return
if(H.stat == DEAD)
var/health = H.health
- M.visible_message("[M]'s body convulses a bit.")
+ M.visible_message(span_warning("[M]'s body convulses a bit."))
playsound(get_turf(src), "bodyfall", 50, 1)
playsound(get_turf(src), 'sound/machines/defib_zap.ogg', 50, 1, -1)
var/total_cloneloss = H.cloneloss
@@ -513,7 +540,7 @@
tobehealed -= 5 //They get 5 of each type of damage healed so excessive combined damage will not immediately kill them after they get revived
H.adjustOxyLoss(tobehealed)
H.adjustToxLoss(tobehealed)
- user.visible_message("[defib || src] pings: Resuscitation successful.")
+ user.visible_message(span_boldnotice("[defib || src] pings: Resuscitation successful."))
playsound(get_turf(src), 'sound/machines/defib_success.ogg', 50, 0)
H.update_revive(TRUE, TRUE)
H.KnockOut()
@@ -534,25 +561,25 @@
add_attack_logs(user, M, "Revived with [src]")
else
if(tplus > tlimit|| !H.get_int_organ(/obj/item/organ/internal/heart))
- user.visible_message("[defib || src] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation.")
+ user.visible_message(span_boldnotice("[defib || src] buzzes: Resuscitation failed - Heart tissue damage beyond point of no return for defibrillation."))
else if(total_cloneloss > 180 || total_bruteloss > 180 || total_burnloss > 180)
- user.visible_message("[defib || src] buzzes: Resuscitation failed - Severe tissue damage detected.")
+ user.visible_message(span_boldnotice("[defib || src] buzzes: Resuscitation failed - Severe tissue damage detected."))
else if(ghost)
if(!ghost.can_reenter_corpse) // DNR or AntagHUD
- user.visible_message("[defib || src] buzzes: Resucitation failed: No electrical brain activity detected.")
+ user.visible_message(span_notice("[defib || src] buzzes: Resucitation failed: No electrical brain activity detected."))
else
- user.visible_message("[defib || src] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed.")
- to_chat(ghost, "Your heart is being defibrillated. Return to your body if you want to be revived! (Verbs -> Ghost -> Re-enter corpse)")
+ user.visible_message(span_notice("[defib || src] buzzes: Resuscitation failed: Patient's brain is unresponsive. Further attempts may succeed."))
+ to_chat(ghost, "[span_ghostalert("Your heart is being defibrillated. Return to your body if you want to be revived!")] (Verbs -> Ghost -> Re-enter corpse)")
window_flash(ghost.client)
- ghost << sound('sound/effects/genetics.ogg')
+ SEND_SOUND(ghost, 'sound/effects/genetics.ogg')
else
- user.visible_message("[defib || src] buzzes: Resuscitation failed.")
+ user.visible_message(span_notice("[defib || src] buzzes: Resuscitation failed."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
spend_charge(user)
trigger_cooldown(user)
else
- user.visible_message("[defib || src] buzzes: Patient is not in a valid state. Operation aborted.")
+ user.visible_message(span_notice("[defib || src] buzzes: Patient is not in a valid state. Operation aborted."))
playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
busy = FALSE
/*
@@ -567,8 +594,12 @@
if(electrocute_mob(affecting, defib.cell, origin)) // shock anyone touching them >:)
var/obj/item/organ/internal/heart/HE = affecting.get_organ_slot(INTERNAL_ORGAN_HEART)
if(HE.parent_organ_zone == BODY_ZONE_CHEST && affecting.has_both_hands()) // making sure the shock will go through their heart (drask hearts are in their head), and that they have both arms so the shock can cross their heart inside their chest
- affecting.visible_message("[affecting]'s entire body shakes as a shock travels up their arm!", \
- "You feel a powerful shock travel up your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)] and back down your [affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)]!")
+ var/obj/item/organ/external/bodypart_upper = affecting.hand ? affecting.get_organ(BODY_ZONE_L_ARM) : affecting.get_organ(BODY_ZONE_R_ARM)
+ var/obj/item/organ/external/bodypart_lower = affecting.hand ? affecting.get_organ(BODY_ZONE_PRECISE_L_HAND) : affecting.get_organ(BODY_ZONE_PRECISE_R_HAND)
+ affecting.visible_message(
+ span_danger("[affecting]'s entire body shakes as a shock travels up their arm!"),
+ span_userdanger("You feel a powerful shock travel up your [bodypart_upper.name] and back down your [bodypart_lower.name]!"),
+ )
affecting.set_heartattack(TRUE)
/obj/item/twohanded/shockpaddles/borg
@@ -576,7 +607,7 @@
icon_state = "defibpaddles0"
item_state = "defibpaddles0"
-/obj/item/twohanded/shockpaddles/borg/check_defib_exists()
+/obj/item/twohanded/shockpaddles/borg/check_defib_exists(obj/item/defibrillator/mainunit)
// No-op.
/obj/item/twohanded/shockpaddles/borg/dropped(mob/user, silent = FALSE)
@@ -590,21 +621,6 @@
/obj/item/twohanded/shockpaddles/borg/attack_self()
// Standard two-handed weapon behavior is disabled.
-/obj/item/twohanded/shockpaddles/borg/trigger_cooldown(mob/user)
- cooldown = TRUE
- update_icon()
- var/mob/living/silicon/robot/R = user
- spawn(50)
- if(R.cell.charge >= revivecost)
- user.visible_message("[src] beeps: Unit ready.")
- playsound(get_turf(src), 'sound/machines/defib_ready.ogg', 50, 0)
- else
- user.visible_message("[src] beeps: Charge depleted.")
- playsound(get_turf(src), 'sound/machines/defib_failed.ogg', 50, 0)
- cooldown = FALSE
- update_icon()
+/obj/item/twohanded/shockpaddles/borg/update_icon_state()
+ icon_state = "[initial(icon_state)][cooldown ? "_cooldown" : ""]"
-/obj/item/twohanded/shockpaddles/borg/update_icon()
- icon_state = "[initial(icon_state)]"
- if(cooldown)
- icon_state = "[initial(icon_state)]_cooldown"
diff --git a/code/game/objects/items/weapons/dice.dm b/code/game/objects/items/weapons/dice.dm
index 8e6df9cde26..e7b90a0942c 100644
--- a/code/game/objects/items/weapons/dice.dm
+++ b/code/game/objects/items/weapons/dice.dm
@@ -6,25 +6,42 @@
can_hold = list(/obj/item/dice)
allow_wrap = FALSE
+
/obj/item/storage/pill_bottle/dice/populate_contents()
+ var/special_die = pick("1", "2", "fudge", "00", "100")
+ if(special_die == "1")
+ new /obj/item/dice/d1(src)
+ if(special_die == "2")
+ new /obj/item/dice/d2(src)
new /obj/item/dice/d4(src)
new /obj/item/dice/d6(src)
+ if(special_die == "fudge")
+ new /obj/item/dice/fudge(src)
new /obj/item/dice/d8(src)
new /obj/item/dice/d10(src)
+ if(special_die == "00")
+ new /obj/item/dice/d00(src)
new /obj/item/dice/d12(src)
new /obj/item/dice/d20(src)
- var/special_die = pick("1","2","fudge","00","100")
- switch(special_die)
- if("1")
- new /obj/item/dice/d1(src)
- if("2")
- new /obj/item/dice/d2(src)
- if("fudge")
- new /obj/item/dice/fudge(src)
- if("00")
- new /obj/item/dice/d00(src)
- if("100")
- new /obj/item/dice/d100(src)
+ if(special_die == "100")
+ new /obj/item/dice/d100(src)
+
+
+/obj/item/storage/box/dice
+ name = "Коробка игральных костей"
+ desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!"
+ icon_state = "box"
+
+
+/obj/item/storage/box/dice/populate_contents()
+ new /obj/item/dice/d2(src)
+ new /obj/item/dice/d4(src)
+ new /obj/item/dice/d8(src)
+ new /obj/item/dice/d10(src)
+ new /obj/item/dice/d00(src)
+ new /obj/item/dice/d12(src)
+ new /obj/item/dice/d20(src)
+
/obj/item/storage/pill_bottle/dice/suicide_act(mob/user)
user.visible_message("[user] Игра[pluralize_ru(user.gender,"ет","ют")] со смертью! Похоже, он[genderize_ru(user.gender,"","а","о","и")] пыта[pluralize_ru(user.gender,"ется","ются")] покончить жизнь самоубийством!")
@@ -44,11 +61,18 @@
var/rigged = DICE_NOT_RIGGED
var/rigged_value
+
/obj/item/dice/Initialize(mapload)
. = ..()
if(!result)
result = roll(sides)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/dice/update_overlays()
+ . = ..()
+ . += "[icon_state][result]"
+
/obj/item/dice/suicide_act(mob/user)
user.visible_message("[user] играет со смертью! Похоже [user.p_theyre()] пытается покончить жизнь самоубийством!")
@@ -122,8 +146,10 @@
icon_state = "d100"
sides = 100
-/obj/item/dice/d100/update_icon()
- return
+
+/obj/item/dice/d100/update_overlays()
+ return list()
+
/obj/item/dice/d20/e20
var/triggered = FALSE
@@ -151,7 +177,7 @@
comment = "ДВАДЦАТКА!"
else if(sides == 20 && result == 1)
comment = "М-да, невезуха."
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if(initial(icon_state) == "d00")
result = (result - 1) * 10
if(length(special_faces) == sides)
@@ -193,20 +219,190 @@
add_attack_logs(user, src, "detonated with a roll of [actual_result]", ATKLOG_FEW)
explosion(epicenter, round(result * 0.25), round(result * 0.5), round(result), round(result * 1.5), TRUE, capped, cause = key_name(user)+" E20")
-/obj/item/dice/update_icon()
- overlays.Cut()
- overlays += "[icon_state][result]"
-/obj/item/storage/box/dice
- name = "Коробка игральных костей"
- desc = "ЕЩЁ ОДНИ!? ДА БЛЯДЬ!"
- icon_state = "box"
+// Die of Fate
+/obj/item/dice/d20/fate
+ name = "\improper Die of Fate"
+ desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
+ icon_state = "d20"
+ var/reusable = TRUE
+ var/used = FALSE
+
+/obj/item/dice/d20/fate/stealth
+ name = "d20"
+ desc = "A die with twenty sides. The preferred die to throw at the GM."
+
+/obj/item/dice/d20/fate/one_use
+ reusable = FALSE
+
+/obj/item/dice/d20/fate/one_use/stealth
+ name = "d20"
+ desc = "A die with twenty sides. The preferred die to throw at the GM."
+
+/obj/item/dice/d20/fate/cursed
+ name = "cursed Die of Fate"
+ desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea."
+ color = "#00BB00"
+
+ rigged = DICE_TOTALLY_RIGGED
+ rigged_value = 1
+
+/obj/item/dice/d20/fate/diceroll(mob/user)
+ . = ..()
+ if(!used)
+ if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
+ to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!")
+ return
+
+ if(!reusable)
+ used = TRUE
+
+ var/turf/T = get_turf(src)
+ T.visible_message("[src] flares briefly.")
+
+ addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS)
+
+/obj/item/dice/d20/fate/equipped(mob/user, slot, initial)
+ . = ..()
+
+ if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
+ to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.")
+ user.drop_item_ground(src)
+
+/obj/item/dice/d20/fate/proc/create_smoke(amount)
+ var/datum/effect_system/smoke_spread/smoke = new
+ smoke.set_up(amount, 0, drop_location())
+ smoke.start()
+
+/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll)
+ var/turf/T = get_turf(src)
+ switch(roll)
+ if(1)
+ //Dust
+ T.visible_message("[user] turns to dust!")
+ user.dust()
+ if(2)
+ //Death
+ T.visible_message("[user] suddenly dies!")
+ user.death()
+ if(3)
+ //Swarm of creatures
+ T.visible_message("A swarm of creatures surround [user]!")
+ for(var/direction in GLOB.alldirs)
+ new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction))
+ if(4)
+ //Destroy Equipment
+ T.visible_message("Everything [user] is holding and wearing disappears!")
+ for(var/obj/item/I in user)
+ if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ))
+ continue
+ qdel(I)
+ if(5)
+ //Monkeying
+ T.visible_message("[user] transforms into a monkey!")
+ user.monkeyize()
+ if(6)
+ //Cut speed
+ T.visible_message("[user] starts moving slower!")
+ var/datum/species/S = user.dna.species
+ S.speed_mod += 1
+ if(7)
+ //Throw
+ T.visible_message("Unseen forces throw [user]!")
+ user.Stun(12 SECONDS)
+ user.adjustBruteLoss(50)
+ var/throw_dir = GLOB.cardinal
+ var/atom/throw_target = get_edge_target_turf(user, throw_dir)
+ user.throw_at(throw_target, 200, 4)
+ if(8)
+ //Fueltank Explosion
+ T.visible_message("An explosion bursts into existence around [user]!")
+ explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src)
+ if(9)
+ //Cold
+ T.visible_message("[user] looks a little under the weather!")
+ var/datum/disease/virus/cold/D = new
+ D.Contract(user)
+ if(10)
+ //Nothing
+ T.visible_message("Nothing seems to happen.")
+ if(11)
+ //Cookie
+ T.visible_message("A cookie appears out of thin air!")
+ var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
+ create_smoke(2)
+ C.name = "Cookie of Fate"
+ if(12)
+ //Healing
+ T.visible_message("[user] looks very healthy!")
+ user.revive()
+ if(13)
+ //Mad Dosh
+ T.visible_message("Mad dosh shoots out of [src]!")
+ var/turf/Start = get_turf(src)
+ for(var/direction in GLOB.alldirs)
+ var/turf/dirturf = get_step(Start,direction)
+ if(rand(0,1))
+ new /obj/item/stack/spacecash/c1000(dirturf)
+ else
+ var/obj/item/storage/bag/money/M = new(dirturf)
+ for(var/i in 1 to rand(5,50))
+ new /obj/item/coin/gold(M)
+ if(14)
+ //Free Gun
+ T.visible_message("An impressive gun appears!")
+ create_smoke(2)
+ new /obj/item/gun/projectile/revolver/mateba(drop_location())
+ if(15)
+ //Random One-use spellbook
+ T.visible_message("A magical looking book drops to the floor!")
+ create_smoke(2)
+ new /obj/item/spellbook/oneuse/random(drop_location())
+ if(16)
+ //Servant & Servant Summon
+ T.visible_message("A Dice Servant appears in a cloud of smoke!")
+ var/mob/living/carbon/human/H = new(drop_location())
+ create_smoke(2)
+
+ H.equipOutfit(/datum/outfit/butler)
+ var/datum/mind/servant_mind = new /datum/mind()
+ var/datum/objective/O = new
+ O.owner = servant_mind
+ O.target = user.mind
+ O.explanation_text = "Serve [user.real_name]."
+ servant_mind.objectives += O
+ servant_mind.transfer_to(H)
+
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H)
+ if(LAZYLEN(candidates))
+ var/mob/dead/observer/C = pick(candidates)
+ message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
+ H.key = C.key
+ to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.")
+
+ var/obj/effect/proc_holder/spell/summonmob/S = new
+ S.target_mob = H
+ user.mind.AddSpell(S)
+
+ if(17)
+ //Tator Kit
+ T.visible_message("A suspicious box appears!")
+ new /obj/item/storage/box/syndicate(drop_location())
+ create_smoke(2)
+ if(18)
+ //Captain ID
+ T.visible_message("A golden identification card appears!")
+ new /obj/item/card/id/captains_spare(drop_location())
+ create_smoke(2)
+ if(19)
+ //Instrinct Resistance
+ T.visible_message("[user] looks very robust!")
+ var/datum/species/S = user.dna.species
+ S.brute_mod *= 0.5
+ S.burn_mod *= 0.5
+
+ if(20)
+ //Free wizard!
+ T.visible_message("Magic flows out of [src] and into [user]!")
+ user.mind.make_Wizard()
-/obj/item/storage/box/dice/populate_contents()
- new /obj/item/dice/d2(src)
- new /obj/item/dice/d4(src)
- new /obj/item/dice/d8(src)
- new /obj/item/dice/d10(src)
- new /obj/item/dice/d00(src)
- new /obj/item/dice/d12(src)
- new /obj/item/dice/d20(src)
diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm
index a6a59400212..c2113a08ee8 100644
--- a/code/game/objects/items/weapons/dna_injector.dm
+++ b/code/game/objects/items/weapons/dna_injector.dm
@@ -33,6 +33,16 @@
QDEL_NULL(buf)
return ..()
+
+/obj/item/dnainjector/update_icon_state()
+ icon_state = "[initial(icon_state)][used ? "0" : ""]"
+
+
+/obj/item/dnainjector/update_desc(updates = ALL)
+ . = ..()
+ desc = used ? "[initial(desc)] This one is used up." : initial(desc)
+
+
/obj/item/dnainjector/proc/GetRealBlock(selblock)
if(selblock == 0)
return block
@@ -67,51 +77,62 @@
else
return buf.dna.SetUIValue(real_block,val)
-/obj/item/dnainjector/proc/inject(mob/living/M, mob/user)
+
+/obj/item/dnainjector/proc/inject(mob/living/carbon/human/target, mob/user)
if(used)
return
- if(isliving(M))
- M.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1)
- var/mob/living/carbon/human/H
- if(ishuman(M))
- H = M
+
+ if(isliving(target))
+ target.apply_effect(rand(20 / (damage_coeff ** 2), 50 / (damage_coeff ** 2)), IRRADIATE, 0, 1)
+
+ if(!ishuman(target))
+ return
if(!buf)
- log_runtime(EXCEPTION("[src] used by [user] on [M] failed to initialize properly."), src)
+ log_runtime(EXCEPTION("[src] used by [user] on [target] failed to initialize properly."), src)
return
used = TRUE
- icon_state = "[icon_state]0"
- desc += " This one is used up."
-
- spawn(0) //Some mutations have sleeps in them, like monkey
- if(!(NOCLONE in M.mutations) && !(H && (NO_DNA in H.dna.species.species_traits))) // prevents drained people from having their DNA changed
- var/prev_ue = M.dna.unique_enzymes
- // UI in syringe.
- if(buf.types & DNA2_BUF_UI)
- if(!block) //isolated block?
- M.dna.UI = buf.dna.UI.Copy()
- M.dna.UpdateUI()
- M.UpdateAppearance()
- if(buf.types & DNA2_BUF_UE) //unique enzymes? yes
-
- M.real_name = buf.dna.real_name
- M.name = buf.dna.real_name
- M.dna.real_name = buf.dna.real_name
- M.dna.unique_enzymes = buf.dna.unique_enzymes
- else
- M.dna.SetUIValue(block,src.GetValue())
- M.UpdateAppearance()
- if(buf.types & DNA2_BUF_SE)
- if(!block) //isolated block?
- M.dna.SE = buf.dna.SE.Copy()
- M.dna.UpdateSE()
- else
- M.dna.SetSEValue(block,src.GetValue())
- domutcheck(M, null, forcedmutation ? MUTCHK_FORCED : 0)
- M.update_mutations()
- if(H)
- H.sync_organ_dna(assimilate = 0, old_ue = prev_ue)
+ update_appearance(UPDATE_ICON_STATE|UPDATE_DESC)
+ INVOKE_ASYNC(src, PROC_REF(async_update), target) //Some mutations have sleeps in them, like monkey
+
+
+/obj/item/dnainjector/proc/async_update(mob/living/carbon/human/target)
+ // prevents drained people from having their DNA changed
+ if(!target.dna || (NOCLONE in target.mutations) || (NO_DNA in target.dna.species.species_traits))
+ return
+
+ var/datum/dna/target_dna = target.dna
+ var/prev_UE = target_dna.unique_enzymes
+
+ // UI in syringe
+ if(buf.types & DNA2_BUF_UI)
+ if(!block) //isolated block?
+ target_dna.UI = buf.dna.UI.Copy()
+ target_dna.UpdateUI()
+ target.UpdateAppearance()
+
+ if(buf.types & DNA2_BUF_UE) //unique enzymes? yes
+ target.real_name = buf.dna.real_name
+ target.name = buf.dna.real_name
+ target_dna.real_name = buf.dna.real_name
+ target_dna.unique_enzymes = buf.dna.unique_enzymes
+ else
+ target_dna.SetUIValue(block, GetValue())
+ target.UpdateAppearance()
+
+ // SE in syringe
+ if(buf.types & DNA2_BUF_SE)
+ if(!block) //isolated block?
+ target_dna.SE = buf.dna.SE.Copy()
+ target_dna.UpdateSE()
+ else
+ target_dna.SetSEValue(block, GetValue())
+ domutcheck(target, null, forcedmutation ? MUTCHK_FORCED : NONE)
+ target.update_mutations()
+
+ target.sync_organ_dna(assimilate = FALSE, old_ue = prev_UE)
+
/obj/item/dnainjector/attack(mob/M, mob/user)
if(used)
diff --git a/code/game/objects/items/weapons/dna_upgrader.dm b/code/game/objects/items/weapons/dna_upgrader.dm
index 3ca2bf1cdb4..4821d4d498c 100644
--- a/code/game/objects/items/weapons/dna_upgrader.dm
+++ b/code/game/objects/items/weapons/dna_upgrader.dm
@@ -13,6 +13,16 @@
icon_state = "dnaupgrader"
var/used = FALSE
+
+/obj/item/dna_upgrader/update_icon_state()
+ icon_state = "dnaupgrader[used ? "0" : ""]"
+
+
+/obj/item/dna_upgrader/update_name(updates = ALL)
+ . = ..()
+ name = used ? "used [initial(name)]" : initial(name)
+
+
/obj/item/dna_upgrader/attack_self(mob/user)
if(!used)
ui_interact(user)
@@ -79,7 +89,7 @@
H.gene_stability += 25
to_chat(H, span_notice("You feel like your body rebasing."))
used = TRUE
- icon_state = "[icon_state]0"
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
return TRUE
#undef VAULT_TOXIN
diff --git a/code/game/objects/items/weapons/dnascrambler.dm b/code/game/objects/items/weapons/dnascrambler.dm
index 1dcc4a942c2..cefe9f7abc8 100644
--- a/code/game/objects/items/weapons/dnascrambler.dm
+++ b/code/game/objects/items/weapons/dnascrambler.dm
@@ -4,15 +4,22 @@
icon = 'icons/obj/hypo.dmi'
item_state = "syringe_0"
icon_state = "lepopen"
- var/used = null
+ var/used = FALSE
-/obj/item/dnascrambler/update_icon()
+
+/obj/item/dnascrambler/update_icon_state()
if(used)
icon_state = "lepopen0"
else
icon_state = "lepopen"
-/obj/item/dnascrambler/attack(mob/M as mob, mob/user as mob)
+
+/obj/item/dnascrambler/update_name(updates = ALL)
+ . = ..()
+ name = used ? "used [initial(name)]" : initial(name)
+
+
+/obj/item/dnascrambler/attack(mob/M, mob/user)
if(!M || !user)
return
@@ -53,6 +60,6 @@
target.update_icons()
add_attack_logs(user, target, "injected with [src]")
- used = 1
- update_icon()
- name = "used " + name
+ used = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
+
diff --git a/code/game/objects/items/weapons/explosives.dm b/code/game/objects/items/weapons/explosives.dm
index e2478d00882..6195f927a01 100644
--- a/code/game/objects/items/weapons/explosives.dm
+++ b/code/game/objects/items/weapons/explosives.dm
@@ -4,89 +4,107 @@
icon_state = "plastic-explosive0"
item_state = "plastic-explosive"
flags = NOBLUDGEON
- det_time = 10
+ det_time = 10 SECONDS
display_timer = 0
origin_tech = "syndicate=1"
toolspeed = 1
- var/atom/target = null
- var/image_overlay = null
- var/obj/item/assembly_holder/nadeassembly = null
+ var/atom/target
+ var/image_overlay
+ var/obj/item/assembly_holder/nadeassembly
var/assemblyattacher
var/notify_admins = TRUE
-/obj/item/grenade/plastic/New()
+
+/obj/item/grenade/plastic/Initialize(mapload)
+ . = ..()
image_overlay = image('icons/obj/weapons/grenade.dmi', "[item_state]2")
- ..()
+
/obj/item/grenade/plastic/Destroy()
QDEL_NULL(nadeassembly)
target = null
return ..()
+
/obj/item/grenade/plastic/attackby(obj/item/I, mob/user, params)
if(!nadeassembly && istype(I, /obj/item/assembly_holder))
- var/obj/item/assembly_holder/A = I
- if(!user.drop_item_ground(I))
+ var/obj/item/assembly_holder/assembly_holder = I
+ if(!user.drop_transfer_item_to_loc(I, src))
return ..()
- nadeassembly = A
- A.master = src
- A.loc = src
+ nadeassembly = assembly_holder
+ assembly_holder.master = src
assemblyattacher = user.ckey
- to_chat(user, "You add [A] to the [name].")
+ to_chat(user, "You add [assembly_holder] to the [name].")
playsound(src, 'sound/weapons/tap.ogg', 20, 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
- if(nadeassembly && istype(I, /obj/item/wirecutters))
+ if(nadeassembly && I.tool_behaviour == TOOL_WIRECUTTER)
playsound(src, I.usesound, 20, 1)
- nadeassembly.loc = get_turf(src)
+ nadeassembly.forceMove_turf()
nadeassembly.master = null
nadeassembly = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
..()
+
//assembly stuff
/obj/item/grenade/plastic/receive_signal()
prime()
+
/obj/item/grenade/plastic/Crossed(atom/movable/AM, oldloc)
if(nadeassembly)
nadeassembly.Crossed(AM, oldloc)
+
/obj/item/grenade/plastic/on_found(mob/finder)
if(nadeassembly)
nadeassembly.on_found(finder)
+
/obj/item/grenade/plastic/attack_self(mob/user)
if(nadeassembly)
nadeassembly.attack_self(user)
return
- var/newtime = input(usr, "Please set the timer.", "Timer", det_time) as num
+ var/newtime = input(usr, "Please set the timer (in seconds).", "Timer", det_time/10) as null|num
+ if(isnull(newtime))
+ return
if(user.is_in_active_hand(src))
- newtime = clamp(newtime, initial(det_time), 60000)
- det_time = newtime
- to_chat(user, "Timer set for [det_time] seconds.")
+ newtime = round(newtime)
+ det_time = clamp(newtime SECONDS, initial(det_time), 10 MINUTES)
+ to_chat(user, "Timer set for [newtime] seconds.")
+
/obj/item/grenade/plastic/afterattack(atom/movable/AM, mob/user, flag)
- if (!flag)
+ if(!flag)
+ return
+ if(iscarbon(AM))
+ to_chat(user, "You can't get the [src] to stick to [AM]!")
return
- if (istype(AM, /mob/living/carbon))
+ if(isobserver(AM))
+ to_chat(user, "Your hand just phases through [AM]!")
return
- to_chat(user, "You start planting the [src]. The timer is set to [det_time]...")
-
- if(do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM))
- if(!user.drop_item_ground(src))
- return
- src.target = AM
- loc = null
- if(notify_admins)
- message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time] second fuse")
- add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time] second fuse", user)
-
- target.overlays += image_overlay
- if(!nadeassembly)
- to_chat(user, "You plant the bomb. Timer counting down from [det_time].")
- addtimer(CALLBACK(src, PROC_REF(prime)), det_time*10)
+ to_chat(user, "You start planting [src].[isnull(nadeassembly) ? " The timer is set to [det_time/10]..." : ""]")
+
+ if(!do_after(user, 50 * toolspeed * gettoolspeedmod(user), target = AM))
+ return
+
+ if(!user.drop_item_ground(src))
+ return
+
+ target = AM
+ do_pickup_animation(AM)
+ loc = null
+ if(notify_admins)
+ message_admins("[ADMIN_LOOKUPFLW(user)] planted [src.name] on [target.name] at [ADMIN_COORDJMP(target)] with [det_time/10] second fuse")
+ add_game_logs("planted [name] on [target.name] at [COORD(target)] with [det_time/10] second fuse", user)
+
+ AddComponent(/datum/component/persistent_overlay, image_overlay, target)
+ if(!nadeassembly)
+ to_chat(user, "You plant the bomb. Timer counting down from [det_time/10].")
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
+
/obj/item/grenade/plastic/suicide_act(mob/user)
message_admins("[ADMIN_LOOKUPFLW(user)] suicided with [src.name] at [ADMIN_COORDJMP(user)]")
@@ -119,12 +137,14 @@
user.gib()
return OBLITERATION
-/obj/item/grenade/plastic/update_icon()
+
+/obj/item/grenade/plastic/update_icon_state()
if(nadeassembly)
icon_state = "[item_state]1"
else
icon_state = "[item_state]0"
+
//////////////////////////
///// The Explosives /////
//////////////////////////
@@ -145,7 +165,6 @@
location = get_turf(target) // Set the explosion location to turf if planted directly on a wall or floor
else
location = get_atom_on_turf(target) // Otherwise, make sure we're blowing up what's on top of the turf
- target.overlays -= image_overlay
else
location = get_atom_on_turf(src)
if(location)
@@ -250,7 +269,7 @@
/obj/item/grenade/plastic/x4/thermite
name = "T4"
desc = "A wall breaching charge, containing fuel, metal oxide and metal powder mixed in just the right way. One hell of a combination. Effective against walls, ineffective against airlocks..."
- det_time = 2
+ det_time = 2 SECONDS
icon_state = "t4breach0"
item_state = "t4breach"
@@ -259,7 +278,6 @@
if(target)
if(!QDELETED(target))
location = get_turf(target)
- target.overlays -= image_overlay
else
location = get_turf(src)
if(location)
@@ -268,7 +286,7 @@
if(target && target.density)
var/turf/T = get_step(location, aim_dir)
for(var/turf/simulated/wall/W in range(1, location))
- W.thermitemelt(speed = 30)
+ W.thermitemelt(time = 3 SECONDS)
addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3)
addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3)
else
@@ -276,7 +294,6 @@
addtimer(CALLBACK(GLOBAL_PROC, /proc/explosion, T, 0, 0, 2), 3)
addtimer(CALLBACK(smoke, TYPE_PROC_REF(/datum/effect_system/smoke_spread, start)), 3)
-
if(isliving(target))
var/mob/living/M = target
M.adjust_fire_stacks(2)
diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index 5e41af4e072..602e834f465 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -40,21 +40,34 @@
sprite_name = "miniFE"
dog_fashion = null
+
+/obj/item/extinguisher/Initialize(mapload)
+ . = ..()
+ if(!reagents)
+ create_reagents(max_water)
+ reagents.add_reagent("water", max_water)
+
+
/obj/item/extinguisher/examine(mob/user)
. = ..()
. += "The safety is [safety ? "on" : "off"]."
-/obj/item/extinguisher/New()
- ..()
- create_reagents(max_water)
- reagents.add_reagent("water", max_water)
+
+/obj/item/extinguisher/update_icon_state()
+ icon_state = "[sprite_name][!safety]"
+
+
+/obj/item/extinguisher/update_desc(updates = ALL)
+ . = ..()
+ desc = "The safety is [safety ? "on" : "off"]."
+
+
/obj/item/extinguisher/attack_self(mob/user as mob)
safety = !safety
- src.icon_state = "[sprite_name][!safety]"
- src.desc = "The safety is [safety ? "on" : "off"]."
+ update_appearance(UPDATE_ICON_STATE|UPDATE_DESC)
to_chat(user, "The safety is [safety ? "on" : "off"].")
- return
+
/obj/item/extinguisher/attack_obj(obj/O, mob/living/user, params)
if(AttemptRefill(O, user))
diff --git a/code/game/objects/items/weapons/flamethrower.dm b/code/game/objects/items/weapons/flamethrower.dm
index ca0f4756b24..3a02ab76dd3 100644
--- a/code/game/objects/items/weapons/flamethrower.dm
+++ b/code/game/objects/items/weapons/flamethrower.dm
@@ -48,21 +48,25 @@
igniter.flamethrower_process(location)
-/obj/item/flamethrower/update_icon()
- cut_overlays()
+/obj/item/flamethrower/update_icon(updates = ALL)
+ . = ..()
+ update_equipped_item()
+
+
+
+/obj/item/flamethrower/update_icon_state()
+ item_state = "flamethrower_[lit]"
+
+
+/obj/item/flamethrower/update_overlays()
+ . = ..()
if(igniter)
- add_overlay("+igniter[status]")
+ . += "+igniter[status]"
if(ptank)
- add_overlay("+ptank")
+ . += "+ptank"
if(lit)
- add_overlay("+lit")
- item_state = "flamethrower_1"
- else
- item_state = "flamethrower_0"
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_l_hand()
- M.update_inv_r_hand()
+ . += "+lit"
+
/obj/item/flamethrower/can_enter_storage(obj/item/storage/S, mob/user)
if(lit)
diff --git a/code/game/objects/items/weapons/garrote.dm b/code/game/objects/items/weapons/garrote.dm
index 132ec7649fa..09b93ee0444 100644
--- a/code/game/objects/items/weapons/garrote.dm
+++ b/code/game/objects/items/weapons/garrote.dm
@@ -19,12 +19,11 @@
strangling = null
return ..()
-/obj/item/twohanded/garrote/update_icon()
+/obj/item/twohanded/garrote/update_icon_state()
if(strangling) // If we're strangling someone we want our icon to stay wielded
icon_state = "garrot_unwrap"
return
-
- icon_state = "garrot_[wielded ? "un" : ""]wrap"
+ icon_state = "garrot_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap"
/obj/item/twohanded/garrote/improvised // Made via tablecrafting
name = "garrote"
@@ -32,12 +31,11 @@
icon_state = "garrot_I_wrap"
improvised = 1
-/obj/item/twohanded/garrote/improvised/update_icon()
+/obj/item/twohanded/garrote/improvised/update_icon_state()
if(strangling)
icon_state = "garrot_I_unwrap"
return
-
- icon_state = "garrot_I_[wielded ? "un" : ""]wrap"
+ icon_state = "garrot_I_[HAS_TRAIT(src, TRAIT_WIELDED) ? "un" : ""]wrap"
/obj/item/twohanded/garrote/unwield(obj/item/source, mob/living/carbon/user)
@@ -46,7 +44,7 @@
"You remove the [src] from [strangling]'s neck.")
strangling.garroted_by.Remove(src)
strangling = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
@@ -102,7 +100,7 @@
garrote_time = world.time + 10
START_PROCESSING(SSobj, src)
strangling = M
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
playsound(src.loc, 'sound/weapons/cablecuff.ogg', 15, 1, -1)
@@ -110,19 +108,18 @@
"[U] begins garroting you with the [src]![improvised ? "" : " You are unable to speak!"]", \
"You hear struggling and wire strain against flesh!")
- return
/obj/item/twohanded/garrote/process()
if(!strangling)
// Our mark got gibbed or similar
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
return
if(!istype(loc, /mob/living/carbon/human))
strangling = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
return
@@ -141,7 +138,7 @@
strangling.garroted_by.Remove(src)
strangling = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
return
@@ -152,7 +149,7 @@
strangling.garroted_by.Remove(src)
strangling = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
STOP_PROCESSING(SSobj, src)
return
diff --git a/code/game/objects/items/weapons/gift_wrappaper.dm b/code/game/objects/items/weapons/gift_wrappaper.dm
index 2291671194d..649897ee351 100644
--- a/code/game/objects/items/weapons/gift_wrappaper.dm
+++ b/code/game/objects/items/weapons/gift_wrappaper.dm
@@ -42,7 +42,7 @@
/obj/effect/spresent/attackby(obj/item/W as obj, mob/user as mob, params)
..()
- if(!istype(W, /obj/item/wirecutters))
+ if(W.tool_behaviour != TOOL_WIRECUTTER)
to_chat(user, "I need wirecutters for that.")
return
diff --git a/code/game/objects/items/weapons/grenades/bananade.dm b/code/game/objects/items/weapons/grenades/bananade.dm
index ea2cbc5f6cf..6c954b8c497 100644
--- a/code/game/objects/items/weapons/grenades/bananade.dm
+++ b/code/game/objects/items/weapons/grenades/bananade.dm
@@ -45,7 +45,7 @@
qdel(I)
else
to_chat(usr, "The bananade is full, screwdriver it shut to lock it down.")
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(fillamt)
var/obj/item/grenade/bananade/G = new /obj/item/grenade/bananade(drop_location())
if(!remove_item_from_storage(user))
diff --git a/code/game/objects/items/weapons/grenades/chem_grenade.dm b/code/game/objects/items/weapons/grenades/chem_grenade.dm
index ffa8a8b4b5f..15fec3a3187 100644
--- a/code/game/objects/items/weapons/grenades/chem_grenade.dm
+++ b/code/game/objects/items/weapons/grenades/chem_grenade.dm
@@ -25,22 +25,26 @@
var/contained = "" // For logging
var/cores = "" // Also for logging
-/obj/item/grenade/chem_grenade/New()
- ..()
+
+/obj/item/grenade/chem_grenade/Initialize(mapload)
+ . = ..()
create_reagents(1000)
if(payload_name)
payload_name += " " // formatting, ignore me
update_icon()
+
/obj/item/grenade/chem_grenade/Destroy()
QDEL_NULL(nadeassembly)
if (!no_splash)
QDEL_LIST(beakers)
return ..()
+
/obj/item/grenade/chem_grenade/examine(mob/user)
- . = ..()
display_timer = (stage == READY && !nadeassembly) //show/hide the timer based on assembly state
+ . = ..()
+
/obj/item/grenade/chem_grenade/proc/get_trigger()
if(!nadeassembly) return null
@@ -49,21 +53,11 @@
return O
return null
-/obj/item/grenade/chem_grenade/update_overlays()
- underlays = list()
- if(nadeassembly)
- underlays += "[nadeassembly.a_left.icon_state]_left"
- for(var/O in nadeassembly.a_left.attached_overlays)
- underlays += "[O]_l"
- underlays += "[nadeassembly.a_right.icon_state]_right"
- for(var/O in nadeassembly.a_right.attached_overlays)
- underlays += "[O]_r"
-/obj/item/grenade/chem_grenade/update_icon()
+/obj/item/grenade/chem_grenade/update_icon_state()
if(nadeassembly)
icon = 'icons/obj/assemblies/new_assemblies.dmi'
icon_state = bomb_state
- update_overlays()
var/obj/item/assembly/A = get_trigger()
if(stage != READY)
name = "bomb casing[label]"
@@ -75,7 +69,6 @@
else
icon = 'icons/obj/weapons/grenade.dmi'
icon_state = initial(icon_state)
- overlays = list()
switch(stage)
if(EMPTY)
name = "grenade casing[label]"
@@ -89,12 +82,21 @@
icon_state += "_locked"
name = payload_name + "grenade" + label
+ underlays.Cut()
+ if(nadeassembly)
+ underlays += "[nadeassembly.a_left.icon_state]_left"
+ for(var/O in nadeassembly.a_left.attached_overlays)
+ underlays += "[O]_l"
+ underlays += "[nadeassembly.a_right.icon_state]_right"
+ for(var/O in nadeassembly.a_right.attached_overlays)
+ underlays += "[O]_r"
+
/obj/item/grenade/chem_grenade/attack_self(mob/user)
if(stage == READY && !active)
if(nadeassembly)
nadeassembly.attack_self(user)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else if(clown_check(user))
// This used to go before the assembly check, but that has absolutely zero to do with priming the damn thing. You could spam the admins with it.
investigate_log("[key_name_log(usr)] has primed a [name] for detonation [contained].", INVESTIGATE_BOMB)
@@ -127,38 +129,9 @@
else
if(label)
label = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "You remove the label from [src].")
return 1
- if(istype(I, /obj/item/screwdriver))
- if(stage == WIRED)
- if(beakers.len)
- to_chat(user, "You lock the assembly.")
- playsound(loc, prime_sound, 25, -3)
- stage = READY
- update_icon()
- contained = ""
- cores = "" // clear them out so no recursive logging by accidentally
- for(var/obj/O in beakers)
- if(!O.reagents) continue
- if(istype(O,/obj/item/slime_extract))
- cores += " [O]"
- for(var/R in O.reagents.reagent_list)
- var/datum/reagent/reagent = R
- contained += "[reagent.volume] [reagent], "
- if(contained)
- if(cores)
- contained = "\[[cores]; [contained]\]"
- else
- contained = "\[ [contained]\]"
- add_attack_logs(user, src, "has completed with [contained]", ATKLOG_FEW)
- else
- to_chat(user, "You need to add at least one beaker before locking the assembly.")
- else if(stage == READY && !nadeassembly)
- det_time = det_time == 50 ? 30 : 50 //toggle between 30 and 50
- to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.")
- else if(stage == EMPTY)
- to_chat(user, "You need to add an activation mechanism.")
else if(stage == WIRED && is_type_in_list(I, allowed_containers))
if(beakers.len == 2)
@@ -187,7 +160,7 @@
assemblyattacher = user.ckey
stage = WIRED
to_chat(user, "You add [A] to [src]!")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else if(stage == EMPTY && istype(I, /obj/item/stack/cable_coil))
var/obj/item/stack/cable_coil/C = I
@@ -195,14 +168,14 @@
stage = WIRED
to_chat(user, "You rig [src].")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
- else if(stage == READY && istype(I, /obj/item/wirecutters))
+ else if(stage == READY && I.tool_behaviour == TOOL_WIRECUTTER)
to_chat(user, "You unlock the assembly.")
stage = WIRED
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
- else if(stage == WIRED && istype(I, /obj/item/wrench))
+ else if(stage == WIRED && I.tool_behaviour == TOOL_WRENCH)
to_chat(user, "You open the grenade and remove the contents.")
stage = EMPTY
payload_name = null
@@ -218,7 +191,47 @@
for(var/obj/O in beakers)
O.loc = get_turf(src)
beakers = list()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/grenade/chem_grenade/screwdriver_act(mob/living/user, obj/item/I)
+ if(stage == WIRED)
+ if(!length(beakers))
+ to_chat(user, "You need to add at least one beaker before locking the assembly.")
+ return TRUE
+
+ to_chat(user, "You lock the assembly.")
+ playsound(loc, prime_sound, 25, -3)
+ stage = READY
+ update_icon(UPDATE_ICON_STATE)
+ contained = ""
+ cores = "" // clear them out so no recursive logging by accidentally
+ for(var/obj/O in beakers)
+ if(!O.reagents)
+ continue
+ if(istype(O, /obj/item/slime_extract))
+ cores += " [O]"
+ for(var/R in O.reagents.reagent_list)
+ var/datum/reagent/reagent = R
+ contained += "[reagent.volume] [reagent], "
+ if(contained)
+ if(cores)
+ contained = "\[[cores]; [contained]\]"
+ else
+ contained = "\[ [contained]\]"
+ var/turf/bombturf = get_turf(loc)
+ add_attack_logs(user, src, "has completed with [contained]", ATKLOG_MOST)
+ log_game("[key_name(usr)] has completed [name] at [bombturf.x], [bombturf.y], [bombturf.z]. [contained]")
+ return TRUE
+
+ else if(stage == READY && !nadeassembly)
+ det_time = det_time == 5 SECONDS ? 3 SECONDS : 5 SECONDS
+ to_chat(user, "You modify the time delay. It's set for [det_time / 10] second\s.")
+ return TRUE
+
+ else if(stage == EMPTY)
+ to_chat(user, "You need to add an activation mechanism.")
+ return TRUE
//assembly stuff
@@ -281,7 +294,7 @@
O.forceMove(get_turf(src))
beakers = list()
stage = EMPTY
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
if(nadeassembly)
@@ -430,8 +443,9 @@
desc = "Used for emergency sealing of air breaches."
stage = READY
-/obj/item/grenade/chem_grenade/metalfoam/New()
- ..()
+/obj/item/grenade/chem_grenade/metalfoam/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -441,7 +455,7 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/firefighting
@@ -449,8 +463,9 @@
desc = "Can help to put out dangerous fires from a distance."
stage = READY
-/obj/item/grenade/chem_grenade/firefighting/New()
- ..()
+/obj/item/grenade/chem_grenade/firefighting/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -459,15 +474,16 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/incendiary
payload_name = "incendiary"
desc = "Used for clearing rooms of living things."
stage = READY
-/obj/item/grenade/chem_grenade/incendiary/New()
- ..()
+/obj/item/grenade/chem_grenade/incendiary/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -478,7 +494,7 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/antiweed
@@ -486,8 +502,9 @@
desc = "Used for purging large areas of invasive plant species. Contents under pressure. Do not directly inhale contents."
stage = READY
-/obj/item/grenade/chem_grenade/antiweed/New()
- ..()
+/obj/item/grenade/chem_grenade/antiweed/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -499,7 +516,7 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/cleaner
@@ -507,8 +524,9 @@
desc = "BLAM!-brand foaming space cleaner. In a special applicator for rapid cleaning of wide areas."
stage = READY
-/obj/item/grenade/chem_grenade/cleaner/New()
- ..()
+/obj/item/grenade/chem_grenade/cleaner/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -518,7 +536,7 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/teargas
@@ -526,8 +544,9 @@
desc = "Used for nonlethal riot control. Contents under pressure. Do not directly inhale contents."
stage = READY
-/obj/item/grenade/chem_grenade/teargas/New()
- ..()
+/obj/item/grenade/chem_grenade/teargas/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -539,15 +558,16 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/facid
payload_name = "acid smoke"
desc = "Use to chew up opponents from the inside out."
stage = READY
-/obj/item/grenade/chem_grenade/facid/New()
- ..()
+/obj/item/grenade/chem_grenade/facid/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/large/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/large/B2 = new(src)
@@ -559,15 +579,16 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/chem_grenade/saringas
payload_name = "sarin gas"
desc = "Contains sarin gas; extremely deadly and fast acting; use with extreme caution."
stage = READY
-/obj/item/grenade/chem_grenade/saringas/New()
- ..()
+/obj/item/grenade/chem_grenade/saringas/Initialize(mapload)
+ . = ..()
+
var/obj/item/reagent_containers/glass/beaker/B1 = new(src)
var/obj/item/reagent_containers/glass/beaker/B2 = new(src)
@@ -579,7 +600,7 @@
beakers += B1
beakers += B2
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
#undef EMPTY
#undef WIRED
diff --git a/code/game/objects/items/weapons/grenades/custom_grenades.dm b/code/game/objects/items/weapons/grenades/custom_grenades.dm
index 3cb0be484b0..41d473d0411 100644
--- a/code/game/objects/items/weapons/grenades/custom_grenades.dm
+++ b/code/game/objects/items/weapons/grenades/custom_grenades.dm
@@ -39,7 +39,7 @@
payload_name = "holy water"
desc = "Then shalt thou count to three, no more, no less."
stage = 2
- det_time = 30
+ det_time = 3 SECONDS
/obj/item/grenade/chem_grenade/holywater/New()
..()
@@ -51,7 +51,7 @@
payload_name = "hell water"
desc = "And he struck them down with an unholy fury that burn like one-thousands badmins."
stage = 2
- det_time = 30
+ det_time = 3 SECONDS
/obj/item/grenade/chem_grenade/hellwater/New()
..()
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 10488d8e01e..681bb8edf63 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -78,9 +78,8 @@
if(istype(ears))
ears.receive_damage(5)
if(ears.damage >= 15)
- to_chat(M, "Your ears start to ring badly!")
+ to_chat(M, span_warning("Your ears start to ring badly!"))
if(prob(ears.damage - 5))
- to_chat(M, "You can't hear anything!")
- M.BecomeDeaf()
+ to_chat(M, span_warning("You can't hear anything!"))
else if(ears.damage >= 5)
- to_chat(M, "Your ears start to ring!")
+ to_chat(M, span_warning("Your ears start to ring!"))
diff --git a/code/game/objects/items/weapons/grenades/ghettobomb.dm b/code/game/objects/items/weapons/grenades/ghettobomb.dm
index 09ce7f8f6e0..85b8b6f2124 100644
--- a/code/game/objects/items/weapons/grenades/ghettobomb.dm
+++ b/code/game/objects/items/weapons/grenades/ghettobomb.dm
@@ -12,7 +12,7 @@
flags = CONDUCT
slot_flags = SLOT_BELT
active = 0
- det_time = 50
+ det_time = 5 SECONDS
display_timer = 0
var/list/times
@@ -20,10 +20,10 @@
..()
overlays += "improvised_grenade_filled"
overlays += "improvised_grenade_wired"
- times = list("5" = 10, "-1" = 20, "[rand(30, 80)]" = 50, "[rand(65, 180)]" = 20)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
+ times = list("5" = 1 SECONDS, "-1" = 2 SECONDS, "[rand(3 SECONDS, 8 SECONDS)]" = 5 SECONDS, "[rand(6.5 SECONDS, 18 SECONDS)]" = 2 SECONDS)// "Premature, Dud, Short Fuse, Long Fuse"=[weighting value]
det_time = text2num(pickweight(times))
if(det_time < 0) //checking for 'duds'
- det_time = rand(30,80)
+ det_time = rand(3 SECONDS, 8 SECONDS)
/obj/item/grenade/iedcasing/CheckParts(list/parts_list)
..()
@@ -44,6 +44,7 @@
active = TRUE
overlays -= "improvised_grenade_filled"
icon_state = initial(icon_state) + "_active"
+ update_icon()
add_fingerprint(user)
investigate_log("[key_name_log(user)] has primed a [name] for detonation", INVESTIGATE_BOMB)
add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW)
@@ -67,7 +68,7 @@
icon_state = "improvised_satchel"
item_state = "plastic-explosive"
toolspeed = 1
- det_time = 80
+ det_time = 8 SECONDS
var/atom/target = null
var/image_overlay = null
var/planted = FALSE
@@ -80,6 +81,17 @@
if(burned_out)
. += span_notice("Looks like wick has burned out")
+
+/obj/item/grenade/iedsatchel/update_icon_state()
+ if(active)
+ icon_state = "[initial(icon_state)]_active"
+ return
+ if(anchored || burned_out)
+ icon_state = "[initial(icon_state)]_burned"
+ return
+ icon_state = initial(icon_state)
+
+
/obj/item/grenade/iedsatchel/afterattack(atom/T, mob/user, proximity)
if(!proximity)
return
@@ -98,12 +110,12 @@
layer = ABOVE_OBJ_LAYER
add_game_logs("planted [src] on [T.name] at [T.loc]", user)
- icon_state = initial(icon_state) + "_burned"
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, span_notice("You plant the [src]."))
-/obj/item/grenade/iedsatchel/attack_hand(var/mob/user)
+/obj/item/grenade/iedsatchel/attack_hand(mob/user)
if(anchored)
- icon_state = initial(icon_state) + "_burned"
+ update_icon(UPDATE_ICON_STATE)
return
..()
@@ -114,7 +126,7 @@
to_chat(user, span_notice("You tickled a makeshift wick made of wires, it looks like it needs to be set on fire."))
/obj/item/grenade/iedsatchel/attackby(obj/item/W, user)
- if(active == 1)
+ if(active)
return
if(istype(W, /obj/item/lighter))
var/obj/item/lighter/I = W
@@ -126,7 +138,7 @@
var/obj/item/match/I = W
if(!I.lit)
return
- trigger()
+ trigger(user)
return
if(istype(W, /obj/item/weldingtool))
var/obj/item/weldingtool/I = W
@@ -142,17 +154,18 @@
if(I.use(5))
to_chat(user, span_notice("You made a new wick from the cable"))
burned_out = FALSE
+ update_icon(UPDATE_ICON_STATE)
return
to_chat(user, span_notice("There is not enough cables to make a wick."))
- if(istype(W, /obj/item/wirecutters))
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
if(!anchored)
return
pixel_w = 0
pixel_z = 0
to_chat(user, span_notice("You unattached [src]."))
- icon_state = "improvised_satchel"
layer = TURF_LAYER
anchored = FALSE
+ update_icon(UPDATE_ICON_STATE)
target = null
/obj/item/grenade/iedsatchel/proc/trigger(mob/user)
@@ -160,9 +173,9 @@
to_chat(user, span_notice("There is no wick to ignite [src]."))
return
var/N = roll(11) - 1
- active = 1
+ active = TRUE
to_chat(user, span_danger("You ignite wires on [src]!"))
- icon_state = initial(icon_state) + "_active"
+ update_icon(UPDATE_ICON_STATE)
add_game_logs("Triggered [name] at [COORD(target)]", user)
if(N <= 3)
active = 1
@@ -175,10 +188,10 @@
prime()
/obj/item/grenade/iedsatchel/proc/prime_fake()
- src.visible_message(span_notice("The wires on [src] burned out, but nothing happened."))
- active = 0
+ visible_message(span_notice("The wires on [src] burned out, but nothing happened."))
+ active = FALSE
burned_out = TRUE
- icon_state = initial(icon_state) + "_burned"
+ update_icon(UPDATE_ICON_STATE)
/obj/item/grenade/iedsatchel/prime()
update_mob()
diff --git a/code/game/objects/items/weapons/grenades/grenade.dm b/code/game/objects/items/weapons/grenades/grenade.dm
index 7a02c0a4381..0280830be32 100644
--- a/code/game/objects/items/weapons/grenades/grenade.dm
+++ b/code/game/objects/items/weapons/grenades/grenade.dm
@@ -12,9 +12,16 @@
slot_flags = SLOT_BELT
resistance_flags = FLAMMABLE
max_integrity = 40
- var/active = 0
- var/det_time = 50
- var/display_timer = 1
+ var/active = FALSE
+ var/det_time = 5 SECONDS
+ var/display_timer = TRUE
+
+
+/obj/item/grenade/Destroy()
+ ///We need to clear the walk_to on destroy to allow a grenade which uses walk_to or related to properly GC
+ walk_to(src, 0)
+ return ..()
+
/obj/item/grenade/deconstruct(disassembled = TRUE)
if(!disassembled)
@@ -22,65 +29,56 @@
if(!QDELETED(src))
qdel(src)
-/obj/item/grenade/proc/clown_check(var/mob/living/user)
+
+/obj/item/grenade/proc/clown_check(mob/living/user)
if((CLUMSY in user.mutations) && prob(50))
- to_chat(user, "Huh? How does this thing work?")
- active = 1
- icon_state = initial(icon_state) + "_active"
- playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- spawn(5)
- if(user)
- user.drop_from_active_hand()
- prime()
- return 0
- return 1
-
-
-/*/obj/item/grenade/afterattack(atom/target as mob|obj|turf|area, mob/user as mob)
- if(istype(target, /obj/item/storage)) return ..() // Trying to put it in a full container
- if(istype(target, /obj/item/gun/grenadelauncher)) return ..()
- if((user.is_in_active_hand(src)) && (!active) && (clown_check(user)) && target.loc != src.loc)
- to_chat(user, "You prime the [name]! [det_time/10] seconds!")
- active = 1
- icon_state = initial(icon_state) + "_active"
- playsound(loc, 'sound/weapons/armbomb.ogg', 75, 1, -3)
- spawn(det_time)
- prime()
- return
- user.dir = get_dir(user, target)
- user.drop_from_active_hand()
- var/t = (isturf(target) ? target : target.loc)
- walk_towards(src, t, 3)
- return*/
+ to_chat(user, span_warning("Huh? How does this thing work?"))
+ active = TRUE
+ update_icon(UPDATE_ICON_STATE)
+ playsound(loc, 'sound/weapons/armbomb.ogg', 75, TRUE, -3)
+ addtimer(CALLBACK(src, PROC_REF(delayed_boom)), 0.5 SECONDS)
+ return FALSE
+ return TRUE
+
+
+/obj/item/grenade/proc/delayed_boom(mob/living/user)
+ if(!QDELETED(user))
+ user.drop_item_ground(src)
+ prime()
+
+
+/obj/item/grenade/update_icon_state()
+ icon_state = "[initial(icon_state)][active ? "_active" : ""]"
/obj/item/grenade/examine(mob/user)
. = ..()
if(display_timer)
if(det_time > 1)
- . += "The timer is set to [det_time/10] second\s."
+ . += span_notice("The timer is set to [det_time/10] second\s.")
else
- . += "\The [src] is set for instant detonation."
-
-/obj/item/grenade/attack_self(mob/user as mob)
- if(!active)
- if(clown_check(user))
- to_chat(user, "You prime the [name]! [det_time/10] seconds!")
- active = 1
- icon_state = initial(icon_state) + "_active"
- add_fingerprint(user)
- var/turf/bombturf = get_turf(src)
- message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]")
- investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB)
- add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW)
- if(iscarbon(user))
- var/mob/living/carbon/C = user
- C.throw_mode_on()
- spawn(det_time)
- prime()
+ . += span_warning("[src] is set for instant detonation.")
+
+
+/obj/item/grenade/attack_self(mob/user)
+ if(!active && clown_check(user))
+ to_chat(user, "You prime the [name]! [det_time/10] seconds!")
+ active = TRUE
+ update_icon(UPDATE_ICON_STATE)
+ add_fingerprint(user)
+ var/turf/bombturf = get_turf(src)
+ message_admins("[key_name_admin(usr)] has primed a [name] for detonation at [ADMIN_COORDJMP(bombturf)]")
+ investigate_log("[key_name_log(usr)] has primed a [name] for detonation", INVESTIGATE_BOMB)
+ add_attack_logs(user, src, "has primed for detonation", ATKLOG_FEW)
+ if(iscarbon(user))
+ var/mob/living/carbon/c_user = user
+ c_user.throw_mode_on()
+ addtimer(CALLBACK(src, PROC_REF(prime)), det_time)
/obj/item/grenade/proc/prime(mob/user)
+ return
+
/obj/item/grenade/proc/update_mob()
if(ismob(loc))
@@ -88,24 +86,25 @@
M.drop_item_ground(src)
-/obj/item/grenade/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/screwdriver))
- switch(det_time)
- if("1")
- det_time = 10
- to_chat(user, "You set the [name] for 1 second detonation time.")
- if("10")
- det_time = 30
- to_chat(user, "You set the [name] for 3 second detonation time.")
- if("30")
- det_time = 50
- to_chat(user, "You set the [name] for 5 second detonation time.")
- if("50")
- det_time = 1
- to_chat(user, "You set the [name] for instant detonation.")
- add_fingerprint(user)
- ..()
+/obj/item/grenade/screwdriver_act(mob/living/user, obj/item/I)
+ switch(det_time)
+ if(0.1 SECONDS)
+ det_time = 1 SECONDS
+ to_chat(user, span_notice("You set [src] for 1 second detonation time."))
+ if(1 SECONDS)
+ det_time = 3 SECONDS
+ to_chat(user, span_notice("You set [src] for 3 second detonation time."))
+ if(3 SECONDS)
+ det_time = 5 SECONDS
+ to_chat(user, span_notice("You set [src] for 5 second detonation time."))
+ if(5 SECONDS)
+ det_time = 0.1 SECONDS
+ to_chat(user, span_notice("You set [src] for instant detonation."))
+ add_fingerprint(user)
+ return TRUE
+
/obj/item/grenade/attack_hand()
walk(src, null, null)
..()
+
diff --git a/code/game/objects/items/weapons/grenades/smokebomb.dm b/code/game/objects/items/weapons/grenades/smokebomb.dm
index 715a18e9ca6..eb486c54b09 100644
--- a/code/game/objects/items/weapons/grenades/smokebomb.dm
+++ b/code/game/objects/items/weapons/grenades/smokebomb.dm
@@ -3,7 +3,7 @@
name = "smoke bomb"
icon = 'icons/obj/weapons/grenade.dmi'
icon_state = "flashbang"
- det_time = 20
+ det_time = 2 SECONDS
item_state = "flashbang"
slot_flags = SLOT_BELT
var/datum/effect_system/smoke_spread/bad/smoke
diff --git a/code/game/objects/items/weapons/highlander_swords.dm b/code/game/objects/items/weapons/highlander_swords.dm
index be938303fa1..2590d72d985 100644
--- a/code/game/objects/items/weapons/highlander_swords.dm
+++ b/code/game/objects/items/weapons/highlander_swords.dm
@@ -5,6 +5,7 @@
/datum/martial_art/highlander
name = "Highlander Style"
deflection_chance = 100
+ weight = 100
no_guns = TRUE
no_guns_message = "Вы никогда не опуститесь таааак низко, чтобы пользоваться оружием ПОДЛЕЦОВ!"
diff --git a/code/game/objects/items/weapons/implants/implant.dm b/code/game/objects/items/weapons/implants/implant.dm
index 72a36fdb90b..8b9f985e683 100644
--- a/code/game/objects/items/weapons/implants/implant.dm
+++ b/code/game/objects/items/weapons/implants/implant.dm
@@ -51,7 +51,7 @@
if(istype(loc, /obj/item/implanter))
var/obj/item/implanter/implanter = loc
implanter.imp = null
- implanter.update_icon()
+ implanter.update_state()
if(istype(loc, /obj/item/implantpad))
var/obj/item/implantcase/implantcase = loc
implantcase.imp = null
@@ -92,15 +92,13 @@
to_chat(user, span_warning("You can't trigger [src] with a custom emote."))
return FALSE
- if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)))
+ var/intentional_cause = (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL) && !(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL)
+ if(!(emote_key in user.usable_emote_keys(intentional_cause)))
if(!silent)
- to_chat(user, span_warning("You can't trigger [src] with that emote! Try *help to see emotes you can use."))
+ to_chat(user, span_warning("You can't trigger [src] with that emote [intentional_cause ? "intentionally" : "unintentionally"]! Try *help to see emotes you can use."))
return FALSE
- if(!(emote_key in user.usable_emote_keys(trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL)))
- CRASH("User was given an bio-chip for an unintentional emote that they can't use.")
-
- LAZYADD(trigger_emotes, emote_key)
+ LAZYADDOR(trigger_emotes, emote_key)
RegisterSignal(user, COMSIG_MOB_EMOTED(emote_key), PROC_REF(on_emote))
@@ -113,7 +111,7 @@
if(!(intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)) && !(!intentional && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL)))
return
- add_attack_logs(user, user, "[intentional ? "intentionally" : "unintentionally"] [src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].")
+ add_attack_logs(user, user, "[src] was [intentional ? "intentionally" : "unintentionally"] triggered with the emote [fired_emote].")
emote_trigger(key, user, intentional)
@@ -136,7 +134,7 @@
death_trigger(source, gibbed)
-/obj/item/implant/proc/emote_trigger(emote, mob/source, force)
+/obj/item/implant/proc/emote_trigger(emote, mob/source, intentional)
return
@@ -183,13 +181,13 @@
if(trigger_emotes)
if(!(trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL|BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL))
CRASH("Bio-chip [src] has trigger emotes defined but no trigger cause with which to use them!")
- if(!activated && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL))
+ if(activated == BIOCHIP_ACTIVATED_PASSIVE && (trigger_causes & BIOCHIP_EMOTE_TRIGGER_INTENTIONAL))
CRASH("Bio-chip [src] has intentional emote triggers on a passive bio-chip")
// If you can't activate the implant manually, you shouldn't be able to deliberately activate it with an emote
for(var/emote in trigger_emotes)
set_trigger(source, emote, on_implant = TRUE)
- if(activated)
+ if(activated == BIOCHIP_ACTIVATED_ACTIVE)
for(var/datum/action/action as anything in actions)
action.Grant(source)
update_button(action)
diff --git a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
index 097324fe1ce..e4868acb04f 100644
--- a/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
+++ b/code/game/objects/items/weapons/implants/implant_sad_trombone.dm
@@ -8,15 +8,15 @@
implant_state = "implant-honk"
-/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, force)
- activate(emote)
+/obj/item/implant/sad_trombone/emote_trigger(emote, mob/source, intentional)
+ activate()
/obj/item/implant/sad_trombone/death_trigger(mob/user, gibbed)
- activate(gibbed)
+ activate()
-/obj/item/implant/sad_trombone/activate()
+/obj/item/implant/sad_trombone/activate(cause)
playsound(loc, 'sound/misc/sadtrombone.ogg', 50, FALSE)
diff --git a/code/game/objects/items/weapons/implants/implant_second_chance.dm b/code/game/objects/items/weapons/implants/implant_second_chance.dm
new file mode 100644
index 00000000000..e05c4355ed3
--- /dev/null
+++ b/code/game/objects/items/weapons/implants/implant_second_chance.dm
@@ -0,0 +1,51 @@
+/obj/item/implant/second_chance
+ name = "second chance bio-chip"
+ desc = "Simulates your death and teleports you to an exact safe place."
+ icon_state = "explosive_old"
+ origin_tech = "materials=1;combat=2;biotech=4;syndicate=3;bluespace=1"
+ implant_state = "implant-syndicate"
+ activated = BIOCHIP_ACTIVATED_ACTIVE
+ actions_types = list(/datum/action/item_action/hands_free/activate/always)
+ implant_data = /datum/implant_fluff/second_chance
+
+
+/obj/item/implant/second_chance/activate()
+ var/turf/old_turf = get_turf(imp_in)
+
+ if(is_teleport_allowed(imp_in.z))
+ var/turf/new_turf = find_safe_turf(level_name_to_num(MAIN_STATION))
+ do_teleport(imp_in, new_turf, 0)
+ playsound(imp_in, 'sound/effects/sparks4.ogg', 50, TRUE)
+ do_sparks(4, TRUE, imp_in)
+ imp_in.rejuvenate()
+ investigate_log("[key_name_log(imp_in)] fake-gib himself using [name] and teleports to [COORD(new_turf)].", INVESTIGATE_TELEPORTATION)
+
+ explosion(old_turf, 0, 0, 3, 6, cause = imp_in)
+
+ if(isnucleation(imp_in))
+ imp_in.visible_message(span_warning("Тело [imp_in] взрывается, оставляя после себя множество микроскопических кристаллов!"))
+ else if(!ismachineperson(imp_in))
+ new /obj/effect/temp_visual/gib(old_turf)
+ new /obj/effect/gibspawner/human(old_turf)
+ playsound(old_turf, 'sound/goonstation/effects/gib.ogg', 50, TRUE)
+ else
+ do_sparks(3, TRUE, old_turf)
+ playsound(old_turf, 'sound/goonstation/effects/robogib.ogg', 50, TRUE)
+ new /obj/effect/decal/cleanable/blood/gibs/robot(old_turf)
+
+ else
+ to_chat(imp_in, span_userdanger("[src] is malfunctioning!"))
+ explosion(old_turf, 0, 0, 3, 6, cause = imp_in)
+ qdel(src)
+
+
+/obj/item/implanter/second_chance
+ name = "bio-chip implanter (second chance)"
+ imp = /obj/item/implant/second_chance
+
+
+/obj/item/implantcase/second_chance
+ name = "bio-chip case - 'Second Chance'"
+ desc = "A glass case containing an second chance bio-chip."
+ imp = /obj/item/implant/second_chance
+
diff --git a/code/game/objects/items/weapons/implants/implant_stealth.dm b/code/game/objects/items/weapons/implants/implant_stealth.dm
index 7fe0ed65984..5ac03283359 100644
--- a/code/game/objects/items/weapons/implants/implant_stealth.dm
+++ b/code/game/objects/items/weapons/implants/implant_stealth.dm
@@ -155,7 +155,8 @@
qdel(src)
-/obj/structure/closet/cardboard/agent/update_icon() // When the box is opened, it's deleted, so we never need to update this.
+// When the box is opened, it's deleted, so we never need to update this.
+/obj/structure/closet/cardboard/agent/update_icon_state()
return
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index 5c50ffdd780..5d610eb97a4 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -36,15 +36,13 @@
origin_tech = initial(origin_tech)
flags = initial(flags)
reagents = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/implantcase/update_icon()
- ..()
- cut_overlays()
+/obj/item/implantcase/update_overlays()
+ . = ..()
if(imp)
- var/image/implant_overlay = image('icons/obj/implants.dmi', imp.implant_state)
- add_overlay(implant_overlay)
+ . += image('icons/obj/implants.dmi', imp.implant_state)
/obj/item/implantcase/attackby(obj/item/I, mob/user)
@@ -58,7 +56,8 @@
implater.imp.forceMove(src)
imp = implater.imp
implater.imp = null
- implater.update_icon()
+ update_state()
+ implater.update_state()
else
if(imp)
if(implater.imp)
@@ -66,8 +65,8 @@
imp.forceMove(implater)
implater.imp = imp
imp = null
- implater.update_icon()
- update_state()
+ update_state()
+ implater.update_state()
else
return ..()
diff --git a/code/game/objects/items/weapons/implants/implantchair.dm b/code/game/objects/items/weapons/implants/implantchair.dm
index 63de271a625..f11a3e75097 100644
--- a/code/game/objects/items/weapons/implants/implantchair.dm
+++ b/code/game/objects/items/weapons/implants/implantchair.dm
@@ -33,12 +33,8 @@
LAZYADD(implants_list, bio_chip)
-/obj/machinery/implantchair/update_icon()
- . = ..()
- if(occupant)
- icon_state = "implantchair_on"
- else
- icon_state = "implantchair"
+/obj/machinery/implantchair/update_icon_state()
+ icon_state = "implantchair[occupant ? "_on" : ""]"
/obj/machinery/implantchair/attack_hand(mob/user)
@@ -124,7 +120,7 @@
return FALSE
-/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user)
+/obj/machinery/implantchair/MouseDrop_T(mob/living/carbon/human/dropping, mob/living/user, params)
return put_mob(dropping, user)
@@ -136,7 +132,7 @@
target.forceMove(src)
occupant = target
add_fingerprint(user)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
updateUsrDialog()
return TRUE
@@ -178,7 +174,7 @@
occupant.forceMove(loc)
add_fingerprint(user)
occupant = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm
index 418fb1321fa..1cc51f73a03 100644
--- a/code/game/objects/items/weapons/implants/implanter.dm
+++ b/code/game/objects/items/weapons/implants/implanter.dm
@@ -18,7 +18,7 @@
. = ..()
if(ispath(imp, /obj/item/implant))
imp = new imp(src)
- update_icon()
+ update_state()
/obj/item/implanter/Destroy()
@@ -26,13 +26,13 @@
return ..()
-/obj/item/implanter/update_icon()
- if(imp)
- icon_state = "implanter1"
- origin_tech = imp.origin_tech
- else
- icon_state = "implanter0"
- origin_tech = initial(origin_tech)
+/obj/item/implanter/proc/update_state()
+ origin_tech = imp ? imp.origin_tech : initial(origin_tech)
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/implanter/update_icon_state()
+ icon_state = "implanter[imp ? "1" : "0"]"
/obj/item/implanter/attack(mob/living/carbon/target, mob/user)
@@ -50,7 +50,7 @@
else
target.visible_message("[user] has implanted [target].", span_notice("[user] bio-chips you."))
imp = null
- update_icon()
+ update_state()
/obj/item/implanter/attackby(obj/item/I, mob/user, params)
diff --git a/code/game/objects/items/weapons/implants/implantfluff.dm b/code/game/objects/items/weapons/implants/implantfluff.dm
index b1d2510e9b2..86d1865dbbd 100644
--- a/code/game/objects/items/weapons/implants/implantfluff.dm
+++ b/code/game/objects/items/weapons/implants/implantfluff.dm
@@ -73,6 +73,13 @@
function = "Contains a bulky, electrically triggered explosive that detonates upon receiving a specially encoded signal or upon host death."
+/datum/implant_fluff/second_chance
+ name = "Cybersun Industries RX-87 Employee Management Bio-chip"
+ life = "Destroyed upon activation."
+ notes = "A small chip containing a familiar explosive device, the warhead of which has been partially replaced by a redspace crystal."
+ function = "Contains a compact, electrically triggered explosive that detonates upon receiving a specially encoded signal and teleports the operator to an exact safe location."
+
+
/datum/implant_fluff/freedom
name = "Cybersun Industries RX-92 Quick Escape Bio-chip"
life = "Destroyed after 4 uses."
@@ -144,13 +151,6 @@
function = "Plays a sad trombone noise upon death of the implantee, allows clowns to entertain the crew even post-mortem."
-/datum/implant_fluff/pathfinder
- name = "Paizo Productions 5-E Pathfinder Implant"
- life = "Lasts 2-12 months. Known to fail at the worst possible time, space radation may be a factor."
- notes = "By use of an internal private GPS signal, allows the pathfinder module to have the MODsuit find the user. Also wirelessly transfers ID information to the suit, to allow doors to open."
- function = "Allows for the recall of a Modular Outerwear Device by the implant owner at any time."
-
-
/datum/implant_fluff/stealth
name = "Syndicate S3 \"Stealth\" Bio-chip"
life = "Unknown. No collected sample has been active long enough to determine lifespan."
diff --git a/code/game/objects/items/weapons/implants/implantpad.dm b/code/game/objects/items/weapons/implants/implantpad.dm
index a14bcaeb9d6..75adb54aa87 100644
--- a/code/game/objects/items/weapons/implants/implantpad.dm
+++ b/code/game/objects/items/weapons/implants/implantpad.dm
@@ -17,11 +17,8 @@
return ..()
-/obj/item/implantpad/update_icon()
- if(case)
- icon_state = "implantpad-on"
- else
- icon_state = "implantpad-off"
+/obj/item/implantpad/update_icon_state()
+ icon_state = "implantpad-[case ? "on" : "off"]"
/obj/item/implantpad/attack_self(mob/user)
@@ -43,7 +40,7 @@
return
user.drop_transfer_item_to_loc(new_case, src)
case = new_case
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/implantpad/proc/eject_case(mob/user)
@@ -57,7 +54,7 @@
case.add_fingerprint(user)
case = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/implantpad/AltClick(mob/living/user)
diff --git a/code/game/objects/items/weapons/kitchen.dm b/code/game/objects/items/weapons/kitchen.dm
index 992b04842f7..d72f997ab0b 100644
--- a/code/game/objects/items/weapons/kitchen.dm
+++ b/code/game/objects/items/weapons/kitchen.dm
@@ -293,17 +293,20 @@
drop_sound = 'sound/items/handling/bone_drop.ogg'
var/size
+
/obj/item/kitchen/knife/glassshiv/Initialize(mapload, obj/item/shard/sh)
. = ..()
if(sh)
size = sh.icon_state
- update_icon()
-
-/obj/item/kitchen/knife/glassshiv/update_icon()
if(!size)
size = pick("large", "medium", "small")
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/kitchen/knife/glassshiv/update_icon_state()
icon_state = "[size]_[initial(icon_state)]"
+
/obj/item/kitchen/knife/glassshiv/plasma
name = "plasma glass shiv"
desc = "A plasma glass shard with some cloth wrapped around it"
diff --git a/code/game/objects/items/weapons/legcuffs.dm b/code/game/objects/items/weapons/legcuffs.dm
index e18f2c03c14..dd7ccbd9968 100644
--- a/code/game/objects/items/weapons/legcuffs.dm
+++ b/code/game/objects/items/weapons/legcuffs.dm
@@ -42,11 +42,16 @@
return BRUTELOSS
+/obj/item/restraints/legcuffs/beartrap/update_icon_state()
+ icon_state = "[initial(icon_state)][armed]"
+
+
+
/obj/item/restraints/legcuffs/beartrap/attack_self(mob/user)
..()
if(ishuman(user) && !user.stat && !user.restrained())
armed = !armed
- icon_state = "[initial(icon_state)][armed]"
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, span_notice("[src] is now [armed ? "armed" : "disarmed"]"))
@@ -116,7 +121,7 @@
return
armed = FALSE
- icon_state = "[initial(icon_state)][armed]"
+ update_icon(UPDATE_ICON_STATE)
playsound(src.loc, 'sound/effects/snap.ogg', 50, TRUE)
moving_thing.visible_message(span_danger("[moving_thing] triggers [src]."),
span_userdanger("You trigger [src]!"))
@@ -185,6 +190,11 @@
RegisterSignal(src, COMSIG_CARBON_TOGGLE_THROW, PROC_REF(spin_up_wrapper))
+/obj/item/restraints/legcuffs/bola/update_icon_state()
+ item_state = spinning ? "[initial(item_state)]_spin" : initial(item_state)
+ update_equipped_item()
+
+
/obj/item/restraints/legcuffs/bola/proc/spin_up_wrapper(datum/source, throw_mode_state) // so that signal handler works
SIGNAL_HANDLER
if(throw_mode_state) // if we actually turned throw mode on
@@ -196,8 +206,7 @@
return
var/mob/living/owner = loc // can only be called if the mob is holding the bola.
spinning = TRUE
- item_state = "[initial(item_state)]_spin"
- owner.update_inv_hands()
+ update_icon(UPDATE_ICON_STATE)
playsound(owner, spin_sound, 30, list(38000, 48000), SHORT_RANGE_SOUND_EXTRARANGE)
spin_timer_id = addtimer(CALLBACK(src, PROC_REF(spin_loop), owner), 1 SECONDS, TIMER_UNIQUE|TIMER_LOOP|TIMER_STOPPABLE|TIMER_DELETE_ME)
do_spin_cycle(owner)
@@ -244,10 +253,9 @@
/obj/item/restraints/legcuffs/bola/proc/reset_values(mob/living/user)
throw_range = initial(throw_range)
throw_speed = initial(throw_speed)
- item_state = initial(item_state)
spin_cycle = 0
spinning = FALSE
- user?.update_inv_hands()
+ update_icon(UPDATE_ICON_STATE)
if(spin_timer_id)
deltimer(spin_timer_id)
diff --git a/code/game/objects/items/weapons/lighters.dm b/code/game/objects/items/weapons/lighters.dm
index d4d3126cab5..02c8dbf7c05 100644
--- a/code/game/objects/items/weapons/lighters.dm
+++ b/code/game/objects/items/weapons/lighters.dm
@@ -280,6 +280,7 @@
pickup_sound = 'sound/items/handling/generic_small_pickup.ogg'
drop_sound = 'sound/items/handling/generic_small_drop.ogg'
+
/obj/item/match/process()
var/turf/location = get_turf(src)
smoketime--
@@ -287,50 +288,65 @@
matchburnout()
if(location)
location.hotspot_expose(700, 5)
- return
+
/obj/item/match/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
matchignite()
+
/obj/item/match/extinguish_light(force = FALSE)
if(!force)
return
matchburnout()
+
+/obj/item/match/update_icon_state()
+ icon_state = lit ? "match_lit" : "match_burnt"
+ item_state = lit ? "cigon" : "cigoff"
+
+
+/obj/item/match/update_name(updates = ALL)
+ . = ..()
+ var/init_name = initial(name)
+ name = lit ? "lit [init_name]" : burnt ? "burnt [init_name]" : initial(name)
+
+
+/obj/item/match/update_desc(updates = ALL)
+ . = ..()
+ var/init_name = initial(name)
+ desc = lit ? "A [init_name]. This one is lit." : burnt ? "A [init_name]. This one has seen better days." : initial(desc)
+
+
/obj/item/match/proc/matchignite()
if(!lit && !burnt)
lit = TRUE
- icon_state = "match_lit"
- damtype = "fire"
+ damtype = FIRE
force = 3
hitsound = 'sound/weapons/tap.ogg'
- item_state = "cigon"
- name = "lit match"
- desc = "A match. This one is lit."
attack_verb = list("burnt","singed")
START_PROCESSING(SSobj, src)
- update_icon()
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
return TRUE
+
/obj/item/match/proc/matchburnout()
if(lit)
lit = FALSE
burnt = TRUE
- damtype = "brute"
+ damtype = BRUTE
force = initial(force)
- icon_state = "match_burnt"
- item_state = "cigoff"
- name = "burnt match"
- desc = "A match. This one has seen better days."
attack_verb = list("flicked")
STOP_PROCESSING(SSobj, src)
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
return TRUE
+
/obj/item/match/dropped(mob/user, silent = FALSE)
matchburnout()
. = ..()
+
/obj/item/match/attack(mob/living/carbon/M, mob/living/carbon/user)
if(!isliving(M))
return ..()
@@ -359,6 +375,7 @@
else
..()
+
/obj/item/match/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(burnt)
C.stored_comms["wood"] += 1
@@ -366,20 +383,24 @@
return TRUE
return ..()
+
/obj/item/proc/help_light_cig(mob/living/M)
var/mask_item = M.get_item_by_slot(slot_wear_mask)
if(istype(mask_item, /obj/item/clothing/mask/cigarette))
return mask_item
+
/obj/item/match/firebrand
name = "firebrand"
desc = "An unlit firebrand. It makes you wonder why it's not just called a stick."
smoketime = 20 //40 seconds
-/obj/item/match/firebrand/New()
- ..()
+
+/obj/item/match/firebrand/Initialize(mapload)
+ . = ..()
matchignite()
+
/obj/item/match/unathi
name = "small blaze"
desc = "A little flame of your own, currently located dangerously in your mouth."
@@ -391,16 +412,24 @@
lit = TRUE
w_class = WEIGHT_CLASS_BULKY //to prevent it going to pockets
+
/obj/item/match/unathi/Initialize(mapload)
. = ..()
START_PROCESSING(SSobj, src)
+
+/obj/item/match/unathi/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
+ return // we are already burning
+
+
/obj/item/match/unathi/matchburnout()
if(!lit)
return
lit = FALSE //to avoid a qdel loop
qdel(src)
+
/obj/item/match/unathi/Destroy()
. = ..()
STOP_PROCESSING(SSobj, src)
+
diff --git a/code/game/objects/items/weapons/melee/energy.dm b/code/game/objects/items/weapons/melee/energy.dm
index d6caf9caf68..4357fb33819 100644
--- a/code/game/objects/items/weapons/melee/energy.dm
+++ b/code/game/objects/items/weapons/melee/energy.dm
@@ -38,6 +38,21 @@
"[user] is falling on the [name]! It looks like [user.p_theyre()] trying to commit suicide."))
return BRUTELOSS|FIRELOSS
+
+/obj/item/melee/energy/update_icon_state()
+ if(!active)
+ icon_state = initial(icon_state)
+ set_light(0)
+ return
+ if(icon_state_on)
+ icon_state = icon_state_on
+ set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
+ else
+ icon_state = "sword[item_color]"
+ set_light(brightness_on, l_color = colormap[item_color])
+ update_equipped_item()
+
+
/obj/item/melee/energy/attack_self(mob/living/carbon/user)
if((CLUMSY in user.mutations) && prob(50))
to_chat(user, "You accidentally cut yourself with [src], like a doofus!")
@@ -48,14 +63,6 @@
throwforce = throwforce_on
hitsound = 'sound/weapons/blade1.ogg'
throw_speed = 4
- if(attack_verb_on.len)
- attack_verb = attack_verb_on
- if(icon_state_on)
- icon_state = icon_state_on
- set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
- else
- icon_state = "sword[item_color]"
- set_light(brightness_on, l_color=colormap[item_color])
w_class = w_class_on
playsound(user, 'sound/weapons/saberon.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
to_chat(user, "[src] is now active.")
@@ -66,17 +73,12 @@
throw_speed = initial(throw_speed)
if(attack_verb_on.len)
attack_verb = list()
- icon_state = initial(icon_state)
w_class = initial(w_class)
playsound(user, 'sound/weapons/saberoff.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
- set_light(0)
to_chat(user, "[src] can now be concealed.")
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- H.update_inv_l_hand()
- H.update_inv_r_hand()
add_fingerprint(user)
- return
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/melee/energy/axe
name = "energy axe"
@@ -119,7 +121,7 @@
origin_tech = "combat=3;magnets=4;syndicate=4"
block_chance = 50
sharp = 1
- var/hacked = 0
+ var/hacked = FALSE
/obj/item/melee/energy/sword/New()
..()
@@ -201,32 +203,24 @@
user.adjustBrainLoss(10)
else
to_chat(user, "You attach the ends of the two energy swords, making a single double-bladed weapon! You're cool.")
- var/obj/item/twohanded/dualsaber/newSaber = new /obj/item/twohanded/dualsaber(drop_location())
- if(src.hacked) // That's right, we'll only check the "original" esword.
- newSaber.hacked = 1
- newSaber.item_color = "rainbow"
+ var/obj/item/twohanded/dualsaber/newSaber = new(drop_location())
+ if(hacked) // That's right, we'll only check the "original" esword.
+ newSaber.hacked = TRUE
+ newSaber.blade_color = "rainbow"
user.temporarily_remove_item_from_inventory(W)
user.temporarily_remove_item_from_inventory(src)
qdel(W)
qdel(src)
user.put_in_hands(newSaber, ignore_anim = FALSE)
- else if(istype(W, /obj/item/multitool))
- if(hacked == 0)
- hacked = 1
- item_color = "rainbow"
- to_chat(user, "RNBW_ENGAGE")
-
- if(active)
- icon_state = "swordrainbow"
- // Updating overlays, copied from welder code.
- // I tried calling attack_self twice, which looked cool, except it somehow didn't update the overlays!!
- if(user.r_hand == src)
- user.update_inv_r_hand()
- else if(user.l_hand == src)
- user.update_inv_l_hand()
-
- else
+ else if(W.tool_behaviour == TOOL_MULTITOOL)
+ if(hacked)
to_chat(user, "It's already fabulous!")
+ return
+
+ hacked = TRUE
+ item_color = "rainbow"
+ to_chat(user, "RNBW_ENGAGE")
+ update_icon(UPDATE_ICON_STATE)
/obj/item/melee/energy/sword/saber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
@@ -337,12 +331,6 @@
throw_speed = 4
if(attack_verb_on.len)
attack_verb = attack_verb_on
- if(icon_state_on)
- icon_state = icon_state_on
- set_light(brightness_on, l_color = item_color ? colormap[item_color] : null)
- else
- icon_state = "sword[item_color]"
- set_light(brightness_on, l_color=colormap[item_color])
w_class = w_class_on
playsound(user, 'sound/magic/fellowship_armory.ogg', 35, TRUE, frequency = 90000 - (active * 30000))
to_chat(user, "You open [src]. It will now cleave enemies in a wide arc and deal additional damage to fauna.")
@@ -353,17 +341,10 @@
throw_speed = initial(throw_speed)
if(attack_verb_on.len)
attack_verb = list()
- icon_state = initial(icon_state)
w_class = initial(w_class)
playsound(user, 'sound/magic/fellowship_armory.ogg', 35, 1) //changed it from 50% volume to 35% because deafness
- set_light(0)
to_chat(user, "You close [src]. It will now attack rapidly and cause fauna to bleed.")
-
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- H.update_inv_l_hand()
- H.update_inv_r_hand()
-
+ update_icon(UPDATE_ICON_STATE)
add_fingerprint(user)
/obj/item/melee/energy/cleaving_saw/examine(mob/user)
diff --git a/code/game/objects/items/weapons/misc.dm b/code/game/objects/items/weapons/misc.dm
index 60a67ff64ee..e19f946512c 100644
--- a/code/game/objects/items/weapons/misc.dm
+++ b/code/game/objects/items/weapons/misc.dm
@@ -92,12 +92,19 @@
icon = 'icons/obj/lightning.dmi'
icon_state = "lightning"
desc = "test lightning"
+ var/angle
-/obj/item/lightning/New()
- ..()
+
+/obj/item/lightning/Initialize(mapload)
+ . = ..()
icon_state = "1"
-/obj/item/lightning/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
+
+/obj/item/lightning/update_icon_state()
+ icon_state = "[angle]"
+
+
+/obj/item/lightning/afterattack(atom/A, mob/living/user, flag, params)
var/angle = get_angle(A, user)
//to_chat(world, angle)
angle = round(angle) + 45
@@ -108,9 +115,7 @@
if(!angle)
angle = 1
- //to_chat(world, "adjusted [angle]")
- icon_state = "[angle]"
- //to_chat(world, "[angle] [(get_dist(user, A) - 1)]")
+ update_icon(UPDATE_ICON_STATE)
user.Beam(A, "lightning", 'icons/obj/zap.dmi', 50, 15)
/obj/item/newton
diff --git a/code/game/objects/items/weapons/mop.dm b/code/game/objects/items/weapons/mop.dm
index 5593fe302d7..f4b6aa1dcfc 100644
--- a/code/game/objects/items/weapons/mop.dm
+++ b/code/game/objects/items/weapons/mop.dm
@@ -24,16 +24,20 @@
GLOB.janitorial_equipment -= src
return ..()
-/obj/item/mop/proc/wet_mop(obj/o, mob/user)
- if(o.reagents.total_volume < 1)
- to_chat(user, "[o] is out of water!")
- if(!istype(o, /obj/item/reagent_containers/glass/bucket))
- janicart_insert(user, o)
+
+/obj/item/mop/proc/wet_mop(obj/target, mob/user)
+ if(target.reagents.total_volume < 1)
+ to_chat(user, "[target] is out of water!")
+ if(istype(target, /obj/structure/mopbucket))
+ mopbucket_insert(user, target)
+ if(!istype(target, /obj/item/reagent_containers/glass/bucket))
+ janicart_insert(user, target)
return
- o.reagents.trans_to(src, 5)
- to_chat(user, "You wet [src] in [o].")
- playsound(loc, 'sound/effects/slosh.ogg', 25, 1)
+ target.reagents.trans_to(src, 5)
+ to_chat(user, "You wet [src] in [target].")
+ playsound(loc, 'sound/effects/slosh.ogg', 25, TRUE)
+
/obj/item/mop/proc/clean(turf/simulated/A)
if(reagents.has_reagent("water", 1) || reagents.has_reagent("cleaner", 1) || reagents.has_reagent("holywater", 1))
@@ -69,10 +73,16 @@
else
return ..()
-/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/J)
- J.put_in_cart(src, user)
- J.mymop=src
- J.update_icon()
+
+/obj/item/mop/proc/janicart_insert(mob/user, obj/structure/janitorialcart/cart)
+ cart.mymop = src
+ cart.put_in_cart(src, user)
+
+
+/obj/item/mop/proc/mopbucket_insert(mob/user, obj/structure/mopbucket/bucket)
+ bucket.mymop = src
+ bucket.put_in_cart(src, user)
+
/obj/item/mop/wash(mob/user, atom/source)
reagents.add_reagent("water", 5)
diff --git a/code/game/objects/items/weapons/pneumaticCannon.dm b/code/game/objects/items/weapons/pneumaticCannon.dm
index 30c97a48fa7..93a1cd0acd6 100644
--- a/code/game/objects/items/weapons/pneumaticCannon.dm
+++ b/code/game/objects/items/weapons/pneumaticCannon.dm
@@ -182,14 +182,14 @@
return
to_chat(user, span_notice("You hook [thetank] up to [src]."))
tank = thetank
- update_icons()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/pneumatic_cannon/update_overlays()
+ . = ..()
+ if(tank)
+ . += "[tank.icon_state]"
-/obj/item/pneumatic_cannon/proc/update_icons()
- overlays.Cut()
- if(!tank)
- return
- overlays += image('icons/obj/weapons/pneumaticCannon.dmi', "[tank.icon_state]")
- update_icon()
#undef LOW_PRESSURE
#undef MID_PRESSURE
diff --git a/code/game/objects/items/weapons/pneumaticRifle.dm b/code/game/objects/items/weapons/pneumaticRifle.dm
index 81992d550e4..01ed69bfabb 100644
--- a/code/game/objects/items/weapons/pneumaticRifle.dm
+++ b/code/game/objects/items/weapons/pneumaticRifle.dm
@@ -65,7 +65,7 @@
to_chat(user, span_notice("You strapped [src], so now you can wear it on your back"))
isBelted = TRUE
slot_flags |= SLOT_BACK
- update_icons()
+ update_icon(UPDATE_OVERLAYS)
return
else
to_chat(user, span_warning("[src] is already strapped!"))
@@ -166,7 +166,7 @@
return
to_chat(user, span_notice("You hook [thetank] up to [src]."))
tank = thetank
- update_icons()
+ update_icon(UPDATE_OVERLAYS)
/datum/crafting_recipe/pneumatic_rifle
name = "Pneumatic Rifle"
@@ -181,10 +181,11 @@
category = CAT_WEAPONRY
subcategory = CAT_WEAPON
-/obj/item/gun/pneumatic_rifle/proc/update_icons()
- overlays.Cut()
+
+/obj/item/gun/pneumatic_rifle/update_overlays()
+ . = ..()
if(tank)
- overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "[tank.icon_state]")
+ . += "[tank.icon_state]"
if(isBelted)
- overlays += image('icons/obj/weapons/pneumaticRifle.dmi', "belt")
- update_icon()
+ . += "belt"
+
diff --git a/code/game/objects/items/weapons/shields.dm b/code/game/objects/items/weapons/shields.dm
index 7e8fb75cb2e..cc0f5e69a7d 100644
--- a/code/game/objects/items/weapons/shields.dm
+++ b/code/game/objects/items/weapons/shields.dm
@@ -37,7 +37,7 @@
attack_verb = list("shoved", "bashed")
var/cooldown = 0 //shield bash cooldown. based on world.time
-/obj/item/shield/riot/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/item/shield/riot/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/melee/baton))
if(cooldown < world.time - 25)
user.visible_message("[user] bashes [src] with [W]!")
@@ -130,14 +130,14 @@
add_fingerprint(user)
return
-/obj/item/shield/energy/update_icon()
+/obj/item/shield/energy/update_icon_state()
icon_state = "eshield[active]"
/obj/item/shield/energy/syndie
icon_state = "syndieshield0"
desc = "Reverse-engineered shield that reflects almost all energy projectiles, but is useless against physical attacks. It can be retracted, expanded, and stored anywhere. Property of Gorlex marauders."
-/obj/item/shield/energy/syndie/update_icon()
+/obj/item/shield/energy/syndie/update_icon_state()
icon_state = "syndieshield[active]"
/obj/item/shield/riot/tele
@@ -160,9 +160,14 @@
return ..()
return FALSE
+
+/obj/item/shield/riot/tele/update_icon_state()
+ icon_state = "teleriot[active]"
+
+
/obj/item/shield/riot/tele/attack_self(mob/living/user)
active = !active
- icon_state = "teleriot[active]"
+ update_icon(UPDATE_ICON_STATE)
playsound(src.loc, 'sound/weapons/batonextend.ogg', 50, 1)
if(active)
@@ -179,9 +184,6 @@
w_class = WEIGHT_CLASS_NORMAL
slot_flags = null
to_chat(user, "[src] can now be concealed.")
- if(istype(user,/mob/living/carbon/human))
- var/mob/living/carbon/human/H = user
- H.update_inv_l_hand()
- H.update_inv_r_hand()
+ update_equipped_item()
add_fingerprint(user)
- return
+
diff --git a/code/game/objects/items/weapons/spacechips.dm b/code/game/objects/items/weapons/spacechips.dm
index b33ec81a7fe..f84f9478631 100644
--- a/code/game/objects/items/weapons/spacechips.dm
+++ b/code/game/objects/items/weapons/spacechips.dm
@@ -15,8 +15,7 @@
merge_type = /obj/item/stack/spacechips
-/obj/item/stack/spacechips/update_icon()//changes icon depending on the amount of chips
- ..()
+/obj/item/stack/spacechips/update_icon_state()//changes icon depending on the amount of chips
name = "[amount == max_amount ? "1000000" : amount] Chip[amount > 1 ? "s" : ""]"
if(amount >= 1 && amount <= 20)
icon_state = "c20"
@@ -31,6 +30,7 @@
else
icon_state = "c1000"
+
/obj/item/stack/spacechips/c10
amount = 10
diff --git a/code/game/objects/items/weapons/staff.dm b/code/game/objects/items/weapons/staff.dm
index 3c0a03d3785..edf7cdadb62 100644
--- a/code/game/objects/items/weapons/staff.dm
+++ b/code/game/objects/items/weapons/staff.dm
@@ -19,37 +19,38 @@
icon_state = "broom"
item_state = "broom0"
+
+/obj/item/twohanded/staff/broom/update_icon_state()
+ item_state = "broom[HAS_TRAIT(src, TRAIT_WIELDED)]"
+ update_equipped_item()
+
+
/obj/item/twohanded/staff/broom/wield(obj/item/source, mob/living/carbon/user)
- item_state = "broom[wielded ? 1 : 0]"
- force = wielded ? 5 : 3
- attack_verb = wielded ? list("rammed into", "charged at") : list("bludgeoned", "whacked", "cleaned")
- if(user)
- user.update_inv_l_hand()
- user.update_inv_r_hand()
- if(user.mind in SSticker.mode.wizards)
- user.flying = wielded ? 1 : 0
- if(wielded)
- to_chat(user, "You hold \the [src] between your legs.")
- user.say("QUID 'ITCH")
- animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING)
- else
- animate(user, pixel_y = pixel_y + 10 , time = 1, loop = 1)
- animate(user, pixel_y = pixel_y, time = 10, loop = 1, easing = SINE_EASING)
- animate(user)
- if(user.lying)//aka. if they have just been stunned
- user.pixel_y -= 6
- else
- if(wielded)
- to_chat(user, "You hold \the [src] between your legs.")
+ force = 5
+ attack_verb = list("rammed into", "charged at")
+ if(!user)
+ return
+
+ update_icon(UPDATE_ICON_STATE)
+ if(user.mind && (user.mind in SSticker.mode.wizards))
+ user.flying = TRUE
+ user.float(TRUE)
+ user.say("QUID 'ITCH")
+ animate(user, pixel_y = pixel_y + 10 , time = 10, loop = 1, easing = SINE_EASING)
+
+ to_chat(user, "You hold \the [src] between your legs.")
/obj/item/twohanded/staff/broom/unwield(obj/item/source, mob/living/carbon/user)
+ update_icon(UPDATE_ICON_STATE)
+ force = 3
+ attack_verb = list("bludgeoned", "whacked", "cleaned")
user.flying = FALSE
user.update_gravity(user.mob_has_gravity())
animate(user)
-/obj/item/twohanded/staff/broom/attackby(var/obj/O, mob/user)
+/obj/item/twohanded/staff/broom/attackby(obj/O, mob/user)
if(istype(O, /obj/item/clothing/mask/horsehead))
new/obj/item/twohanded/staff/broom/horsebroom(get_turf(src))
user.temporarily_remove_item_from_inventory(O)
diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
index 9d6fcad5899..de81b839a60 100644
--- a/code/game/objects/items/weapons/storage/backpack.dm
+++ b/code/game/objects/items/weapons/storage/backpack.dm
@@ -110,7 +110,8 @@
max_w_class = WEIGHT_CLASS_NORMAL
max_combined_w_class = 400 // can store a ton of shit!
-/obj/item/storage/backpack/santabag/update_icon()
+
+/obj/item/storage/backpack/santabag/update_icon_state()
var/items_count = length(contents)
switch(items_count)
if(1 to 10)
@@ -120,10 +121,8 @@
if(21 to INFINITY)
icon_state = "giftbag2"
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- H.update_inv_l_hand()
- H.update_inv_r_hand()
+ update_equipped_item()
+
/obj/item/storage/backpack/cultpack
name = "trophy rack"
@@ -413,9 +412,9 @@
level = 1
cant_hold = list(/obj/item/storage/backpack/satchel_flat) //muh recursive backpacks
-/obj/item/storage/backpack/satchel_flat/hide(var/intact)
+/obj/item/storage/backpack/satchel_flat/hide(intact)
if(intact)
- invisibility = INVISIBILITY_ABSTRACT
+ invisibility = INVISIBILITY_MAXIMUM
anchored = 1 //otherwise you can start pulling, cover it, and drag around an invisible backpack.
icon_state = "[initial(icon_state)]2"
else
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index df8f52adbeb..8344ed4bd03 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -49,8 +49,9 @@
playsound(loc, 'sound/items/eatfood.ogg', 50, 1, -1)
return TOXLOSS
-/obj/item/storage/bag/trash/update_icon()
- switch(contents.len)
+
+/obj/item/storage/bag/trash/update_icon_state()
+ switch(length(contents))
if(21 to INFINITY)
icon_state = "[initial(icon_state)]3"
if(11 to 20)
@@ -59,11 +60,8 @@
icon_state = "[initial(icon_state)]1"
else
icon_state = "[initial(icon_state)]"
- if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- H.update_inv_l_hand()
- H.update_inv_r_hand()
- ..()
+ update_equipped_item()
+
/obj/item/storage/bag/trash/cyborg
@@ -451,18 +449,12 @@
if(prob(10))
M.Weaken(4 SECONDS)
-/obj/item/storage/bag/tray/proc/rebuild_overlays()
- overlays.Cut()
- for(var/obj/item/I in contents)
- overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1)
-/obj/item/storage/bag/tray/remove_from_storage(obj/item/W, atom/new_location)
- ..()
- rebuild_overlays()
+/obj/item/storage/bag/tray/update_overlays()
+ . = ..()
+ for(var/obj/item/item in contents)
+ . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4))
-/obj/item/storage/bag/tray/handle_item_insertion(obj/item/I, prevent_warning = 0)
- overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1)
- ..()
/obj/item/storage/bag/tray/cyborg
@@ -482,8 +474,6 @@
else // they clicked on a table
dropspot = target.loc
- overlays = null
-
var/droppedSomething = 0
for(var/obj/item/I in contents)
@@ -502,18 +492,19 @@
user.visible_message("[user] unloads [user.p_their()] service tray.")
else
user.visible_message("[user] drops all the items on [user.p_their()] tray.")
-
+ update_icon(UPDATE_OVERLAYS)
return ..()
/obj/item/storage/bag/tray/cookies_tray
var/cookie = /obj/item/reagent_containers/food/snacks/cookie
+
/obj/item/storage/bag/tray/cookies_tray/populate_contents() /// By Azule Utama, thank you a lot!
for(var/i in 1 to 6)
var/obj/item/C = new cookie(src)
handle_item_insertion(C) // Done this way so the tray actually has the cookies visible when spawned
- rebuild_overlays()
+
/obj/item/storage/bag/tray/cookies_tray/sugarcookie
cookie = /obj/item/reagent_containers/food/snacks/sugarcookie
@@ -560,18 +551,11 @@
M.Weaken(4 SECONDS)
-/obj/item/storage/bag/dangertray/proc/rebuild_overlays()
- overlays.Cut()
- for(var/obj/item/I in contents)
- overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1)
-
-/obj/item/storage/bag/dangertray/remove_from_storage(obj/item/W, atom/new_location)
- ..()
- rebuild_overlays()
+/obj/item/storage/bag/dangertray/update_overlays()
+ . = ..()
+ for(var/obj/item/item in contents)
+ . += image(icon = item.icon, icon_state = item.icon_state, layer = -1, pixel_x = rand(-4,4), pixel_y = rand(-4,4))
-/obj/item/storage/bag/dangertray/handle_item_insertion(obj/item/I, prevent_warning = 0)
- overlays += image("icon" = I.icon, "icon_state" = I.icon_state, "layer" = -1)
- ..()
/*
* Chemistry bag
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index bb506aef1e3..95396f4a984 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -7,6 +7,7 @@
lefthand_file = 'icons/mob/inhands/equipment/belt_lefthand.dmi'
righthand_file = 'icons/mob/inhands/equipment/belt_righthand.dmi'
slot_flags = SLOT_BELT
+ flags_2 = BLOCKS_LIGHT_2
attack_verb = list("whipped", "lashed", "disciplined")
max_integrity = 300
pickup_sound = 'sound/items/handling/backpack_pickup.ogg'
@@ -14,13 +15,16 @@
drop_sound = 'sound/items/handling/backpack_drop.ogg'
var/use_item_overlays = FALSE // Do we have overlays for items held inside the belt?
-/obj/item/storage/belt/update_icon()
- if(use_item_overlays)
- overlays.Cut()
- for(var/obj/item/I in contents)
- if(I.belt_icon)
- overlays += "[I.belt_icon]"
- ..()
+
+/obj/item/storage/belt/update_overlays()
+ . = ..()
+ if(!use_item_overlays)
+ return
+ for(var/obj/item/item in contents)
+ if(!item.belt_icon)
+ continue
+ . += mutable_appearance(icon, item.belt_icon, color = item.color)
+
/obj/item/storage/belt/proc/can_use()
return is_equipped()
@@ -450,6 +454,12 @@
new /obj/item/grenade/plastic/x4/thermite(src)
new /obj/item/storage/pill_bottle/sovietstimulants(src)
+/obj/item/storage/belt/military/assault/gammaert/full/populate_contents()
+ new /obj/item/storage/pouch/fast(src)
+ new /obj/item/storage/pouch/fast(src)
+ new /obj/item/storage/pouch/fast(src)
+ new /obj/item/melee/classic_baton/telescopic(src)
+
/obj/item/storage/belt/janitor
name = "janibelt"
desc = "A belt used to hold most janitorial supplies."
@@ -501,21 +511,16 @@
/obj/item/storage/belt/lazarus/Initialize(mapload)
. = ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/item/storage/belt/lazarus/update_icon()
- ..()
+/obj/item/storage/belt/lazarus/update_icon_state()
icon_state = "[initial(icon_state)]_[length(contents)]"
/obj/item/storage/belt/lazarus/attackby(obj/item/W, mob/user)
var/amount = length(contents)
. = ..()
if(amount != length(contents))
- update_icon()
-
-/obj/item/storage/belt/lazarus/remove_from_storage(obj/item/W, atom/new_location)
- ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/storage/belt/bandolier
name = "bandolier"
@@ -544,19 +549,14 @@
new /obj/item/ammo_casing/shotgun/beanbag/fake(src)
update_icon()
-/obj/item/storage/belt/bandolier/update_icon()
- ..()
+/obj/item/storage/belt/bandolier/update_icon_state()
icon_state = "[initial(icon_state)]_[length(contents)]"
/obj/item/storage/belt/bandolier/attackby(obj/item/W, mob/user)
var/amount = length(contents)
. = ..()
if(amount != length(contents))
- update_icon()
-
-/obj/item/storage/belt/bandolier/remove_from_storage(obj/item/W, atom/new_location)
- ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/storage/belt/holster
name = "shoulder holster"
@@ -695,16 +695,14 @@
return
playsound(src, 'sound/weapons/blade_unsheath.ogg', 20)
-/obj/item/storage/belt/rapier/update_icon()
- . = ..()
+/obj/item/storage/belt/rapier/update_icon_state()
icon_state = initial(icon_state)
item_state = initial(item_state)
if(length(contents))
icon_state = "[icon_state]-rapier"
item_state = "[item_state]-rapier"
- if(isliving(loc))
- var/mob/living/L = loc
- L.update_inv_belt()
+ update_equipped_item()
+
// -------------------------------------
// Bluespace Belt
@@ -977,22 +975,19 @@
sheath_sound = 'sound/weapons/blade_dark_sheath.ogg'
unsheath_sound = 'sound/weapons/blade_dark_unsheath.ogg'
-/obj/item/storage/belt/claymore/update_icon()
- . = ..()
+/obj/item/storage/belt/claymore/update_icon_state()
if(length(contents))
icon_state = "[initial(icon_state)]_blade"
item_state = "[initial(icon_state)]_blade"
else
icon_state = initial(icon_state)
item_state = initial(item_state)
- if(isliving(loc))
- var/mob/living/L = loc
- L.update_inv_belt()
- L.update_inv_s_store()
+ update_equipped_item()
+
/obj/item/storage/belt/claymore/populate_contents()
new claymore_path(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/storage/belt/claymore/attack_hand(mob/user)
if(loc != user)
@@ -1008,7 +1003,7 @@
var/obj/item/I = contents[1]
H.visible_message(span_notice("[H] takes [I] out of [src]."), span_notice("You take [I] out of [src]."))
H.put_in_hands(I, ignore_anim = FALSE)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else
to_chat(user, span_warning("[src] is empty!"))
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index e8bb99075a5..20754ee59d4 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -85,10 +85,10 @@
else
M.LAssailant = user
- if(!(ishuman(user) || SSticker) && SSticker.mode.name != "monkey")
+ if(!ishuman(user) || ismonkeybasic(user))
to_chat(user, "You don't have the dexterity to do this!")
return
- if(!user.mind?.isholy)
+ if(!user.mind || !user.mind.isholy)
to_chat(user, "The book sizzles in your hands.")
user.take_organ_damage(0, 10)
return
@@ -181,21 +181,6 @@
item_state = choice_icons["inhand"]
customisable = FALSE
- // Carpet symbol icons are currently broken, so commented out until it's fixed
- /*var/carpet_dir
- switch(choice)
- if("Bible")
- carpet_dir = 2
- if("Koran")
- carpet_dir = 4
- if("Scientology")
- carpet_dir = 8
- if(carpet_dir)
- for(var/area/chapel/main/A in world)
- for(var/turf/T in A.contents)
- if(T.icon_state == "carpetsymbol")
- T.dir = carpet_dir*/
-
SSblackbox.record_feedback("text", "religion_book", 1, "[choice]", 1)
if(SSticker)
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index f07c412fd44..35518f02d05 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -269,7 +269,7 @@
new /obj/item/implantcase/tracking(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
- new /obj/item/locator(src)
+ new /obj/item/gps/security(src)
/obj/item/storage/box/minertracker
name = "boxed tracking implant kit"
@@ -281,7 +281,7 @@
new /obj/item/implantcase/tracking(src)
new /obj/item/implanter(src)
new /obj/item/implantpad(src)
- new /obj/item/locator(src)
+ new /obj/item/gps/security(src)
/obj/item/storage/box/chemimp
name = "chemical implant kit"
@@ -647,6 +647,7 @@
icon = 'icons/obj/cigarettes.dmi'
icon_state = "matchbox"
item_state = "matchbox"
+ base_icon_state = "matchbox"
storage_slots = 10
w_class = WEIGHT_CLASS_TINY
max_w_class = WEIGHT_CLASS_TINY
@@ -663,7 +664,19 @@
if(istype(W, /obj/item/match) && !W.lit)
W.matchignite()
playsound(user.loc, 'sound/goonstation/misc/matchstick_light.ogg', 50, 1)
- return
+
+
+/obj/item/storage/box/matches/update_icon_state()
+ switch(length(contents))
+ if(10 to INFINITY)
+ icon_state = base_icon_state
+ if(5 to 9)
+ icon_state = "[base_icon_state]_almostfull"
+ if(1 to 4)
+ icon_state = "[base_icon_state]_almostempty"
+ else
+ icon_state = "[base_icon_state]_e"
+
/obj/item/storage/box/autoinjectors
name = "box of injectors"
@@ -762,13 +775,29 @@
foldable = null
var/design = NODESIGN
-/obj/item/storage/box/papersack/update_icon()
- if(!contents.len)
- icon_state = "[item_state]"
- else icon_state = "[item_state]_closed"
+
+/obj/item/storage/box/papersack/update_desc(updates = ALL)
+ . = ..()
+ switch(design)
+ if(NODESIGN)
+ desc = "A sack neatly crafted out of paper."
+ if(NANOTRASEN)
+ desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go."
+ if(SYNDI)
+ desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program."
+ if(HEART)
+ desc = "A paper sack with a heart etched onto the side."
+ if(SMILE)
+ desc = "A paper sack with a crude smile etched onto the side."
+
+
+/obj/item/storage/box/papersack/update_icon_state()
+ item_state = "paperbag_[design]"
+ icon_state = length(contents) ? "[item_state]_closed" : "[item_state]"
+
/obj/item/storage/box/papersack/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/pen))
+ if(is_pen(W))
//if a pen is used on the sack, dialogue to change its design appears
if(contents.len)
to_chat(user, "You can't modify [src] with items still inside!")
@@ -784,19 +813,7 @@
return
to_chat(usr, "You make some modifications to [src] using your pen.")
design = switchDesign
- icon_state = "paperbag_[design]"
- item_state = "paperbag_[design]"
- switch(design)
- if(NODESIGN)
- desc = "A sack neatly crafted out of paper."
- if(NANOTRASEN)
- desc = "A standard Nanotrasen paper lunch sack for loyal employees on the go."
- if(SYNDI)
- desc = "The design on this paper sack is a remnant of the notorious 'SyndieSnacks' program."
- if(HEART)
- desc = "A paper sack with a heart etched onto the side."
- if(SMILE)
- desc = "A paper sack with a crude smile etched onto the side."
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
return
else if(is_sharp(W))
if(!contents.len)
@@ -844,8 +861,7 @@
new /obj/item/crowbar/red(src)
new /obj/item/kitchen/knife/combat(src)
new /obj/item/radio/centcom(src)
- new /obj/item/reagent_containers/food/pill/patch/synthflesh(src)
- new /obj/item/reagent_containers/hypospray/autoinjector(src)
+ new /obj/item/storage/firstaid/crew(src)
/obj/item/storage/box/soviet
name = "boxed survival kit"
@@ -1018,6 +1034,24 @@
new /obj/item/clothing/gloves/combat(src)
new /obj/item/storage/backpack/security(src)
+/obj/item/storage/box/dominator_kit
+ name = "Dominator kit"
+ icon_state = "box_dominator"
+
+/obj/item/storage/box/dominator_kit/populate_contents()
+ new /obj/item/gun/energy/dominator/sibyl(src)
+ new /obj/item/clothing/accessory/holster(src)
+
+/obj/item/storage/box/enforcer_kit
+ name = "Enforcer kit"
+ icon_state = "box_enforcer"
+
+/obj/item/storage/box/enforcer_kit/populate_contents()
+ new /obj/item/gun/projectile/automatic/pistol/enforcer/security(src)
+ new /obj/item/ammo_box/magazine/enforcer(src)
+ new /obj/item/ammo_box/magazine/enforcer(src)
+ new /obj/item/clothing/accessory/holster(src)
+
/obj/item/storage/box/hardmode_box
name = "box of HRD-MDE project box"
desc = "Contains everything needed to get yourself killed for a medal."
diff --git a/code/game/objects/items/weapons/storage/fancy.dm b/code/game/objects/items/weapons/storage/fancy.dm
index acf687cfa60..2c9df74c88e 100644
--- a/code/game/objects/items/weapons/storage/fancy.dm
+++ b/code/game/objects/items/weapons/storage/fancy.dm
@@ -18,10 +18,10 @@
resistance_flags = FLAMMABLE
var/icon_type
-/obj/item/storage/fancy/update_icon(var/itemremoved = 0)
- var/total_contents = src.contents.len - itemremoved
- src.icon_state = "[src.icon_type]box[total_contents]"
- return
+
+/obj/item/storage/fancy/update_icon_state()
+ icon_state = "[icon_type]box[length(contents)]"
+
/obj/item/storage/fancy/examine(mob/user)
. = ..()
@@ -47,23 +47,29 @@
foldable = /obj/item/stack/sheet/cardboard
foldable_amt = 1
-/obj/item/storage/fancy/donut_box/update_icon()
- overlays.Cut()
- for(var/i = 1 to length(contents))
- var/obj/item/reagent_containers/food/snacks/donut/donut = contents[i]
- var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "donut_[donut.donut_sprite_type]")
- new_donut_icon.Shift(EAST, 3 * (i-1))
- overlays += new_donut_icon
+/obj/item/storage/fancy/donut_box/update_icon_state()
+ return
+
+
+/obj/item/storage/fancy/donut_box/update_overlays()
+ . = ..()
+ for(var/I = 1 to length(contents))
+ var/obj/item/reagent_containers/food/snacks/donut/donut = contents[I]
+ var/icon/new_donut_icon = icon(icon, "donut_[donut.donut_sprite_type]")
+ new_donut_icon.Shift(EAST, 3 * (I - 1))
+ . += new_donut_icon
+ . += "donutbox_front"
- overlays += icon('icons/obj/food/containers.dmi', "donutbox_front")
/obj/item/storage/fancy/donut_box/populate_contents()
for(var/i = 1 to storage_slots)
new /obj/item/reagent_containers/food/snacks/donut(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/storage/fancy/donut_box/empty/populate_contents()
+ update_icon(UPDATE_OVERLAYS)
return
/*
@@ -135,17 +141,23 @@
new /obj/item/toy/crayon/blue(src)
new /obj/item/toy/crayon/purple(src)
new /obj/item/toy/crayon/black(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
-/obj/item/storage/fancy/crayons/update_icon()
- overlays = list() //resets list
- overlays += image('icons/obj/crayons.dmi',"crayonbox")
+/obj/item/storage/fancy/crayons/update_icon_state()
+ return
+
+
+/obj/item/storage/fancy/crayons/update_overlays()
+ . = ..()
for(var/obj/item/toy/crayon/crayon in contents)
- overlays += image('icons/obj/crayons.dmi',crayon.colourName)
+ . += crayon.colourName
+
-/obj/item/storage/fancy/crayons/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W,/obj/item/toy/crayon))
- switch(W:colourName)
+/obj/item/storage/fancy/crayons/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/toy/crayon))
+ var/obj/item/toy/crayon/crayon = I
+ switch(crayon.colourName)
if("mime")
to_chat(usr, "This crayon is too sad to be contained in this box.")
return
@@ -182,58 +194,57 @@
for(var/i = 1 to storage_slots)
new cigarette_type(src)
-/obj/item/storage/fancy/cigarettes/update_icon() //lazy as hell
- switch(contents.len)
+/obj/item/storage/fancy/cigarettes/update_icon_state()
+ var/init_state = initial(icon_state)
+ switch(length(contents))
if(17 to INFINITY)
- icon_state = "[initial(icon_state)]6"
+ icon_state = "[init_state]6"
if(14 to 16)
- icon_state = "[initial(icon_state)]5"
+ icon_state = "[init_state]5"
if(11 to 13)
- icon_state = "[initial(icon_state)]4"
+ icon_state = "[init_state]4"
if(7 to 10)
- icon_state = "[initial(icon_state)]3"
+ icon_state = "[init_state]3"
if(4 to 6)
- icon_state = "[initial(icon_state)]2"
+ icon_state = "[init_state]2"
if(1 to 3)
- icon_state = "[initial(icon_state)]1"
+ icon_state = "[init_state]1"
else
- icon_state = "[initial(icon_state)]0"
-
-/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
- if(!istype(M, /mob))
- return
-
- if(istype(M) && M == user && user.zone_selected == "mouth" && contents.len > 0 && !user.wear_mask)
- var/got_cig = 0
- for(var/num=1, num <= contents.len, num++)
- var/obj/item/I = contents[num]
- if(istype(I, /obj/item/clothing/mask/cigarette))
- var/obj/item/clothing/mask/cigarette/C = I
- user.equip_to_slot_if_possible(C, slot_wear_mask)
- to_chat(user, "You take \a [C.name] out of the pack.")
- update_icon()
- got_cig = 1
- break
- if(!got_cig)
- to_chat(user, "There are no smokables in the pack!")
+ icon_state = "[init_state]0"
+
+
+/obj/item/storage/fancy/cigarettes/attack(mob/living/carbon/human/target, mob/living/carbon/user)
+ if(!ishuman(target) || user.zone_selected != BODY_ZONE_PRECISE_MOUTH)
+ return ..()
+
+ var/obj/item/clothing/mask/cigarette/cigar = locate() in src
+ if(!cigar)
+ to_chat(user, span_warning("There are no smokables in the pack!"))
+ return TRUE
+
+ if(target.equip_to_slot_if_possible(cigar, slot_wear_mask, disable_warning = TRUE))
+ to_chat(user, span_notice("You took \a [cigar.name] out of the pack[target != user ? " and deftly place it in [target] mouth" : ""]."))
else
- ..()
+ to_chat(user, span_warning("Something is blocking [target] mouth!"))
+
+ return TRUE
-/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W as obj, stop_messages = 0)
+
+/obj/item/storage/fancy/cigarettes/can_be_inserted(obj/item/W , stop_messages = 0)
if(istype(W, /obj/item/match))
- var/obj/item/match/M = W
- if(M.lit == 1)
+ var/obj/item/match/match = W
+ if(match.lit)
if(!stop_messages)
- to_chat(usr, "Putting a lit [W] in [src] probably isn't a good idea.")
- return 0
+ to_chat(usr, span_notice("Putting a lit [W] in [src] probably isn't a good idea."))
+ return FALSE
if(istype(W, /obj/item/lighter))
- var/obj/item/lighter/L = W
- if(L.lit == 1)
+ var/obj/item/lighter/lighter = W
+ if(lighter.lit)
if(!stop_messages)
- to_chat(usr, "Putting [W] in [src] while lit probably isn't a good idea.")
- return 0
- //if we get this far, handle the insertion checks as normal
- .=..()
+ to_chat(usr, span_notice("Putting [W] in [src] while lit probably isn't a good idea."))
+ return FALSE
+ return ..()
+
/obj/item/storage/fancy/cigarettes/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!length(contents))
@@ -336,10 +347,15 @@
for(var/i in 1 to storage_slots)
new /obj/item/rollingpaper(src)
-/obj/item/storage/fancy/rollingpapers/update_icon()
- overlays.Cut()
- if(!contents.len)
- overlays += "[icon_state]_empty"
+
+/obj/item/storage/fancy/crayons/update_icon_state()
+ return
+
+
+/obj/item/storage/fancy/rollingpapers/update_icon_state()
+ . = ..()
+ if(!length(contents))
+ . += "[icon_state]_empty"
/*
* cigcase
@@ -353,10 +369,10 @@
storage_slots = 7
can_hold = list(/obj/item/clothing/mask/cigarette/cigar)
-/obj/item/storage/fancy/cigcase/update_icon(var/itemremoved = 0)
- var/total_contents = src.contents.len - itemremoved
- src.icon_state = "[src.icon_type]case[total_contents]"
- return
+
+/obj/item/storage/fancy/cigcase/update_icon_state()
+ icon_state = "[icon_type]case[length(contents)]"
+
/obj/item/storage/fancy/cigcase/populate_contents()
for(var/I = 1 to storage_slots)
@@ -390,27 +406,25 @@
storage_slots = 6
req_access = list(ACCESS_VIROLOGY)
+
/obj/item/storage/lockbox/vials/populate_contents()
for(var/I = 1 to storage_slots)
new /obj/item/reagent_containers/glass/beaker/vial(src)
update_icon()
-/obj/item/storage/lockbox/vials/update_icon(var/itemremoved = 0)
- var/total_contents = src.contents.len - itemremoved
- src.icon_state = "vialbox[total_contents]"
- src.overlays.Cut()
+
+/obj/item/storage/lockbox/vials/update_icon_state()
+ icon_state = "vialbox[length(contents)]"
+
+
+/obj/item/storage/lockbox/vials/update_overlays()
+ . = ..()
if(!broken)
- overlays += image(icon, src, "led[locked]")
+ . += "led[locked]"
if(locked)
- overlays += image(icon, src, "cover")
+ . += "cover"
else
- overlays += image(icon, src, "ledb")
- return
-
-/obj/item/storage/lockbox/vials/attackby(obj/item/W as obj, mob/user as mob, params)
- ..()
- update_icon()
-
+ . += "ledb"
///Aquatic Starter Kit
diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm
index 6bc66cb282c..6b33df174aa 100644
--- a/code/game/objects/items/weapons/storage/firstaid.dm
+++ b/code/game/objects/items/weapons/storage/firstaid.dm
@@ -353,22 +353,25 @@
new /obj/item/reagent_containers/food/pill/charcoal(src)
new /obj/item/reagent_containers/food/pill/charcoal(src)
-/obj/item/storage/pill_bottle/MouseDrop(obj/over_object as obj) // Best utilized if you're a cantankerous doctor with a Vicodin habit.
- if(iscarbon(over_object))
- var/mob/living/carbon/C = over_object
- if(loc == C && src == C.get_active_hand())
- if(!contents.len)
- to_chat(C, "There is nothing in [src]!")
- return
- C.visible_message("[C] [rapid_intake_message]")
- if(do_mob(C, C, 100)) // 10 seconds
- for(var/obj/item/reagent_containers/food/pill/P in contents)
- P.attack(C, C)
- C.visible_message("[C] [rapid_post_instake_message]")
- return
+
+/obj/item/storage/pill_bottle/MouseDrop(mob/living/carbon/user, src_location, over_location, src_control, over_control, params) // Best utilized if you're a cantankerous doctor with a Vicodin habit.
+ if(iscarbon(user) && src == user.get_active_hand())
+ if(!length(contents))
+ to_chat(user, span_notice("There is nothing in [src]!"))
+ return FALSE
+
+ user.visible_message(span_danger("[user] [rapid_intake_message]"))
+ if(!do_mob(user, user, 10 SECONDS) || src != user.get_active_hand())
+ return FALSE
+
+ for(var/obj/item/reagent_containers/food/pill/pill in src)
+ pill.attack(user, user)
+ user.visible_message(span_danger("[user] [rapid_post_instake_message]"))
+ return FALSE
return ..()
+
/obj/item/storage/pill_bottle/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
rename_interactive(user, I)
diff --git a/code/game/objects/items/weapons/storage/internal.dm b/code/game/objects/items/weapons/storage/internal.dm
index e9f3455468a..1c08db71d6e 100644
--- a/code/game/objects/items/weapons/storage/internal.dm
+++ b/code/game/objects/items/weapons/storage/internal.dm
@@ -34,70 +34,36 @@
* If you are using these you will probably want to override attackby() as well.
* See /obj/item/clothing/suit/storage for an example.
* Items that use internal storage have the option of calling this to emulate default storage MouseDrop behaviour.
- * Returns `TRUE` if the master item's parent's MouseDrop() should be called, `FALSE` otherwise. It's strange, but no other way of
+ * Returns `FALSE` if the master item's parent's MouseDrop() should be called, `TRUE` otherwise. It's strange, but no other way of
* doing it without the ability to call another proc's parent, really.
*/
-/obj/item/storage/internal/proc/handle_mousedrop(mob/user, obj/over_object)
- if(ishuman(user)) //so monkeys can take off their backpacks -- Urist
-
- if(istype(user.loc,/obj/mecha)) // stops inventory actions in a mech
- return FALSE
-
- if(over_object == user && Adjacent(user)) // this must come before the screen objects only block
- src.open(user)
- return FALSE
-
- if(!(istype(over_object, /obj/screen)))
- return TRUE
-
- //makes sure master_item is equipped before putting it in hand, so that we can't drag it into our hand from miles away.
- //there's got to be a better way of doing this...
- if(!(master_item.loc == user) || (master_item.loc && master_item.loc.loc == user))
- return FALSE
-
- if(!(user.restrained() ) && !(user.stat))
- switch(over_object.name)
- if("r_hand")
- if(!master_item.remove_item_from_storage(drop_location()))
- user.drop_item_ground(master_item)
- user.put_in_r_hand(master_item)
- if("l_hand")
- if(!master_item.remove_item_from_storage(drop_location()))
- user.drop_item_ground(master_item)
- user.put_in_l_hand(master_item)
- master_item.add_fingerprint(user)
- return FALSE
- return FALSE
+/obj/item/storage/internal/proc/handle_mousedrop(mob/living/carbon/human/user, obj/over_object)
+ . = FALSE
+ if(over_object == user && ishuman(user) && !user.incapacitated() && !ismecha(user.loc) && !is_ventcrawling(user) && user.Adjacent(master_item))
+ open(user)
+ master_item.add_fingerprint(user)
+ return TRUE
/**
* Items that use internal storage have the option of calling this to emulate default storage attack_hand behaviour.
- * Returns `TRUE` if the master item's parent's attack_hand() should be called, 0 otherwise.
+ * Returns `FALSE` if the master item's parent's attack_hand() should be called, `TRUE` otherwise.
* It's strange, but no other way of doing it without the ability to call another proc's parent, really.
*/
-/obj/item/storage/internal/proc/handle_attack_hand(mob/user)
-
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- if(H.l_store == master_item && !H.get_active_hand()) //Prevents opening if it's in a pocket.
- H.put_in_hands(master_item)
- H.l_store = null
- return FALSE
- if(H.r_store == master_item && !H.get_active_hand())
- H.put_in_hands(master_item)
- H.r_store = null
- return FALSE
-
- src.add_fingerprint(user)
- if(master_item.loc == user)
- src.open(user)
+/obj/item/storage/internal/proc/handle_attack_hand(mob/living/carbon/human/user)
+ . = TRUE
+ if(master_item.loc != user || !ishuman(user) || user.incapacitated() || ismecha(user.loc) || is_ventcrawling(user))
return FALSE
- for(var/mob/M in range(1, master_item.loc))
- if(M.s_active == src)
- src.close(M)
- return TRUE
+ //Prevents opening if it's in a pocket.
+ if(!user.get_active_hand() && (master_item == user.l_store || master_item == user.r_store))
+ user.temporarily_remove_item_from_inventory(master_item)
+ user.put_in_hands(master_item)
+ return .
+ open(user)
+ master_item.add_fingerprint(user)
-/obj/item/storage/internal/Adjacent(var/atom/neighbor)
+
+/obj/item/storage/internal/Adjacent(atom/neighbor)
return master_item.Adjacent(neighbor)
diff --git a/code/game/objects/items/weapons/storage/lockbox.dm b/code/game/objects/items/weapons/storage/lockbox.dm
index e48f0e8d6cc..c001c82d5ac 100644
--- a/code/game/objects/items/weapons/storage/lockbox.dm
+++ b/code/game/objects/items/weapons/storage/lockbox.dm
@@ -8,12 +8,20 @@
max_combined_w_class = 14 //The sum of the w_classes of all the items in this storage item.
storage_slots = 4
req_access = list(ACCESS_ARMORY)
- var/locked = 1
- var/broken = 0
+ var/locked = TRUE
+ var/broken = FALSE
var/icon_locked = "lockbox+l"
var/icon_closed = "lockbox"
var/icon_broken = "lockbox+b"
+
+/obj/item/storage/lockbox/update_icon_state()
+ if(broken)
+ icon_state = icon_broken
+ return
+ icon_state = locked ? icon_locked : icon_closed
+
+
/obj/item/storage/lockbox/attackby(obj/item/I, mob/user, params)
if(I.GetID())
if(broken)
@@ -21,14 +29,13 @@
return
if(check_access(I))
locked = !locked
+ update_icon()
if(locked)
- icon_state = icon_locked
to_chat(user, "You lock \the [src]!")
if(user.s_active)
user.s_active.close(user)
return
else
- icon_state = icon_closed
to_chat(user, "You unlock \the [src]!")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
return
@@ -42,36 +49,39 @@
..()
else
to_chat(user, "It's locked!")
- return
-/obj/item/storage/lockbox/show_to(mob/user as mob)
+
+/obj/item/storage/lockbox/show_to(mob/user)
if(locked)
to_chat(user, "It's locked!")
else
..()
return
+
/obj/item/storage/lockbox/can_be_inserted(obj/item/W, stop_messages = 0)
if(!locked)
return ..()
if(!stop_messages)
to_chat(usr, "[src] is locked!")
- return 0
+ return FALSE
+
/obj/item/storage/lockbox/emag_act(mob/user)
if(!broken)
add_attack_logs(user, src, "emagged")
- broken = 1
- locked = 0
+ broken = TRUE
+ locked = FALSE
desc = "It appears to be broken."
- icon_state = icon_broken
+ update_icon()
if(user)
to_chat(user, "You unlock \the [src].")
origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
-/obj/item/storage/lockbox/hear_talk(mob/living/M as mob, list/message_pieces)
-/obj/item/storage/lockbox/hear_message(mob/living/M as mob, msg)
+/obj/item/storage/lockbox/hear_talk(mob/living/M, list/message_pieces)
+
+/obj/item/storage/lockbox/hear_message(mob/living/M, msg)
/obj/item/storage/lockbox/mindshield
name = "Lockbox (Mindshield Implants)"
@@ -83,6 +93,9 @@
new /obj/item/implantcase/mindshield(src)
new /obj/item/implanter/mindshield(src)
+/obj/item/storage/lockbox/mindshield/ert
+ w_class = WEIGHT_CLASS_NORMAL
+
/obj/item/storage/lockbox/sibyl_system_mod
name = "lockbox (Sibyl System Mods)"
desc = "Contains proprietary Sibyl System mods for energy guns."
@@ -126,6 +139,7 @@
name = "lockbox (T4)"
desc = "Contains three T4 breaching charges."
req_access = list(ACCESS_CENT_SPECOPS)
+ w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/lockbox/t4/populate_contents()
for(var/I in 1 to 3)
diff --git a/code/game/objects/items/weapons/storage/secure.dm b/code/game/objects/items/weapons/storage/secure.dm
index 77376ffa221..1aa67075c29 100644
--- a/code/game/objects/items/weapons/storage/secure.dm
+++ b/code/game/objects/items/weapons/storage/secure.dm
@@ -27,11 +27,21 @@
max_w_class = WEIGHT_CLASS_SMALL
max_combined_w_class = 14
+
/obj/item/storage/secure/examine(mob/user)
. = ..()
if(in_range(user, src))
. += "The service panel is [open ? "open" : "closed"]."
+
+/obj/item/storage/secure/update_overlays()
+ . = ..()
+ if(emagged)
+ . += icon_locking
+ else if(!locked)
+ . += icon_opened
+
+
/obj/item/storage/secure/populate_contents()
new /obj/item/paper(src)
new /obj/item/pen(src)
@@ -41,13 +51,13 @@
if((istype(W, /obj/item/melee/energy/blade)) && (!emagged))
emag_act(user, W)
- if(istype(W, /obj/item/screwdriver))
+ if(W.tool_behaviour == TOOL_SCREWDRIVER)
if(do_after(user, 20 * W.toolspeed * gettoolspeedmod(user), target = src))
open = !open
user.show_message("You [open ? "open" : "close"] the service panel.", 1)
return
- if((istype(W, /obj/item/multitool)) && (open) && (!l_hacking))
+ if((W.tool_behaviour = TOOL_MULTITOOL) && (open) && (!l_hacking))
user.show_message("Now attempting to reset internal memory, please hold.", 1)
l_hacking = TRUE
if(do_after(user, 100 * W.toolspeed * gettoolspeedmod(user), target = src))
@@ -70,30 +80,34 @@
return ..()
+
/obj/item/storage/secure/emag_act(mob/user, obj/weapon)
- if(!emagged)
- add_attack_logs(user, src, "emagged")
- emagged = TRUE
- overlays += image('icons/obj/storage.dmi', icon_sparking)
- sleep(6)
- overlays.Cut()
- overlays += image('icons/obj/storage.dmi', icon_locking)
- locked = FALSE
- if(istype(weapon, /obj/item/melee/energy/blade))
- do_sparks(5, 0, loc)
- playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
- playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- if(user)
- to_chat(user, "You slice through the lock on [src].")
- else if(user)
- to_chat(user, "You short out the lock on [src].")
+ if(emagged)
+ return
+
+ add_attack_logs(user, src, "emagged")
+ emagged = TRUE
+ locked = FALSE
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, icon_sparking), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
+
+ if(istype(weapon, /obj/item/melee/energy/blade))
+ do_sparks(5, 0, loc)
+ playsound(loc, 'sound/weapons/blade1.ogg', 50, 1)
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ if(user)
+ to_chat(user, "You slice through the lock on [src].")
+ else if(user)
+ to_chat(user, "You short out the lock on [src].")
+
/obj/item/storage/secure/AltClick(mob/living/user)
if(istype(user) && !try_to_open())
return FALSE
return ..()
-/obj/item/storage/secure/MouseDrop(over_object, src_location, over_location)
+/obj/item/storage/secure/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
if(!try_to_open())
return FALSE
return ..()
@@ -138,8 +152,8 @@
switch(action)
if("close")
locked = TRUE
- overlays.Cut()
code = null
+ update_icon(UPDATE_OVERLAYS)
close(usr)
if("setnumber")
switch(params["buttonValue"])
@@ -150,9 +164,8 @@
to_chat(usr, "The code was set successfully.")
else if((code == l_code) && l_set)
locked = FALSE
- overlays.Cut()
- overlays += image('icons/obj/storage.dmi', icon_opened)
code = null
+ update_icon(UPDATE_OVERLAYS)
else
code = "ERROR"
if("R")
diff --git a/code/game/objects/items/weapons/storage/storage.dm b/code/game/objects/items/weapons/storage/storage.dm
index ce9e95495ac..5f06e4bc428 100644
--- a/code/game/objects/items/weapons/storage/storage.dm
+++ b/code/game/objects/items/weapons/storage/storage.dm
@@ -9,6 +9,7 @@
name = "storage"
icon = 'icons/obj/storage.dmi'
w_class = WEIGHT_CLASS_NORMAL
+ flags_2 = BLOCKS_LIGHT_2
///No message on putting items in
var/silent = FALSE
///List of objects which this item can store (if set, it can't store anything else)
@@ -98,40 +99,44 @@
continue
hide_from(player)
-/obj/item/storage/MouseDrop(obj/over_object)
- if(ishuman(usr)) //so monkeys can take off their backpacks -- Urist
- var/mob/M = usr
- if(istype(M.loc,/obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated
- return
+/obj/item/storage/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ if(!ishuman(usr))
+ return FALSE
- if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
- if(M.s_active)
- M.s_active.close(M)
- open(M)
- return
+ var/mob/living/carbon/human/user = usr
- if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \
- && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr) \
- && !istype(src, /obj/item/storage/lockbox))
- var/turf/T = get_turf(over_object)
- if(istype(over_object, /turf/simulated/floor))
- if(get_turf(usr) != T)
- return // Can only empty containers onto the floor under you
- if("Yes" != alert(usr,"Empty \the [src] onto \the [T]?","Confirm","Yes","No"))
- return
- if(!(usr && over_object && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && get_turf(usr) == T))
- return // Something happened while the player was thinking
- hide_from(usr)
- usr.face_atom(over_object)
- usr.visible_message("[usr] empties \the [src] onto \the [over_object].",
- "You empty \the [src] onto \the [over_object].")
- for(var/obj/item/I in contents)
- remove_from_storage(I, T)
- update_icon() // For content-sensitive icons
- return
+ // Stops inventory actions in a mech, while ventcrawling and while being incapacitated
+ if(ismecha(user.loc) || is_ventcrawling(user) || user.incapacitated(FALSE, TRUE, TRUE))
+ return FALSE
+
+ if(over_object == user && user.Adjacent(src)) // this must come before the screen objects only block
+ open(user)
+ return FALSE
+
+ if((!istype(src, /obj/item/storage/lockbox) && (istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \
+ && length(contents) && loc == user && !user.incapacitated() && user.Adjacent(over_object)))
+
+ if(alert(user, "Empty [src] onto [over_object]?", "Confirm", "Yes", "No") != "Yes")
+ return FALSE
+
+ if(!user || !over_object || user.incapacitated() || loc != user || !user.Adjacent(over_object))
+ return FALSE
+
+ close(user)
+ user.face_atom(over_object)
+ user.visible_message(
+ span_notice("[user] empties [src] onto [over_object]."),
+ span_notice("You empty [src] onto [over_object]."),
+ )
+ var/turf/object_turf = get_turf(over_object)
+ for(var/obj/item/item in src)
+ remove_from_storage(item, object_turf)
+
+ update_icon() // For content-sensitive icons
+ return FALSE
- return ..()
+ return ..()
/obj/item/storage/AltClick(mob/user)
@@ -186,6 +191,14 @@
if(user.s_active == src)
user.s_active = null
+
+/obj/item/storage/proc/hide_from_all_viewers()
+ if(!LAZYLEN(mobs_viewing))
+ return
+ for(var/mob/viewer as anything in mobs_viewing)
+ hide_from(viewer)
+
+
/obj/item/storage/proc/update_viewers()
for(var/_M in mobs_viewing)
var/mob/M = _M
@@ -438,7 +451,7 @@
if(istype(src, /obj/item/storage/fancy))
var/obj/item/storage/fancy/F = src
- F.update_icon(TRUE)
+ F.update_icon()
for(var/_M in mobs_viewing)
var/mob/M = _M
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 21e9f1520ae..9e6f0c59bf8 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -527,3 +527,15 @@ To apply, hold the injector a short distance away from the outer thigh before ap
/obj/item/storage/box/syndie_kit/knives_kit/populate_contents()
for(var/i in 1 to 7)
new /obj/item/kitchen/knife/combat/throwing(src)
+/obj/item/storage/box/syndie_kit/blackops_kit
+ name = "Black ops kit"
+
+/obj/item/storage/box/syndie_kit/blackops_kit/populate_contents()
+ new /obj/item/clothing/under/syndicate/blackops(src)
+ new /obj/item/clothing/gloves/combat(src)
+ new /obj/item/clothing/shoes/combat(src)
+ new /obj/item/clothing/suit/armor/vest(src)
+ new /obj/item/clothing/glasses/night(src)
+ new /obj/item/clothing/accessory/storage/webbing(src)
+ new /obj/item/storage/belt/military/assault(src)
+ new /obj/item/clothing/mask/balaclava(src)
diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index b27d66f347e..86dd971d773 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -35,56 +35,70 @@
var/obj/item/card/id/front_id = null
var/image/front_id_overlay = null
-/obj/item/storage/wallet/proc/id_check()
- front_id = (locate(/obj/item/card/id) in contents)
- if(!front_id)
- name = "[item_color] leather wallet"
- return FALSE
- name = "[item_color] leather wallet with [front_id] on the front"
- return TRUE
-/obj/item/storage/wallet/remove_from_storage(obj/item/W, atom/new_location)
- . = ..(W, new_location)
- if(.)
- id_check()
- update_icon()
+/obj/item/storage/wallet/remove_from_storage(obj/item/I, atom/new_location)
+ . = ..()
+ if(. && istype(I, /obj/item/card/id))
+ refresh_ID()
+
+
+/obj/item/storage/wallet/handle_item_insertion(obj/item/I, prevent_warning = FALSE)
+ . = ..()
+ if(. && istype(I, /obj/item/card/id))
+ refresh_ID()
-/obj/item/storage/wallet/handle_item_insertion(obj/item/W, prevent_warning = 0)
- . = ..(W, prevent_warning)
- if(.)
- id_check()
- update_icon()
/obj/item/storage/wallet/swap_items(obj/item/item_1, obj/item/item_2, mob/user)
- . = ..(item_1, item_2, user)
+ . = ..()
if(.)
- id_check()
- update_icon()
+ refresh_ID()
+
+/obj/item/storage/wallet/orient2hud(mob/user)
+ . = ..()
+ refresh_ID()
+
+
+/obj/item/storage/wallet/proc/refresh_ID()
+ // Locate the first ID in the wallet
+ front_id = (locate(/obj/item/card/id) in contents)
-/obj/item/storage/wallet/update_icon()
if(ishuman(loc))
- var/mob/living/carbon/human/H = loc
- if(H.wear_id == src)
- H.sec_hud_set_ID()
- overlays -= front_id_overlay
+ var/mob/living/carbon/human/wearing_human = loc
+ if(wearing_human.wear_id == src)
+ wearing_human.sec_hud_set_ID()
+
+ update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
+
+
+/obj/item/storage/wallet/update_overlays()
+ . = ..()
if(!front_id)
- front_id_overlay = null
return
var/front_id_icon_state_holder = front_id.icon_state
- if (copytext(front_id_icon_state_holder,1,4) == "ERT")
+ if(copytext(front_id_icon_state_holder,1,4) == "ERT")
front_id_icon_state_holder = "ERT"
else if(!(front_id_icon_state_holder in icon_states(src.icon)))
front_id_icon_state_holder = "id"
- front_id_overlay = image('icons/obj/wallets.dmi', front_id_icon_state_holder)
- overlays += front_id_overlay
+ . += mutable_appearance('icons/obj/wallets.dmi', front_id_icon_state_holder)
+
+
+/obj/item/storage/wallet/update_name(updates = ALL)
+ . = ..()
+ if(front_id)
+ name = "[item_color] leather wallet with [front_id] on the front"
+ else
+ name = "[item_color] leather wallet"
+
/obj/item/storage/wallet/GetID()
return front_id ? front_id : ..()
+
/obj/item/storage/wallet/GetAccess()
return front_id ? front_id.GetAccess() : ..()
+
/obj/item/storage/wallet/random/populate_contents()
var/cash = pick(/obj/item/stack/spacecash,
/obj/item/stack/spacecash/c10,
@@ -110,6 +124,7 @@
icon = 'icons/obj/wallets.dmi'
item_state = "wallet"
+
/obj/item/storage/wallet/color/Initialize(mapload)
. = ..()
if(!item_color)
@@ -117,31 +132,17 @@
new color_wallet(src.loc)
qdel(src)
return
- UpdateDesc()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
-/obj/item/storage/wallet/color/proc/UpdateDesc()
- name = "[item_color] wallet"
- desc = "[item_color] wallet made from... leather?"
- icon_state = "[item_color]_wallet"
+/obj/item/storage/wallet/color/update_icon_state()
+ icon_state = "[item_color]_wallet"
-/obj/item/storage/wallet/color/remove_from_storage(obj/item/W, atom/new_location)
- . = ..(W, new_location)
- if(.)
- id_check()
- update_icon()
-/obj/item/storage/wallet/color/handle_item_insertion(obj/item/W, prevent_warning = 0)
- . = ..(W, prevent_warning)
- if(.)
- id_check()
- update_icon()
+/obj/item/storage/wallet/color/update_desc(updates = ALL)
+ . = ..()
+ desc = "[item_color] wallet made from... leather?"
-/obj/item/storage/wallet/color/swap_items(obj/item/item_1, obj/item/item_2, mob/user)
- . = ..(item_1, item_2, user)
- if(.)
- id_check()
- update_icon()
/obj/item/storage/wallet/color/blue
item_color = "blue"
diff --git a/code/game/objects/items/weapons/tanks/jetpack.dm b/code/game/objects/items/weapons/tanks/jetpack.dm
index cf670bd194f..526780bc215 100644
--- a/code/game/objects/items/weapons/tanks/jetpack.dm
+++ b/code/game/objects/items/weapons/tanks/jetpack.dm
@@ -54,14 +54,18 @@
A.UpdateButtonIcon()
+/obj/item/tank/jetpack/update_icon_state()
+ icon_state = "[initial(icon_state)][on ? "-on" : ""]"
+
+
/obj/item/tank/jetpack/proc/turn_on(mob/user)
on = TRUE
- icon_state = "[initial(icon_state)]-on"
+ update_icon(UPDATE_ICON_STATE)
/obj/item/tank/jetpack/proc/turn_off(mob/user)
on = FALSE
stabilizers = FALSE
- icon_state = initial(icon_state)
+ update_icon(UPDATE_ICON_STATE)
/obj/item/tank/jetpack/proc/allow_thrust(num, mob/living/user, should_leave_trail)
if(!on)
diff --git a/code/game/objects/items/weapons/tanks/tanks.dm b/code/game/objects/items/weapons/tanks/tanks.dm
index b592c3d220a..e9040c412c3 100644
--- a/code/game/objects/items/weapons/tanks/tanks.dm
+++ b/code/game/objects/items/weapons/tanks/tanks.dm
@@ -62,7 +62,7 @@
if(!silent)
to_chat(C, "You are not wearing a suitable mask or helmet.")
return FALSE
- if(M.mask_adjusted) // If the mask is equipped but pushed down
+ if(M.up) // If the mask is equipped but pushed down
M.adjustmask(C) // Adjust it back
if(!silent)
diff --git a/code/game/objects/items/weapons/tanks/watertank.dm b/code/game/objects/items/weapons/tanks/watertank.dm
index 357d0ccabef..ea7891ca7b9 100644
--- a/code/game/objects/items/weapons/tanks/watertank.dm
+++ b/code/game/objects/items/weapons/tanks/watertank.dm
@@ -190,12 +190,28 @@
/obj/item/watertank/atmos/make_noz()
return new /obj/item/extinguisher/mini/nozzle(src)
+
+/obj/item/watertank/atmos/update_icon_state()
+ var/obj/item/extinguisher/mini/nozzle/our_noz = noz
+ switch(our_noz.nozzle_mode)
+ if(EXTINGUISHER)
+ icon_state = "waterbackpackatmos_0"
+ if(NANOFROST)
+ icon_state = "waterbackpackatmos_1"
+ if(METAL_FOAM)
+ icon_state = "waterbackpackatmos_2"
+ else
+ icon_state = "waterbackpackatmos"
+
+
/obj/item/watertank/atmos/dropped(mob/user, silent = FALSE)
- ..()
- icon_state = "waterbackpackatmos"
- if(istype(noz, /obj/item/extinguisher/mini/nozzle))
- var/obj/item/extinguisher/mini/nozzle/N = noz
- N.nozzle_mode = 0
+ . = ..()
+ if(!noz)
+ return
+ var/obj/item/extinguisher/mini/nozzle/our_noz = noz
+ our_noz.nozzle_mode = NONE
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/extinguisher/mini/nozzle
name = "extinguisher nozzle"
@@ -210,11 +226,12 @@
cooling_power = 5
w_class = WEIGHT_CLASS_HUGE
flags = NODROP //Necessary to ensure that the nozzle and tank never seperate
- var/obj/item/watertank/tank
- var/nozzle_mode = 0
+ var/obj/item/watertank/atmos/tank
+ var/nozzle_mode = NONE
var/metal_synthesis_cooldown = 0
var/nanofrost_cooldown = 0
+
/obj/item/extinguisher/mini/nozzle/New(parent_tank)
. = ..()
if(check_tank_exists(parent_tank, src))
@@ -222,32 +239,30 @@
reagents = tank.reagents
max_water = tank.volume
loc = tank
- return
+
/obj/item/extinguisher/mini/nozzle/Move()
. = ..()
if(tank && loc != tank.loc)
loc = tank
- return
-/obj/item/extinguisher/mini/nozzle/attack_self(mob/user as mob)
+
+/obj/item/extinguisher/mini/nozzle/attack_self(mob/user)
switch(nozzle_mode)
if(EXTINGUISHER)
nozzle_mode = NANOFROST
- tank.icon_state = "waterbackpackatmos_1"
to_chat(user, "Swapped to nanofrost launcher")
- return
+
if(NANOFROST)
nozzle_mode = METAL_FOAM
- tank.icon_state = "waterbackpackatmos_2"
to_chat(user, "Swapped to metal foam synthesizer")
- return
+
if(METAL_FOAM)
nozzle_mode = EXTINGUISHER
- tank.icon_state = "waterbackpackatmos_0"
to_chat(user, "Swapped to water extinguisher")
- return
- return
+
+ tank.update_icon(UPDATE_ICON_STATE)
+
/obj/item/extinguisher/mini/nozzle/dropped(mob/user, silent = FALSE)
..()
diff --git a/code/game/objects/items/weapons/tape.dm b/code/game/objects/items/weapons/tape.dm
index a66470628d4..d4cfa546b95 100644
--- a/code/game/objects/items/weapons/tape.dm
+++ b/code/game/objects/items/weapons/tape.dm
@@ -9,10 +9,9 @@
amount = 25
max_amount = 25
-/obj/item/stack/tape_roll/New(var/loc, var/amount=null)
+/obj/item/stack/tape_roll/New(loc, amount=null)
..()
-
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/stack/tape_roll/attack(mob/living/carbon/human/M, mob/living/user)
if(!istype(M)) //What good is a duct tape mask if you are unable to speak?
@@ -43,7 +42,8 @@
M.equip_to_slot_if_possible(G, slot_wear_mask)
G.add_fingerprint(user)
-/obj/item/stack/tape_roll/update_icon()
+
+/obj/item/stack/tape_roll/update_icon_state()
var/amount = get_amount()
if((amount <= 2) && (amount > 0))
icon_state = "[initial(icon_state)]"
@@ -55,7 +55,7 @@
icon_state = "[initial(icon_state)]4"
else
icon_state = "[initial(icon_state)]4"
- ..()
+
/obj/item/stack/tape_roll/thick
name = "incredibly thick tape roll"
@@ -90,3 +90,4 @@
var/obj/item/clothing/mask/muzzle/G = new /obj/item/clothing/mask/muzzle/tapegag/thick
M.equip_to_slot_if_possible(G, slot_wear_mask)
G.add_fingerprint(user)
+
diff --git a/code/game/objects/items/weapons/teleportation.dm b/code/game/objects/items/weapons/teleportation.dm
index be1e86f519d..171ab0f1a5e 100644
--- a/code/game/objects/items/weapons/teleportation.dm
+++ b/code/game/objects/items/weapons/teleportation.dm
@@ -1,103 +1,10 @@
-/* Teleportation devices.
- * Contains:
- * Locator
- * Hand-tele
- */
-
-/*
- * Locator
- */
-/obj/item/locator
- name = "locator"
- desc = "Used to track those with locater implants."
- icon = 'icons/obj/device.dmi'
- icon_state = "locator"
- var/temp = null
- var/frequency = 1451
- var/broadcasting = null
- var/listening = 1.0
- flags = CONDUCT
- w_class = WEIGHT_CLASS_SMALL
- item_state = "electronic"
- throw_speed = 4
- throw_range = 20
- materials = list(MAT_METAL=400)
- armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 30, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
- origin_tech = "magnets=3;bluespace=2"
-
-/obj/item/locator/attack_self(mob/user as mob)
- add_fingerprint(user)
- var/dat = {""}
- if(temp)
- dat += "[src.temp]
Clear"
- else
- dat += {"
-Persistent Signal Locator
-Frequency:
--
-- [format_frequency(src.frequency)]
-+
-+
-
-Refresh"}
- user << browse(dat, "window=radio")
- onclose(user, "radio")
- return
-
-/obj/item/locator/Topic(href, href_list)
- if(..())
- return 1
-
- var/turf/current_location = get_turf(usr)//What turf is the user on?
- if(!current_location || is_admin_level(current_location.z))//If turf was not found or they're in the admin zone
- to_chat(usr, "\The [src] is malfunctioning.")
- return 1
-
- if(href_list["refresh"])
- temp = "Persistent Signal Locator"
- var/turf/sr = get_turf(src)
-
- if(sr)
- temp += "Located Beacons: "
-
- for(var/obj/item/radio/beacon/W in GLOB.beacons)
- if(W.frequency == frequency && !W.syndicate)
- if(W && W.z == z)
- var/turf/TB = get_turf(W)
- temp += "[W.code]: [TB.x], [TB.y], [TB.z] "
-
- temp += "Located Implants: "
- for(var/obj/item/implant/tracking/T in GLOB.tracked_implants)
- if(!T.implanted || !T.imp_in)
- continue
- var/turf/Tr = get_turf(T)
-
- if(Tr && Tr.z == sr.z)
- temp += "[T.gps_tag]: [Tr.x], [Tr.y], [Tr.z] "
-
- temp += "You are at \[[sr.x],[sr.y],[sr.z]\]."
- temp += "
Refresh "
- else
- temp += "Processing error: Unable to locate orbital position. "
- else
- if(href_list["freq"])
- frequency += text2num(href_list["freq"])
- frequency = sanitize_frequency(frequency)
- else
- if(href_list["temp"])
- temp = null
-
- attack_self(usr)
- return 1
-
-/*
- * Hand-tele
- */
+/// Hand-tele
/obj/item/hand_tele
name = "hand tele"
desc = "A portable item using blue-space technology."
icon = 'icons/obj/device.dmi'
icon_state = "hand_tele"
+ base_icon_state = "hand_tele"
item_state = "electronic"
throwforce = 0
w_class = WEIGHT_CLASS_SMALL
@@ -163,7 +70,7 @@ Frequency:
/obj/item/hand_tele/proc/make_inactive(severity)
- var/time = rand(20 SECONDS, 30 SECONDS) * severity
+ var/time = rand(10 SECONDS, 15 SECONDS) * (severity == EMP_HEAVY ? 2 : 1)
emp_timer = world.time + time
update_icon(UPDATE_ICON_STATE)
addtimer(CALLBACK(src, PROC_REF(check_inactive), emp_timer), time)
@@ -182,7 +89,7 @@ Frequency:
/obj/item/hand_tele/update_icon_state()
- icon_state = (emp_timer > world.time) ? icon_state_inactive : initial(icon_state)
+ icon_state = (emp_timer > world.time) ? icon_state_inactive : base_icon_state
/obj/item/hand_tele/portal_destroyed(obj/effect/portal/P)
diff --git a/code/game/objects/items/weapons/twohanded.dm b/code/game/objects/items/weapons/twohanded.dm
index df52cc09e1e..515128f65d2 100644
--- a/code/game/objects/items/weapons/twohanded.dm
+++ b/code/game/objects/items/weapons/twohanded.dm
@@ -115,15 +115,14 @@
resistance_flags = FIRE_PROOF
-/obj/item/twohanded/fireaxe/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "fireaxe[wielded]"
- ..()
+/obj/item/twohanded/fireaxe/update_icon_state() //Currently only here to fuck with the on-mob icons.
+ icon_state = "fireaxe[HAS_TRAIT(src, TRAIT_WIELDED)]"
/obj/item/twohanded/fireaxe/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
- if(wielded) //destroys windows and grilles in one hit
+ if(HAS_TRAIT(src, TRAIT_WIELDED)) //destroys windows and grilles in one hit
if(istype(A, /obj/structure/window) || istype(A, /obj/structure/grille))
var/obj/structure/W = A
W.obj_destruction("fireaxe")
@@ -136,8 +135,8 @@
needs_permit = TRUE
-/obj/item/twohanded/fireaxe/boneaxe/update_icon()
- icon_state = "bone_axe[wielded]"
+/obj/item/twohanded/fireaxe/boneaxe/update_icon_state()
+ icon_state = "bone_axe[HAS_TRAIT(src, TRAIT_WIELDED)]"
/obj/item/twohanded/fireaxe/energized
@@ -148,8 +147,8 @@
var/max_charge = 30
-/obj/item/twohanded/fireaxe/energized/update_icon()
- if(wielded)
+/obj/item/twohanded/fireaxe/energized/update_icon_state()
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
icon_state = "fireaxe2"
else
icon_state = "fireaxe0"
@@ -171,7 +170,7 @@
/obj/item/twohanded/fireaxe/energized/attack(mob/M, mob/user)
. = ..()
- if(wielded && charge == max_charge)
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && charge == max_charge)
if(isliving(M))
var/mob/living/target = M
charge = 0
@@ -241,27 +240,26 @@
/obj/item/twohanded/dualsaber/IsReflect()
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return TRUE
-/obj/item/twohanded/dualsaber/update_icon()
- if(wielded)
- icon_state = "dualsaber[blade_color][wielded]"
- set_light(brightness_on, l_color=colormap[blade_color])
+/obj/item/twohanded/dualsaber/update_icon_state()
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
+ icon_state = "dualsaber[blade_color]1"
+ set_light(brightness_on, l_color = colormap[blade_color])
else
icon_state = "dualsaber0"
set_light(0)
- ..()
/obj/item/twohanded/dualsaber/attack(mob/target, mob/living/user)
..()
- if((CLUMSY in user.mutations) && (wielded) && prob(40))
+ if((CLUMSY in user.mutations) && HAS_TRAIT(src, TRAIT_WIELDED) && prob(40))
to_chat(user, "You twirl around a bit before losing your balance and impaling yourself on the [src].")
user.take_organ_damage(20, 25)
return
- if((wielded) && prob(50))
+ if(HAS_TRAIT(src, TRAIT_WIELDED) && prob(50))
INVOKE_ASYNC(src, PROC_REF(jedi_spin), user)
@@ -274,7 +272,7 @@
/obj/item/twohanded/dualsaber/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
return FALSE
@@ -344,8 +342,8 @@
var/icon_prefix = "spearglass"
-/obj/item/twohanded/spear/update_icon()
- icon_state = "[icon_prefix][wielded]"
+/obj/item/twohanded/spear/update_icon_state()
+ icon_state = "[icon_prefix][HAS_TRAIT(src, TRAIT_WIELDED)]"
/obj/item/twohanded/spear/CheckParts(list/parts_list)
@@ -365,7 +363,7 @@
return
if(isturf(AM)) //So you can actually melee with it
return
- if(explosive && wielded)
+ if(explosive && HAS_TRAIT(src, TRAIT_WIELDED))
explosive.forceMove(AM)
explosive.prime()
qdel(src)
@@ -580,15 +578,12 @@
flags &= ~NODROP
-/obj/item/twohanded/chainsaw/update_icon()
- if(wielded)
- icon_state = "chainsaw[wielded]"
- else
- icon_state = "chainsaw0"
- ..()
+/obj/item/twohanded/chainsaw/update_icon_state()
+ icon_state = "chainsaw[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
/obj/item/twohanded/chainsaw/attack(mob/living/target, mob/living/user)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
playsound(loc, 'sound/weapons/chainsaw.ogg', 100, 1, -1) //incredibly loud; you ain't goin' for stealth with this thing. Credit to Lonemonk of Freesound for this sound.
if(isrobot(target))
..()
@@ -638,9 +633,9 @@
if(charged < 5)
charged++
-/obj/item/twohanded/singularityhammer/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "mjollnir[wielded]"
- ..()
+/obj/item/twohanded/singularityhammer/update_icon_state() //Currently only here to fuck with the on-mob icons.
+ icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
/obj/item/twohanded/singularityhammer/proc/vortex(turf/pull, mob/wielder)
for(var/atom/movable/X in orange(5, pull))
@@ -664,7 +659,7 @@
/obj/item/twohanded/singularityhammer/afterattack(atom/A, mob/user, proximity)
if(!proximity)
return
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(charged == 5)
charged = 0
if(isliving(A))
@@ -699,9 +694,7 @@
/obj/item/twohanded/mjollnir/attack(mob/living/M, mob/user)
..()
- if(wielded)
- //if(charged == 5)
- //charged = 0
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
if(isliving(M))
M.Stun(4 SECONDS)
@@ -714,9 +707,9 @@
L.Stun(4 SECONDS)
shock(L)
-/obj/item/twohanded/mjollnir/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "mjollnir[wielded]"
- ..()
+/obj/item/twohanded/mjollnir/update_icon_state() //Currently only here to fuck with the on-mob icons.
+ icon_state = "mjollnir[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
/obj/item/twohanded/knighthammer
name = "singuloth knight's hammer"
@@ -745,9 +738,9 @@
if(charged < 5)
charged++
-/obj/item/twohanded/knighthammer/update_icon() //Currently only here to fuck with the on-mob icons.
- icon_state = "knighthammer[wielded]"
- ..()
+/obj/item/twohanded/knighthammer/update_icon_state() //Currently only here to fuck with the on-mob icons.
+ icon_state = "knighthammer[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
/obj/item/twohanded/knighthammer/afterattack(atom/A, mob/user, proximity)
if(!proximity)
@@ -763,13 +756,13 @@
var/atom/throw_target = get_edge_target_turf(Z, get_dir(src, get_step_away(Z, src)))
Z.throw_at(throw_target, 200, 4)
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
- else if(wielded && Z.health < 1)
+ else if(HAS_TRAIT(src, TRAIT_WIELDED) && Z.health < 1)
Z.visible_message("[Z.name] was blown to pieces by the power of [name]!", \
"You feel a powerful blow rip you apart!", \
"You hear a heavy impact and the sound of ripping flesh!.")
Z.gib()
playsound(user, 'sound/weapons/marauder.ogg', 50, 1)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
if(istype(A, /turf/simulated/wall))
var/turf/simulated/wall/Z = A
Z.ex_act(2)
@@ -816,8 +809,8 @@
force_unwielded = 100
force_wielded = 500000 // Kills you DEAD.
-/obj/item/twohanded/pitchfork/update_icon()
- icon_state = "pitchfork[wielded]"
+/obj/item/twohanded/pitchfork/update_icon_state()
+ icon_state = "pitchfork[HAS_TRAIT(src, TRAIT_WIELDED)]"
/obj/item/twohanded/pitchfork/suicide_act(mob/user)
user.visible_message("[user] impales \himself in \his abdomen with [src]! It looks like \he's trying to commit suicide...")
@@ -844,7 +837,7 @@
// It's no fun being the lord of all hell if you can't get out of a simple room
/obj/item/twohanded/pitchfork/demonic/ascended/afterattack(atom/target, mob/user, proximity)
- if(!proximity || !wielded)
+ if(!proximity || !HAS_TRAIT(src, TRAIT_WIELDED))
return
if(istype(target, /turf/simulated/wall))
var/turf/simulated/wall/W = target
@@ -872,8 +865,8 @@
embed_chance = 50
embedded_ignore_throwspeed_threshold = TRUE
-/obj/item/twohanded/bamboospear/update_icon()
- icon_state = "bamboo_spear[wielded]"
+/obj/item/twohanded/bamboospear/update_icon_state()
+ icon_state = "bamboo_spear[HAS_TRAIT(src, TRAIT_WIELDED)]"
//pyro claws
/obj/item/twohanded/required/pyro_claws
@@ -1013,9 +1006,6 @@
w_class = initial(w_class)
item_state = ""
-/obj/item/twohanded/fishingrod/update_icon()
- if(wielded)
- icon_state = "fishing_rod[wielded]"
- else
- icon_state = "fishing_rod0"
- ..()
+/obj/item/twohanded/fishingrod/update_icon_state()
+ icon_state = "fishing_rod[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index 6cc621bd3ce..736cca7b9f3 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -349,7 +349,6 @@
В официальных документах эта бита проходит под элегантным названием \"Высокоскоростная система доставки СРП\". \
Выдаваясь только самым верным и эффективным офицерам NanoTrasen, это оружие является одновременно символом статуса \
и инструментом высшего правосудия."
- slot_flags = SLOT_BELT
w_class = WEIGHT_CLASS_SMALL
can_deflect = FALSE
@@ -374,22 +373,39 @@
/// Attack verbs when extended (created on Initialize)
var/list/attack_verb_on = list("smacked", "struck", "cracked", "beaten")
+
/obj/item/melee/baseball_bat/homerun/central_command/srt
name = "тактическая бита ГСН"
desc = "Выдвижная тактическая бита Центрального Командования Nanotrasen. Скорее всего, к этому моменту командование станции уже осознало, что их коленные чашечки не переживут эту встречу."
-
item_state = "srt_bat_0"
item_state_on = "srt_bat_1"
icon_state = "srt_bat_0"
icon_state_on = "srt_bat_1"
-/obj/item/melee/baseball_bat/homerun/central_command/Initialize(mapload)
- . = ..()
+
+/obj/item/melee/baseball_bat/homerun/central_command/update_icon_state()
icon_state = on ? icon_state_on : initial(icon_state)
+ item_state = on ? item_state_on : initial(item_state)
+
+
+/obj/item/melee/baseball_bat/homerun/central_command/proc/toggle(mob/living/user)
+ on = !on
+ slot_flags = on ? NONE : SLOT_BELT
force = on ? force_on : initial(force)
attack_verb = on ? attack_verb_on : initial(attack_verb)
w_class = on ? WEIGHT_CLASS_HUGE : WEIGHT_CLASS_SMALL
homerun_able = on
+ homerun_ready = on
+ update_icon(UPDATE_ICON_STATE)
+ update_equipped_item()
+ playsound(loc, extend_sound, 50, TRUE)
+ add_fingerprint(user)
+ if(on)
+ to_chat(user, span_userdanger("Вы активировали [name] - время для правосудия!"))
+ else
+ to_chat(user, span_notice("Вы деактивировали [name]."))
+
+
/obj/item/melee/baseball_bat/homerun/central_command/pickup(mob/living/user)
if(!(isertmindshielded(user)))
@@ -404,31 +420,10 @@
return FALSE
return ..()
+
/obj/item/melee/baseball_bat/homerun/central_command/attack_self(mob/user)
- on = !on
- icon_state = on ? icon_state_on : initial(icon_state)
- if(on)
- to_chat(user, "Вы активировали [src.name] - время для правосудия!")
- item_state = item_state_on
- w_class = WEIGHT_CLASS_HUGE //doesnt fit in backpack when its on for balance
- force = force_on
- attack_verb = attack_verb_on
- homerun_ready = TRUE
- else
- to_chat(user, "Вы деактивировали [src.name].")
- item_state = initial(item_state)
- slot_flags = SLOT_BELT
- w_class = WEIGHT_CLASS_SMALL
- force = initial(force)
- attack_verb = initial(attack_verb)
- homerun_ready = FALSE
- // Update mob hand visuals
- if(ishuman(user))
- var/mob/living/carbon/human/H = user
- H.update_inv_l_hand()
- H.update_inv_r_hand()
- playsound(loc, extend_sound, 50, TRUE)
- add_fingerprint(user)
+ toggle(user)
+
/obj/item/claymore/bone
name = "bone sword"
@@ -441,3 +436,4 @@
armour_penetration = 15
w_class = WEIGHT_CLASS_BULKY
block_chance = 30
+
diff --git a/code/game/objects/obj_defense.dm b/code/game/objects/obj_defense.dm
index ef71c1cc4bf..31751386403 100644
--- a/code/game/objects/obj_defense.dm
+++ b/code/game/objects/obj_defense.dm
@@ -193,8 +193,8 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
if(!(resistance_flags & ON_FIRE) && (resistance_flags & FLAMMABLE) && !(resistance_flags & FIRE_PROOF))
resistance_flags |= ON_FIRE
SSfires.processing[src] = src
- add_overlay(GLOB.fire_overlay, TRUE)
- return 1
+ add_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay)
+ return TRUE
///called when the obj is destroyed by fire
/obj/proc/burn()
@@ -206,7 +206,7 @@ GLOBAL_DATUM_INIT(acid_overlay, /mutable_appearance, mutable_appearance('icons/e
/obj/proc/extinguish()
if(resistance_flags & ON_FIRE)
resistance_flags &= ~ON_FIRE
- cut_overlay(GLOB.fire_overlay, TRUE)
+ cut_overlay(custom_fire_overlay ? custom_fire_overlay : GLOB.fire_overlay, TRUE)
SSfires.processing -= src
///Called when the obj is hit by a tesla bolt.
diff --git a/code/game/objects/structures.dm b/code/game/objects/structures.dm
index fcb49d30568..47ba86c7220 100644
--- a/code/game/objects/structures.dm
+++ b/code/game/objects/structures.dm
@@ -8,8 +8,9 @@
var/creates_cover = FALSE
var/mob/living/climber
var/broken = FALSE
- /// Amount of SSobj ticks (Roughly 2 seconds) that a extinguished structure has been lit up
+ /// Amount of timer ticks that an extinguished structure has been lit up
var/light_process = 0
+ var/extinguish_timer_id
/obj/structure/New()
..()
@@ -78,11 +79,11 @@
do_climb(usr)
-/obj/structure/MouseDrop_T(var/atom/movable/C, mob/user as mob)
- if(..())
- return
- if(C == user)
+/obj/structure/MouseDrop_T(atom/movable/dropping, mob/user, params)
+ . = ..()
+ if(!. && dropping == user)
do_climb(user)
+ return TRUE
/obj/structure/proc/density_check()
for(var/obj/O in orange(0, src))
@@ -211,18 +212,18 @@
/obj/structure/proc/can_touch(mob/living/user)
if(!istype(user))
- return 0
+ return FALSE
if(!Adjacent(user))
- return 0
+ return FALSE
if(user.restrained() || user.buckled)
- to_chat(user, "You need your hands and legs free for this.")
- return 0
- if(user.stat || user.IsParalyzed() || user.IsSleeping() || user.lying || user.IsWeakened())
- return 0
+ to_chat(user, span_notice("You need your hands and legs free for this."))
+ return FALSE
+ if(user.incapacitated())
+ return FALSE
if(issilicon(user))
- to_chat(user, "You need hands for this.")
- return 0
- return 1
+ to_chat(user, span_notice("You need hands for this."))
+ return FALSE
+ return TRUE
/obj/structure/examine(mob/user)
. = ..()
@@ -234,17 +235,19 @@
var/examine_status = examine_status(user)
if(examine_status)
. += examine_status
+ if(climbable)
+ . += "You can Click-Drag someone to [src] to put them on the table after a short delay."
/obj/structure/proc/examine_status(mob/user) //An overridable proc, mostly for falsewalls.
var/healthpercent = (obj_integrity/max_integrity) * 100
switch(healthpercent)
if(50 to 99)
- return "It looks slightly damaged."
+ . += "It looks slightly damaged."
if(25 to 50)
- return "It appears heavily damaged."
+ . += "It appears heavily damaged."
if(0 to 25)
if(!broken)
- return "It's falling apart!"
+ . += "It's falling apart!"
/obj/structure/proc/prevents_buckled_mobs_attacking()
return FALSE
@@ -257,11 +260,13 @@
update_light()
name = "dimmed [name]"
desc = "Something shadowy moves to cover the object. Perhaps shining a light will force it to clear?"
- START_PROCESSING(SSobj, src)
+ extinguish_timer_id = addtimer(CALLBACK(src, PROC_REF(extinguish_light_check)), 2 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE|TIMER_LOOP|TIMER_DELETE_ME|TIMER_STOPPABLE)
-/obj/structure/process()
+/obj/structure/proc/extinguish_light_check()
var/turf/source_turf = get_turf(src)
+ if(!source_turf)
+ return
if(source_turf.get_lumcount() > 0.2)
light_process++
if(light_process > 3)
@@ -277,4 +282,5 @@
update_light()
name = initial(name)
desc = initial(desc)
- STOP_PROCESSING(SSobj, src)
+ deltimer(extinguish_timer_id)
+
diff --git a/code/game/objects/structures/aliens.dm b/code/game/objects/structures/aliens.dm
index f7060c17f70..607555ec888 100644
--- a/code/game/objects/structures/aliens.dm
+++ b/code/game/objects/structures/aliens.dm
@@ -150,7 +150,7 @@
return ..()
-/obj/structure/alien/resin/door/update_icon()
+/obj/structure/alien/resin/door/update_icon_state()
switch(state)
if(RESIN_DOOR_CLOSED)
icon_state = "resin_door_closed"
@@ -460,18 +460,35 @@
status = BURST
icon_state = "egg_hatched"
-/obj/structure/alien/egg/New()
- new /obj/item/clothing/mask/facehugger(src)
- ..()
- if(status == BURST)
- obj_integrity = integrity_failure
- else if(status != GROWN)
- spawn(rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
- Grow()
+
+/obj/structure/alien/egg/Initialize(mapload)
+ . = ..()
+ update_icon(UPDATE_ICON_STATE)
+ switch(status)
+ if(GROWING)
+ new /obj/item/clothing/mask/facehugger(src)
+ addtimer(CALLBACK(src, PROC_REF(Grow)), rand(MIN_GROWTH_TIME, MAX_GROWTH_TIME))
+ if(GROWN)
+ new /obj/item/clothing/mask/facehugger(src)
+ AddComponent(/datum/component/proximity_monitor)
+ if(BURST)
+ obj_integrity = integrity_failure
+
+
+/obj/structure/alien/egg/update_icon_state()
+ switch(status)
+ if(GROWING)
+ icon_state = "egg_growing"
+ if(GROWN)
+ icon_state = "egg"
+ if(BURST)
+ icon_state = "egg_hatched"
+
/obj/structure/alien/egg/attack_alien(mob/living/carbon/alien/user)
return attack_hand(user)
+
/obj/structure/alien/egg/attack_hand(mob/living/user)
if(user.get_int_organ(/obj/item/organ/internal/xenos/plasmavessel))
switch(status)
@@ -485,7 +502,7 @@
return
if(GROWN)
to_chat(user, "You retrieve the child.")
- Burst(0)
+ Burst(kill = FALSE)
return
else
to_chat(user, "It feels slimy.")
@@ -495,51 +512,62 @@
/obj/structure/alien/egg/proc/GetFacehugger()
return locate(/obj/item/clothing/mask/facehugger) in contents
+
/obj/structure/alien/egg/proc/Grow()
- icon_state = "egg"
status = GROWN
+ update_icon(UPDATE_ICON_STATE)
AddComponent(/datum/component/proximity_monitor)
+
+///Need to carry the kill from Burst() to Hatch(), this section handles the alien opening the egg
/obj/structure/alien/egg/proc/Burst(kill = TRUE) //drops and kills the hugger if any is remaining
if(status == GROWN || status == GROWING)
playsound(get_turf(src), 'sound/creatures/alien/xeno_egg_crack.ogg', 50)
- icon_state = "egg_hatched"
flick("egg_opening", src)
status = BURSTING
qdel(GetComponent(/datum/component/proximity_monitor))
- spawn(15)
- status = BURST
- var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
- if(child)
- child.loc = get_turf(src)
- if(kill && istype(child))
- child.Die()
- else
- for(var/mob/M in range(1,src))
- if(CanHug(M))
- child.Attach(M)
- break
+ addtimer(CALLBACK(src, PROC_REF(Hatch), kill), 1.5 SECONDS)
+
+
+///We now check HOW the hugger is hatching, kill carried from Burst() and obj_break()
+/obj/structure/alien/egg/proc/Hatch(kill)
+ status = BURST
+ update_icon(UPDATE_ICON_STATE)
+ var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+ if(!child)
+ return
+ child.forceMove(get_turf(src))
+ if(kill)
+ child.Die()
+ return
+ for(var/mob/living/victim in range(1, src))
+ if(CanHug(victim))
+ child.Attach(victim)
+ break
+
/obj/structure/alien/egg/obj_break(damage_flag)
- if(!(flags & NODECONSTRUCT))
- if(status != BURST)
- Burst(kill = TRUE)
+ if(!(flags & NODECONSTRUCT) && status != BURST)
+ Burst(kill = TRUE)
+
/obj/structure/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
if(exposed_temperature > 500)
take_damage(5, BURN, 0, 0)
+
/obj/structure/alien/egg/HasProximity(atom/movable/AM)
if(status == GROWN)
if(!CanHug(AM))
return
- var/mob/living/carbon/C = AM
- if(C.stat == CONSCIOUS && C.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo))
+ var/mob/living/carbon/target = AM
+ if(iscarbon(target) && target.stat == CONSCIOUS && target.get_int_organ(/obj/item/organ/internal/body_egg/alien_embryo))
return
- Burst(0)
+ Burst(kill = FALSE)
+
#undef BURST
#undef BURSTING
diff --git a/code/game/objects/structures/barsign.dm b/code/game/objects/structures/barsign.dm
index c71ec0075d7..38f3a956792 100644
--- a/code/game/objects/structures/barsign.dm
+++ b/code/game/objects/structures/barsign.dm
@@ -6,6 +6,7 @@
req_access = list(ACCESS_BAR)
max_integrity = 500
integrity_failure = 250
+ blocks_emissive = FALSE
armor = list("melee" = 20, "bullet" = 20, "laser" = 20, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
var/list/barsigns=list()
var/list/hiddensigns
diff --git a/code/game/objects/structures/bedsheet_bin.dm b/code/game/objects/structures/bedsheet_bin.dm
index f6398b2f16e..04e944ac3b6 100644
--- a/code/game/objects/structures/bedsheet_bin.dm
+++ b/code/game/objects/structures/bedsheet_bin.dm
@@ -263,7 +263,7 @@ LINEN BINS
else
. += "There are [amount] bed sheets in the bin."
-/obj/structure/bedsheetbin/update_icon()
+/obj/structure/bedsheetbin/update_icon_state()
switch(amount)
if(0)
icon_state = "linenbin-empty"
@@ -276,13 +276,13 @@ LINEN BINS
/obj/structure/bedsheetbin/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(amount)
amount = 0
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
..()
/obj/structure/bedsheetbin/burn()
amount = 0
extinguish()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/bedsheetbin/attackby(obj/item/I as obj, mob/user as mob, params)
if(istype(I, /obj/item/bedsheet))
@@ -338,7 +338,7 @@ LINEN BINS
B.loc = loc
to_chat(user, "You telekinetically remove [B] from [src].")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
if(hidden)
hidden.loc = loc
diff --git a/code/game/objects/structures/coathanger.dm b/code/game/objects/structures/coathanger.dm
index 1d2d70ebdf1..2f0f691800e 100644
--- a/code/game/objects/structures/coathanger.dm
+++ b/code/game/objects/structures/coathanger.dm
@@ -3,104 +3,103 @@
desc = "Rack that holds coats."
icon = 'icons/obj/coatrack.dmi'
icon_state = "coatrack0"
- density = 1
- anchored = 1
+ density = TRUE
+ anchored = TRUE
var/obj/item/clothing/suit/coat
- var/list/allowed = list(
+ var/static/list/allowed = list(
/obj/item/clothing/suit/storage/labcoat,
/obj/item/clothing/suit/storage/det_suit,
/obj/item/clothing/suit/storage/blueshield,
/obj/item/clothing/suit/leathercoat,
- /obj/item/clothing/suit/browntrenchcoat
+ /obj/item/clothing/suit/browntrenchcoat,
)
+
/obj/structure/coatrack/Initialize(mapload)
. = ..()
icon_state = "coatrack[rand(0, 1)]"
+
/obj/structure/coatrack/attack_hand(mob/living/user)
if(coat)
add_fingerprint(user)
- user.visible_message("[user] takes [coat] off \the [src].", "You take [coat] off the \the [src].")
+ user.visible_message("[user] takes [coat] off [src].", "You take [coat] off [src].")
coat.forceMove_turf()
user.put_in_active_hand(coat, ignore_anim = FALSE)
coat = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params)
- var/can_hang = FALSE
- for(var/T in allowed)
- if(istype(W,T))
- can_hang = TRUE
- break
- if(can_hang && !coat)
- add_fingerprint(user)
- user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].")
- coat = W
- user.drop_transfer_item_to_loc(W, src)
- update_icon()
- else
+/obj/structure/coatrack/attackby(obj/item/W, mob/living/user, params)
+ if(!move_on_rack(W, user))
return ..()
-/obj/structure/coatrack/MouseDrop_T(obj/item/W, mob/user)
+
+/obj/structure/coatrack/MouseDrop_T(obj/item/I, mob/user, params)
+ . = TRUE
+ move_on_rack(I, user)
+
+
+/obj/structure/coatrack/Bumped(atom/movable/moving_atom)
+ . = ..()
+ move_on_rack(moving_atom)
+
+
+/obj/structure/coatrack/proc/move_on_rack(atom/movable/moving_atom, mob/living/user)
+ . = FALSE
+ if(coat)
+ return .
+
var/can_hang = FALSE
- for(var/T in allowed)
- if(istype(W,T))
+ for(var/check_type in allowed)
+ if(istype(moving_atom, check_type))
can_hang = TRUE
break
- if(can_hang && !coat)
- add_fingerprint(user)
- user.visible_message("[user] hangs [W] on \the [src].", "You hang [W] on the \the [src].")
- coat = W
- user.drop_transfer_item_to_loc(W, src)
- update_icon()
- else
- return ..()
+ if(can_hang)
+ if(user && !user.drop_transfer_item_to_loc(moving_atom, src))
+ return .
+ . = TRUE
+ coat = moving_atom
+ if(user)
+ add_fingerprint(user)
+ user.visible_message("[user] hangs [coat] on [src].", "You hang [coat] on [src].")
+ else
+ visible_message("[coat] lands on [src].")
+ coat.forceMove(src)
+ update_icon(UPDATE_OVERLAYS)
-// Hanging a coat on the hanger only after a bump. Force stoping throwing
-/obj/structure/coatrack/Bumped(atom/movable/moving_atom)
- ..()
- if (coat)
- return
+/obj/structure/coatrack/update_overlays()
+ . = ..()
- for (var/T in allowed)
- if (!istype(moving_atom, T))
- continue
- visible_message("[moving_atom] lands on \the [src].")
- moving_atom.forceMove(src)
- coat = moving_atom
- update_icon()
+ if(!coat)
return
-/obj/structure/coatrack/update_icon()
- overlays.Cut()
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat))
- overlays += image(icon, icon_state = "coat_lab")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/cmo))
- overlays += image(icon, icon_state = "coat_cmo")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mad))
- overlays += image(icon, icon_state = "coat_mad")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/genetics))
- overlays += image(icon, icon_state = "coat_gen")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/chemist))
- overlays += image(icon, icon_state = "coat_chem")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/virologist))
- overlays += image(icon, icon_state = "coat_vir")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/science))
- overlays += image(icon, icon_state = "coat_sci")
- if(istype(coat, /obj/item/clothing/suit/storage/labcoat/mortician))
- overlays += image(icon, icon_state = "coat_mor")
- if(istype(coat, /obj/item/clothing/suit/storage/blueshield))
- overlays += image(icon, icon_state = "coat_blue")
- if(istype(coat, /obj/item/clothing/suit/storage/det_suit))
- overlays += image(icon, icon_state = "coat_det")
- if(istype(coat, /obj/item/clothing/suit/browntrenchcoat))
- overlays += image(icon, icon_state = "coat_brtrench")
- if(istype(coat, /obj/item/clothing/suit/leathercoat))
- overlays += image(icon, icon_state = "coat_leather")
+ var/static/list/type2overlay = list(
+ /obj/item/clothing/suit/storage/labcoat/cmo = "coat_cmo",
+ /obj/item/clothing/suit/storage/labcoat/mad = "coat_mad",
+ /obj/item/clothing/suit/storage/labcoat/genetics = "coat_gen",
+ /obj/item/clothing/suit/storage/labcoat/chemist = "coat_chem",
+ /obj/item/clothing/suit/storage/labcoat/virologist = "coat_vir",
+ /obj/item/clothing/suit/storage/labcoat/science = "coat_sci",
+ /obj/item/clothing/suit/storage/labcoat/mortician = "coat_mor",
+ /obj/item/clothing/suit/storage/labcoat = "coat_lab",
+ /obj/item/clothing/suit/storage/blueshield = "coat_det",
+ /obj/item/clothing/suit/browntrenchcoat = "coat_brtrench",
+ /obj/item/clothing/suit/leathercoat = "coat_leather",
+ )
+
+ var/coat_found = FALSE
+ for(var/path in type2overlay)
+ if(coat.type == path) // we need to check type explicitly
+ . += type2overlay[path]
+ coat_found = TRUE
+ break
+
+ if(!coat_found)
+ . += "coat_lab"
+
/obj/structure/coatrack/crowbar_act(mob/user, obj/item/I)
. = TRUE
@@ -109,16 +108,19 @@
TOOL_DISMANTLE_SUCCESS_MESSAGE
deconstruct(disassembled = TRUE)
+
/obj/structure/coatrack/wrench_act(mob/user, obj/item/I)
. = TRUE
default_unfasten_wrench(user, I, time = 10)
+
/obj/structure/coatrack/deconstruct(disassembled = FALSE)
var/mat_drop = 2
if(disassembled)
mat_drop = 10
new /obj/item/stack/sheet/wood(drop_location(), mat_drop)
if(coat)
- coat.loc = get_turf(src)
+ coat.forceMove_turf()
coat = null
..()
+
diff --git a/code/game/objects/structures/crates_lockers/closets.dm b/code/game/objects/structures/crates_lockers/closets.dm
index 91af470b716..1ac4691d5b6 100644
--- a/code/game/objects/structures/crates_lockers/closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets.dm
@@ -1,13 +1,18 @@
+GLOBAL_LIST_EMPTY(closets)
+
/obj/structure/closet
name = "closet"
desc = "It's a basic storage unit."
icon = 'icons/obj/closet.dmi'
icon_state = "closed"
- density = 1
+ density = TRUE
layer = LOW_ITEM_LAYER //Prevents items from dropping on turf visually
max_integrity = 200
integrity_failure = 50
armor = list("melee" = 20, "bullet" = 10, "laser" = 10, "energy" = 0, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 60)
+
+ /// Special marker for the closet to use default icon_closed/icon_opened states, skipping everything else.
+ var/no_overlays = FALSE
var/icon_closed = "closed" //stays here for compatibility issues
var/icon_opened = "open"
@@ -19,12 +24,13 @@
var/custom_door_overlay = null //handles overlay of door looking into screen
var/custom_open_overlay = null //handles overlay of opened door (its inner side)
+ var/ignore_density_closed = FALSE
var/opened = FALSE
var/welded = FALSE
var/locked = FALSE
var/large = TRUE
var/can_be_emaged = FALSE
- var/wall_mounted = 0 //never solid (You can always pass over it)
+ var/wall_mounted = FALSE //never solid (You can always pass over it)
var/lastbang
var/open_sound = 'sound/machines/closet_open.ogg'
var/close_sound = 'sound/machines/closet_close.ogg'
@@ -42,6 +48,7 @@
// Please dont override this unless you absolutely have to
/obj/structure/closet/Initialize(mapload)
. = ..()
+ GLOB.closets += src
if(mapload && !opened)
// Youre probably asking, why is this a 0 seconds timer AA?
// Well, I will tell you. One day, all /obj/effect/spawner will use Initialize
@@ -60,7 +67,8 @@
/obj/structure/closet/proc/take_contents()
var/itemcount = 0
for(var/obj/item/I in loc)
- if(I.density || I.anchored || I == src) continue
+ if(I.density || I.anchored || I == src)
+ continue
I.forceMove(src)
// Ensure the storage cap is respected
if(++itemcount >= storage_capacity)
@@ -68,6 +76,7 @@
// Fix for #383 - C4 deleting fridges with corpses
/obj/structure/closet/Destroy()
+ GLOB.closets -= src
dump_contents()
return ..()
@@ -162,12 +171,14 @@
playsound(loc, close_sound, close_sound_volume, TRUE, -3)
else
playsound(loc, 'sound/machines/click.ogg', close_sound_volume, TRUE, -3)
- density = TRUE
+ density = ignore_density_closed ? FALSE : TRUE
return TRUE
/obj/structure/closet/proc/toggle(mob/user)
+ . = TRUE
if(!(opened ? close() : open()))
- to_chat(user, "It won't budge!")
+ . = FALSE
+ to_chat(user, span_notice("It won't budge!"))
/obj/structure/closet/proc/bust_open()
welded = FALSE //applies to all lockers
@@ -247,10 +258,10 @@
user.visible_message("[user] welds [src] [adjective]!", "You weld [src] [adjective]!")
welded = !welded
update_icon()
- return
-/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user)
- ..()
+
+/obj/structure/closet/MouseDrop_T(atom/movable/O, mob/living/user, params)
+ . = ..()
if(istype(O, /obj/screen)) //fix for HUD elements making their way into the world -Pete
return
if(O.loc == user)
@@ -271,6 +282,7 @@
if(user != O)
user.visible_message("[user] stuffs [O] into [src]!", "You stuff [O] into [src]!")
add_fingerprint(user)
+ return TRUE
/obj/structure/closet/attack_ai(mob/user)
if(isrobot(user) && Adjacent(user)) //Robots can open/close it, but not the AI
@@ -300,8 +312,7 @@
// tk grab then use on self
/obj/structure/closet/attack_self_tk(mob/user)
add_fingerprint(user)
- if(!toggle())
- to_chat(usr, "It won't budge!")
+ toggle()
/obj/structure/closet/verb/verb_toggleopen()
set src in oview(1)
@@ -317,20 +328,43 @@
else
to_chat(usr, "This mob type can't use this verb.")
-/obj/structure/closet/update_icon() //Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- overlays.Cut()
- if(!opened)
- if(custom_door_overlay)
- overlays += "[custom_door_overlay]_door"
+
+/obj/structure/closet/update_icon(updates = ALL)
+ if(no_overlays)
+ return ..(UPDATE_ICON_STATE)
+ return ..()
+
+
+/obj/structure/closet/update_icon_state()
+ if(no_overlays)
+ icon_state = opened ? icon_opened : icon_closed
+
+
+/obj/structure/closet/update_overlays()
+ . = ..()
+ if(opened)
+ if(custom_open_overlay)
+ . += "[custom_open_overlay]_open"
else
- overlays += "[icon_state]_door" //No initials because of custom map-made closets.
- if(welded)
- overlays += "welded"
+ . += "[icon_state]_open"
else
- if(custom_open_overlay)
- overlays += "[custom_open_overlay]_open"
+ for(var/olay in apply_contents_overlays())
+ . += olay
+ if(custom_door_overlay)
+ . += "[custom_door_overlay]_door"
else
- overlays += "[icon_state]_open"
+ . += "[icon_state]_door" //No initials because of custom map-made closets.
+ if(welded)
+ . += "welded"
+
+
+/**
+ * Additional overlays for contents inside the closet. Usefull when the door is transparent.
+ */
+/obj/structure/closet/proc/apply_contents_overlays()
+ RETURN_TYPE(/list)
+ . = list()
+
// Objects that try to exit a locker by stepping were doing so successfully,
// and due to an oversight in turf/Enter() were going through walls. That
@@ -434,23 +468,26 @@
transparent = transparency
update_icon()
-/obj/structure/closet/bluespace/update_icon()
- overlays.Cut()
- icon_state = initial(icon_state)
+
+/obj/structure/closet/bluespace/update_icon_state()
+ icon_state = "[initial(icon_state)][transparent ? "_trans" : ""]"
+
+
+/obj/structure/closet/bluespace/update_overlays()
+ . = list()
if(!opened)
- if(welded)
- overlays += "welded"
if(transparent)
- icon_state += "_trans"
- overlays += "[initial(icon_state)]_door_trans"
+ . += "[initial(icon_state)]_door_trans"
else
- overlays += "[initial(icon_state)]_door"
+ . += "[initial(icon_state)]_door"
+ if(welded)
+ . += "welded"
else
if(transparent)
- icon_state += "_trans"
- overlays += "[initial(icon_state)]_open_trans"
+ . += "[initial(icon_state)]_open_trans"
else
- overlays += "[initial(icon_state)]_open"
+ . += "[initial(icon_state)]_open"
+
/obj/structure/closet/bluespace/Crossed(atom/movable/AM, oldloc)
if(AM.density)
diff --git a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
index 448e51d9949..5b71d629ad4 100644
--- a/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
+++ b/code/game/objects/structures/crates_lockers/closets/cardboardbox.dm
@@ -3,8 +3,6 @@
desc = "Just a box..."
icon = 'icons/obj/cardboard_boxes.dmi'
icon_state = "cardboard"
- icon_opened = "cardboard_open"
- icon_closed = "cardboard"
resistance_flags = FLAMMABLE
max_integrity = 70
integrity_failure = 0
@@ -13,6 +11,7 @@
open_sound_volume = 35
close_sound_volume = 35
material_drop = /obj/item/stack/sheet/cardboard
+ no_overlays = TRUE
var/decal = ""
var/amt = 4
var/move_delay = FALSE
@@ -71,7 +70,7 @@
/obj/structure/closet/cardboard/attackby(obj/item/W as obj, mob/user as mob, params)
if(src.opened)
- if(istype(W, /obj/item/wirecutters))
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
var/obj/item/wirecutters/WC = W
new /obj/item/stack/sheet/cardboard(src.loc, amt)
for(var/mob/M in viewers(src))
@@ -105,7 +104,7 @@
update_icon()
-/obj/structure/closet/cardboard/update_icon() //Not deriving, because of different logic.
+/obj/structure/closet/cardboard/update_icon_state() //Not deriving, because of different logic.
if(!opened)
if(decal)
icon_state = "cardboard_" + decal
@@ -116,3 +115,8 @@
icon_state = "cardboard_open_" + decal
else
icon_state = "cardboard_open"
+
+
+/obj/structure/closet/cardboard/update_overlays()
+ . = list()
+
diff --git a/code/game/objects/structures/crates_lockers/closets/coffin.dm b/code/game/objects/structures/crates_lockers/closets/coffin.dm
index edb3d1e50d1..eb8d7490fbd 100644
--- a/code/game/objects/structures/crates_lockers/closets/coffin.dm
+++ b/code/game/objects/structures/crates_lockers/closets/coffin.dm
@@ -11,12 +11,8 @@
close_sound = 'sound/machines/wooden_closet_close.ogg'
open_sound_volume = 25
close_sound_volume = 50
+ no_overlays = TRUE
-/obj/structure/closet/coffin/update_icon()
- if(!opened)
- icon_state = icon_closed
- else
- icon_state = icon_opened
/obj/structure/closet/coffin/sarcophagus
name = "sarcophagus"
diff --git a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
index 8370048ecd0..83f34b4eb07 100644
--- a/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/crittercrate.dm
@@ -2,6 +2,4 @@
name = "critter crate"
desc = "A crate which can sustain life for a while."
icon_state = "critter"
- icon_opened = "critteropen"
- icon_closed = "critter"
material_drop = /obj/item/stack/sheet/wood
diff --git a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
index 1b9f3d38738..3c6f12d69c7 100644
--- a/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
+++ b/code/game/objects/structures/crates_lockers/closets/fireaxe.dm
@@ -2,234 +2,204 @@
/obj/structure/closet/fireaxecabinet
name = "fire axe cabinet"
desc = "There is small label that reads \"For Emergency use only\" along with details for safe use of the axe. As if."
- icon_state = "fireaxe1000"
- icon_closed = "fireaxe1000"
- icon_opened = "fireaxe1100"
+ icon_state = "fireaxe_full_0hits"
+ icon_closed = "fireaxe_full_0hits"
+ icon_opened = "fireaxe_full_open"
anchored = TRUE
density = FALSE
- armor = list("melee" = 50, "bullet" = 20, "laser" = 0, "energy" = 100, "bomb" = 10, "bio" = 100, "rad" = 100, "fire" = 90, "acid" = 50)
- opened = TRUE
- locked = TRUE
+ no_overlays = TRUE
+ armor = list(MELEE = 50, BULLET = 20, LASER = 0, ENERGY = 100, BOMB = 10, RAD = 100, FIRE = 90, ACID = 50)
var/obj/item/twohanded/fireaxe/fireaxe
var/localopened = FALSE //Setting this to keep it from behaviouring like a normal closet and obstructing movement in the map. -Agouri
+ opened = TRUE
var/hitstaken = FALSE
+ locked = TRUE
var/smashed = FALSE
+ var/operating = FALSE
+ var/has_axe = null // Use a string over a boolean value to make the sprite names more readable
-/obj/structure/closet/fireaxecabinet/Initialize(mapload)
- . = ..()
- if(!fireaxe)
- fireaxe = new(src)
- update_icon()
+/obj/structure/closet/fireaxecabinet/Destroy()
+ if(!obj_integrity)
+ if(fireaxe)
+ fireaxe.forceMove(loc)
+ fireaxe = null
+ else
+ QDEL_NULL(fireaxe)
+ return ..()
+
+
+/obj/structure/closet/fireaxecabinet/populate_contents()
+ fireaxe = new(src)
+ has_axe = "full"
+ update_icon(UPDATE_ICON_STATE) // So its initial icon doesn't show it without the fireaxe
/obj/structure/closet/fireaxecabinet/examine(mob/user)
. = ..()
- . += "Use a multitool to lock/unlock it."
+ if(!smashed)
+ . += span_notice("Use a multitool to lock/unlock it.")
+ else
+ . += span_notice("It is damaged beyond repair.")
-/obj/structure/closet/fireaxecabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob) //Marker -Agouri
+
+/obj/structure/closet/fireaxecabinet/attackby(obj/item/I, mob/living/user)
+ add_fingerprint(user)
if(isrobot(user) || locked)
- if(istype(O, /obj/item/multitool))
- to_chat(user, "Resetting circuitry...")
- playsound(user, 'sound/machines/lockreset.ogg', 50, 1)
- if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src))
- add_fingerprint(user)
- locked = FALSE
- to_chat(user, " You disable the locking modules.")
- update_icon()
- return
- else if(istype(O, /obj/item))
- user.changeNext_move(CLICK_CD_MELEE)
- var/obj/item/W = O
- if(smashed || localopened)
- if(localopened)
- add_fingerprint(user)
- localopened = FALSE
- update_icon_closing()
+ if(ismultitool(I))
+ to_chat(user, span_warning("Resetting circuitry..."))
+ playsound(user, 'sound/machines/lockreset.ogg', 50, TRUE)
+ if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src))
return
- else
- user.do_attack_animation(src)
- playsound(user, 'sound/effects/glasshit.ogg', 100, 1) //We don't want this playing every time
- if(W.force < 15)
- to_chat(user, "The cabinet's protective glass glances off the hit.")
- else
- hitstaken++
- if(hitstaken == 4)
- playsound(user, 'sound/effects/glassbr3.ogg', 100, 1) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
- smashed = TRUE
- locked = FALSE
- localopened = TRUE
- add_fingerprint(user)
- update_icon()
+
+ locked = FALSE
+ to_chat(user, span_caution("You disable the locking modules."))
+ update_icon(UPDATE_ICON_STATE)
+ return
+
+ user.changeNext_move(CLICK_CD_MELEE)
+ if(smashed || localopened)
+ if(localopened)
+ operate_panel()
+ return
+
+ user.do_attack_animation(src)
+ playsound(user, 'sound/effects/glasshit.ogg', 100, TRUE) //We don't want this playing every time
+ if(I.force < 15)
+ to_chat(user, span_notice("The cabinet's protective glass glances off the hit."))
+ else
+ hitstaken++
+ if(hitstaken == 4)
+ playsound(user, 'sound/effects/glassbr3.ogg', 100, TRUE) //Break cabinet, receive goodies. Cabinet's fucked for life after that.
+ smashed = TRUE
+ locked = FALSE
+ localopened = TRUE
+ update_icon(UPDATE_ICON_STATE)
return
- if(istype(O, /obj/item/twohanded/fireaxe) && localopened)
+
+ if(istype(I, /obj/item/twohanded/fireaxe) && localopened)
if(!fireaxe)
- var/obj/item/twohanded/fireaxe/F = O
- if(F.wielded)
- to_chat(user, "Unwield \the [F] first.")
- return
- if(!user.drop_item_ground(F))
- to_chat(user, "\The [F] stays stuck to your hands!")
+ var/obj/item/twohanded/fireaxe/placed_axe = I
+ if(HAS_TRAIT(placed_axe, TRAIT_WIELDED))
+ to_chat(user, span_warning("Unwield [placed_axe] first."))
return
- add_fingerprint(user)
- fireaxe = F
- contents += F
- to_chat(user, "You place \the [F] back in the [name].")
- update_icon()
- else
- if(smashed)
+ if(!user.drop_transfer_item_to_loc(placed_axe, src))
+ to_chat(user, span_warning("[placed_axe] stays stuck to your hands!"))
return
- else
- add_fingerprint(user)
- localopened = !localopened
- if(localopened)
- update_icon_opening()
- else
- update_icon_closing()
- else
+ fireaxe = placed_axe
+ has_axe = "full"
+ to_chat(user, span_notice("You place [placed_axe] back in the [name]."))
+ update_icon(UPDATE_ICON_STATE)
+ return
+
if(smashed)
return
- if(istype(O, /obj/item/multitool))
- if(localopened)
- add_fingerprint(user)
- localopened = FALSE
- update_icon_closing()
- return
- else
- to_chat(user, "Resetting circuitry...")
- playsound(user, 'sound/machines/lockenable.ogg', 50, 1)
- if(do_after(user, 20 * O.toolspeed * gettoolspeedmod(user), target = src))
- add_fingerprint(user)
- locked = TRUE
- to_chat(user, " You re-enable the locking modules.")
- return
- else
- add_fingerprint(user)
- localopened = !localopened
- if(localopened)
- update_icon_opening()
- else
- update_icon_closing()
-/obj/structure/closet/fireaxecabinet/attack_hand(mob/user as mob)
+ operate_panel()
+ return
+
+ if(smashed)
+ return
+
+ if(ismultitool(I))
+ if(localopened)
+ operate_panel()
+ return
+
+ to_chat(user, span_warning("Resetting circuitry..."))
+ playsound(user, 'sound/machines/lockenable.ogg', 50, TRUE)
+ if(!do_after_once(user, 2 SECONDS * I.toolspeed, target = src))
+ return
+
+ locked = TRUE
+ to_chat(user, span_caution("You re-enable the locking modules."))
+ return
+
+ operate_panel()
+
+
+/obj/structure/closet/fireaxecabinet/attack_hand(mob/user)
if(locked)
- to_chat(user, "The cabinet won't budge!")
+ to_chat(user, span_warning("The cabinet won't budge!"))
return
- if(localopened)
- if(fireaxe)
- add_fingerprint(user)
- fireaxe.forceMove_turf()
- user.put_in_hands(fireaxe, ignore_anim = FALSE)
- to_chat(user, "You take \the [fireaxe] from the [src].")
- fireaxe = null
- add_fingerprint(user)
- update_icon()
- else
- if(smashed)
- return
- else
- add_fingerprint(user)
- localopened = !localopened
- if(localopened)
- update_icon_opening()
- else
- update_icon_closing()
+ if(localopened && fireaxe)
+ fireaxe.forceMove_turf()
+ user.put_in_hands(fireaxe, ignore_anim = FALSE)
+ to_chat(user, span_notice("You take [fireaxe] from [src]."))
+ has_axe = "empty"
+ fireaxe = null
- else
add_fingerprint(user)
- localopened = !localopened //I'm pretty sure we don't need an if(smashed) in here. In case I'm wrong and it fucks up teh cabinet, **MARKER**. -Agouri
- if(localopened)
- update_icon_opening()
- else
- update_icon_closing()
+ update_icon(UPDATE_ICON_STATE)
+ return
+
+ if(smashed)
+ return
-/obj/structure/closet/fireaxecabinet/attack_tk(mob/user as mob)
+ operate_panel()
+
+
+/obj/structure/closet/fireaxecabinet/attack_tk(mob/user)
if(localopened && fireaxe)
fireaxe.forceMove(loc)
- to_chat(user, "You telekinetically remove \the [fireaxe].")
+ to_chat(user, span_notice("You telekinetically remove \the [fireaxe]."))
+ has_axe = "empty"
fireaxe = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
attack_hand(user)
-/obj/structure/closet/fireaxecabinet/verb/toggle_openness() //nice name, huh? HUH?! -Erro //YEAH -Agouri
- set name = "Open/Close"
- set category = "Object"
- if(isrobot(usr) || locked || smashed)
- if(locked)
- to_chat(usr, "The cabinet won't budge!")
- else if(smashed)
- to_chat(usr, "The protective glass is broken!")
+/obj/structure/closet/fireaxecabinet/attack_ai(mob/user)
+ if(smashed)
+ to_chat(user, span_warning("The security of the cabinet is compromised."))
return
- localopened = !localopened
- update_icon()
+ locked = !locked
+ if(locked)
+ to_chat(user, span_warning("Cabinet locked."))
+ else
+ to_chat(user, span_notice("Cabinet unlocked."))
-/obj/structure/closet/fireaxecabinet/verb/remove_fire_axe()
- set name = "Remove Fire Axe"
- set category = "Object"
- if(isrobot(usr))
+/obj/structure/closet/fireaxecabinet/proc/operate_panel()
+ if(operating)
return
+ operating = TRUE
+ localopened = !localopened
+ do_animate()
+ operating = FALSE
- if(localopened)
- if(fireaxe)
- fireaxe.forceMove_turf()
- usr.put_in_hands(fireaxe, ignore_anim = FALSE)
- to_chat(usr, "You take \the [fireaxe] from the [src].")
- fireaxe = null
- else
- to_chat(usr, "The [src] is empty.")
- else
- to_chat(usr, "The [src] is closed.")
- update_icon()
-/obj/structure/closet/fireaxecabinet/attack_ai(mob/user as mob)
- if(smashed)
- to_chat(user, "The security of the cabinet is compromised.")
- return
+/obj/structure/closet/fireaxecabinet/proc/do_animate()
+ if(!localopened)
+ flick("fireaxe_[has_axe]_closing", src)
else
- locked = !locked
- if(locked)
- to_chat(user, "Cabinet locked.")
- else
- to_chat(user, "Cabinet unlocked.")
+ flick("fireaxe_[has_axe]_opening", src)
+ sleep(1 SECONDS)
+ update_icon(UPDATE_ICON_STATE)
-/obj/structure/closet/fireaxecabinet/proc/update_icon_opening()
- var/hasaxe = fireaxe != null
- icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]opening"
- spawn(10)
- update_icon()
-/obj/structure/closet/fireaxecabinet/proc/update_icon_closing()
- var/hasaxe = fireaxe != null
- icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]closing"
- spawn(10)
- update_icon()
+/obj/structure/closet/fireaxecabinet/update_icon_state()
+ if(localopened && !smashed)
+ icon_state = "fireaxe_[has_axe]_open"
+ else
+ icon_state = "fireaxe_[has_axe]_[hitstaken]hits"
-/obj/structure/closet/fireaxecabinet/update_icon() //Template: fireaxe[has fireaxe][is opened][hits taken][is smashed]. If you want the opening or closing animations, add "opening" or "closing" right after the numbers
- var/hasaxe = fireaxe != null
- icon_state = "fireaxe[hasaxe][localopened][hitstaken][smashed]"
/obj/structure/closet/fireaxecabinet/open()
return
+
/obj/structure/closet/fireaxecabinet/close()
return
+
/obj/structure/closet/fireaxecabinet/welder_act(mob/user, obj/item/I) //A bastion of sanity in a sea of madness
return
-/obj/structure/closet/fireaxecabinet/Destroy()
- if(!obj_integrity)
- if(fireaxe)
- fireaxe.forceMove(loc)
- fireaxe = null
- else
- QDEL_NULL(fireaxe)
- return ..()
+
//mining "fireaxe"
/obj/structure/fishingrodcabinet
@@ -240,42 +210,45 @@
anchored = TRUE
var/obj/item/twohanded/fishingrod/olreliable //what the fuck?
-/obj/structure/fishingrodcabinet/Initialize()
+
+/obj/structure/fishingrodcabinet/Initialize(mapload)
. = ..()
- if(!olreliable)
- olreliable = new(src)
- update_icon()
+ olreliable = new(src)
+ update_icon(UPDATE_OVERLAYS)
+
-/obj/structure/fishingrodcabinet/update_icon()
+/obj/structure/fishingrodcabinet/update_overlays()
. = ..()
- cut_overlays()
if(olreliable)
- add_overlay("rod")
+ . += "rod"
-/obj/structure/fishingrodcabinet/attackby(var/obj/item/O as obj, var/mob/living/user as mob)
- if(istype(O, /obj/item/twohanded/fishingrod))
- var/obj/item/twohanded/fishingrod/R = O
- if(R.wielded)
- to_chat(user, "Unwield \the [R] first.")
- return
- if(!user.drop_item_ground(R))
- to_chat(user, "\The [R] stays stuck to your hands!")
- return
- add_fingerprint(user)
- olreliable = R
- contents += R
- to_chat(user, "You place \the [R] back in the [name].")
- update_icon()
+/obj/structure/fishingrodcabinet/attackby(obj/item/I, mob/living/user)
+ if(!istype(I, /obj/item/twohanded/fishingrod))
+ return ..()
+ var/obj/item/twohanded/fishingrod/rod = I
+ if(HAS_TRAIT(rod, TRAIT_WIELDED))
+ to_chat(user, span_warning("Unwield [rod] first."))
+ return
+ if(!user.drop_transfer_item_to_loc(rod, src))
+ to_chat(user, span_warning("[rod] stays stuck to your hands!"))
+ return
-/obj/structure/fishingrodcabinet/attack_hand(mob/user as mob)
- if(olreliable)
- add_fingerprint(user)
- olreliable.forceMove_turf()
- user.put_in_hands(olreliable, ignore_anim = FALSE)
- to_chat(user, "You take \the [olreliable] from the [src].")
- olreliable = null
+ olreliable = rod
+ to_chat(user, span_notice("You place [rod] back in [src]."))
+ update_icon(UPDATE_OVERLAYS)
+
+
+
+/obj/structure/fishingrodcabinet/attack_hand(mob/user)
+ if(!olreliable)
+ return ..()
+
+ add_fingerprint(user)
+ olreliable.forceMove_turf()
+ user.put_in_hands(olreliable, ignore_anim = FALSE)
+ to_chat(user, span_notice("You take [olreliable] from [src]."))
+ olreliable = null
+ update_icon(UPDATE_OVERLAYS)
- add_fingerprint(user)
- update_icon()
diff --git a/code/game/objects/structures/crates_lockers/closets/job_closets.dm b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
index e2805382c05..1b71eb4811b 100644
--- a/code/game/objects/structures/crates_lockers/closets/job_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/job_closets.dm
@@ -27,6 +27,8 @@
new /obj/item/clothing/under/sl_suit(src)
new /obj/item/clothing/under/rank/bartender(src)
new /obj/item/clothing/under/rank/bartender(src)
+ new /obj/item/clothing/under/rank/bartender/skirt(src)
+ new /obj/item/clothing/under/rank/bartender/skirt(src)
new /obj/item/clothing/under/dress/dress_saloon
new /obj/item/clothing/suit/wcoat(src)
new /obj/item/clothing/suit/wcoat(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
index fcd763292e6..5665c22e234 100644
--- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm
+++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm
@@ -2,8 +2,6 @@
/obj/structure/closet/malf/suits
desc = "It's a storage unit for operational gear."
icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
/obj/structure/closet/malf/suits/populate_contents()
new /obj/item/tank/jetpack/void(src)
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
index ab676f2564b..834f1565aa7 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
@@ -43,7 +43,7 @@
/obj/structure/closet/secure_closet/freezer/meat/populate_contents()
for(var/i in 1 to 4)
- new /obj/item/reagent_containers/food/snacks/meat/monkey(src)
+ new /obj/item/reagent_containers/food/snacks/meat/humanoid/monkey(src)
/obj/structure/closet/secure_closet/freezer/meat/open
req_access = null
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
index 4f662b78086..bed6882aab6 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/guncabinet.dm
@@ -2,43 +2,35 @@
name = "gun cabinet"
req_access = list(ACCESS_ARMORY)
icon = 'icons/obj/guncabinet.dmi'
- icon_state = "base"
+ icon_state = "guncabinet"
-/obj/structure/closet/secure_closet/guncabinet/toggle()
- ..()
- update_icon()
-/obj/structure/closet/secure_closet/guncabinet/update_icon()
- overlays.Cut()
- if(opened)
- overlays += icon(icon,"door_open")
- else
- var/lazors = 0
- var/shottas = 0
- for(var/obj/item/gun/G in contents)
- if(istype(G, /obj/item/gun/energy))
- lazors++
- if(istype(G, /obj/item/gun/projectile/))
- shottas++
- if(lazors || shottas)
- for(var/i = 0 to 2)
- var/image/gun = image(icon(src.icon))
+/obj/structure/closet/secure_closet/guncabinet/Initialize(mapload)
+ . = ..()
+ // we need to update our guns inside, after closet is filled
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_OVERLAYS), 1 SECONDS)
- if(lazors > 0 && (shottas <= 0 || prob(50)))
- lazors--
- gun.icon_state = "laser"
- else if(shottas > 0)
- shottas--
- gun.icon_state = "projectile"
- gun.pixel_x = i*4
- overlays += gun
+/obj/structure/closet/secure_closet/guncabinet/apply_contents_overlays()
+ . = ..()
- overlays += icon(src.icon,"door")
+ var/lazors = 0
+ var/shottas = 0
+ for(var/thing in contents)
+ if(istype(thing, /obj/item/gun/energy))
+ lazors++
+ if(istype(thing, /obj/item/gun/projectile))
+ shottas++
+
+ if(lazors || shottas)
+ for(var/i = 1 to 2)
+ var/choise = ""
+ if(lazors > 0 && (shottas <= 0 || prob(50)))
+ lazors--
+ choise = "laser"
+ else if(shottas > 0)
+ shottas--
+ choise = "projectile"
+ if(choise)
+ . += image(icon, icon_state = choise, pixel_x = i * 4)
- if(broken)
- overlays += icon(src.icon,"door_broken")
- else if(locked)
- overlays += icon(src.icon,"door_locked")
- else
- overlays += icon(src.icon,"door")
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
index ab0efd535b0..03a15e37949 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
@@ -19,3 +19,4 @@
new /obj/item/storage/box/disks_plantgene(src)
new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
new /obj/item/clothing/suit/hooded/wintercoat/hydro(src)
+ new /obj/item/clothing/under/rank/hydroponics/skirt(src)
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 9822f33c632..491ad76e1e9 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
@@ -1,47 +1,63 @@
+#define CLOSET_BREAKOUT_TIME (2 MINUTES)
+
/obj/structure/closet/secure_closet
name = "secure locker"
desc = "It's an immobile card-locked storage unit."
icon = 'icons/obj/closet.dmi'
icon_state = "secure"
- density = 1
- opened = 0
- locked = 1
- broken = 0
+ density = TRUE
+ opened = FALSE
+ locked = TRUE
+ broken = FALSE
can_be_emaged = TRUE
max_integrity = 250
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
damage_deflection = 20
- wall_mounted = 0 //never solid (You can always pass over it)
+ wall_mounted = FALSE //never solid (You can always pass over it)
/obj/structure/closet/secure_closet/can_open()
- if(!..())
- return 0
if(locked)
- return 0
+ return FALSE
return ..()
/obj/structure/closet/secure_closet/close()
- if(..())
- if(broken)
- update_icon()
- return 1
- else
- return 0
+ . = ..()
+ if(. && broken)
+ update_icon()
+
/obj/structure/closet/secure_closet/emp_act(severity)
- for(var/obj/O in src)
- O.emp_act(severity)
+ for(var/obj/object in src)
+ object.emp_act(severity)
+
+ if(broken || opened)
+ return
+
+ if(prob(50 / severity))
+ locked = !locked
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
+
+ if(prob(20 / severity))
+ if(locked)
+ req_access = list()
+ req_access += pick(get_all_accesses())
+ return
+ open()
+
+
+/obj/structure/closet/secure_closet/emag_act(mob/user)
if(!broken)
- if(prob(50/severity))
- locked = !locked
- update_icon()
- if(prob(20/severity) && !opened)
- if(!locked)
- open()
- else
- req_access = list()
- req_access += pick(get_all_accesses())
- ..()
+ add_attack_logs(user, src, "emagged")
+ broken = TRUE
+ locked = FALSE
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_appearance), UPDATE_ICON|UPDATE_DESC), 1 SECONDS)
+ if(user)
+ to_chat(user, "You break the lock on [src].")
+
/obj/structure/closet/secure_closet/proc/togglelock(mob/living/user)
if(!istype(user) || user.incapacitated())
@@ -71,15 +87,6 @@
if(Adjacent(user))
togglelock(user)
-/obj/structure/closet/secure_closet/emag_act(mob/user)
- if(!broken)
- add_attack_logs(user, src, "emagged")
- broken = TRUE
- locked = FALSE
- overlays += overlay_sparking
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
- if(user)
- to_chat(user, "You break the lock on \the [src].")
/obj/structure/closet/secure_closet/attack_hand(mob/user)
add_fingerprint(user)
@@ -102,60 +109,75 @@
else
to_chat(usr, "This mob type can't use this verb.")
-/obj/structure/closet/secure_closet/update_icon()//Putting the welded stuff in updateicon() so it's easy to overwrite for special cases (Fridges, cabinets, and whatnot)
- ..()
- if(!opened)
- //overlays += overlay_locker //uncomment if you want to add locker overlay to all secure closets
- if(!broken)
- if(locked)
- overlays += overlay_locked
- else
- overlays += overlay_unlocked
-
-/obj/structure/closet/secure_closet/container_resist(var/mob/living/L)
- var/breakout_time = 2 //2 minutes by default
+
+/obj/structure/closet/secure_closet/update_overlays()
+ . = ..()
+ if(!opened && !broken)
+ if(locked)
+ . += overlay_locked
+ else
+ . += overlay_unlocked
+
+
+/obj/structure/closet/secure_closet/update_desc(updates = ALL)
+ . = ..()
+ if(broken)
+ desc = "It appears to be broken."
+ else
+ desc = initial(desc)
+
+
+/obj/structure/closet/secure_closet/container_resist(mob/living/user)
if(opened)
- if(L.loc == src)
- L.forceMove(get_turf(src)) // Let's just be safe here
+ if(user.loc == src)
+ user.forceMove(get_turf(src)) // Let's just be safe here
return //Door's open... wait, why are you in it's contents then?
+
if(!locked && !welded)
return //It's a secure closet, but isn't locked. Easily escapable from, no need to 'resist'
//okay, so the closet is either welded or locked... resist!!!
- to_chat(L, "You lean on the back of \the [src] and start pushing the door open. (this will take about [breakout_time] minutes)")
- for(var/mob/O in viewers(src))
- O.show_message("The [src] begins to shake violently!", 1)
-
-
- spawn(0)
- if(do_after(usr,(breakout_time*60*10), target = src)) //minutes * 60seconds * 10deciseconds
- if(!src || !L || L.stat != CONSCIOUS || L.loc != src || opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
- return
-
- //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
- if(!locked && !welded)
- return
-
- //Well then break it!
- desc = "It appears to be broken."
- flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS)
- sleep(10)
- flick_overlay_view(image(icon=icon, icon_state=overlay_sparking), 1 SECONDS)
- sleep(10)
- broken = 1
- locked = 0
- welded = 0
- update_icon()
- to_chat(usr, "You successfully break out!")
- for(var/mob/O in viewers(L.loc))
- O.show_message("\the [usr] successfully broke out of \the [src]!", 1)
- if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
- var/obj/structure/bigDelivery/BD = loc
- BD.attack_hand(usr)
- if(isobj(loc))
- var/obj/loc_as_obj = loc
- loc_as_obj.container_resist(L)
- open()
+ visible_message(
+ span_danger("[src] begins to shake violently!"),
+ span_warning("You lean on the back of [src] and start pushing the door open. (this will take about [CLOSET_BREAKOUT_TIME / 10] minutes.)")
+ )
+ INVOKE_ASYNC(src, PROC_REF(resist_async), user)
+
+
+/obj/structure/closet/secure_closet/proc/resist_async(mob/living/user)
+ if(!do_after(user, CLOSET_BREAKOUT_TIME, target = src))
+ return
+
+ //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
+ if(!src || !user || user.incapacitated() || user.loc != src || opened)
+ return
+
+ //Perform the same set of checks as above for weld and lock status to determine if there is even still a point in 'resisting'...
+ if(!locked && !welded)
+ return
+
+ //Well then break it!
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS)
+ broken = TRUE
+ locked = FALSE
+ welded = FALSE
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
+ visible_message(
+ span_danger("[user] successfully broke out of [src]!"),
+ span_warning("You successfully break out!"),
+ )
+
+ if(istype(loc, /obj/structure/bigDelivery)) //Do this to prevent contents from being opened into nullspace (read: bluespace)
+ var/obj/structure/bigDelivery/BD = loc
+ BD.attack_hand(user)
+
+ if(isobj(loc))
+ var/obj/loc_as_obj = loc
+ loc_as_obj.container_resist(user)
+
+ open()
+
/obj/structure/closet/secure_closet/screwdriver_act(mob/living/user, obj/item/I)
. = ..()
diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
index 5ce2ef9270e..c2f23dad71b 100644
--- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm
+++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm
@@ -38,35 +38,6 @@
new /obj/item/clothing/accessory/medal/service(src)
new /obj/item/storage/garmentbag/hop(src)
-/*/obj/structure/closet/secure_closet/hop2 //dont realy need this because of garment bag
- name = "head of personnel's attire"
- req_access = list(ACCESS_HOP)
- icon_state = "hopsecure1"
- icon_closed = "hopsecure"
- icon_locked = "hopsecure1"
- icon_opened = "hopsecureopen"
- icon_broken = "hopsecurebroken"
- icon_off = "hopsecureoff"
-
-/obj/structure/closet/secure_closet/hop2/populate_contents()
- new /obj/item/clothing/neck/mantle/head_of_personnel(src)
- new /obj/item/clothing/neck/cloak/head_of_personnel(src)
- new /obj/item/clothing/under/dress/dress_hr(src)
- new /obj/item/clothing/under/lawyer/female(src)
- new /obj/item/clothing/under/lawyer/black(src)
- new /obj/item/clothing/under/lawyer/red(src)
- new /obj/item/clothing/under/lawyer/oldman(src)
- new /obj/item/clothing/shoes/brown(src)
- new /obj/item/clothing/shoes/black(src)
- new /obj/item/clothing/shoes/leather(src)
- new /obj/item/clothing/shoes/white(src)
- new /obj/item/clothing/under/rank/head_of_personnel_whimsy(src)
- new /obj/item/clothing/under/rank/head_of_personnel_alt(src)
- new /obj/item/clothing/under/rank/head_of_personnel_f(src)
- new /obj/item/clothing/suit/hop_jacket(src)
- new /obj/item/clothing/suit/hop_jacket/female(src)
-*/
-
/obj/structure/closet/secure_closet/hos
name = "head of security's locker"
req_access = list(ACCESS_HOS)
diff --git a/code/game/objects/structures/crates_lockers/closets/statue.dm b/code/game/objects/structures/crates_lockers/closets/statue.dm
index bb2509c6423..e993011aa0b 100644
--- a/code/game/objects/structures/crates_lockers/closets/statue.dm
+++ b/code/game/objects/structures/crates_lockers/closets/statue.dm
@@ -6,6 +6,7 @@
density = 1
anchored = 1
max_integrity = 0 //destroying the statue kills the mob within
+ no_overlays = TRUE
var/intialTox = 0 //these are here to keep the mob from taking damage from things that logically wouldn't affect a rock
var/intialFire = 0 //it's a little sloppy I know but it was this or the GODMODE flag. Lesser of two evils.
var/intialBrute = 0
@@ -94,7 +95,7 @@
/obj/structure/closet/statue/welder_act()
return
-/obj/structure/closet/statue/MouseDrop_T()
+/obj/structure/closet/statue/MouseDrop_T(atom/dropping, mob/user, params)
return
/obj/structure/closet/statue/relaymove()
@@ -106,7 +107,7 @@
/obj/structure/closet/statue/verb_toggleopen()
return
-/obj/structure/closet/statue/update_icon()
+/obj/structure/closet/statue/update_icon_state()
return
/obj/structure/closet/statue/proc/shatter(mob/user)
diff --git a/code/game/objects/structures/crates_lockers/closets/syndicate.dm b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
index ab5070d0871..90d830553c4 100644
--- a/code/game/objects/structures/crates_lockers/closets/syndicate.dm
+++ b/code/game/objects/structures/crates_lockers/closets/syndicate.dm
@@ -2,8 +2,6 @@
name = "armoury closet"
desc = "Why is this here?"
icon_state = "syndicate"
- icon_closed = "syndicate"
- icon_opened = "syndicateopen"
/obj/structure/closet/syndicate/personal
diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
index dc3a1aacb38..8abafd26447 100644
--- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
+++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm
@@ -16,8 +16,6 @@
name = "emergency closet"
desc = "It's a storage unit for emergency breathmasks and o2 tanks."
icon_state = "emergency"
- icon_closed = "emergency"
- icon_opened = "emergencyopen"
/obj/structure/closet/emcloset/anchored
anchored = TRUE
@@ -67,8 +65,6 @@
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
icon_state = "firecloset"
- icon_closed = "firecloset"
- icon_opened = "fireclosetopen"
/obj/structure/closet/firecloset/populate_contents()
new /obj/item/extinguisher(src)
@@ -93,8 +89,6 @@
name = "tool closet"
desc = "It's a storage unit for tools."
icon_state = "toolcloset"
- icon_closed = "toolcloset"
- icon_opened = "toolclosetopen"
/obj/structure/closet/toolcloset/populate_contents()
if(prob(40))
@@ -149,8 +143,6 @@
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
icon_state = "bombsuit"
- icon_closed = "bombsuit"
- icon_opened = "bombsuitopen"
/obj/structure/closet/bombcloset/populate_contents()
new /obj/item/clothing/suit/bomb_suit( src )
@@ -163,8 +155,6 @@
name = "\improper EOD closet"
desc = "It's a storage unit for explosion-protective suits."
icon_state = "bombsuitsec"
- icon_closed = "bombsuitsec"
- icon_opened = "bombsuitsecopen"
/obj/structure/closet/bombclosetsecurity/populate_contents()
new /obj/item/clothing/suit/bomb_suit/security( src )
@@ -179,8 +169,6 @@
name = "fire-safety closet"
desc = "It's a storage unit for fire-fighting supplies."
icon_state = "hydrant"
- icon_closed = "hydrant"
- icon_opened = "hydrant_open"
anchored = 1
density = 0
wall_mounted = 1
diff --git a/code/game/objects/structures/crates_lockers/crates.dm b/code/game/objects/structures/crates_lockers/crates.dm
index 4eb7efc4da1..06c801cad14 100644
--- a/code/game/objects/structures/crates_lockers/crates.dm
+++ b/code/game/objects/structures/crates_lockers/crates.dm
@@ -3,8 +3,6 @@
desc = "A rectangular steel crate."
icon = 'icons/obj/crates.dmi'
icon_state = "crate"
- icon_opened = "crateopen"
- icon_closed = "crate"
climbable = TRUE
open_sound = 'sound/machines/crate_open.ogg'
close_sound = 'sound/machines/crate_close.ogg'
@@ -15,11 +13,17 @@
// A list of beacon names that the crate will announce the arrival of, when delivered.
var/list/announce_beacons = list()
-/obj/structure/closet/crate/update_icon()
- //..() is not needed here because of different overlay handling logic for crates
- overlays.Cut()
+
+/obj/structure/closet/crate/update_icon_state()
+ icon_state = "[initial(icon_state)][opened ? "open" : ""]"
+
+
+/obj/structure/closet/crate/update_overlays()
+ // . = ..() is not needed here because of different overlay handling logic for crates
+ . = list()
if(manifest)
- overlays += "manifest"
+ . += "manifest"
+
/obj/structure/closet/crate/can_open()
return TRUE
@@ -53,8 +57,9 @@
O.forceMove(loc)
for(var/mob/M in src) //Mobs
M.forceMove(loc)
- icon_state = icon_opened
+
opened = TRUE
+ update_icon()
if(climbable)
structure_shaken()
@@ -80,8 +85,8 @@
O.forceMove(src)
itemcount++
- icon_state = icon_closed
opened = FALSE
+ update_icon()
return TRUE
@@ -162,12 +167,11 @@
desc = "A secure crate."
name = "Secure crate"
icon_state = "securecrate"
- icon_opened = "securecrateopen"
- icon_closed = "securecrate"
- var/redlight = "securecrater"
- var/greenlight = "securecrateg"
- var/sparks = "securecratesparks"
- var/emag = "securecrateemag"
+ overlay_locked = "securecrater"
+ overlay_unlocked = "securecrateg"
+ overlay_sparking = "securecratesparks"
+ /// Overlay for crate with broken lock
+ var/overlay_broken = "securecrateemag"
max_integrity = 500
armor = list("melee" = 30, "bullet" = 50, "laser" = 50, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 80)
damage_deflection = 25
@@ -176,17 +180,16 @@
locked = TRUE
can_be_emaged = TRUE
-/obj/structure/closet/crate/secure/update_icon()
- ..()
- overlays.Cut()
- if(manifest)
- overlays += "manifest"
+
+/obj/structure/closet/crate/secure/update_overlays()
+ . = ..()
if(locked)
- overlays += redlight
- else if(broken)
- overlays += emag
+ . += overlay_locked
+ else if(broken && overlay_broken)
+ . += overlay_broken
else
- overlays += greenlight
+ . += overlay_unlocked
+
/obj/structure/closet/crate/secure/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1)
if(prob(tamperproof) && damage_amount >= DAMAGE_PRECISION)
@@ -204,9 +207,16 @@
explosion(get_turf(src), 0, 1, 5, 5, cause = src)
qdel(src)
+
/obj/structure/closet/crate/secure/can_open()
return !locked
+
+/obj/structure/closet/crate/secure/AltClick(mob/living/user)
+ if(iscarbon(user) && !user.incapacitated() && Adjacent(user))
+ togglelock(user)
+
+
/obj/structure/closet/crate/secure/proc/togglelock(mob/user)
if(opened)
to_chat(user, "Close the crate first.")
@@ -222,6 +232,7 @@
else
to_chat(user, "Access Denied")
+
/obj/structure/closet/crate/secure/verb/verb_togglelock()
set src in oview(1) // One square distance
set category = null
@@ -236,6 +247,7 @@
else
to_chat(usr, "This mob type can't use this verb.")
+
/obj/structure/closet/crate/secure/attack_hand(mob/user)
if(manifest)
add_fingerprint(user)
@@ -253,99 +265,74 @@
else
toggle(user, by_hand = TRUE)
+
/obj/structure/closet/crate/secure/closed_item_click(mob/user)
togglelock(user)
+
/obj/structure/closet/crate/secure/emag_act(mob/user)
if(locked)
add_attack_logs(user, src, "emagged")
- overlays += sparks
- spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- playsound(src.loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
- src.locked = 0
- src.broken = 1
- update_icon()
+ locked = FALSE
+ broken = TRUE
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
if(user)
- to_chat(user, "You unlock \the [src].")
+ to_chat(user, span_notice("You unlock [src]."))
+
/obj/structure/closet/crate/secure/emp_act(severity)
- for(var/obj/O in src)
- O.emp_act(severity)
- if(!broken && !opened && prob(50/severity))
- if(!locked)
- src.locked = 1
+ for(var/obj/object in src)
+ object.emp_act(severity)
+
+ if(broken || opened)
+ return
+
+ if(prob(50 / severity))
+ locked = !locked
+ playsound(loc, "sparks", 50, TRUE, SHORT_RANGE_SOUND_EXTRARANGE)
+ flick_overlay_view(image(icon, src, overlay_sparking), 1 SECONDS)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 1 SECONDS)
+
+ if(prob(20 / severity))
+ if(locked)
+ req_access = list()
+ req_access += pick(get_all_accesses())
else
- overlays += sparks
- spawn(6) overlays -= sparks //Tried lots of stuff but nothing works right. so i have to use this *sadface*
- playsound(src.loc, 'sound/effects/sparks4.ogg', 75, TRUE)
- src.locked = 0
- update_icon()
- if(!opened && prob(20/severity))
- if(!locked)
open()
- else
- src.req_access = list()
- src.req_access += pick(get_all_accesses())
- ..()
+
/obj/structure/closet/crate/plastic
name = "plastic crate"
desc = "A rectangular plastic crate."
icon_state = "plasticcrate"
- icon_opened = "plasticcrateopen"
- icon_closed = "plasticcrate"
/obj/structure/closet/crate/internals
desc = "A internals crate."
name = "internals crate"
icon_state = "o2crate"
- icon_opened = "o2crateopen"
- icon_closed = "o2crate"
/obj/structure/closet/crate/trashcart
desc = "A heavy, metal trashcart with wheels."
name = "trash Cart"
icon_state = "trashcart"
- icon_opened = "trashcartopen"
- icon_closed = "trashcart"
pull_push_speed_modifier = 1
/obj/structure/closet/crate/trashcart/gibs
desc = "A heavy, metal trashcart with wheels. You better don't ask."
name = "trash cart with gibs"
icon_state = "trashcartgib"
- icon_opened = "trashcartgibopen"
- icon_closed = "trashcartgib"
-
-/*these aren't needed anymore
-/obj/structure/closet/crate/hat
- desc = "A crate filled with Valuable Collector's Hats!."
- name = "Hat Crate"
- icon_state = "crate"
- icon_opened = "crateopen"
- icon_closed = "crate"
-
-/obj/structure/closet/crate/contraband
- name = "Poster crate"
- desc = "A random assortment of posters manufactured by providers NOT listed under Nanotrasen's whitelist."
- icon_state = "crate"
- icon_opened = "crateopen"
- icon_closed = "crate"
-*/
/obj/structure/closet/crate/medical
desc = "A medical crate."
name = "medical crate"
icon_state = "medicalcrate"
- icon_opened = "medicalcrateopen"
- icon_closed = "medicalcrate"
/obj/structure/closet/crate/rcd
desc = "A crate for the storage of the RCD."
name = "\improper RCD crate"
icon_state = "crate"
- icon_opened = "crateopen"
- icon_closed = "crate"
/obj/structure/closet/crate/rcd/populate_contents()
new /obj/item/rcd_ammo(src)
@@ -357,8 +344,6 @@
desc = "A freezer."
name = "Freezer"
icon_state = "freezer"
- icon_opened = "freezeropen"
- icon_closed = "freezer"
var/target_temp = T0C - 40
var/cooling_power = 40
@@ -384,8 +369,6 @@
desc = "A large can, looks like a bin to me."
name = "garbage can"
icon_state = "largebin"
- icon_opened = "largebinopen"
- icon_closed = "largebin"
anchored = TRUE
/obj/structure/closet/crate/can/wrench_act(mob/user, obj/item/I)
@@ -398,8 +381,6 @@
desc = "A crate with a radiation sign on it."
name = "radioactive gear crate"
icon_state = "radiation"
- icon_opened = "radiationopen"
- icon_closed = "radiation"
/obj/structure/closet/crate/radiation/populate_contents()
new /obj/item/clothing/suit/radiation(src)
@@ -415,58 +396,46 @@
desc = "A secure weapons crate."
name = "weapons crate"
icon_state = "weaponcrate"
- icon_opened = "weaponcrateopen"
- icon_closed = "weaponcrate"
/obj/structure/closet/crate/secure/plasma
desc = "A secure plasma crate."
name = "plasma crate"
icon_state = "plasmacrate"
- icon_opened = "plasmacrateopen"
- icon_closed = "plasmacrate"
/obj/structure/closet/crate/secure/gear
desc = "A secure gear crate."
name = "gear crate"
icon_state = "secgearcrate"
- icon_opened = "secgearcrateopen"
- icon_closed = "secgearcrate"
/obj/structure/closet/crate/secure/hydrosec
desc = "A crate with a lock on it, painted in the scheme of the station's botanists."
name = "secure hydroponics crate"
icon_state = "hydrosecurecrate"
- icon_opened = "hydrosecurecrateopen"
- icon_closed = "hydrosecurecrate"
/obj/structure/closet/crate/secure/bin
desc = "A secure bin."
name = "secure bin"
icon_state = "largebins"
- icon_opened = "largebinsopen"
- icon_closed = "largebins"
- redlight = "largebinr"
- greenlight = "largebing"
- sparks = "largebinsparks"
- emag = "largebinemag"
+ overlay_locked = "largebinr"
+ overlay_unlocked = "largebing"
+ overlay_sparking = "largebinsparks"
+ overlay_broken = "largebinemag"
/obj/structure/closet/crate/large
name = "large crate"
desc = "A hefty metal crate."
icon_state = "largemetal"
- icon_opened = "largemetalopen"
- icon_closed = "largemetal"
integrity_failure = 0 //Makes the crate break when integrity reaches 0, instead of opening and becoming an invisible sprite.
/obj/structure/closet/crate/large/close()
. = ..()
if(.)//we can hold up to one large item
- var/found = 0
+ var/found = FALSE
for(var/obj/structure/S in src.loc)
if(S == src)
continue
if(!S.anchored)
- found = 1
+ found = TRUE
S.forceMove(src)
break
if(!found)
@@ -479,10 +448,9 @@
name = "large crate"
desc = "A hefty metal crate with an electronic locking system."
icon_state = "largemetal"
- icon_opened = "largemetalopen"
- icon_closed = "largemetal"
- redlight = "largemetalr"
- greenlight = "largemetalg"
+ overlay_locked = "largemetalr"
+ overlay_unlocked = "largemetalg"
+ overlay_broken = ""
/obj/structure/closet/crate/secure/large/close()
. = ..()
@@ -505,15 +473,11 @@
/obj/structure/closet/crate/secure/large/reinforced
desc = "A hefty, reinforced metal crate with an electronic locking system."
icon_state = "largermetal"
- icon_opened = "largermetalopen"
- icon_closed = "largermetal"
/obj/structure/closet/crate/hydroponics
name = "hydroponics crate"
desc = "All you need to destroy those pesky weeds and pests."
icon_state = "hydrocrate"
- icon_opened = "hydrocrateopen"
- icon_closed = "hydrocrate"
/obj/structure/closet/crate/hydroponics/prespawned
//This exists so the prespawned hydro crates spawn with their contents.
@@ -539,36 +503,26 @@
name = "science crate"
desc = "A science crate."
icon_state = "scicrate"
- icon_opened = "scicrateopen"
- icon_closed = "scicrate"
/obj/structure/closet/crate/secure/scisec
name = "secure science crate"
desc = "A crate with a lock on it, painted in the scheme of the station's scientists."
icon_state = "scisecurecrate"
- icon_opened = "scisecurecrateopen"
- icon_closed = "scisecurecrate"
/obj/structure/closet/crate/engineering
name = "engineering crate"
desc = "An engineering crate."
icon_state = "engicrate"
- icon_opened = "engicrateopen"
- icon_closed = "engicrate"
/obj/structure/closet/crate/secure/engineering
name = "secure engineering crate"
desc = "A crate with a lock on it, painted in the scheme of the station's engineers."
icon_state = "engisecurecrate"
- icon_opened = "engisecurecrateopen"
- icon_closed = "engisecurecrate"
/obj/structure/closet/crate/engineering/electrical
name = "electrical engineering crate"
desc = "An electrical engineering crate."
icon_state = "electricalcrate"
- icon_opened = "electricalcrateopen"
- icon_closed = "electricalcrate"
/obj/structure/closet/crate/tape/populate_contents()
if(prob(10))
@@ -578,8 +532,6 @@
name = "secure biohazard crate"
desc = "An protected biohazard crate."
icon_state = "biohazard"
- icon_opened = "biohazardopen"
- icon_closed = "biohazard"
//crates of gear in the free golem ship
/obj/structure/closet/crate/golemgear/populate_contents()
@@ -594,19 +546,14 @@
//syndie crates by Furukai
/obj/structure/closet/crate/syndicate
-
desc = "Definitely a property of an evil corporation!"
icon_state = "syndiecrate"
- icon_opened = "syndiecrateopen"
- icon_closed = "syndiecrate"
material_drop = /obj/item/stack/sheet/mineral/plastitanium
/obj/structure/closet/crate/secure/syndicate
name = "Secure suspicious crate"
desc = "Definitely a property of an evil corporation! And it has a hardened lock! And a microphone?"
icon_state = "syndiesecurecrate"
- icon_opened = "syndiesecurecrateopen"
- icon_closed = "syndiesecurecrate"
material_drop = /obj/item/stack/sheet/mineral/plastitanium
can_be_emaged = FALSE
diff --git a/code/game/objects/structures/crates_lockers/crittercrate.dm b/code/game/objects/structures/crates_lockers/crittercrate.dm
index 6c4bf01ee6a..cf15893c72c 100644
--- a/code/game/objects/structures/crates_lockers/crittercrate.dm
+++ b/code/game/objects/structures/crates_lockers/crittercrate.dm
@@ -2,8 +2,6 @@
name = "critter crate"
desc = "A crate designed for safe transport of animals. Only openable from the outside."
icon_state = "critter"
- icon_opened = "critteropen"
- icon_closed = "critter"
open_sound = 'sound/machines/wooden_closet_open.ogg'
close_sound = 'sound/machines/wooden_closet_close.ogg'
var/already_opened = 0
diff --git a/code/game/objects/structures/crates_lockers/largecrate.dm b/code/game/objects/structures/crates_lockers/largecrate.dm
index 9d670424371..bc7103b462a 100644
--- a/code/game/objects/structures/crates_lockers/largecrate.dm
+++ b/code/game/objects/structures/crates_lockers/largecrate.dm
@@ -6,17 +6,14 @@
density = 1
var/obj/item/paper/manifest/manifest
-/obj/structure/largecrate/Initialize(mapload)
- . = ..()
- update_icon()
-/obj/structure/largecrate/update_icon()
- ..()
- overlays.Cut()
+/obj/structure/largecrate/update_overlays()
+ . = ..()
if(manifest)
- overlays += "manifest"
+ . += "manifest"
-/obj/structure/largecrate/attack_hand(mob/user as mob)
+
+/obj/structure/largecrate/attack_hand(mob/user)
if(manifest)
add_fingerprint(user)
to_chat(user, "You tear the manifest off of the crate.")
@@ -25,18 +22,18 @@
if(ishuman(user))
user.put_in_hands(manifest, ignore_anim = FALSE)
manifest = null
- update_icon()
- return
- else
- to_chat(user, "You need a crowbar to pry this open!")
+ update_icon(UPDATE_OVERLAYS)
return
-/obj/structure/largecrate/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+ to_chat(user, "You need a crowbar to pry this open!")
+
+
+/obj/structure/largecrate/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_CROWBAR)
if(manifest)
manifest.forceMove(loc)
manifest = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
new /obj/item/stack/sheet/wood(src)
var/turf/T = get_turf(src)
for(var/O in contents)
@@ -56,8 +53,8 @@
/obj/structure/largecrate/lisa
icon_state = "lisacrate"
-/obj/structure/largecrate/lisa/attackby(obj/item/W as obj, mob/user as mob) //ugly but oh well
- if(istype(W, /obj/item/crowbar))
+/obj/structure/largecrate/lisa/attackby(obj/item/W, mob/user) //ugly but oh well
+ if(W.tool_behaviour == TOOL_CROWBAR)
new /mob/living/simple_animal/pet/dog/corgi/Lisa(loc)
return ..()
@@ -65,8 +62,8 @@
name = "cow crate"
icon_state = "lisacrate"
-/obj/structure/largecrate/cow/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+/obj/structure/largecrate/cow/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_CROWBAR)
new /mob/living/simple_animal/cow(loc)
return ..()
@@ -74,8 +71,8 @@
name = "goat crate"
icon_state = "lisacrate"
-/obj/structure/largecrate/goat/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+/obj/structure/largecrate/goat/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_CROWBAR)
new /mob/living/simple_animal/hostile/retaliate/goat(loc)
return ..()
@@ -83,8 +80,8 @@
name = "chicken crate"
icon_state = "lisacrate"
-/obj/structure/largecrate/chick/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+/obj/structure/largecrate/chick/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_CROWBAR)
var/num = rand(4, 6)
for(var/i = 0, i < num, i++)
new /mob/living/simple_animal/chick(loc)
@@ -94,7 +91,7 @@
name = "cat crate"
icon_state = "lisacrate"
-/obj/structure/largecrate/cat/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/crowbar))
+/obj/structure/largecrate/cat/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_CROWBAR)
new /mob/living/simple_animal/pet/cat(loc)
return ..()
diff --git a/code/game/objects/structures/crates_lockers/walllocker.dm b/code/game/objects/structures/crates_lockers/walllocker.dm
index 4a2f9a7ed88..c127b629719 100644
--- a/code/game/objects/structures/crates_lockers/walllocker.dm
+++ b/code/game/objects/structures/crates_lockers/walllocker.dm
@@ -6,15 +6,13 @@
name = "wall locker"
icon = 'icons/obj/walllocker.dmi'
icon_state = "wall-locker"
- density = 0
- anchored = 1
+ density = FALSE
+ anchored = TRUE
+ ignore_density_closed = TRUE
+ no_overlays = TRUE
icon_closed = "wall-locker"
icon_opened = "wall-lockeropen"
-/obj/structure/closet/walllocker/close()
- ..()
- density = 0 //It's a locker in a wall, you aren't going to be walking into it.
-
/obj/structure/closet/walllocker/emerglocker
name = "emergency locker"
desc = "A wall mounted locker with emergency supplies"
@@ -22,6 +20,7 @@
icon_closed = "emerg"
icon_opened = "emergopen"
+
/obj/structure/closet/walllocker/emerglocker/populate_contents()
new /obj/item/tank/internals/emergency_oxygen(src)
new /obj/item/tank/internals/emergency_oxygen(src)
diff --git a/code/game/objects/structures/electricchair.dm b/code/game/objects/structures/electricchair.dm
index 491ce2f5523..cd532bf025c 100644
--- a/code/game/objects/structures/electricchair.dm
+++ b/code/game/objects/structures/electricchair.dm
@@ -4,13 +4,15 @@
icon_state = "echair0"
item_chair = null
anchored = TRUE
- var/obj/item/assembly/shock_kit/part = null
- var/last_time = 1.0
- var/delay_time = 50
+ var/obj/item/assembly/shock_kit/part
+ var/last_time = 0
+ var/delay_time = 5 SECONDS
+ var/shocking = FALSE
+
/obj/structure/chair/e_chair/Initialize(mapload, obj/item/assembly/shock_kit/sk)
. = ..()
- overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir)
+ update_icon(UPDATE_OVERLAYS)
if(sk)
part = sk
@@ -25,64 +27,96 @@
part.part1 = part1
part.part2 = part2
-/obj/structure/chair/e_chair/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/wrench))
- var/obj/structure/chair/C = new /obj/structure/chair(loc)
- transfer_fingerprints_to(C)
- playsound(loc, W.usesound, 50, 1)
- C.dir = dir
- part.loc = loc
+
+/obj/structure/chair/e_chair/Destroy()
+ if(part)
+ QDEL_NULL(part)
+ return ..()
+
+
+/obj/structure/chair/e_chair/rotate()
+ if(..())
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/structure/chair/e_chair/update_icon_state()
+ icon_state = "echair[shocking]"
+
+
+/obj/structure/chair/e_chair/update_overlays()
+ . = ..()
+ . += image(icon, icon_state = "echair_over", layer = ABOVE_MOB_LAYER, dir = src.dir)
+ if(shocking)
+ . += image(icon, icon_state = "echair_shock", layer = ABOVE_MOB_LAYER)
+
+
+/obj/structure/chair/e_chair/attackby(obj/item/W, mob/user, params)
+ if(W.tool_behaviour == TOOL_WRENCH)
+ var/obj/structure/chair/chair = new (loc)
+ transfer_fingerprints_to(chair)
+ playsound(loc, W.usesound, 50, TRUE)
+ chair.dir = dir
+ part.forceMove(loc)
part.master = null
part = null
qdel(src)
return
return ..()
+
+/obj/structure/chair/e_chair/examine(mob/user)
+ . = ..()
+ . += span_warning("You can Alt-Shift-Click [src] to activate it.")
+
+
+/obj/structure/chair/e_chair/AltShiftClick(mob/living/user)
+ if(!Adjacent(user))
+ return ..()
+ shock(user)
+
+
/obj/structure/chair/e_chair/verb/activate_e_chair()
set name = "Activate Electric Chair"
set category = "Object"
set src in oview(1)
- if(usr.stat || !usr.canmove || usr.restrained())
- return
- if(last_time + delay_time > world.time)
- to_chat(usr, "\The [src] is not ready yet!")
- return
- to_chat(usr, "You activate \the [src].")
- shock()
-/obj/structure/chair/e_chair/rotate()
- ..()
- overlays.Cut()
- overlays += image('icons/obj/chairs.dmi', src, "echair_over", MOB_LAYER + 1, dir) //there's probably a better way of handling this, but eh. -Pete
+ shock(usr)
-/obj/structure/chair/e_chair/proc/shock()
- if(last_time + delay_time > world.time)
- return
- last_time = world.time
- icon_state = "echair1"
- spawn(delay_time)
- icon_state = "echair0"
+/obj/structure/chair/e_chair/proc/shock(mob/living/user)
+ if(isliving(user) && (user.incapacitated() || user.restrained()))
+ return
// special power handling
- var/area/A = get_area(src)
- if(!isarea(A))
+ var/area/our_area = get_area(src)
+ if(!our_area || !our_area.powered(EQUIP))
return
- if(!A.powered(EQUIP))
+
+ if(last_time + delay_time > world.time)
+ if(user)
+ to_chat(user, span_warning("[src] is not ready yet!"))
return
- A.use_power(5000, EQUIP)
- var/light = A.power_light
- A.updateicon()
+ last_time = world.time
+ our_area.use_power(5000, EQUIP)
+ our_area.update_icon(UPDATE_ICON_STATE)
+
+ if(user)
+ to_chat(user, span_notice("You activate [src]."))
- flick("echair_shock", src)
+ shocking = TRUE
+ update_icon()
do_sparks(12, 1, src)
- visible_message("The electric chair went off!", "You hear a deep sharp shock!")
+ visible_message(span_danger("The electric chair went off!"))
+ addtimer(CALLBACK(src, PROC_REF(reset_echair)), delay_time, TIMER_DELETE_ME)
+
if(has_buckled_mobs())
- for(var/m in buckled_mobs)
- var/mob/living/buckled_mob = m
+ for(var/mob/living/buckled_mob as anything in buckled_mobs)
buckled_mob.electrocute_act(110, src, 1)
- to_chat(buckled_mob, "You feel a deep shock course through your body!")
- spawn(1)
- buckled_mob.electrocute_act(110, src, 1)
- A.power_light = light
- A.updateicon()
+ to_chat(buckled_mob, span_userdanger("You feel a deep shock course through your body!"))
+ addtimer(CALLBACK(buckled_mob, TYPE_PROC_REF(/mob/living, electrocute_act), 110, src, 1), 0.1 SECONDS, TIMER_DELETE_ME)
+
+
+/obj/structure/chair/e_chair/proc/reset_echair()
+ shocking = FALSE
+ update_icon()
+
diff --git a/code/game/objects/structures/engicart.dm b/code/game/objects/structures/engicart.dm
index 9de1ce1c470..840e67e89be 100644
--- a/code/game/objects/structures/engicart.dm
+++ b/code/game/objects/structures/engicart.dm
@@ -38,7 +38,7 @@
add_fingerprint(user)
put_in_cart(I, user)
myglass=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/stack/sheet/metal))
@@ -46,7 +46,7 @@
add_fingerprint(user)
put_in_cart(I, user)
mymetal=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/stack/sheet/plasteel))
@@ -54,7 +54,7 @@
add_fingerprint(user)
put_in_cart(I, user)
myplasteel=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/flashlight))
@@ -62,7 +62,7 @@
add_fingerprint(user)
put_in_cart(I, user)
myflashlight=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/storage/toolbox/mechanical))
@@ -70,7 +70,7 @@
add_fingerprint(user)
put_in_cart(I, user)
mybluetoolbox=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/storage/toolbox/electrical))
@@ -78,7 +78,7 @@
add_fingerprint(user)
put_in_cart(I, user)
myyellowtoolbox=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/storage/toolbox))
@@ -86,10 +86,10 @@
add_fingerprint(user)
put_in_cart(I, user)
myredtoolbox=I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(user, fail_msg)
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
if(!anchored && !isinspace())
playsound(src.loc, I.usesound, 50, 1)
@@ -178,22 +178,24 @@
to_chat(user, "You take [myyellowtoolbox] from [src].")
myyellowtoolbox = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
updateUsrDialog()
-/obj/structure/engineeringcart/update_icon()
- overlays.Cut()
+
+/obj/structure/engineeringcart/update_overlays()
+ . = ..()
if(myglass)
- overlays += "cart_glass"
+ . += "cart_glass"
if(mymetal)
- overlays += "cart_metal"
+ . += "cart_metal"
if(myplasteel)
- overlays += "cart_plasteel"
+ . += "cart_plasteel"
if(myflashlight)
- overlays += "cart_flashlight"
+ . += "cart_flashlight"
if(mybluetoolbox)
- overlays += "cart_bluetoolbox"
+ . += "cart_bluetoolbox"
if(myredtoolbox)
- overlays += "cart_redtoolbox"
+ . += "cart_redtoolbox"
if(myyellowtoolbox)
- overlays += "cart_yellowtoolbox"
+ . += "cart_yellowtoolbox"
+
diff --git a/code/game/objects/structures/extinguisher.dm b/code/game/objects/structures/extinguisher.dm
index 20c58523d17..00b51055261 100644
--- a/code/game/objects/structures/extinguisher.dm
+++ b/code/game/objects/structures/extinguisher.dm
@@ -29,6 +29,7 @@
has_extinguisher = new/obj/item/extinguisher/mini(src)
else
has_extinguisher = new/obj/item/extinguisher(src)
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/examine(mob/user)
. = ..()
@@ -44,7 +45,7 @@
return
playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
opened = !opened
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/Destroy()
QDEL_NULL(has_extinguisher)
@@ -58,7 +59,7 @@
/obj/structure/extinguisher_cabinet/handle_atom_del(atom/A)
if(A == has_extinguisher)
has_extinguisher = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/attackby(obj/item/O, mob/user, params)
if(isrobot(user) || isalien(user))
@@ -69,18 +70,18 @@
return
add_fingerprint(user)
has_extinguisher = O
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "You place [O] in [src].")
return TRUE
else
playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
opened = !opened
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else if(user.a_intent != INTENT_HARM)
add_fingerprint(user)
playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
opened = !opened
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
else
return ..()
@@ -123,7 +124,7 @@
else
playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
opened = !opened
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/attack_tk(mob/user)
if(has_extinguisher)
@@ -136,7 +137,7 @@
else
playsound(loc, 'sound/machines/click.ogg', 15, TRUE, -3)
opened = !opened
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/obj_break(damage_flag)
if(!broken && !(flags & NODECONSTRUCT))
@@ -145,7 +146,7 @@
if(has_extinguisher)
has_extinguisher.forceMove(loc)
has_extinguisher = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/extinguisher_cabinet/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
@@ -155,7 +156,7 @@
has_extinguisher = null
qdel(src)
-/obj/structure/extinguisher_cabinet/update_icon()
+/obj/structure/extinguisher_cabinet/update_icon_state()
if(!opened)
icon_state = "extinguisher_closed"
return
diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm
index 2847d2f54af..4eb87c6d37b 100644
--- a/code/game/objects/structures/false_walls.dm
+++ b/code/game/objects/structures/false_walls.dm
@@ -45,13 +45,14 @@
var/healthpercent = (obj_integrity/max_integrity) * 100
switch(healthpercent)
if(100)
- return "It looks fully intact."
+ . = "It looks fully intact."
if(70 to 99)
- return "It looks slightly damaged."
+ . = "It looks slightly damaged."
if(40 to 70)
- return "It looks moderately damaged."
+ . = "It looks moderately damaged."
if(0 to 40)
- return "It looks heavily damaged."
+ . = "It looks heavily damaged."
+ . += " Using a lit welding tool on this item will allow you to slice through it, eventually removing the outer layer."
/obj/structure/falsewall/ratvar_act()
new /obj/structure/falsewall/brass(loc)
@@ -73,31 +74,31 @@
. = ..()
toggle(user)
+
/obj/structure/falsewall/proc/toggle(mob/user)
if(opening)
return
-
- opening = 1
+ opening = TRUE
if(density)
add_fingerprint(user)
do_the_flick()
- sleep(4)
- density = 0
- set_opacity(0)
- update_icon(0)
+ sleep(0.4 SECONDS)
+ density = FALSE
+ set_opacity(FALSE)
else
var/srcturf = get_turf(src)
for(var/mob/living/obstacle in srcturf) //Stop people from using this as a shield
- opening = 0
+ opening = FALSE
return
add_fingerprint(user)
do_the_flick()
- density = 1
- sleep(4)
- set_opacity(1)
- update_icon()
- air_update_turf(1)
- opening = 0
+ density = TRUE
+ sleep(0.4 SECONDS)
+ set_opacity(TRUE)
+ air_update_turf(TRUE)
+ opening = FALSE
+ update_icon(UPDATE_ICON_STATE)
+
/obj/structure/falsewall/proc/do_the_flick()
if(density)
@@ -107,7 +108,8 @@
else
flick("fwall_closing", src)
-/obj/structure/falsewall/update_icon()
+
+/obj/structure/falsewall/update_icon_state()
if(density)
icon_state = initial(icon_state)
smooth = SMOOTH_TRUE
@@ -115,6 +117,7 @@
else
icon_state = "fwall_open"
+
/obj/structure/falsewall/proc/ChangeToWall(delete = TRUE)
var/turf/T = get_turf(src)
T.ChangeTurf(walltype)
@@ -132,7 +135,7 @@
if(T.density)
to_chat(user, "[src] is blocked!")
return
- if(istype(W, /obj/item/screwdriver))
+ if(W.tool_behaviour == TOOL_SCREWDRIVER)
if(!istype(T, /turf/simulated/floor))
to_chat(user, "[src] bolts must be tightened on the floor!")
return
diff --git a/code/game/objects/structures/firepit.dm b/code/game/objects/structures/firepit.dm
index 075c83e7033..f3f48243f0a 100644
--- a/code/game/objects/structures/firepit.dm
+++ b/code/game/objects/structures/firepit.dm
@@ -2,7 +2,7 @@
name = "firepit"
desc = "Warm and toasty."
icon = 'icons/obj/fireplace.dmi'
- icon_state = "firepit-active"
+ icon_state = "firepit"
density = FALSE
anchored = TRUE
max_integrity = 50
@@ -10,9 +10,6 @@
var/lighter // Who lit the thing
var/fire_stack_strength = 5
-/obj/structure/firepit/Initialize(mapload)
- . = ..()
- update_icon()
/obj/structure/firepit/attack_hand(mob/living/user)
if(active)
@@ -31,18 +28,26 @@
else
W.fire_act()
-/obj/structure/firepit/update_icon()
- . = ..()
+
+/obj/structure/firepit/proc/adjust_light()
if(active)
set_light(4, ,"#ffb366")
- icon_state = "firepit-active"
else
set_light(0)
+
+
+/obj/structure/firepit/update_icon_state()
+ if(active)
+ icon_state = "firepit-active"
+ else
icon_state = "firepit"
+
/obj/structure/firepit/proc/toggleFirepit()
active = !active
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+ adjust_light()
+
/obj/structure/firepit/extinguish()
. = ..()
diff --git a/code/game/objects/structures/fireplace.dm b/code/game/objects/structures/fireplace.dm
index 10a5bf70a74..948020d288b 100644
--- a/code/game/objects/structures/fireplace.dm
+++ b/code/game/objects/structures/fireplace.dm
@@ -69,10 +69,15 @@
else
. = ..()
-/obj/structure/fireplace/update_icon()
+
+/obj/structure/fireplace/update_desc(updates = ALL)
+ . = ..()
+ desc = lit ? "A large stone brick fireplace, warm and cozy." : initial(desc)
+
+
+/obj/structure/fireplace/update_overlays()
. = ..()
- overlays.Cut()
if(!lit)
return
@@ -81,17 +86,18 @@
switch(burn_time_remaining())
if(0 to 500)
firepower = "fireplace_fire0"
- if(500 to 1000)
+ if(501 to 1000)
firepower = "fireplace_fire1"
- if(1000 to 1500)
+ if(1001 to 1500)
firepower = "fireplace_fire2"
- if(1500 to 2000)
+ if(1501 to 2000)
firepower = "fireplace_fire3"
- if(2000 to MAXIMUM_BURN_TIMER)
+ if(2001 to MAXIMUM_BURN_TIMER)
firepower = "fireplace_fire4"
- overlays += icon('icons/obj/fireplace.dmi', "[firepower]")
- overlays += icon('icons/obj/fireplace.dmi', "fireplace_glow")
+ . += "[firepower]"
+ . += "fireplace_glow"
+
/obj/structure/fireplace/proc/adjust_light()
if(!lit)
@@ -101,15 +107,16 @@
switch(burn_time_remaining())
if(0 to 500)
set_light(1, ,"#ffb366")
- if(500 to 1000)
+ if(501 to 1000)
set_light(2, ,"#ffb366")
- if(1000 to 1500)
+ if(1001 to 1500)
set_light(3, ,"#ffb366")
- if(1500 to 2000)
+ if(1501 to 2000)
set_light(4, ,"#ffb366")
- if(2000 to MAXIMUM_BURN_TIMER)
+ if(2001 to MAXIMUM_BURN_TIMER)
set_light(6, ,"#ffb366")
+
/obj/structure/fireplace/process(seconds_per_tick)
if(!lit)
return
@@ -120,9 +127,10 @@
playsound(src, 'sound/effects/comfyfire.ogg',40,FALSE, FALSE, TRUE)
var/turf/T = get_turf(src)
T.hotspot_expose(700, 2.5 * seconds_per_tick)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
adjust_light()
+
/obj/structure/fireplace/extinguish()
. = ..()
if(lit)
@@ -131,6 +139,7 @@
put_out()
adjust_fuel_timer(fuel)
+
/obj/structure/fireplace/proc/adjust_fuel_timer(amount)
if(lit)
flame_expiry_timer += amount
@@ -139,25 +148,27 @@
else
fuel_added = clamp(fuel_added + amount, 0, MAXIMUM_BURN_TIMER)
+
/obj/structure/fireplace/proc/burn_time_remaining()
if(lit)
return max(0, flame_expiry_timer - world.time)
else
return max(0, fuel_added)
+
/obj/structure/fireplace/proc/ignite()
lit = TRUE
- desc = "A large stone brick fireplace, warm and cozy."
flame_expiry_timer = world.time + fuel_added
fuel_added = 0
- update_icon()
+ update_appearance(UPDATE_OVERLAYS|UPDATE_DESC)
adjust_light()
+
/obj/structure/fireplace/proc/put_out()
lit = FALSE
- update_icon()
+ update_appearance(UPDATE_OVERLAYS|UPDATE_DESC)
adjust_light()
- desc = initial(desc)
+
#undef LOG_BURN_TIMER
#undef PAPER_BURN_TIMER
diff --git a/code/game/objects/structures/fluff.dm b/code/game/objects/structures/fluff.dm
index 4fbe7ef4542..66f7b6e1792 100644
--- a/code/game/objects/structures/fluff.dm
+++ b/code/game/objects/structures/fluff.dm
@@ -11,7 +11,7 @@
var/deconstructible = TRUE
/obj/structure/fluff/attackby(obj/item/I, mob/living/user, params)
- if(istype(I, /obj/item/wrench) && deconstructible)
+ if(I.tool_behaviour == TOOL_WRENCH && deconstructible)
user.visible_message("[user] starts disassembling [src]...", "You start disassembling [src]...")
playsound(loc, I.usesound, 50, 1)
if(do_after(src, 50 * I.toolspeed * gettoolspeedmod(user), target = src))
diff --git a/code/game/objects/structures/foodcart.dm b/code/game/objects/structures/foodcart.dm
index 24d051e6b89..8f7dcda91d8 100644
--- a/code/game/objects/structures/foodcart.dm
+++ b/code/game/objects/structures/foodcart.dm
@@ -39,7 +39,6 @@
add_fingerprint(user)
put_in_cart(I, user)
food_slots[s]=I
- update_icon()
success = 1
break
if(!success)
@@ -51,12 +50,11 @@
add_fingerprint(user)
put_in_cart(I, user)
drink_slots[s]=I
- update_icon()
success = 1
break
if(!success)
to_chat(user, fail_msg)
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
if(!anchored && !isinspace())
playsound(src.loc, I.usesound, 50, 1)
@@ -198,7 +196,6 @@
to_chat(user, "You take [drink] from [src].")
drink_slots[6] = null
- update_icon() //Not really needed without overlays, but keeping just in case
updateUsrDialog()
/obj/structure/foodcart/deconstruct(disassembled = TRUE)
diff --git a/code/game/objects/structures/grille.dm b/code/game/objects/structures/grille.dm
index 2a7cbe1ffc7..a8c693301b8 100644
--- a/code/game/objects/structures/grille.dm
+++ b/code/game/objects/structures/grille.dm
@@ -43,9 +43,6 @@
//height=42
icon='icons/obj/fence-ns.dmi'
-/obj/structure/grille/take_damage(damage_amount, damage_type = BRUTE, damage_flag = 0, sound_effect = 1, attack_dir, armour_penetration)
- . = ..()
- update_icon()
/obj/structure/grille/examine(mob/user)
. = ..()
diff --git a/code/game/objects/structures/guillotine.dm b/code/game/objects/structures/guillotine.dm
index c1fbb87d958..9106bf66cb6 100644
--- a/code/game/objects/structures/guillotine.dm
+++ b/code/game/objects/structures/guillotine.dm
@@ -2,15 +2,18 @@
#define GUILLOTINE_DECAP_MIN_SHARP 7 // Minimum amount of sharpness for decapitation. Any less and it will just deal brute damage
#define GUILLOTINE_ANIMATION_LENGTH 9 // How many deciseconds the animation is
#define GUILLOTINE_BLADE_RAISED 1
-#define GUILLOTINE_BLADE_MOVING 2
-#define GUILLOTINE_BLADE_DROPPED 3
-#define GUILLOTINE_BLADE_SHARPENING 4
+#define GUILLOTINE_BLADE_RAISING 2
+#define GUILLOTINE_BLADE_DROPPING 3
+#define GUILLOTINE_BLADE_DROPPED 4
+#define GUILLOTINE_BLADE_SHARPENING 5
+
#define GUILLOTINE_HEAD_OFFSET 16 // How much we need to move the player to center their head
#define GUILLOTINE_LAYER_DIFF 1.2 // How much to increase/decrease a head when it's buckled/unbuckled
#define GUILLOTINE_ACTIVATE_DELAY 30 // Delay for executing someone
#define GUILLOTINE_WRENCH_DELAY 10
-#define GUILLOTINE_ACTION_INUSE 5
-#define GUILLOTINE_ACTION_WRENCH 6
+
+#define GUILLOTINE_ACTION_INUSE 1
+#define GUILLOTINE_ACTION_WRENCH 2
/obj/structure/guillotine
name = "guillotine"
@@ -26,7 +29,7 @@
var/blade_sharpness = GUILLOTINE_BLADE_MAX_SHARP // How sharp the blade is
var/kill_count = 0
var/force_clap = FALSE //You WILL clap if I want you to
- var/current_action = 0 // What's currently happening to the guillotine
+ var/current_action = NONE// What's currently happening to the guillotine
/obj/structure/guillotine/Initialize(mapload)
LAZYINITLIST(buckled_mobs)
@@ -51,6 +54,31 @@
msg += " "
msg += "Someone appears to be strapped in. You can help them out, or you can harm them by activating the guillotine."
. += "[msg]"
+
+
+/obj/structure/guillotine/update_icon_state()
+ switch(blade_status)
+ if(GUILLOTINE_BLADE_DROPPED)
+ icon_state = "guillotine"
+ if(GUILLOTINE_BLADE_RAISED)
+ icon_state = "guillotine_raised"
+ if(GUILLOTINE_BLADE_RAISING)
+ icon_state = "guillotine_raise"
+ if(GUILLOTINE_BLADE_DROPPING)
+ icon_state = "guillotine_drop"
+
+
+/obj/structure/guillotine/update_overlays()
+ . = ..()
+ switch(kill_count)
+ if(1)
+ . += mutable_appearance(icon, "guillotine_bloody_overlay")
+ if(2)
+ . += mutable_appearance(icon, "guillotine_bloodier_overlay")
+ if(3 to INFINITY)
+ . += mutable_appearance(icon, "guillotine_bloodiest_overlay")
+
+
/obj/structure/guillotine/attack_hand(mob/user)
// Currently being used by something
@@ -58,12 +86,12 @@
return
switch(blade_status)
- if(GUILLOTINE_BLADE_MOVING)
+ if(GUILLOTINE_BLADE_RAISING, GUILLOTINE_BLADE_DROPPING)
return
if(GUILLOTINE_BLADE_DROPPED)
add_fingerprint(user)
- blade_status = GUILLOTINE_BLADE_MOVING
- icon_state = "guillotine_raise"
+ blade_status = GUILLOTINE_BLADE_RAISING
+ update_icon(UPDATE_ICON_STATE)
addtimer(CALLBACK(src, PROC_REF(raise_blade)), GUILLOTINE_ANIMATION_LENGTH)
return
if(GUILLOTINE_BLADE_RAISED)
@@ -75,26 +103,28 @@
if(do_after(user, GUILLOTINE_ACTIVATE_DELAY, target = src) && blade_status == GUILLOTINE_BLADE_RAISED)
add_fingerprint(user)
- current_action = 0
- blade_status = GUILLOTINE_BLADE_MOVING
- icon_state = "guillotine_drop"
+ current_action = NONE
+ blade_status = GUILLOTINE_BLADE_DROPPING
+ update_icon(UPDATE_ICON_STATE)
playsound(src, 'sound/items/unsheath.ogg', 100, 1)
addtimer(CALLBACK(src, PROC_REF(drop_blade), user), GUILLOTINE_ANIMATION_LENGTH - 2) // Minus two so we play the sound and decap faster
else
- current_action = 0
+ current_action = NONE
else
add_fingerprint(user)
unbuckle_all_mobs()
else
add_fingerprint(user)
- blade_status = GUILLOTINE_BLADE_MOVING
- icon_state = "guillotine_drop"
+ blade_status = GUILLOTINE_BLADE_DROPPING
+ update_icon(UPDATE_ICON_STATE)
playsound(src, 'sound/items/unsheath.ogg', 100, 1)
addtimer(CALLBACK(src, PROC_REF(drop_blade)), GUILLOTINE_ANIMATION_LENGTH)
+
/obj/structure/guillotine/proc/raise_blade()
blade_status = GUILLOTINE_BLADE_RAISED
- icon_state = "guillotine_raised"
+ update_icon(UPDATE_ICON_STATE)
+
/obj/structure/guillotine/proc/drop_blade(mob/user)
if(has_buckled_mobs() && blade_sharpness)
@@ -102,14 +132,14 @@
if(!H)
blade_status = GUILLOTINE_BLADE_DROPPED
- icon_state = "guillotine"
+ update_icon(UPDATE_ICON_STATE)
return
var/obj/item/organ/external/head/head = H.get_organ(BODY_ZONE_HEAD)
if(QDELETED(head))
blade_status = GUILLOTINE_BLADE_DROPPED
- icon_state = "guillotine"
+ update_icon(UPDATE_ICON_STATE)
return
playsound(src, 'sound/weapons/bladeslice.ogg', 100, 1)
@@ -118,18 +148,8 @@
add_attack_logs(user, H, "beheaded with [src]")
H.regenerate_icons()
unbuckle_all_mobs()
- kill_count += 1
-
- var/blood_overlay = "bloody"
-
- if(kill_count == 2)
- blood_overlay = "bloodier"
- else if(kill_count > 2)
- blood_overlay = "bloodiest"
-
- blood_overlay = "guillotine_" + blood_overlay + "_overlay"
- overlays.Cut()
- overlays += mutable_appearance(icon, blood_overlay)
+ kill_count++
+ update_icon(UPDATE_OVERLAYS)
if(force_clap)
// The crowd is pleased
@@ -147,7 +167,7 @@
blade_sharpness -= 1
blade_status = GUILLOTINE_BLADE_DROPPED
- icon_state = "guillotine"
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/guillotine/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/whetstone))
@@ -185,13 +205,13 @@
return
current_action = GUILLOTINE_ACTION_WRENCH
if(!I.use_tool(src, user, GUILLOTINE_WRENCH_DELAY, volume = I.tool_volume))
- current_action = 0
+ current_action = NONE
return
if(has_buckled_mobs())
to_chat(user, "Can't unfasten, someone's strapped in!")
return
- current_action = 0
+ current_action = NONE
to_chat(user, "You [anchored ? "un" : ""]secure [src].")
anchored = !anchored
playsound(src, 'sound/items/deconstruct.ogg', 50, 1)
@@ -244,7 +264,8 @@
#undef GUILLOTINE_DECAP_MIN_SHARP
#undef GUILLOTINE_ANIMATION_LENGTH
#undef GUILLOTINE_BLADE_RAISED
-#undef GUILLOTINE_BLADE_MOVING
+#undef GUILLOTINE_BLADE_RAISING
+#undef GUILLOTINE_BLADE_DROPPING
#undef GUILLOTINE_BLADE_DROPPED
#undef GUILLOTINE_BLADE_SHARPENING
#undef GUILLOTINE_HEAD_OFFSET
diff --git a/code/game/objects/structures/inflatable.dm b/code/game/objects/structures/inflatable.dm
index a13532d1f0f..5dc13e56008 100644
--- a/code/game/objects/structures/inflatable.dm
+++ b/code/game/objects/structures/inflatable.dm
@@ -15,9 +15,9 @@
/obj/structure/inflatable
name = "inflatable wall"
desc = "An inflated membrane. Do not puncture."
- density = 1
- anchored = 1
- opacity = 0
+ density = TRUE
+ anchored = TRUE
+ opacity = FALSE
max_integrity = 50
icon = 'icons/obj/inflatable.dmi'
icon_state = "wall"
@@ -39,20 +39,30 @@
else
return FALSE
+
/obj/structure/inflatable/CanAtmosPass(turf/T)
return !density
-/obj/structure/inflatable/attack_hand(mob/user as mob)
+
+/obj/structure/inflatable/attackby(obj/item/I, mob/living/user, params)
+ if(I.sharp || is_type_in_typecache(I, GLOB.pointed_types))
+ user.do_attack_animation(src, used_item = I)
+ deconstruct(FALSE)
+ return FALSE
+ return ..()
+
+/obj/structure/inflatable/attack_hand(mob/user)
add_fingerprint(user)
/obj/structure/inflatable/AltClick(mob/living/user)
- if(!istype(user) || user.incapacitated() || user.restrained())
+ if(!istype(user) || user.incapacitated())
to_chat(user, "You can't do that right now!")
return
if(!Adjacent(user))
return
deconstruct(TRUE)
+
/obj/structure/inflatable/deconstruct(disassembled = TRUE)
playsound(loc, 'sound/machines/hiss.ogg', 75, 1)
if(!disassembled)
@@ -62,17 +72,20 @@
qdel(src)
else
visible_message("[src] slowly deflates.")
- spawn(50)
- var/obj/item/inflatable/R = new intact(loc)
- transfer_fingerprints_to(R)
- qdel(src)
+ addtimer(CALLBACK(src, PROC_REF(deflate)), 5 SECONDS)
+
+
+/obj/structure/inflatable/proc/deflate()
+ var/obj/item/inflatable/R = new intact(loc)
+ transfer_fingerprints_to(R)
+ qdel(src)
/obj/structure/inflatable/verb/hand_deflate()
set name = "Deflate"
set category = "Object"
set src in oview(1)
- if(usr.stat || usr.restrained())
+ if(usr.incapacitated())
return
deconstruct(TRUE)
@@ -93,27 +106,24 @@
/obj/structure/inflatable/door //Based on mineral door code
name = "inflatable door"
- density = 1
- anchored = 1
- opacity = 0
-
icon = 'icons/obj/inflatable.dmi'
icon_state = "door_closed"
+ opacity = TRUE
torn = /obj/item/inflatable/door/torn
intact = /obj/item/inflatable/door
- var/state = 0 //closed, 1 == open
- var/isSwitchingStates = 0
+ var/state_closed = TRUE
+ var/is_operating = FALSE
-/obj/structure/inflatable/door/attack_ai(mob/user as mob) //those aren't machinery, they're just big fucking slabs of a mineral
+/obj/structure/inflatable/door/attack_ai(mob/user) //those aren't machinery, they're just big fucking slabs of a mineral
if(isAI(user)) //so the AI can't open it
return
else if(isrobot(user)) //but cyborgs can
if(get_dist(user,src) <= 1) //not remotely though
- return TryToSwitchState(user)
+ return try_to_operate(user)
-/obj/structure/inflatable/door/attack_hand(mob/user as mob)
- return TryToSwitchState(user)
+/obj/structure/inflatable/door/attack_hand(mob/user)
+ return try_to_operate(user)
/obj/structure/inflatable/door/CanPass(atom/movable/mover, turf/target, height=0)
if(istype(mover) && mover.checkpass(PASS_OTHER_THINGS))
@@ -125,59 +135,45 @@
/obj/structure/inflatable/door/CanAtmosPass(turf/T)
return !density
-/obj/structure/inflatable/door/proc/TryToSwitchState(atom/user)
- if(isSwitchingStates)
+
+/obj/structure/inflatable/door/proc/try_to_operate(atom/user)
+ if(is_operating)
return
if(ismob(user))
var/mob/M = user
- if(world.time - user.last_bumped <= 60)
- return //NOTE do we really need that?
if(M.client)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(!C.handcuffed)
- add_fingerprint(user)
- SwitchState()
+ operate()
else
- add_fingerprint(user)
- SwitchState()
- else if(istype(user, /obj/mecha))
- SwitchState()
-
-/obj/structure/inflatable/door/proc/SwitchState()
- if(state)
- Close()
- else
- Open()
- air_update_turf(1)
-
-/obj/structure/inflatable/door/proc/Open()
- isSwitchingStates = 1
- //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1)
- flick("door_opening",src)
- sleep(10)
- density = 0
- opacity = 0
- state = 1
- update_icon()
- isSwitchingStates = 0
-
-/obj/structure/inflatable/door/proc/Close()
- isSwitchingStates = 1
- //playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 100, 1)
- flick("door_closing",src)
- sleep(10)
- density = 1
- opacity = 0
- state = 0
- update_icon()
- isSwitchingStates = 0
-
-/obj/structure/inflatable/door/update_icon()
- if(state)
- icon_state = "door_open"
+ operate()
+ else if(ismecha(user))
+ operate()
+
+
+/obj/structure/inflatable/door/proc/operate()
+ is_operating = TRUE
+ if(state_closed)
+ flick("door_opening", src)
else
- icon_state = "door_closed"
+ flick("door_closing", src)
+
+ sleep(1 SECONDS)
+ if(QDELETED(src))
+ return
+
+ state_closed = !state_closed
+ density = state_closed
+ set_opacity(state_closed)
+ update_icon(UPDATE_ICON_STATE)
+ air_update_turf(TRUE)
+ is_operating = FALSE
+
+
+/obj/structure/inflatable/door/update_icon_state()
+ icon_state = "door_[state_closed ? "closed" : "open"]"
+
/obj/item/inflatable/torn
name = "torn inflatable wall"
@@ -206,6 +202,7 @@
item_state = "syringe_kit"
max_combined_w_class = 21
w_class = WEIGHT_CLASS_NORMAL
+ can_hold = list(/obj/item/inflatable)
/obj/item/storage/briefcase/inflatable/populate_contents()
new /obj/item/inflatable/door(src)
diff --git a/code/game/objects/structures/janicart.dm b/code/game/objects/structures/janicart.dm
index dc2567bc6a7..ed9614e9ad0 100644
--- a/code/game/objects/structures/janicart.dm
+++ b/code/game/objects/structures/janicart.dm
@@ -5,8 +5,8 @@
desc = "This is the alpha and omega of sanitation."
icon = 'icons/obj/janitor.dmi'
icon_state = "cart"
- anchored = 0
- density = 1
+ anchored = FALSE
+ density = TRUE
container_type = OPENCONTAINER
pull_push_speed_modifier = 1
//copypaste sorry
@@ -32,14 +32,16 @@
QDEL_NULL(myreplacer)
return ..()
+
/obj/structure/janitorialcart/proc/put_in_cart(obj/item/I, mob/user)
user.drop_transfer_item_to_loc(I, src)
updateUsrDialog()
to_chat(user, "You put [I] into [src].")
- return
+ update_icon(UPDATE_OVERLAYS)
+
/obj/structure/janitorialcart/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/structure/janitorialcart/attackby(obj/item/I, mob/user, params)
var/fail_msg = "There is already one of those in [src]."
@@ -66,9 +68,8 @@
else if(istype(I, /obj/item/reagent_containers/spray/cleaner))
if(!myspray)
add_fingerprint(user)
- put_in_cart(I, user)
myspray=I
- update_icon()
+ put_in_cart(I, user)
else
to_chat(user, fail_msg)
else if(istype(I, /obj/item/lightreplacer))
@@ -81,19 +82,18 @@
else if(istype(I, /obj/item/caution))
if(signs < max_signs)
add_fingerprint(user)
- put_in_cart(I, user)
signs++
- update_icon()
+ put_in_cart(I, user)
else
to_chat(user, "[src] can't hold any more signs.")
- else if(istype(I, /obj/item/crowbar))
+ else if(I.tool_behaviour == TOOL_CROWBAR)
user.visible_message("[user] begins to empty the contents of [src].")
if(do_after(user, 30 * I.toolspeed * gettoolspeedmod(user), target = src))
add_fingerprint(user)
to_chat(usr, "You empty the contents of [src]'s bucket onto the floor.")
reagents.reaction(src.loc)
src.reagents.clear_reagents()
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
if(!anchored && !isinspace())
playsound(src.loc, I.usesound, 50, 1)
@@ -176,26 +176,26 @@
WARNING("Signs ([signs]) didn't match contents")
signs = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
updateUsrDialog()
-/obj/structure/janitorialcart/update_icon()
- overlays = null
+/obj/structure/janitorialcart/update_overlays()
+ . = ..()
if(mybag)
- overlays += "cart_garbage"
+ . += "cart_garbage"
if(mymop)
- overlays += "cart_mop"
+ . += "cart_mop"
if(myspray)
- overlays += "cart_spray"
+ . += "cart_spray"
if(myreplacer)
- overlays += "cart_replacer"
+ . += "cart_replacer"
if(signs)
- overlays += "cart_sign[signs]"
+ . += "cart_sign[signs]"
if(reagents.total_volume > 0)
var/image/reagentsImage = image(icon,src,"cart_reagents0")
reagentsImage.alpha = 150
- switch((reagents.total_volume/reagents.maximum_volume)*100)
+ switch((reagents.total_volume / reagents.maximum_volume) * 100)
if(1 to 25)
reagentsImage.icon_state = "cart_reagents1"
if(26 to 50)
@@ -205,4 +205,5 @@
if(76 to 100)
reagentsImage.icon_state = "cart_reagents4"
reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list)
- add_overlay(reagentsImage)
+ . += reagentsImage
+
diff --git a/code/game/objects/structures/kitchen_spike.dm b/code/game/objects/structures/kitchen_spike.dm
index 0245e372f36..9efb35006f1 100644
--- a/code/game/objects/structures/kitchen_spike.dm
+++ b/code/game/objects/structures/kitchen_spike.dm
@@ -11,7 +11,7 @@
max_integrity = 200
/obj/structure/kitchenspike_frame/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/wrench))
+ if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
if(anchored)
to_chat(user, "You unwrench [src] from the floor.")
@@ -53,7 +53,7 @@
..()
/obj/structure/kitchenspike/attackby(obj/item/grab/G, mob/user)
- if(istype(G, /obj/item/crowbar))
+ if(G.tool_behaviour == TOOL_CROWBAR)
if(!has_buckled_mobs())
playsound(loc, G.usesound, 100, 1)
if(do_after(user, 20 * G.toolspeed * gettoolspeedmod(user), target = src))
diff --git a/code/game/objects/structures/ladders.dm b/code/game/objects/structures/ladders.dm
index cb093c9521a..de42568a598 100644
--- a/code/game/objects/structures/ladders.dm
+++ b/code/game/objects/structures/ladders.dm
@@ -14,11 +14,11 @@
if (up)
src.up = up
up.down = src
- up.update_icon()
+ up.update_icon(UPDATE_ICON_STATE)
if (down)
src.down = down
down.up = src
- down.update_icon()
+ down.update_icon(UPDATE_ICON_STATE)
return INITIALIZE_HINT_LATELOAD
/obj/structure/ladder/Destroy(force)
@@ -35,7 +35,7 @@
for(var/obj/structure/ladder/L in locate(T.x, T.y, T.z - 1))
down = L
L.up = src // Don't waste effort looping the other way
- L.update_icon()
+ L.update_icon(UPDATE_ICON_STATE)
break
if(!up)
for (var/obj/structure/ladder/L in locate(T.x, T.y, T.z + 1))
@@ -44,7 +44,7 @@
L.update_icon()
break
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/ladder/proc/disconnect()
if(up && up.down == src)
@@ -55,7 +55,7 @@
down.update_icon()
up = down = null
-/obj/structure/ladder/update_icon()
+/obj/structure/ladder/update_icon_state()
if(up && down)
icon_state = "ladder11"
@@ -153,7 +153,7 @@
/obj/structure/ladder/unbreakable/LateInitialize()
// Override the parent to find ladders based on being height-linked
if(!id || (up && down))
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return
for(var/O in GLOB.ladders)
@@ -163,17 +163,17 @@
if(!down && L.height == height - 1)
down = L
L.up = src
- L.update_icon()
+ L.update_icon(UPDATE_ICON_STATE)
if (up)
break // break if both our connections are filled
else if(!up && L.height == height + 1)
up = L
L.down = src
- L.update_icon()
+ L.update_icon(UPDATE_ICON_STATE)
if (down)
break // break if both our connections are filled
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/ladder/unbreakable/dive_point/buoy
name = "diving point buoy"
@@ -198,5 +198,5 @@
. = ..()
set_light(light_range, light_power) //magical glowing anchor
-/obj/structure/ladder/unbreakable/dive_point/update_icon()
+/obj/structure/ladder/unbreakable/dive_point/update_icon_state()
return
diff --git a/code/game/objects/structures/mop_bucket.dm b/code/game/objects/structures/mop_bucket.dm
index 62a3c559d0b..653e180cc23 100644
--- a/code/game/objects/structures/mop_bucket.dm
+++ b/code/game/objects/structures/mop_bucket.dm
@@ -26,37 +26,40 @@
if(in_range(user, src))
. += "[bicon(src)] [src] contains [reagents.total_volume] units of water left."
-/obj/structure/mopbucket/attackby(obj/item/W as obj, mob/user as mob, params)
+/obj/structure/mopbucket/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/mop))
- var/obj/item/mop/m = W
- if(m.reagents.total_volume < m.reagents.maximum_volume)
+ var/obj/item/mop/mop = W
+ if(mop.reagents.total_volume < mop.reagents.maximum_volume)
add_fingerprint(user)
- m.wet_mop(src, user)
+ mop.wet_mop(src, user)
return
if(!mymop)
add_fingerprint(user)
- m.janicart_insert(user, src)
+ mop.mopbucket_insert(user, src)
return
to_chat(user, "Theres already a mop in the mopbucket.")
return
return ..()
+
/obj/structure/mopbucket/proc/put_in_cart(obj/item/mop/I, mob/user)
user.drop_transfer_item_to_loc(I, src)
to_chat(user, "You put [I] into [src].")
- return
+ update_icon(UPDATE_OVERLAYS)
+
/obj/structure/mopbucket/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/structure/mopbucket/update_icon()
- overlays.Cut()
+
+/obj/structure/mopbucket/update_overlays()
+ . = ..()
if(mymop)
- overlays += image(icon,"mopbucket_mop")
+ . += "mopbucket_mop"
if(reagents.total_volume > 0)
var/image/reagentsImage = image(icon, src, "mopbucket_reagents0")
reagentsImage.alpha = 150
- switch((reagents.total_volume/reagents.maximum_volume)*100)
+ switch((reagents.total_volume / reagents.maximum_volume) * 100)
if(1 to 25)
reagentsImage.icon_state = "mopbucket_reagents1"
if(26 to 50)
@@ -66,7 +69,8 @@
if(76 to 100)
reagentsImage.icon_state = "mopbucket_reagents4"
reagentsImage.icon += mix_color_from_reagents(reagents.reagent_list)
- add_overlay(reagentsImage)
+ . += reagentsImage
+
/obj/structure/mopbucket/attack_hand(mob/living/user)
. = ..()
@@ -75,5 +79,5 @@
user.put_in_hands(mymop, ignore_anim = FALSE)
to_chat(user, "You take [mymop] from [src].")
mymop = null
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
+
diff --git a/code/game/objects/structures/morgue.dm b/code/game/objects/structures/morgue.dm
index c88387ee183..d0c22b44715 100644
--- a/code/game/objects/structures/morgue.dm
+++ b/code/game/objects/structures/morgue.dm
@@ -139,12 +139,18 @@
return ..()
-/obj/structure/morgue/wirecutter_act(mob/user)
- if(name != initial(name))
- to_chat(user, span_notice("You cut the tag off the morgue."))
- name = initial(name)
- update_icon(UPDATE_OVERLAYS)
- return TRUE
+/obj/structure/morgue/wirecutter_act(mob/user, obj/item/I)
+ if(name == initial(name))
+ return FALSE
+
+ . = TRUE
+
+ if(!I.use_tool(src, user, 0, volume = I.tool_volume))
+ return .
+
+ to_chat(user, span_notice("You cut the tag off the morgue."))
+ name = initial(name)
+ update_icon(UPDATE_OVERLAYS)
/obj/structure/morgue/attack_hand(mob/user)
diff --git a/code/game/objects/structures/noticeboard.dm b/code/game/objects/structures/noticeboard.dm
index 4d05534d468..737ce80494f 100644
--- a/code/game/objects/structures/noticeboard.dm
+++ b/code/game/objects/structures/noticeboard.dm
@@ -25,6 +25,7 @@
break
. += image(src.icon, icon_state = "[src.icon_state][I]")
+
//attaching papers!!
/obj/structure/noticeboard/attackby(obj/item/item, mob/user, params)
if(istype(item, /obj/item/paper))
diff --git a/code/game/objects/structures/pit.dm b/code/game/objects/structures/pit.dm
index 99b778479b3..9b6ca752a84 100644
--- a/code/game/objects/structures/pit.dm
+++ b/code/game/objects/structures/pit.dm
@@ -45,9 +45,11 @@
return
..()
-/obj/structure/pit/update_icon()
+
+/obj/structure/pit/update_icon_state()
icon_state = "pit[open][icon_floor_type]"
+
/obj/structure/pit/Initialize(mapload)
. = ..()
if(mapload && !open)
@@ -64,12 +66,13 @@
icon_floor_type = "sand"
if(istype(loc, /turf/simulated/floor/grass))
icon_floor_type = "mud"
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/pit/proc/take_contents()
var/itemcount = 0
for(var/atom/movable/A in loc)
- if(A.density || A.anchored || A == src || open) continue
+ if(A.density || A.anchored || A == src || open)
+ continue
A.forceMove(src)
itemcount += 1
if(itemcount >= storage_capacity)
@@ -87,7 +90,7 @@
if(istype(A, /obj/structure/closet))
for(var/mob/living/carbon/M in A.contents)
M.update_tint()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/pit/proc/close(var/user)
name = "mound"
@@ -108,7 +111,7 @@
if(istype(A, /obj/structure/closet))
for(var/mob/living/carbon/M in A.contents)
M.overlay_fullscreen("tint", /obj/screen/fullscreen/blind)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/pit/remove_air(amount)
return 0
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index 06cd6627178..f2f64492a6e 100644
--- a/code/game/objects/structures/safe.dm
+++ b/code/game/objects/structures/safe.dm
@@ -112,7 +112,8 @@ GLOBAL_LIST_EMPTY(safes)
/obj/structure/safe/examine_status(mob/user)
return
-/obj/structure/safe/update_icon()
+
+/obj/structure/safe/update_icon_state()
if(open)
if(broken)
icon_state = "[initial(icon_state)]-open-broken"
@@ -124,17 +125,15 @@ GLOBAL_LIST_EMPTY(safes)
else
icon_state = initial(icon_state)
- var/list/overlays_to_cut = list(drill_overlay)
- if(!drill_timer)
- overlays_to_cut += progress_bar
-
- cut_overlay(overlays_to_cut)
+/obj/structure/safe/update_overlays()
+ . = ..()
if(istype(drill, /obj/item/thermal_drill))
var/drill_icon = istype(drill, /obj/item/thermal_drill/diamond_drill) ? "d" : "h"
var/state = "[initial(icon_state)]_[drill_icon]-drill-[drill_timer ? "on" : "off"]"
drill_overlay = image(icon = 'icons/effects/drill.dmi', icon_state = state, pixel_x = drill_x_offset, pixel_y = drill_y_offset)
- add_overlay(drill_overlay)
+ . += drill_overlay
+
/obj/structure/safe/attack_ghost(mob/user)
if(..() || drill)
@@ -376,7 +375,7 @@ GLOBAL_LIST_EMPTY(safes)
hide(T.intact)
/obj/structure/safe/floor/hide(intact)
- invisibility = intact ? INVISIBILITY_ABSTRACT : 0
+ invisibility = intact ? INVISIBILITY_MAXIMUM : 0
/**
* # Safe Internals
diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
index c841de19414..30fe46a8e8a 100644
--- a/code/game/objects/structures/signs.dm
+++ b/code/game/objects/structures/signs.dm
@@ -5,8 +5,28 @@
density = 0
layer = 3.5
max_integrity = 100
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
+ var/does_emissive = FALSE
armor = list("melee" = 50, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
+
+/obj/structure/sign/Initialize(mapload)
+ . = ..()
+ if(does_emissive)
+ update_icon(UPDATE_OVERLAYS)
+ set_light(1, LIGHTING_MINIMUM_POWER)
+
+
+/obj/structure/sign/update_overlays()
+ . = ..()
+
+ underlays.Cut()
+ if(!does_emissive)
+ return
+
+ underlays += emissive_appearance(icon,"[icon_state]_lightmask")
+
+
/obj/structure/sign/play_attack_sound(damage_amount, damage_type = BRUTE, damage_flag = 0)
switch(damage_type)
if(BRUTE)
@@ -17,6 +37,7 @@
if(BURN)
playsound(loc, 'sound/items/welder.ogg', 80, TRUE)
+
/obj/structure/sign/screwdriver_act(mob/user, obj/item/I)
if(istype(src, /obj/structure/sign/double))
return
@@ -42,33 +63,36 @@
resistance_flags = FLAMMABLE
var/sign_state = ""
-/obj/item/sign/attackby(obj/item/tool as obj, mob/user as mob) //construction
- if(istype(tool, /obj/item/screwdriver) && isturf(user.loc))
- var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
- if(direction == "Cancel")
- return
- if(QDELETED(src))
- return
- var/obj/structure/sign/S = new(user.loc)
- switch(direction)
- if("North")
- S.pixel_y = 32
- if("East")
- S.pixel_x = 32
- if("South")
- S.pixel_y = -32
- if("West")
- S.pixel_x = -32
- else
- return
- S.name = name
- S.desc = desc
- S.icon_state = sign_state
- src.transfer_fingerprints_to(S)
- to_chat(user, "You fasten \the [S] with your [tool].")
- qdel(src)
- else
- return ..()
+
+/obj/item/sign/screwdriver_act(mob/living/user, obj/item/I)
+ if(!isturf(loc))
+ return
+
+ var/direction = input("In which direction?", "Select direction.") in list("North", "East", "South", "West", "Cancel")
+ if(direction == "Cancel")
+ return TRUE // These gotta be true or we stab the sign
+ if(QDELETED(src))
+ return TRUE // Unsure about this, but stabbing something that doesnt exist seems like a bad idea
+
+ var/obj/structure/sign/sign = new(loc)
+ switch(direction)
+ if("North")
+ sign.pixel_y = 32
+ if("East")
+ sign.pixel_x = 32
+ if("South")
+ sign.pixel_y = -32
+ if("West")
+ sign.pixel_x = -32
+ else
+ return TRUE // We dont want to stab it or place it, so we return
+ sign.name = name
+ sign.desc = desc
+ sign.icon_state = sign_state
+ to_chat(user, span_notice("You fasten [sign] with your [I]."))
+ qdel(src)
+ return TRUE
+
/obj/structure/sign/double/map
name = "station map"
@@ -212,11 +236,15 @@
name = "\improper barber shop sign"
desc = "A spinning sign indicating a barbershop is near."
icon_state = "barber"
+ does_emissive = TRUE
+ blocks_emissive = FALSE
/obj/structure/sign/chinese
name = "\improper chinese restaurant sign"
desc = "A glowing dragon invites you in."
icon_state = "chinese"
+ does_emissive = TRUE
+ blocks_emissive = FALSE
/obj/structure/sign/science
name = "\improper SCIENCE!"
diff --git a/code/game/objects/structures/statues.dm b/code/game/objects/structures/statues.dm
index 8ad8842a508..eb704a4f139 100644
--- a/code/game/objects/structures/statues.dm
+++ b/code/game/objects/structures/statues.dm
@@ -409,15 +409,11 @@
var/lit = 0
layer = EDGED_TURF_LAYER
-/obj/structure/statue/unknown/Destroy()
- return ..()
-/obj/structure/statue/unknown/update_icon()
- if(lit)
- lit = 1
- icon_state = "unknown_lit"
- else
- icon_state = "unknown"
+/obj/structure/statue/unknown/update_icon_state()
+ icon_state = "unknown[lit ? "_lit" : ""]"
+
+
/obj/structure/statue/unknown/attackby(obj/item/W, mob/user, params)
if(is_hot(W))
@@ -425,29 +421,33 @@
return
return ..()
+
/obj/structure/statue/unknown/welder_act(mob/user, obj/item/I)
. = TRUE
if(I.tool_use_check(user, 0))
light(span_notice("[user] casually lights the [name] with [I], what a badass."))
+
/obj/structure/statue/unknown/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(!lit)
light()
return ..()
+
/obj/structure/statue/unknown/proc/light(show_message)
if(!lit)
- lit = 1
+ lit = TRUE
if(show_message)
usr.visible_message(show_message)
set_light(CANDLE_LUM)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/structure/statue/unknown/attack_hand(mob/user)
if(lit)
user.visible_message(span_notice("[user] snuffs out [src]."))
- lit = 0
- update_icon()
+ lit = FALSE
+ update_icon(UPDATE_ICON_STATE)
set_light(0)
////////////////////////////////
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 eaeabd374a5..5f44986b557 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm
@@ -149,16 +149,18 @@
forceMove(RH)
RH.held = src
-/obj/structure/bed/roller/MouseDrop(over_object, src_location, over_location)
- ..()
- if(over_object == usr && Adjacent(usr) && (in_range(src, usr) || usr.contents.Find(src)))
- if(!ishuman(usr) || usr.incapacitated())
- return
- if(has_buckled_mobs())
- return 0
- usr.visible_message("[usr] collapses \the [name].", "You collapse \the [name].")
+
+/obj/structure/bed/roller/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ if(!has_buckled_mobs() && over_object == usr && ishuman(usr) && !usr.incapacitated() && usr.Adjacent(src))
+ usr.visible_message(
+ span_notice("[usr] collapses [src]."),
+ span_notice("You collapse [src]."),
+ )
new folded(get_turf(src))
qdel(src)
+ return FALSE
+ return ..()
+
/obj/item/roller/holo
name = "holo stretcher"
diff --git a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
index c7895e40f5c..0af76ed1295 100644
--- a/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
+++ b/code/game/objects/structures/stool_bed_chair_nest/chairs.dm
@@ -73,11 +73,9 @@
new buildstacktype(loc, buildstackamount)
..()
-/obj/structure/chair/MouseDrop(over_object, src_location, over_location)
- . = ..()
- if(over_object == usr && Adjacent(usr))
- if(!item_chair || has_buckled_mobs() || anchored)
- return
+
+/obj/structure/chair/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ if(over_object == usr && ishuman(usr) && item_chair && !anchored && !has_buckled_mobs() && usr.Adjacent(src))
if(usr.incapacitated())
to_chat(usr, span_warning("You can't do that right now!"))
return
@@ -87,13 +85,18 @@
if(usr.get_active_hand() && usr.get_inactive_hand())
to_chat(usr, span_warning("You try to grab the chair, but your hands are already full!"))
return
- if(!ishuman(usr))
- return
- usr.visible_message(span_notice("[usr] grabs \the [src]."), span_notice("You grab \the [src]."))
- var/C = new item_chair(drop_location())
- usr.put_in_hands(C, ignore_anim = FALSE)
- transfer_fingerprints_to(C)
+ usr.visible_message(
+ span_notice("[usr] grabs [src]."),
+ span_notice("You grab [src]."),
+ )
+ var/new_chair = new item_chair(drop_location())
+ transfer_fingerprints_to(new_chair)
+ usr.put_in_hands(new_chair, ignore_anim = FALSE)
qdel(src)
+ return FALSE
+
+ return ..()
+
/obj/structure/chair/attack_tk(mob/user)
if(!anchored || has_buckled_mobs() || !isturf(user.loc))
@@ -101,53 +104,65 @@
else
rotate()
+
/obj/structure/chair/proc/handle_rotation(direction)
handle_layer()
if(has_buckled_mobs())
- for(var/m in buckled_mobs)
- var/mob/living/buckled_mob = m
+ for(var/mob/living/buckled_mob as anything in buckled_mobs)
buckled_mob.setDir(direction)
+
/obj/structure/chair/proc/handle_layer()
if(has_buckled_mobs() && dir == NORTH)
layer = ABOVE_MOB_LAYER
else
layer = OBJ_LAYER
+
/obj/structure/chair/post_buckle_mob(mob/living/M)
. = ..()
handle_layer()
+
/obj/structure/chair/post_unbuckle_mob()
. = ..()
handle_layer()
+
/obj/structure/chair/setDir(newdir)
..()
handle_rotation(newdir)
-/obj/structure/chair/verb/rotate()
- set name = "Rotate Chair"
- set category = "Object"
- set src in oview(1)
- if(CONFIG_GET(flag/ghost_interaction))
- add_fingerprint(usr)
- setDir(turn(dir, 90))
- handle_rotation()
- return
+/obj/structure/chair/examine(mob/user)
+ . = ..()
+ . += span_info("You can Alt-Click [src] to rotate it.")
- if(usr.incapacitated())
- return
- add_fingerprint(usr)
+/obj/structure/chair/proc/rotate(mob/living/user)
+ if(user)
+ if(isobserver(user))
+ if(!CONFIG_GET(flag/ghost_interaction))
+ return FALSE
+ else if(!isliving(user) || user.incapacitated() || user.restrained() || !Adjacent(user))
+ return FALSE
+
setDir(turn(dir, 90))
handle_rotation()
+ return TRUE
+
+
+/obj/structure/chair/AltClick(mob/living/user)
+ rotate(user)
+
+
+/obj/structure/chair/verb/rotate_chair()
+ set name = "Rotate Chair"
+ set category = "Object"
+ set src in oview(1)
+
+ rotate(usr)
-/obj/structure/chair/AltClick(mob/user)
- if(!Adjacent(user))
- return
- rotate()
// CHAIR TYPES
@@ -288,7 +303,7 @@
anchored = TRUE
item_chair = null
comfort = 0.6
- var/image/armrest = null
+ var/mutable_appearance/armrest
/obj/structure/chair/sofa/Initialize(mapload)
armrest = GetArmrest()
diff --git a/code/game/objects/structures/tables_racks.dm b/code/game/objects/structures/tables_racks.dm
index 186ec4ea419..9364329513e 100644
--- a/code/game/objects/structures/tables_racks.dm
+++ b/code/game/objects/structures/tables_racks.dm
@@ -34,52 +34,72 @@
var/buildstackamount = 1
var/framestackamount = 2
var/deconstruction_ready = TRUE
- var/flipped = 0
+ var/flip_sound = 'sound/machines/wooden_closet_close.ogg'
+ var/flipped = FALSE
+ /// Can this table be flipped?
+ var/can_be_flipped = TRUE
+
/obj/structure/table/Initialize(mapload)
. = ..()
if(flipped)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/structure/table/examine(mob/user)
. = ..()
. += deconstruction_hints(user)
+ if(can_be_flipped)
+ if(flipped)
+ . += span_info("Alt-Shift-Click to right the table again.")
+ else
+ . += span_info("Alt-Shift-Click to flip over the table.")
+
/obj/structure/table/proc/deconstruction_hints(mob/user)
return "The top is screwed on, but the main bolts are also visible."
-/obj/structure/table/update_icon()
+
+/obj/structure/table/update_icon(updates = ALL)
+ . = ..()
+ update_smoothing()
+
+
+/obj/structure/table/update_icon_state()
if(smooth && !flipped)
icon_state = ""
- queue_smooth(src)
- queue_smooth_neighbors(src)
if(flipped)
- clear_smooth_overlays()
-
var/type = 0
var/subtype = null
for(var/direction in list(turn(dir,90), turn(dir,-90)) )
- var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,direction))
- if(T && T.flipped)
+ var/obj/structure/table/other_table = locate(/obj/structure/table,get_step(src,direction))
+ if(other_table?.flipped)
type++
if(type == 1)
subtype = direction == turn(dir,90) ? "-" : "+"
var/base = "table"
if(istype(src, /obj/structure/table/wood))
base = "wood"
- if(istype(src, /obj/structure/table/reinforced))
+ else if(istype(src, /obj/structure/table/reinforced))
base = "rtable"
- if(istype(src, /obj/structure/table/wood/poker))
+ else if(istype(src, /obj/structure/table/wood/poker))
base = "poker"
- if(istype(src, /obj/structure/table/wood/fancy))
+ else if(istype(src, /obj/structure/table/wood/fancy))
base = "fancy"
- if(istype(src, /obj/structure/table/wood/fancy/black))
+ else if(istype(src, /obj/structure/table/wood/fancy/black))
base = "fancyblack"
-
icon_state = "[base]flip[type][type == 1 ? subtype : ""]"
- return 1
+
+/obj/structure/table/proc/update_smoothing()
+ if(smooth)
+ queue_smooth(src)
+ queue_smooth_neighbors(src)
+
+ if(flipped)
+ clear_smooth_overlays()
+
/obj/structure/table/narsie_act()
new /obj/structure/table/wood(loc)
@@ -117,28 +137,29 @@
var/mob/living/user = AM
clumse_stuff(user)
+
/obj/structure/table/CanPass(atom/movable/mover, turf/target, height=0)
if(height == 0)
- return 1
+ return TRUE
if(istype(mover,/obj/item/projectile))
- return (check_cover(mover,target))
+ return check_cover(mover,target)
if(ismob(mover))
- var/mob/M = mover
+ var/mob/living/M = mover
if(M.flying)
- return 1
+ return TRUE
if(istype(mover) && mover.checkpass(PASSTABLE))
- return 1
+ return TRUE
if(mover.throwing)
- return 1
+ return TRUE
+ if(length(get_atoms_of_type(get_turf(mover), /obj/structure/table) - mover))
+ var/obj/structure/table/other_table = locate(/obj/structure/table) in get_turf(mover)
+ if(!other_table.flipped)
+ return TRUE
if(flipped)
if(get_dir(loc, target) == dir)
return !density
- else
- return 1
- var/obj/structure/table/S = locate(/obj/structure/table) in get_turf(mover)
- if(S?.flipped == 0)
- return 1
- return 0
+ return TRUE
+ return FALSE
/obj/structure/table/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE)
@@ -157,53 +178,48 @@
* * from - Where the projectile is located.
*/
/obj/structure/table/proc/check_cover(obj/item/projectile/P, turf/from)
- var/turf/cover = flipped ? get_turf(src) : get_step(loc, get_dir(from, loc))
- if(get_dist(P.starting, loc) <= 1) //Tables won't help you if people are THIS close
- return 1
- if(get_turf(P.original) == cover)
- var/chance = 20
- if(ismob(P.original))
- var/mob/M = P.original
- if(M.lying)
- chance += 20 //Lying down lets you catch less bullets
- if(flipped)
- if(get_dir(loc, from) == dir) //Flipped tables catch mroe bullets
- chance += 20
- else
- return 1 //But only from one side
- if(prob(chance))
- obj_integrity -= P.damage/2
- if(obj_integrity > 0)
- visible_message("[P] hits \the [src]!")
- return 0
- else
- visible_message("[src] breaks down!")
- deconstruct(FALSE)
- return 1
- return 1
-
-/obj/structure/table/CheckExit(atom/movable/O, turf/target)
- if(istype(O) && O.checkpass(PASSTABLE))
- return 1
- if(flipped)
- if(get_dir(loc, target) == dir)
- return !density
- else
- return 1
- return 1
+ . = TRUE
-/obj/structure/table/MouseDrop_T(obj/O, mob/user)
- ..()
- if((!( istype(O, /obj/item) ) || user.get_active_hand() != O))
- return
+ if(!flipped)
+ return .
+
+ if(in_range(P.starting, loc)) // Tables won't help you if people are THIS close
+ return .
+
+ var/proj_dir = get_dir(from, loc)
+ var/block_dir = get_dir(get_step(loc, dir), loc)
+ var/full_protection = (proj_dir & block_dir)
+ var/half_protection = ((proj_dir == get_clockwise_dir(block_dir)) || (proj_dir == get_anticlockwise_dir(block_dir)))
+
+ if(!full_protection && !half_protection) // Back/side shots may pass
+ return .
+
+ if(prob(half_protection ? 40 : 60))
+ return FALSE // Blocked
+
+
+/obj/structure/table/CheckExit(atom/movable/mover, turf/target)
+ if(istype(mover) && mover.checkpass(PASSTABLE))
+ return TRUE
+ if(flipped && get_dir(loc, target) == dir)
+ return !density
+ return TRUE
+
+
+/obj/structure/table/MouseDrop_T(obj/dropping, mob/user, params)
+ if(..())
+ return TRUE
+ if(!isitem(dropping) || user.get_active_hand() != dropping)
+ return FALSE
if(isrobot(user))
- return
- if(!user.drop_from_active_hand())
- return
- if(O.loc != src.loc)
+ return FALSE
+ if(!user.drop_item_ground(dropping))
+ return FALSE
+ if(dropping.loc != loc)
add_fingerprint(user)
- step(O, get_dir(O, src))
- return
+ step(dropping, get_dir(dropping, src))
+ return TRUE
+
/obj/structure/table/proc/tablepush(obj/item/grab/G, mob/user)
if(HAS_TRAIT(user, TRAIT_PACIFISM) || GLOB.pacifism_after_gt)
@@ -232,6 +248,7 @@
return TRUE
qdel(G)
+
/obj/structure/table/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/grab))
add_fingerprint(user)
@@ -269,6 +286,7 @@
deconstruct(TRUE)
TOOL_DISMANTLE_SUCCESS_MESSAGE
+
/obj/structure/table/wrench_act(mob/user, obj/item/I)
if(flags & NODECONSTRUCT)
return
@@ -282,6 +300,7 @@
deconstruct(TRUE, 1)
TOOL_DISMANTLE_SUCCESS_MESSAGE
+
/obj/structure/table/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
if(!(flags & NODECONSTRUCT))
var/turf/T = get_turf(src)
@@ -292,119 +311,113 @@
new framestack(T, framestackamount)
qdel(src)
+
/obj/structure/table/proc/straight_table_check(direction)
- var/obj/structure/table/T
- for(var/angle in list(-90,90))
- T = locate() in get_step(loc,turn(direction,angle))
- if(T && !T.flipped)
- return 0
- T = locate() in get_step(loc,direction)
- if(!T || T.flipped)
- return 1
- if(istype(T,/obj/structure/table/reinforced/))
- if(!T.deconstruction_ready)
- return 0
- return T.straight_table_check(direction)
+ var/obj/structure/table/check_table
+ for(var/angle in list(-90, 90))
+ check_table = locate() in get_step(loc, turn(direction, angle))
+ if(check_table && !check_table.flipped)
+ return FALSE
+ check_table = locate() in get_step(loc, direction)
+ if(!check_table || check_table.flipped)
+ return TRUE
+ if(istype(check_table, /obj/structure/table/reinforced) && !check_table.deconstruction_ready)
+ return FALSE
+ return check_table.straight_table_check(direction)
-/obj/structure/table/verb/do_flip()
- set name = "Flip table"
- set desc = "Flips a non-reinforced table"
- set category = null
- set src in oview(1)
- if(!can_touch(usr) || ismouse(usr))
- return
+/obj/structure/table/AltShiftClick(mob/user)
+ actual_flip(user)
- if(!flip(get_cardinal_dir(usr,src)))
- to_chat(usr, "It won't budge.")
- return
- add_fingerprint(usr)
- usr.visible_message("[usr] flips \the [src]!")
+/obj/structure/table/verb/do_flip()
+ set name = "Flip/Unflip table"
+ set desc = "Flips or unflips a table"
+ set category = null
+ set src in oview(1)
+ actual_flip(usr)
- if(climbable)
- structure_shaken()
- return
+/obj/structure/table/proc/actual_flip(mob/living/user)
+ if(!can_be_flipped || !can_touch(user))
+ return FALSE
-/obj/structure/table/proc/do_put()
- set name = "Put table back"
- set desc = "Puts flipped table back"
- set category = "Object"
- set src in oview(1)
+ if(!flipped)
+ if(!flip(get_cardinal_dir(user, src)))
+ to_chat(user, span_notice("It won't budge."))
+ return
- if(!can_touch(usr) || ismouse(usr))
- return
+ user.visible_message("[user] flips \the [src]!")
- if(!unflip())
- to_chat(usr, "It won't budge.")
- return
+ if(climbable)
+ structure_shaken()
+ else
+ if(!unflip())
+ to_chat(user, span_notice("It won't budge."))
/obj/structure/table/proc/flip(direction)
if(flipped)
- return 0
+ return FALSE
- if( !straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)) )
- return 0
-
- verbs -=/obj/structure/table/verb/do_flip
- verbs +=/obj/structure/table/proc/do_put
+ if(!straight_table_check(turn(direction,90)) || !straight_table_check(turn(direction,-90)))
+ return FALSE
var/list/targets = list(get_step(src,dir),get_step(src,turn(dir, 45)),get_step(src,turn(dir, -45)))
- for(var/atom/movable/A in get_turf(src))
- if(!A.anchored)
- spawn(0)
- A.throw_at(pick(targets),1,1)
+ for(var/atom/movable/thing in get_turf(src))
+ if(!thing.anchored)
+ INVOKE_ASYNC(thing, TYPE_PROC_REF(/atom/movable, throw_at), pick(targets), 1, 1)
dir = direction
if(dir != NORTH)
layer = 5
- flipped = 1
+ flipped = TRUE
smooth = SMOOTH_FALSE
flags |= ON_BORDER
- for(var/D in list(turn(direction, 90), turn(direction, -90)))
- if(locate(/obj/structure/table,get_step(src,D)))
- var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D))
- T.flip(direction)
- update_icon()
+ playsound(loc, flip_sound, 100, TRUE)
+
+ for(var/check_dir in list(turn(direction, 90), turn(direction, -90)))
+ var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir))
+ if(other_table)
+ other_table.flip(direction)
+ update_icon(UPDATE_ICON_STATE)
creates_cover = FALSE
if(isturf(loc))
REMOVE_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src))
- return 1
+ return TRUE
+
/obj/structure/table/proc/unflip()
if(!flipped)
- return 0
+ return FALSE
- var/can_flip = 1
- for(var/mob/A in oview(src,0))//loc)
- if(istype(A))
- can_flip = 0
+ var/can_flip = TRUE
+ for(var/mob/check in oview(src, 0))
+ can_flip = FALSE
+ break
if(!can_flip)
- return 0
-
- verbs -=/obj/structure/table/proc/do_put
- verbs +=/obj/structure/table/verb/do_flip
+ return FALSE
layer = initial(layer)
- flipped = 0
+ flipped = FALSE
smooth = initial(smooth)
flags &= ~ON_BORDER
- for(var/D in list(turn(dir, 90), turn(dir, -90)))
- if(locate(/obj/structure/table,get_step(src,D)))
- var/obj/structure/table/T = locate(/obj/structure/table,get_step(src,D))
- T.unflip()
+ playsound(loc, flip_sound, 100, TRUE)
+
+ for(var/check_dir in list(turn(dir, 90), turn(dir, -90)))
+ var/obj/structure/table/other_table = locate(/obj/structure/table, get_step(src, check_dir))
+ if(other_table)
+ other_table.unflip()
dir = initial(dir)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
creates_cover = TRUE
if(isturf(loc))
ADD_TRAIT(loc, TRAIT_TURF_COVERED, UNIQUE_TRAIT_SOURCE(src))
- return 1
+ return TRUE
/*
@@ -433,25 +446,30 @@
qdel(i)
. = ..()
+
/obj/structure/table/glass/Crossed(atom/movable/AM, oldloc)
. = ..()
if(flags & NODECONSTRUCT)
return
if(!isliving(AM))
return
+
+ var/mob/living/check = AM
+ if(check.incorporeal_move || check.flying || check.floating)
+ return
+
// Don't break if they're just flying past
if(AM.throwing)
addtimer(CALLBACK(src, PROC_REF(throw_check), AM), 5)
else
check_break(AM)
+
/obj/structure/table/glass/proc/throw_check(mob/living/M)
if(M.loc == get_turf(src))
check_break(M)
/obj/structure/table/glass/proc/check_break(mob/living/M)
- if(M.flying || M.incorporeal_move)
- return
if(has_gravity(M) && M.mob_size > MOB_SIZE_SMALL)
table_shatter(M)
@@ -628,9 +646,8 @@
/obj/structure/table/reinforced/flip(direction)
if(!deconstruction_ready)
- return 0
- else
- return ..()
+ return FALSE
+ return ..()
/obj/structure/table/reinforced/welder_act(mob/user, obj/item/I)
. = TRUE
@@ -683,15 +700,15 @@
icon_state = "tray"
buildstack = /obj/item/stack/sheet/mineral/titanium
buildstackamount = 2
+ can_be_flipped = FALSE
var/list/typecache_can_hold = list(/mob, /obj/item)
var/list/held_items = list()
/obj/structure/table/tray/Initialize()
. = ..()
- verbs -= /obj/structure/table/verb/do_flip
typecache_can_hold = typecacheof(typecache_can_hold)
for(var/atom/movable/held in get_turf(src))
- if(is_type_in_typecache(held, typecache_can_hold))
+ if(!held.anchored && held.move_resist != INFINITY && is_type_in_typecache(held, typecache_can_hold))
held_items += held.UID()
/obj/structure/table/tray/Move(NewLoc, direct)
@@ -717,10 +734,26 @@
continue
held.forceMove(NewLoc)
+
+/obj/structure/table/tray/can_be_pulled(user, force, show_message)
+ var/atom/movable/puller = user
+ if(loc != puller.loc)
+ held_items -= puller.UID()
+ if(isliving(user))
+ var/mob/living/M = user
+ if(M.UID() in held_items)
+ return FALSE
+ return ..()
+
+
/obj/structure/table/tray/item_placed(atom/movable/item)
. = ..()
if(is_type_in_typecache(item, typecache_can_hold))
held_items += item.UID()
+ if(isliving(item))
+ var/mob/living/M = item
+ if(M.pulling == src)
+ M.stop_pulling()
/obj/structure/table/tray/deconstruct(disassembled = TRUE, wrench_disassembly = 0)
if(!(flags & NODECONSTRUCT))
@@ -758,17 +791,17 @@
. = ..()
. += "It's held together by a couple of bolts."
+
/obj/structure/rack/CanPass(atom/movable/mover, turf/target, height=0)
if(height==0)
- return 1
- if(density == 0) //Because broken racks -Agouri |TODO: SPRITE!|
- return 1
+ return TRUE
+ if(!density) //Because broken racks -Agouri |TODO: SPRITE!|
+ return TRUE
if(istype(mover) && mover.checkpass(PASSTABLE))
- return 1
+ return TRUE
if(mover.throwing)
- return 1
- else
- return 0
+ return TRUE
+ return FALSE
/obj/structure/rack/CanPathfindPass(obj/item/card/id/ID, dir, caller, no_id = FALSE)
@@ -778,23 +811,25 @@
. = . || mover.checkpass(PASSTABLE)
-/obj/structure/rack/MouseDrop_T(obj/item/O, mob/user)
- if((!(istype(O)) || user.get_active_hand() != O))
- return
+/obj/structure/rack/MouseDrop_T(obj/item/dropping, mob/user, params)
+ . = FALSE
+ if((!isitem(dropping)) || user.get_active_hand() != dropping)
+ return .
if(isrobot(user))
- return
- if(O.loc != src.loc)
- if(user.transfer_item_to_loc(O, src.loc))
- add_fingerprint(user)
+ return .
+ if(dropping.loc != loc && user.transfer_item_to_loc(dropping, src.loc))
+ add_fingerprint(user)
+ return TRUE
+
-/obj/structure/rack/attackby(obj/item/W, mob/user, params)
+/obj/structure/rack/attackby(obj/item/I, mob/user, params)
if(isrobot(user))
return
if(user.a_intent == INTENT_HARM)
return ..()
- if(!(W.flags & ABSTRACT))
- if(user.transfer_item_to_loc(W, src.loc))
- add_fingerprint(user)
+ if(!(I.flags & ABSTRACT) && user.transfer_item_to_loc(I, loc))
+ add_fingerprint(user)
+
/obj/structure/rack/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -842,46 +877,45 @@
desc = "A gun rack for storing guns."
icon_state = "gunrack"
-/obj/structure/rack/gunrack/MouseDrop_T(obj/O, mob/user)
- if(isrobot(user))
- return
- if(!user.drop_from_active_hand())
- return
- if(!(istype(O, /obj/item/gun)))
- to_chat(user, "This item doesn't fit!")
- return
- if(O.loc != src.loc)
- add_fingerprint(user)
- var/obj/item/gun/our_gun = O
- our_gun.reset_direction()
- our_gun.place_on_rack()
- our_gun.do_drop_animation(src)
- our_gun.Move(loc)
-/obj/structure/rack/gunrack/attackby(obj/item/W, mob/user, params)
+/obj/structure/rack/gunrack/proc/place_gun(obj/item/gun/our_gun, mob/user, params)
+ . = FALSE
if(!ishuman(user))
- return
- if(user.a_intent == INTENT_HARM)
- return ..()
- if(!(istype(W, /obj/item/gun)))
- to_chat(user, "This item doesn't fit!")
- return
- if(!(W.flags & ABSTRACT) && user.drop_from_active_hand())
+ return .
+ if(!(istype(our_gun)))
+ to_chat(user, span_warning("This item doesn't fit!"))
+ return .
+ if(our_gun.flags & ABSTRACT)
+ return .
+ if(!user.drop_item_ground(our_gun))
+ return .
+ if(our_gun.loc != loc)
add_fingerprint(user)
- var/obj/item/gun/our_gun = W
+ our_gun.reset_direction()
our_gun.place_on_rack()
our_gun.do_drop_animation(src)
our_gun.Move(loc)
var/list/click_params = params2list(params)
//Center the icon where the user clicked.
if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
- return
+ return .
//Clamp it so that the icon never moves more than 16 pixels in either direction (thus leaving the table turf)
- W.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
- W.pixel_y = 0
- else
+ our_gun.pixel_x = clamp(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
+ our_gun.pixel_y = 0
+ return TRUE
+
+
+/obj/structure/rack/gunrack/MouseDrop_T(obj/item/gun/our_gun, mob/user, params)
+ return place_gun(our_gun, user, params)
+
+
+/obj/structure/rack/gunrack/attackby(obj/item/I, mob/user, params)
+ if(!ishuman(user))
return
- return
+ if(user.a_intent == INTENT_HARM)
+ return ..()
+ place_gun(I, user, params)
+
/obj/structure/rack/gunrack/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -889,13 +923,15 @@
return
deconstruct(TRUE)
+
/obj/structure/rack/gunrack/Initialize(mapload)
. = ..()
- if(mapload)
- for(var/obj/item/I in loc.contents)
- if(istype(I, /obj/item/gun))
- var/obj/item/gun/to_place = I
- to_place.place_on_rack()
+ if(!mapload)
+ return
+
+ for(var/obj/item/gun/gun in loc)
+ gun.place_on_rack()
+
/obj/structure/rack/gunrack/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
diff --git a/code/game/objects/structures/tank_dispenser.dm b/code/game/objects/structures/tank_dispenser.dm
index e773b66baf2..3fdc6d574aa 100644
--- a/code/game/objects/structures/tank_dispenser.dm
+++ b/code/game/objects/structures/tank_dispenser.dm
@@ -21,7 +21,7 @@
/obj/structure/dispenser/Initialize(mapload)
. = ..()
initialize_tanks()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/structure/dispenser/Destroy()
QDEL_LIST(stored_plasma_tanks)
@@ -37,21 +37,23 @@
var/obj/item/tank/internals/oxygen/O = new(src)
stored_oxygen_tanks.Add(O)
-/obj/structure/dispenser/update_icon()
- cut_overlays()
+
+/obj/structure/dispenser/update_overlays()
+ . = ..()
var/oxy_tank_amount = LAZYLEN(stored_oxygen_tanks)
switch(oxy_tank_amount)
if(1 to 3)
- overlays += "oxygen-[oxy_tank_amount]"
+ . += "oxygen-[oxy_tank_amount]"
if(4 to INFINITY)
- overlays += "oxygen-4"
+ . += "oxygen-4"
var/pla_tank_amount = LAZYLEN(stored_plasma_tanks)
switch(pla_tank_amount)
if(1 to 4)
- overlays += "plasma-[pla_tank_amount]"
+ . += "plasma-[pla_tank_amount]"
if(5 to INFINITY)
- overlays += "plasma-5"
+ . += "plasma-5"
+
/obj/structure/dispenser/attack_hand(mob/user)
if(..())
@@ -100,7 +102,7 @@
try_insert_tank(user, stored_plasma_tanks, I)
return
- if(istype(I, /obj/item/wrench))
+ if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
if(anchored)
to_chat(user, "You lean down and unwrench [src].")
@@ -116,14 +118,14 @@
if(!LAZYLEN(tank_list))
return // There are no tanks left to withdraw.
- var/obj/item/tank/internals/T = tank_list[1]
- tank_list.Remove(T)
+ var/obj/item/tank/internals/tank = tank_list[1]
+ tank_list.Remove(tank)
- T.forceMove_turf()
- user.put_in_hands(T)
+ tank.forceMove_turf()
+ user.put_in_hands(tank, ignore_anim = FALSE)
- to_chat(user, "You take [T] out of [src].")
- update_icon()
+ to_chat(user, "You take [tank] out of [src].")
+ update_icon(UPDATE_OVERLAYS)
/// Called when the user clicks on the dispenser with a tank. Tries to insert the tank into the dispenser, and updates the UI if successful.
/obj/structure/dispenser/proc/try_insert_tank(mob/living/user, list/tank_list, obj/item/tank/T)
@@ -137,7 +139,7 @@
add_fingerprint(user)
tank_list.Add(T)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
to_chat(user, "You put [T] in [src].")
SStgui.update_uis(src)
diff --git a/code/game/objects/structures/transit_tubes/station.dm b/code/game/objects/structures/transit_tubes/station.dm
index 12e14dcf80d..7ebd461fd7e 100644
--- a/code/game/objects/structures/transit_tubes/station.dm
+++ b/code/game/objects/structures/transit_tubes/station.dm
@@ -1,15 +1,14 @@
#define CLOSE_DURATION 6
#define OPEN_DURATION 6
-#define LAUNCH_COOLDOWN 50
-
-
+#define LAUNCH_COOLDOWN 30
// A place where tube pods stop, and people can get in or out.
-// Mappers: use "Generate Instances from Directions" for this
-// one.
+// Mappers: use "Generate Instances from Directions" for this one.
/obj/structure/transit_tube/station
name = "station tube station"
+ desc = "The lynchpin of the transit system."
icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi'
- icon_state = "closed"
+ icon_state = "closed_station0"
+ base_icon_state = "station0"
exit_delay = 1
enter_delay = 2
var/pod_moving = FALSE
@@ -18,6 +17,8 @@
var/hatch_state = TRANSIT_TUBE_CLOSED
var/list/disallowed_mobs = list(/mob/living/silicon/ai)
+ /// Direction by which you can board the tube
+ var/boarding_dir
/obj/structure/transit_tube/station/Initialize(mapload)
. = ..()
@@ -27,26 +28,32 @@
STOP_PROCESSING(SSobj, src)
return ..()
-// Stations which will send the tube in the opposite direction after their stop.
-/obj/structure/transit_tube/station/reverse
- reverse_launch = TRUE
+/obj/structure/transit_tube/station/init_tube_dirs()
+ // Tube station directions are simply 90 to either side of
+ // the exit.
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(EAST, WEST)
+ if(SOUTH)
+ tube_dirs = list(EAST, WEST)
+ if(EAST)
+ tube_dirs = list(NORTH, SOUTH)
+ if(WEST)
+ tube_dirs = list(NORTH, SOUTH)
+ boarding_dir = reverse_direction(dir)
/obj/structure/transit_tube/station/should_stop_pod(pod, from_dir)
return TRUE
-/obj/structure/transit_tube/station/Bumped(atom/movable/moving_atom)
- if(!pod_moving && hatch_state == TRANSIT_TUBE_OPEN && isliving(moving_atom) && !is_type_in_list(moving_atom, disallowed_mobs))
- var/failed = FALSE
+/obj/structure/transit_tube/station/Bumped(mob/living/L)
+ if(!pod_moving && L.dir == boarding_dir && hatch_state == TRANSIT_TUBE_OPEN && isliving(L) && !is_type_in_list(L, disallowed_mobs))
for(var/obj/structure/transit_tube_pod/pod in loc)
- if(pod.contents.len)
- failed = TRUE
- else if(!pod.moving && (pod.dir in directions()))
- pod.move_into(moving_atom)
+ if(length(pod.contents))
+ to_chat(L, "The pod is already occupied.")
+ return
+ if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions()))))
+ pod.move_into(L)
return
- if(failed)
- to_chat(moving_atom, "The pod is already occupied.")
-
-
/obj/structure/transit_tube/station/attack_hand(mob/user)
if(pod_moving)
@@ -66,9 +73,7 @@
"You start emptying [pod]'s contents onto the floor.", "You hear a loud noise! As if somebody is throwing stuff on the floor!")
if(!do_after(user, 20, target = pod))
return
- add_fingerprint(user)
for(var/atom/movable/AM in pod)
- AM.add_fingerprint(user)
pod.eject(AM)
if(isliving(AM))
var/mob/living/L = AM
@@ -82,7 +87,7 @@
if(ismob(G.affecting) && G.state >= GRAB_AGGRESSIVE)
var/mob/living/GM = G.affecting
for(var/obj/structure/transit_tube_pod/pod in loc)
- pod.visible_message("[user] starts putting [GM] into the [pod]!")
+ pod.visible_message("[user] starts putting [GM] into [pod]!")
if(do_after(user, 30, target = GM) && GM && G && G.affecting == GM)
GM.add_fingerprint(user)
GM.Weaken(10 SECONDS)
@@ -92,31 +97,36 @@
/obj/structure/transit_tube/station/proc/open_hatch()
if(hatch_state == TRANSIT_TUBE_CLOSED)
- icon_state = "opening"
+ icon_state = "opening_[base_icon_state]"
hatch_state = TRANSIT_TUBE_OPENING
- addtimer(CALLBACK(src, PROC_REF(open_hatch_callback)), OPEN_DURATION)
-
-/obj/structure/transit_tube/station/proc/open_hatch_callback()
- if(hatch_state == TRANSIT_TUBE_OPENING)
- icon_state = "open"
- hatch_state = TRANSIT_TUBE_OPEN
-
-
+ addtimer(CALLBACK(src, PROC_REF(finish_animation)), OPEN_DURATION)
/obj/structure/transit_tube/station/proc/close_hatch()
if(hatch_state == TRANSIT_TUBE_OPEN)
- icon_state = "closing"
+ icon_state = "closing_[base_icon_state]"
hatch_state = TRANSIT_TUBE_CLOSING
- addtimer(CALLBACK(src, PROC_REF(close_hatch_calllback)), CLOSE_DURATION)
+ addtimer(CALLBACK(src, PROC_REF(finish_animation)), CLOSE_DURATION)
-/obj/structure/transit_tube/station/proc/close_hatch_calllback()
- if(hatch_state == TRANSIT_TUBE_CLOSING)
- icon_state = "closed"
- hatch_state = TRANSIT_TUBE_CLOSED
+/obj/structure/transit_tube/station/proc/finish_animation()
+ switch(hatch_state)
+ if(TRANSIT_TUBE_OPENING)
+ icon_state = "open_[base_icon_state]"
+ hatch_state = TRANSIT_TUBE_OPEN
+ for(var/obj/structure/transit_tube_pod/pod in loc)
+ for(var/thing in pod)
+ if(ismob(thing))
+ var/mob/mob_content = thing
+ if(mob_content.client && mob_content.stat < UNCONSCIOUS)
+ continue // Let the mobs with clients decide what they want to do themselves.
+ var/atom/movable/movable_content = thing
+ movable_content.forceMove(loc) //Everything else is moved out of.
+ if(TRANSIT_TUBE_CLOSING)
+ icon_state = "closed_[base_icon_state]"
+ hatch_state = TRANSIT_TUBE_CLOSED
/obj/structure/transit_tube/station/proc/launch_pod()
for(var/obj/structure/transit_tube_pod/pod in loc)
- if(!pod.moving && (pod.dir in directions()))
+ if(!pod.moving && ((pod.dir in directions()) || (reverse_launch && (turn(pod.dir, 180) in directions()))))
addtimer(CALLBACK(src, PROC_REF(launch_pod_callback), pod), 5)
return
@@ -135,7 +145,7 @@
if(!nexttube)
pod.dir = turn(pod.dir, 180)
- if(hatch_state == TRANSIT_TUBE_CLOSED && pod)
+ if(hatch_state == TRANSIT_TUBE_CLOSED && pod && pod.loc == loc)
pod.follow_tube()
pod_moving = FALSE
@@ -146,6 +156,7 @@
/obj/structure/transit_tube/station/pod_stopped(obj/structure/transit_tube_pod/pod, from_dir)
pod_moving = TRUE
+ pod.stop_following()
addtimer(CALLBACK(src, PROC_REF(pod_stopped_callback), pod), 5)
/obj/structure/transit_tube/station/proc/pod_stopped_callback(obj/structure/transit_tube_pod/pod)
@@ -156,10 +167,99 @@
pod_moving = FALSE
pod.mix_air()
-// Tube station directions are simply 90 to either side of
-// the exit.
-/obj/structure/transit_tube/station/init_dirs()
- tube_dirs = list(turn(dir, 90), turn(dir, -90))
+/obj/structure/transit_tube/station/flipped
+ icon_state = "closed_station1"
+ base_icon_state = "station1"
+
+/obj/structure/transit_tube/station/flipped/init_tube_dirs()
+ ..()
+ boarding_dir = dir
+
+// Stations which will send the tube in the opposite direction after their stop.
+/obj/structure/transit_tube/station/reverse
+ icon_state = "closed_terminus0"
+ base_icon_state = "terminus0"
+ reverse_launch = TRUE
+
+/obj/structure/transit_tube/station/reverse/init_tube_dirs()
+ tube_dirs = list(turn(dir, -90))
+ boarding_dir = reverse_direction(dir)
+
+/obj/structure/transit_tube/station/reverse/flipped
+ icon_state = "closed_terminus1"
+ base_icon_state = "terminus1"
+
+/obj/structure/transit_tube/station/reverse/flipped/init_tube_dirs()
+ ..()
+ boarding_dir = dir
+
+//special dispenser station, it creates a pod for you to enter when you bump into it.
+
+/obj/structure/transit_tube/station/dispenser
+ name = "station tube pod dispenser"
+ icon_state = "open_dispenser0"
+ desc = "The lynchpin of a GOOD transit system."
+ enter_delay = 1
+ base_icon_state = "dispenser0"
+ hatch_state = TRANSIT_TUBE_OPEN
+
+/obj/structure/transit_tube/station/dispenser/examine(mob/user)
+ . = ..()
+ . += "This station will create a pod for you to ride, no need to wait for one."
+ . += "Any pods arriving at this station will be reclaimed."
+
+/obj/structure/transit_tube/station/dispenser/close_hatch()
+ . = ..()
+ return
+
+/obj/structure/transit_tube/station/dispenser/launch_pod()
+ for(var/obj/structure/transit_tube_pod/pod in loc)
+ if(!pod.moving)
+ pod_moving = TRUE
+ pod.follow_tube()
+ pod_moving = FALSE
+ return TRUE
+ return FALSE
+
+/obj/structure/transit_tube/station/dispenser/Bumped(mob/living/L)
+ if(!(istype(L) && L.dir == boarding_dir) || L.anchored)
+ return
+ if(isliving(L) && !is_type_in_list(L, disallowed_mobs))
+ var/obj/structure/transit_tube_pod/dispensed/pod = new(loc)
+ L.visible_message("[pod] forms around [L].", "[pod] materializes around you.")
+ playsound(src, 'sound/weapons/emitter2.ogg', 50, TRUE)
+ pod.dir = turn(dir, -90)
+ pod.move_into(L)
+ launch_pod()
+
+/obj/structure/transit_tube/station/dispenser/pod_stopped(obj/structure/transit_tube_pod/pod)
+ playsound(src, 'sound/machines/ding.ogg', 50, TRUE)
+ qdel(pod)
+
+/obj/structure/transit_tube/station/dispenser/flipped
+ icon_state = "open_dispenser1"
+ base_icon_state = "dispenser1"
+
+/obj/structure/transit_tube/station/dispenser/flipped/init_tube_dirs()
+ ..()
+ boarding_dir = dir
+/obj/structure/transit_tube/station/dispenser/reverse
+ reverse_launch = TRUE
+ icon_state = "open_terminusdispenser0"
+ base_icon_state = "terminusdispenser0"
+
+/obj/structure/transit_tube/station/dispenser/reverse/init_tube_dirs()
+ tube_dirs = list(turn(dir, 90))
+ boarding_dir = reverse_direction(dir)
+
+/obj/structure/transit_tube/station/dispenser/reverse/flipped
+ icon_state = "open_terminusdispenser1"
+ base_icon_state = "terminusdispenser1"
+
+/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs()
+ ..()
+ boarding_dir = dir
+
#undef CLOSE_DURATION
#undef OPEN_DURATION
diff --git a/code/game/objects/structures/transit_tubes/transit_tube.dm b/code/game/objects/structures/transit_tubes/transit_tube.dm
index 476ce469492..584c8136eeb 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube.dm
@@ -4,38 +4,50 @@
// Mappers: you can use "Generate Instances from Icon-states"
// to get the different pieces.
/obj/structure/transit_tube
+ name = "transit tube"
+ desc = "A pneumatic tube that brings you from here to there."
icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi'
- icon_state = "E-W"
- density = 1
+ icon_state = "straight"
+ density = TRUE
layer = 3.1
- anchored = 1.0
+ anchored = TRUE
var/list/tube_dirs = null
var/exit_delay = 1
var/enter_delay = 0
- // alldirs in global.dm is the same list of directions, but since
- // the specific order matters to get a usable icon_state, it is
- // copied here so that, in the unlikely case that alldirs is changed,
- // this continues to work.
- var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
+/obj/structure/transit_tube/Initialize(mapload, new_direction)
+ . = ..()
+ if(new_direction)
+ setDir(new_direction)
+ // set up our appearance after the initialize in case someone's setting our direction afterwards
+ // (especially for things like admin spawning)
+ addtimer(CALLBACK(src, PROC_REF(setup_appearance)), 1)
+/obj/structure/transit_tube/proc/setup_appearance()
+ init_tube_dirs()
+ update_appearance()
+
+/obj/structure/transit_tube/Destroy()
+ for(var/obj/structure/transit_tube_pod/P in loc)
+ P.empty_pod()
+ return ..()
/obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target)
if(istype(mover) && mover.checkpass(PASSGLASS))
- return 1
+ return TRUE
return !density
// When destroyed by explosions, properly handle contents.
/obj/structure/transit_tube/ex_act(severity)
switch(severity)
- if(1.0)
+ if(EXPLODE_DEVASTATE)
for(var/atom/movable/AM in contents)
AM.loc = loc
AM.ex_act(severity++)
qdel(src)
return
- if(2.0)
+ if(EXPLODE_HEAVY)
if(prob(50))
for(var/atom/movable/AM in contents)
AM.loc = loc
@@ -43,20 +55,12 @@
qdel(src)
return
- if(3.0)
+ if(EXPLODE_LIGHT)
return
-
-/obj/structure/transit_tube/New(loc)
- ..(loc)
-
- if(tube_dirs == null)
- init_dirs()
-
-
// Called to check if a pod should stop upon entering this tube.
/obj/structure/transit_tube/proc/should_stop_pod(pod, from_dir)
- return 0
+ return FALSE
// Called when a pod stops in this tube section.
/obj/structure/transit_tube/proc/pod_stopped(pod, from_dir)
@@ -69,27 +73,21 @@
/obj/structure/transit_tube/proc/directions()
return tube_dirs
-
-
/obj/structure/transit_tube/proc/has_entrance(from_dir)
from_dir = turn(from_dir, 180)
for(var/direction in directions())
if(direction == from_dir)
- return 1
-
- return 0
-
+ return TRUE
+ return FALSE
/obj/structure/transit_tube/proc/has_exit(in_dir)
for(var/direction in directions())
if(direction == in_dir)
- return 1
-
- return 0
-
+ return TRUE
+ return FALSE
// Searches for an exit direction within 45 degrees of the
// specified dir. Returns that direction, or 0 if none match.
@@ -110,7 +108,6 @@
return near_dir
-
// Return how many BYOND ticks to wait before entering/exiting
// the tube section. Default action is to return the value of
// a var, which wouldn't need a proc, but it makes it possible
@@ -122,194 +119,157 @@
/obj/structure/transit_tube/proc/enter_delay(pod, to_dir)
return enter_delay
+/obj/structure/transit_tube/proc/init_tube_dirs()
+ switch(dir)
+ if(NORTH, SOUTH)
+ tube_dirs = list(NORTH, SOUTH)
+ if(EAST, WEST)
+ tube_dirs = list(EAST, WEST)
-// Parse the icon_state into a list of directions.
-// This means that mappers can use Dream Maker's built in
-// "Generate Instances from Icon-states" option to get all
-// variations. Additionally, as a separate proc, sub-types
-// can handle it more intelligently.
-/obj/structure/transit_tube/proc/init_dirs()
- if(icon_state == "auto")
- // Additional delay, for map loading.
- spawn(1)
- init_dirs_automatic()
-
- else
- tube_dirs = parse_dirs(icon_state)
-
- if(copytext(icon_state, 1, 3) == "D-" || findtextEx(icon_state, "Pass"))
- density = 0
-
-
-
-
-// Initialize dirs by searching for tubes that do/might connect
-// on nearby turfs. Create corner pieces if nessecary.
-// Pick two directions, preferring tubes that already connect
-// to loc, or other auto tubes if there aren't enough connections.
-/obj/structure/transit_tube/proc/init_dirs_automatic()
- var/list/connected = list()
- var/list/connected_auto = list()
-
- for(var/direction in tube_dir_list)
- var/location = get_step(loc, direction)
- for(var/obj/structure/transit_tube/tube in location)
- if(tube.directions() == null && tube.icon_state == "auto")
- connected_auto += direction
- break
-
- else if(turn(direction, 180) in tube.directions())
- connected += direction
- break
-
- connected += connected_auto
-
- tube_dirs = select_automatic_dirs(connected)
-
- if(length(tube_dirs) == 2 && tube_dir_list.Find(tube_dirs[1]) > tube_dir_list.Find(tube_dirs[2]))
- tube_dirs.Swap(1, 2)
-
- generate_automatic_corners(tube_dirs)
- select_automatic_icon_state(tube_dirs)
-
-
-
-// Given a list of directions, look a pair that forms a 180 or
-// 135 degree angle, and return a list containing the pair.
-// If none exist, return list(connected[1], turn(connected[1], 180)
-/obj/structure/transit_tube/proc/select_automatic_dirs(connected)
- if(length(connected) < 1)
- return list()
-
- for(var/i = 1, i <= length(connected), i++)
- for(var/j = i + 1, j <= length(connected), j++)
- var/d1 = connected[i]
- var/d2 = connected[j]
-
- if(d1 == turn(d2, 135) || d1 == turn(d2, 180) || d1 == turn(d2, 225))
- return list(d1, d2)
-
- return list(connected[1], turn(connected[1], 180))
-
-
-
-/obj/structure/transit_tube/proc/select_automatic_icon_state(directions)
- if(length(directions) == 2)
- icon_state = "[dir2text_short(directions[1])]-[dir2text_short(directions[2])]"
-
-
-
-// Look for diagonal directions, generate the decorative corners in each.
-/obj/structure/transit_tube/proc/generate_automatic_corners(directions)
- for(var/direction in directions)
- if(direction == 5 || direction == 6 || direction == 9 || direction == 10)
- if(direction & NORTH)
- create_automatic_decorative_corner(get_step(loc, NORTH), direction ^ 3)
-
- else
- create_automatic_decorative_corner(get_step(loc, SOUTH), direction ^ 3)
-
- if(direction & EAST)
- create_automatic_decorative_corner(get_step(loc, EAST), direction ^ 12)
-
- else
- create_automatic_decorative_corner(get_step(loc, WEST), direction ^ 12)
-
-
-
-// Generate a corner, if one doesn't exist for the direction on the turf.
-/obj/structure/transit_tube/proc/create_automatic_decorative_corner(location, direction)
- var/state = "D-[dir2text_short(direction)]"
-
- for(var/obj/structure/transit_tube/tube in location)
- if(tube.icon_state == state)
- return
-
- var/obj/structure/transit_tube/tube = new(location)
- tube.icon_state = state
- tube.init_dirs()
-
-
-
-// Uses a list() to cache return values. Since they should
-// never be edited directly, all tubes with a certain
-// icon_state can just reference the same list. In theory,
-// reduces memory usage, and improves CPU cache usage.
-// In reality, I don't know if that is quite how BYOND works,
-// but it is probably safer to assume the existence of, and
-// rely on, a sufficiently smart compiler/optimizer.
-/obj/structure/transit_tube/proc/parse_dirs(text)
- var/global/list/direction_table = list()
-
- if(text in direction_table)
- return direction_table[text]
-
- var/list/split_text = splittext(text, "-")
-
- // If the first token is D, the icon_state represents
- // a purely decorative tube, and doesn't actually
- // connect to anything.
- if(split_text[1] == "D")
- direction_table[text] = list()
- return null
-
- var/list/directions = list()
-
- for(var/text_part in split_text)
- var/direction = text2dir_extended(text_part)
-
- if(direction > 0)
- directions += direction
-
- direction_table[text] = directions
- return directions
-
-
-
-// A copy of text2dir, extended to accept one and two letter
-// directions, and to clearly return 0 otherwise.
-/obj/structure/transit_tube/proc/text2dir_extended(direction)
- switch(uppertext(direction))
- if("NORTH", "N")
- return 1
- if("SOUTH", "S")
- return 2
- if("EAST", "E")
- return 4
- if("WEST", "W")
- return 8
- if("NORTHEAST", "NE")
- return 5
- if("NORTHWEST", "NW")
- return 9
- if("SOUTHEAST", "SE")
- return 6
- if("SOUTHWEST", "SW")
- return 10
- else
- return 0
-
-
-
-// A copy of dir2text, which returns the short one or two letter
-// directions used in tube icon states.
-/obj/structure/transit_tube/proc/dir2text_short(direction)
- switch(direction)
- if(1)
- return "N"
- if(2)
- return "S"
- if(4)
- return "E"
- if(8)
- return "W"
- if(5)
- return "NE"
- if(6)
- return "SE"
- if(9)
- return "NW"
- if(10)
- return "SW"
+/obj/structure/transit_tube/update_overlays()
+ . = ..()
+ for(var/direction in directions())
+ if(!IS_DIR_DIAGONAL(direction))
+ . += create_tube_overlay(direction)
+ continue
+ if(!(direction & NORTH))
+ continue
+
+ . += create_tube_overlay(direction ^ (NORTH|SOUTH), NORTH)
+ if(direction & EAST)
+ . += create_tube_overlay(direction ^ (EAST|WEST), EAST)
else
+ . += create_tube_overlay(direction ^ (EAST|WEST), WEST)
+
+
+/obj/structure/transit_tube/proc/create_tube_overlay(direction, shift_dir)
+ // We use image() because a mutable appearance will have its dir mirror the parent which sort of fucks up what we're doing here
+ var/image/tube_overlay = image(icon, dir = direction)
+ if(shift_dir)
+ tube_overlay.icon_state = "decorative_diag"
+ switch(shift_dir)
+ if(NORTH)
+ tube_overlay.pixel_y = 32
+ if(SOUTH)
+ tube_overlay.pixel_y = -32
+ if(EAST)
+ tube_overlay.pixel_x = 32
+ if(WEST)
+ tube_overlay.pixel_x = -32
+ else
+ tube_overlay.icon_state = "decorative"
+
+ tube_overlay.overlays += emissive_blocker(icon, tube_overlay.icon_state, src)
+ return tube_overlay
+
+//Some of these are mostly for mapping use
+/obj/structure/transit_tube/horizontal
+ dir = WEST
+
+/obj/structure/transit_tube/diagonal
+ icon_state = "diagonal"
+
+/obj/structure/transit_tube/diagonal/init_tube_dirs()
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(NORTHEAST, SOUTHWEST)
+ if(SOUTH)
+ tube_dirs = list(NORTHEAST, SOUTHWEST)
+ if(EAST)
+ tube_dirs = list(NORTHWEST, SOUTHEAST)
+ if(WEST)
+ tube_dirs = list(NORTHWEST, SOUTHEAST)
+
+//mostly for mapping use
+/obj/structure/transit_tube/diagonal/topleft
+ dir = WEST
+
+/obj/structure/transit_tube/diagonal/crossing
+ density = FALSE
+ icon_state = "diagonal_crossing"
+
+//mostly for mapping use
+/obj/structure/transit_tube/diagonal/crossing/topleft
+ dir = WEST
+
+
+/obj/structure/transit_tube/curved
+ icon_state = "curved0"
+
+/obj/structure/transit_tube/curved/init_tube_dirs()
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(NORTH, SOUTHWEST)
+ if(SOUTH)
+ tube_dirs = list(SOUTH, NORTHEAST)
+ if(EAST)
+ tube_dirs = list(EAST, NORTHWEST)
+ if(WEST)
+ tube_dirs = list(SOUTHEAST, WEST)
+
+/obj/structure/transit_tube/curved/flipped
+ icon_state = "curved1"
+
+/obj/structure/transit_tube/curved/flipped/init_tube_dirs()
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(NORTH, SOUTHEAST)
+ if(SOUTH)
+ tube_dirs = list(SOUTH, NORTHWEST)
+ if(EAST)
+ tube_dirs = list(EAST, SOUTHWEST)
+ if(WEST)
+ tube_dirs = list(NORTHEAST, WEST)
+
+
+/obj/structure/transit_tube/junction
+ icon_state = "junction0"
+
+/obj/structure/transit_tube/junction/init_tube_dirs()
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(NORTH, SOUTHEAST, SOUTHWEST)//ending with the prefered direction
+ if(SOUTH)
+ tube_dirs = list(SOUTH, NORTHWEST, NORTHEAST)
+ if(EAST)
+ tube_dirs = list(EAST, SOUTHWEST, NORTHWEST)
+ if(WEST)
+ tube_dirs = list(WEST, NORTHEAST, SOUTHEAST)
+
+/obj/structure/transit_tube/junction/flipped
+ icon_state = "junction1"
+
+/obj/structure/transit_tube/junction/flipped/init_tube_dirs()
+ switch(dir)
+ if(NORTH)
+ tube_dirs = list(NORTH, SOUTHWEST, SOUTHEAST)//ending with the prefered direction
+ if(SOUTH)
+ tube_dirs = list(SOUTH, NORTHEAST, NORTHWEST)
+ if(EAST)
+ tube_dirs = list(EAST, NORTHWEST, SOUTHWEST)
+ if(WEST)
+ tube_dirs = list(WEST, SOUTHEAST, NORTHEAST)
+
+
+/obj/structure/transit_tube/crossing
+ icon_state = "crossing"
+ density = FALSE
+
+//mostly for mapping use
+/obj/structure/transit_tube/crossing/horizontal
+ dir = WEST
+
+// cosmetic "cap" for tubes. Note that tubes can't enter this.
+/obj/structure/transit_tube/cap
+ icon_state = "cap"
+
+/obj/structure/transit_tube/cap/init_tube_dirs()
+ tube_dirs = list(turn(dir, 180)) // back the way we came
+
+/obj/structure/transit_tube/cap/has_entrance(from_dir)
+ return FALSE
+
+/obj/structure/transit_tube/cap/create_tube_overlay()
+ // cap sprites already have overlays
return
+
diff --git a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
index 9ab4942cefd..bd368eb24f9 100644
--- a/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
+++ b/code/game/objects/structures/transit_tubes/transit_tube_pod.dm
@@ -1,3 +1,6 @@
+#define MOVE_ANIMATION_STAGE_ONE 1
+#define MOVE_ANIMATION_STAGE_TWO 2
+
/obj/structure/transit_tube_pod
icon = 'icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi'
icon_state = "pod"
@@ -6,21 +9,47 @@
density = TRUE
var/moving = FALSE
var/datum/gas_mixture/air_contents = new()
-
-/obj/structure/transit_tube_pod/New(loc)
- ..(loc)
+ /// The tube we're currently traveling through
+ var/obj/structure/transit_tube/current_tube = null
+ /// The direction of our next transit from pipe to pipe. Stored between process calls here.
+ var/next_dir
+ /// The location of our next target tube. Stored same as above
+ var/next_loc
+ /// How long to wait when entering a new tube
+ var/enter_delay = 0
+ /// How long to wait when exiting a new tube
+ var/exit_delay
+ /// The next time we'll be moving
+ COOLDOWN_DECLARE(move_cooldown)
+ /// The move animation mode for the next processing tick
+ var/current_move_anim_mode = MOVE_ANIMATION_STAGE_ONE
+ /// Icon state in use while we're occupied
+ var/occupied_icon_state = "pod_occupied"
+
+/obj/structure/transit_tube_pod/Initialize(mapload)
+ . = ..()
+ // Give auto tubes time to align before trying to start moving
+ spawn(5)
air_contents.oxygen = MOLES_O2STANDARD * 2
air_contents.nitrogen = MOLES_N2STANDARD
air_contents.temperature = T20C
- // Give auto tubes time to align before trying to start moving
- spawn(5)
- follow_tube()
+ for(var/obj/structure/transit_tube/tube in loc)
+ setDir(pick(tube.directions()))
+ break
+ follow_tube()
+
+/obj/structure/transit_tube_pod/update_icon_state()
+ . = ..()
+ icon_state = length(contents) ? occupied_icon_state : initial(icon_state)
+
+/obj/structure/transit_tube_pod/proc/stop_following()
+ STOP_PROCESSING(SStransit_tube, src)
/obj/structure/transit_tube_pod/Destroy()
- for(var/atom/movable/AM in contents)
- AM.forceMove(get_turf(src))
+ empty_pod()
+ stop_following()
return ..()
/obj/structure/transit_tube_pod/Process_Spacemove()
@@ -28,69 +57,115 @@
return TRUE
else return ..()
-/obj/structure/transit_tube_pod/proc/follow_tube(var/reverse_launch)
+/obj/structure/transit_tube_pod/proc/empty_pod(atom/location)
+ if(!location)
+ location = get_turf(src)
+ for(var/atom/movable/M in contents)
+ M.forceMove(location)
+ update_appearance()
+
+/obj/structure/transit_tube_pod/crowbar_act(mob/living/user, obj/item/I)
+ . = ..()
if(moving)
return
- moving = TRUE
+ if(length(contents))
+ I.play_tool_sound(src)
+ user.visible_message("[user] pries [src] open.")
+ empty_pod()
+
+/obj/structure/transit_tube_pod/process()
+ ..()
+
+ if(!COOLDOWN_FINISHED(src, move_cooldown))
+ return
+
+ var/move_result = move_animation(current_move_anim_mode)
+ if(isnull(move_result))
+ if(isnull(current_tube) || (!(dir in current_tube.directions()) && !(reverse_direction(dir) in current_tube.directions())))
+ outside_tube()
+ return PROCESS_KILL
- spawn()
- var/obj/structure/transit_tube/current_tube = null
- var/next_dir
- var/next_loc
- var/last_delay = 0
- var/exit_delay
+ current_move_anim_mode = move_result
- if(reverse_launch)
- dir = turn(dir, 180) // Back it up
+/obj/structure/transit_tube_pod/proc/outside_tube()
+ var/list/savedcontents = contents.Copy()
+ var/saveddir = dir
+ var/turf/destination = get_edge_target_turf(src, saveddir)
+ visible_message("[src] ejects its insides out!")
+ for(var/i in savedcontents)
+ var/atom/movable/AM = i
+ AM.throw_at(destination, rand(1, 3), 5)
- for(var/obj/structure/transit_tube/tube in loc)
- if(tube.has_exit(dir))
+
+/obj/structure/transit_tube_pod/proc/move_animation(stage = MOVE_ANIMATION_STAGE_ONE)
+ if(stage == MOVE_ANIMATION_STAGE_ONE)
+ next_dir = current_tube.get_exit(dir)
+
+ if(!next_dir)
+ moving = FALSE
+ density = TRUE
+ return
+ exit_delay = current_tube.exit_delay
+ next_loc = get_step(src, next_dir)
+ current_tube = null
+ for(var/obj/structure/transit_tube/tube in next_loc)
+ if(tube.has_entrance(next_dir))
current_tube = tube
break
- while(current_tube)
- next_dir = current_tube.get_exit(dir)
+ if(isnull(current_tube))
+ setDir(next_dir)
+ Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes.
+ moving = FALSE
+ density = TRUE
+ return
- if(!next_dir)
- break
+ enter_delay = current_tube.enter_delay(src, next_dir)
+ if(enter_delay > 0)
+ COOLDOWN_START(src, move_cooldown, enter_delay)
+ return MOVE_ANIMATION_STAGE_TWO
- exit_delay = current_tube.exit_delay(src, dir)
- last_delay += exit_delay
+ stage = MOVE_ANIMATION_STAGE_TWO
- sleep(exit_delay)
+ if(stage == MOVE_ANIMATION_STAGE_TWO)
+ setDir(next_dir)
+ forceMove(next_loc) // When moving from one tube to another, skip collision and such.
+ density = current_tube.density
- next_loc = get_step(loc, next_dir)
+ if(current_tube?.should_stop_pod(src, next_dir))
+ current_tube.pod_stopped(src, dir)
+ else
+ COOLDOWN_START(src, move_cooldown, exit_delay)
+ return MOVE_ANIMATION_STAGE_ONE
- current_tube = null
- for(var/obj/structure/transit_tube/tube in next_loc)
- if(tube.has_entrance(next_dir))
- current_tube = tube
- break
+ density = TRUE
+ moving = FALSE
- if(current_tube == null)
- setDir(next_dir)
- Move(get_step(loc, dir), dir) // Allow collisions when leaving the tubes.
- break
+ return MOVE_ANIMATION_STAGE_ONE
- last_delay = current_tube.enter_delay(src, next_dir)
- sleep(last_delay)
- setDir(next_dir)
- forceMove(next_loc) // When moving from one tube to another, skip collision and such.
- density = current_tube.density
- if(current_tube && current_tube.should_stop_pod(src, next_dir))
- current_tube.pod_stopped(src, dir)
- break
+/obj/structure/transit_tube_pod/proc/follow_tube(reverse_launch)
+ if(moving)
+ return
- density = TRUE
+ moving = TRUE
- moving = FALSE
+ for(var/obj/structure/transit_tube/tube in loc)
+ if(tube.has_exit(dir))
+ current_tube = tube
+ break
+ if(current_tube)
+ START_PROCESSING(SStransit_tube, src)
+ // move_animation(MOVE_ANIMATION_STAGE_ONE)
+ else
+ moving = FALSE
// Should I return a copy here? If the caller edits or qdel()s the returned
// datum, there might be problems if I don't...
/obj/structure/transit_tube_pod/return_air()
+ RETURN_TYPE(/datum/gas_mixture)
var/datum/gas_mixture/GM = new()
GM.copy_from(air_contents)
return GM
@@ -152,9 +227,9 @@
if(!moving)
for(var/obj/structure/transit_tube/station/station in loc)
- if(dir in station.directions())
+ if((dir in station.directions()) || (turn(dir, 180) in station.directions()))
if(!station.pod_moving)
- if(direction == station.dir)
+ if(direction == turn(station.boarding_dir, 180))
if(station.hatch_state == TRANSIT_TUBE_OPEN)
eject(mob, direction)
@@ -173,8 +248,8 @@
return
/obj/structure/transit_tube_pod/proc/move_into(atom/movable/A)
- icon_state = "pod_occupied"
A.forceMove(src)
+ update_appearance()
/obj/structure/transit_tube_pod/proc/eject_mindless(direction)
for(var/atom/movable/A in contents)
@@ -187,9 +262,24 @@
/obj/structure/transit_tube_pod/proc/eject(atom/movable/A, direction)
- icon_state = "pod"
A.forceMove(loc)
+ update_appearance()
A.Move(get_step(loc, direction), direction)
if(ismob(A))
var/mob/M = A
M.reset_perspective(null)
+
+
+/obj/structure/transit_tube_pod/dispensed
+ name = "temporary transit tube pod"
+ desc = "Gets you from here to there, and no further."
+ icon_state = "temppod"
+ occupied_icon_state = "temppod_occupied"
+
+
+/obj/structure/transit_tube_pod/dispensed/outside_tube()
+ if(!QDELETED(src))
+ qdel(src)
+
+#undef MOVE_ANIMATION_STAGE_TWO
+#undef MOVE_ANIMATION_STAGE_ONE
diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
index d0769b4cd0a..cd3486d2ae0 100644
--- a/code/game/objects/structures/watercloset.dm
+++ b/code/game/objects/structures/watercloset.dm
@@ -52,7 +52,8 @@
open = !open
update_icon()
-/obj/structure/toilet/update_icon()
+
+/obj/structure/toilet/update_icon_state()
icon_state = "toilet[open][cistern]"
if(!anchored)
pixel_x = 0
@@ -129,7 +130,7 @@
user.visible_message("[user] [cistern ? "replaces the lid on the cistern" : "lifts the lid off the cistern"]!", "You [cistern ? "replace the lid on the cistern" : "lift the lid off the cistern"]!", "You hear grinding porcelain.")
cistern = !cistern
update_icon()
- return
+
/obj/structure/toilet/wrench_act(mob/user, obj/item/I)
. = TRUE
@@ -168,7 +169,7 @@
var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST)
var/selected = input(user,"Select a direction for the connector.", "Connector Direction") in dir_choices
dir = dir_choices[selected]
- update_icon() //is this necessary? probably not
+ update_icon()
/obj/structure/toilet/proc/stash_goods(obj/item/I, mob/user)
if(!I)
@@ -217,7 +218,7 @@
desc = "Поговаривают, что 7 веков назад у каждого арабского шейха был такой унитаз."
icon_state = "gold_toilet00"
-/obj/structure/toilet/golden_toilet/update_icon()
+/obj/structure/toilet/golden_toilet/update_icon_state()
. = ..()
icon_state = "gold_toilet[open][cistern]"
@@ -226,7 +227,7 @@
desc = "Престижное седалище для престижной персоны. Судя по форме, был идеально подготовлен под седальное место Капитана."
icon_state = "captain_toilet00"
-/obj/structure/toilet/captain_toilet/update_icon()
+/obj/structure/toilet/captain_toilet/update_icon_state()
. = ..()
icon_state = "captain_toilet[open][cistern]"
@@ -281,21 +282,28 @@
pixel_x = 0
pixel_y = 32
+
+#define SHOWER_FREEZING "freezing"
+#define SHOWER_NORMAL "normal"
+#define SHOWER_BOILING "boiling"
+
/obj/machinery/shower
name = "shower"
desc = "The HS-451. Installed in the 2550s by the Nanotrasen Hygiene Division."
icon = 'icons/obj/watercloset.dmi'
icon_state = "shower"
- density = 0
- anchored = 1
+ density = FALSE
+ anchored = TRUE
use_power = NO_POWER_USE
- var/on = 0
- var/obj/effect/mist/mymist = null
- var/ismist = 0 //needs a var so we can make it linger~
- var/watertemp = "normal" //freezing, normal, or boiling
+ ///Is the shower on or off?
+ var/on = FALSE
+ ///What temperature the shower reagents are set to.
+ var/current_temperature = SHOWER_NORMAL
var/mobpresent = 0 //true if there is a mob on the shower's loc, this is to ease process()
+ ///What sound will be played on loop when the shower is on and pouring water.
var/datum/looping_sound/showering/soundloop
+
/obj/machinery/shower/New(turf/T, newdir = SOUTH, building = FALSE)
..()
soundloop = new(list(src), FALSE)
@@ -310,9 +318,12 @@
pixel_y = -5
layer = FLY_LAYER
+
/obj/machinery/shower/Destroy()
- QDEL_NULL(mymist)
QDEL_NULL(soundloop)
+ var/obj/effect/mist/mist = locate() in loc
+ if(!QDELETED(mist))
+ QDEL_IN(mist, 25 SECONDS)
return ..()
//add heat controls? when emagged, you can freeze to death in it?
@@ -321,164 +332,176 @@
name = "mist"
icon = 'icons/obj/watercloset.dmi'
icon_state = "mist"
- layer = MOB_LAYER + 1
- anchored = 1
+ layer = FLY_LAYER
+ anchored = TRUE
mouse_opacity = MOUSE_OPACITY_TRANSPARENT
-/obj/machinery/shower/attack_hand(mob/M as mob)
- add_fingerprint(M)
+
+/obj/machinery/shower/attack_hand(mob/user)
on = !on
update_icon()
+ handle_mist()
+ add_fingerprint(user)
if(on)
+ START_PROCESSING(SSmachines, src)
+ process()
soundloop.start()
- if(M.loc == loc)
- wash(M)
- check_heat(M)
- M.water_act(100, convertHeat(), src)
- for(var/atom/movable/G in src.loc)
- G.clean_blood()
- G.water_act(100, convertHeat(), src)
else
soundloop.stop()
+ var/turf/simulated/source_turf = loc
+ if(istype(source_turf) && !source_turf.density)
+ source_turf.MakeSlippery(TURF_WET_WATER, 5 SECONDS)
+
/obj/machinery/shower/attackby(obj/item/I as obj, mob/user as mob, params)
if(I.type == /obj/item/analyzer)
add_fingerprint(user)
- to_chat(user, "The water temperature seems to be [watertemp].")
- if(on)
- add_fingerprint(user)
- I.water_act(100, convertHeat(), src)
+ to_chat(user, span_notice("The water temperature seems to be [current_temperature]."))
return ..()
+
/obj/machinery/shower/wrench_act(mob/user, obj/item/I)
- . = TRUE
- if(!I.tool_use_check(user, 0))
- return
- to_chat(user, "You begin to adjust the temperature valve with the [I].")
- if(I.use_tool(src, user, 50, volume = I.tool_volume))
- switch(watertemp)
- if("normal")
- watertemp = "freezing"
- if("freezing")
- watertemp = "boiling"
- if("boiling")
- watertemp = "normal"
- user.visible_message("[user] adjusts the shower with the [I].", "You adjust [src] to [watertemp].")
- update_icon() //letsa update whenever we change the temperature, since the mist might need to change
+ to_chat(user, span_notice("You begin to adjust the temperature valve with [I]."))
+ if(I.use_tool(src, user, 5 SECONDS))
+ switch(current_temperature)
+ if(SHOWER_NORMAL)
+ current_temperature = SHOWER_FREEZING
+ if(SHOWER_FREEZING)
+ current_temperature = SHOWER_BOILING
+ if(SHOWER_BOILING)
+ current_temperature = SHOWER_NORMAL
+ user.visible_message(
+ span_notice("[user] adjusts the shower with [I]."),
+ span_notice("You adjust [src] to [current_temperature] temperature."),
+ )
+ add_hiddenprint(user)
+ handle_mist()
+ return TRUE
+
/obj/machinery/shower/welder_act(mob/user, obj/item/I)
. = TRUE
if(on)
- to_chat(user, "Turn [src] off before you attempt to cut it loose.")
+ to_chat(user, span_warning("Turn [src] off before you attempt to cut it loose."))
return
if(!I.tool_use_check(user, 0))
return
- visible_message("[user] begins slicing [src] free...", "You begin slicing [src] free...", "You hear welding.")
- if(I.use_tool(src, user, 40, volume = I.tool_volume))
- if(mymist)
- qdel(mymist)
- user.visible_message("[user] cuts [src] loose!", "You cut [src] loose!")
- var/obj/item/mounted/shower/S = new /obj/item/mounted/shower(get_turf(user))
- transfer_fingerprints_to(S)
+ user.visible_message(
+ span_notice("[user] begins slicing [src] free..."),
+ span_notice("You begin slicing [src] free..."),
+ span_italics("You hear welding."),
+ )
+ if(I.use_tool(src, user, 4 SECONDS, volume = I.tool_volume))
+ user.visible_message(
+ span_notice("[user] cuts [src] loose!"),
+ span_notice("You cut [src] loose!>"),
+ )
+ var/obj/item/mounted/shower/shower = new /obj/item/mounted/shower(get_turf(user))
+ transfer_prints_to(shower, TRUE)
qdel(src)
-/obj/machinery/shower/update_icon() //this makes the shower mist up or clear mist (depending on water temperature)
- overlays.Cut() //once it's been on for a while, in addition to handling the water overlay.
- if(on)
- overlays += image('icons/obj/watercloset.dmi', src, "water", MOB_LAYER + 1, dir)
- var/mist_time = 50 //5 seconds at normal temperature to build up mist
- if(watertemp == "freezing")
- mist_time = 70 //7 seconds on freezing temperature to disperse existing mist
- if(watertemp == "boiling")
- mist_time = 20 //2 seconds on boiling temperature to build up mist
- addtimer(CALLBACK(src, PROC_REF(update_mist)), mist_time)
- else
- addtimer(CALLBACK(src, PROC_REF(update_mist)), 250) //25 seconds for mist to disperse after being turned off
-/obj/machinery/shower/proc/update_mist()
+/obj/machinery/shower/update_overlays()
+ . = ..()
if(on)
- if(watertemp == "freezing")
- if(mymist)
- qdel(mymist)
- ismist = 0
- return
- if(mymist)
- return
- ismist = 1
- mymist = new /obj/effect/mist(loc)
- else
- if(mymist)
- qdel(mymist)
- ismist = 0
+ . += image(icon, icon_state = "water", layer = ABOVE_MOB_LAYER, dir = src.dir)
-/obj/machinery/shower/Crossed(atom/movable/O, oldloc)
- ..()
- wash(O)
- if(ismob(O))
- mobpresent += 1
- check_heat(O)
-
-/obj/machinery/shower/Uncrossed(atom/movable/O)
- if(ismob(O))
- mobpresent -= 1
+
+/obj/machinery/shower/proc/handle_mist()
+ // If there is no mist, and the shower was turned on (on a non-freezing temp): make mist in 5 seconds
+ // If there was already mist, and the shower was turned off (or made cold): remove the existing mist in 25 sec
+ var/obj/effect/mist/mist = locate() in loc
+ if(!mist && on && current_temperature != SHOWER_FREEZING)
+ addtimer(CALLBACK(src, PROC_REF(make_mist)), 5 SECONDS)
+
+ if(mist && (!on || current_temperature == SHOWER_FREEZING))
+ addtimer(CALLBACK(src, PROC_REF(clear_mist)), 25 SECONDS)
+
+
+/obj/machinery/shower/proc/make_mist()
+ var/obj/effect/mist/mist = locate() in loc
+ if(!mist && on && current_temperature != SHOWER_FREEZING)
+ new /obj/effect/mist(loc)
+
+
+/obj/machinery/shower/proc/clear_mist()
+ var/obj/effect/mist/mist = locate() in loc
+ if(mist && (!on || current_temperature == SHOWER_FREEZING))
+ qdel(mist)
+
+
+/obj/machinery/shower/Crossed(atom/movable/AM, oldloc)
..()
+ if(on)
+ wash(AM)
+
/obj/machinery/shower/proc/convertHeat()
- switch(watertemp)
- if("boiling")
+ switch(current_temperature)
+ if(SHOWER_BOILING)
return 340.15
- if("normal")
+ if(SHOWER_NORMAL)
return 310.15
- if("freezing")
+ if(SHOWER_FREEZING)
return 230.15
+
//Yes, showers are super powerful as far as washing goes.
-/obj/machinery/shower/proc/wash(atom/movable/O as obj|mob)
- if(!on) return
+/obj/machinery/shower/proc/wash(atom/target)
+ if(!on)
+ return
+
+ if(isitem(target))
+ var/obj/item/item = target
+ item.extinguish()
- if(istype(O, /obj/item))
- var/obj/item/I = O
- I.extinguish()
+ target.water_act(100, convertHeat(), src)
- O.water_act(100, convertHeat(), src)
+ if(isliving(target))
+ var/mob/living/l_target = target
+ l_target.ExtinguishMob()
+ l_target.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
+ to_chat(l_target, span_warning("You've been drenched in water!"))
- if(isliving(O))
- var/mob/living/L = O
- L.ExtinguishMob()
- L.adjust_fire_stacks(-20) //Douse ourselves with water to avoid fire more easily
- to_chat(L, "You've been drenched in water!")
- L.clean_blood()
+ target.clean_blood()
- if(isturf(loc))
- var/turf/tile = loc
- loc.clean_blood()
- for(var/obj/effect/E in tile)
- if(E.is_cleanable())
- qdel(E)
/obj/machinery/shower/process()
- if(!on || !mobpresent)
- return
- for(var/mob/living/carbon/C in loc)
- if(prob(33))
- wash(C) //re-applies water and re-cleans mob while they remain under the shower, 33% chance per process to avoid message spam/quick death
- check_heat(C)
+ if(on)
+ if(isturf(loc))
+ var/turf/tile = loc
+ tile.water_act(100, convertHeat(), src)
+ tile.clean_blood()
+ for(var/obj/effect/effect in tile)
+ if(effect.is_cleanable())
+ qdel(effect)
+ for(var/thing in loc)
+ wash(thing)
+ else
+ on = FALSE
+ soundloop.stop()
+ handle_mist()
+ update_icon(UPDATE_OVERLAYS)
-/obj/machinery/shower/proc/check_heat(mob/M as mob)
- if(!on || watertemp == "normal")
+
+/obj/machinery/shower/proc/check_heat(mob/M)
+ if(current_temperature == SHOWER_NORMAL)
return
if(iscarbon(M))
var/mob/living/carbon/C = M
- if(watertemp == "freezing")
+ if(current_temperature == SHOWER_FREEZING)
//C.bodytemperature = max(80, C.bodytemperature - 80)
to_chat(C, "The water is freezing!")
- return
- if(watertemp == "boiling")
+
+ else if(current_temperature == SHOWER_BOILING)
//C.bodytemperature = min(500, C.bodytemperature + 35)
C.adjustFireLoss(5)
to_chat(C, "The water is searing!")
- return
+
+#undef SHOWER_FREEZING
+#undef SHOWER_NORMAL
+#undef SHOWER_BOILING
/obj/item/bikehorn/rubberducky
@@ -621,10 +644,9 @@
var/list/dir_choices = list("North" = NORTH, "East" = EAST, "South" = SOUTH, "West" = WEST)
var/selected = input(user, "Select a direction for the connector.", "Connector Direction") in dir_choices
dir = dir_choices[selected]
- update_icon() //is this necessary? probably not
+ update_icon(UPDATE_ICON_STATE)
-/obj/structure/sink/update_icon()
- ..()
+/obj/structure/sink/update_icon_state()
layer = OBJ_LAYER
if(!anchored)
pixel_x = 0
@@ -743,7 +765,7 @@
var/obj/structure/S = new result(T)
S.anchored = 0
S.dir = user.dir
- S.update_icon()
+ S.update_icon(UPDATE_ICON_STATE)
user.temporarily_remove_item_from_inventory(src, force = TRUE)
qdel(src)
if(prob(50))
diff --git a/code/game/objects/structures/windoor_assembly.dm b/code/game/objects/structures/windoor_assembly.dm
index 4a66c4326cd..0c4249e085c 100644
--- a/code/game/objects/structures/windoor_assembly.dm
+++ b/code/game/objects/structures/windoor_assembly.dm
@@ -50,7 +50,7 @@
setDir(ini_dir)
move_update_air(T)
-/obj/structure/windoor_assembly/update_icon()
+/obj/structure/windoor_assembly/update_icon_state()
var/temp_state = state
if(temp_state == "03")
temp_state = "02"
@@ -162,7 +162,7 @@
add_fingerprint(user)
//Update to reflect changes(if applicable)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/windoor_assembly/crowbar_act(mob/user, obj/item/I) //Crowbar to complete the assembly, Step 7 complete.
if(state != "03")
@@ -228,7 +228,7 @@
state = "02"
electronics.forceMove(loc)
electronics = null
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/windoor_assembly/wirecutter_act(mob/user, obj/item/I)
if(state != "02")
@@ -243,7 +243,7 @@
new/obj/item/stack/cable_coil(get_turf(user), 1)
state = "01"
name = "[(src.secure) ? "secure" : ""] anchored windoor assembly"
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/windoor_assembly/wrench_act(mob/user, obj/item/I)
if(state != "01")
@@ -274,7 +274,7 @@
to_chat(user, "You loosen bolts on [src].")
anchored = FALSE
name = "[(src.secure) ? "secure" : ""] windoor assembly"
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/windoor_assembly/welder_act(mob/user, obj/item/I)
if(state != "01")
@@ -312,7 +312,7 @@
setDir(target_dir)
ini_dir = dir
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
/obj/structure/windoor_assembly/AltClick(mob/user)
@@ -339,5 +339,5 @@
facing = "l"
to_chat(usr, "The windoor will now slide to the left.")
- update_icon()
- return
+ update_icon(UPDATE_ICON_STATE)
+
diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm
index 1d8ea14736a..316cfc4afc9 100644
--- a/code/game/objects/structures/window.dm
+++ b/code/game/objects/structures/window.dm
@@ -44,7 +44,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
var/glass_type = /obj/item/stack/sheet/glass
var/glass_amount = 1
var/cancolor = FALSE
- var/image/crack_overlay
+ var/mutable_appearance/crack_overlay
var/list/debris = list()
var/real_explosion_block //ignore this, just use explosion_block
var/breaksound = "shatter"
@@ -325,6 +325,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
if(I.use_tool(src, user, 40, volume = I.tool_volume))
obj_integrity = max_integrity
WELDER_REPAIR_SUCCESS_MESSAGE
+ update_icon(UPDATE_OVERLAYS)
/obj/structure/window/proc/check_state(checked_state)
if(state == checked_state)
@@ -478,23 +479,25 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
//This proc is used to update the icons of nearby windows.
/obj/structure/window/proc/update_nearby_icons()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if(smooth)
queue_smooth_neighbors(src)
-/obj/structure/window/update_icon()
- if(!QDELETED(src))
- if(!fulltile)
- return
- var/ratio = obj_integrity / max_integrity
- ratio = CEILING(ratio*4, 1) * 25
- if(smooth)
- queue_smooth(src)
- overlays -= crack_overlay
- if(ratio > 75)
- return
- crack_overlay = image('icons/obj/structures.dmi',"damage[ratio]",-(layer+0.1))
- overlays += crack_overlay
+/obj/structure/window/update_overlays()
+ . = ..()
+ if(QDELETED(src) || !fulltile)
+ return
+
+ var/ratio = obj_integrity / max_integrity
+ ratio = CEILING(ratio * 4, 1) * 25
+ if(smooth)
+ queue_smooth(src)
+ if(ratio > 75)
+ return
+
+ crack_overlay = mutable_appearance('icons/obj/structures.dmi', "damage[ratio]", -(layer + 0.01), appearance_flags = RESET_COLOR)
+ . += crack_overlay
+
/obj/structure/window/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
..()
@@ -596,35 +599,38 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
use_power(5)
active = !active
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
- for(var/obj/structure/window/reinforced/polarized/W in range(src,range))
- if(W.id == src.id || !W.id)
- spawn(0)
- W.toggle()
- return
- for(var/obj/machinery/door/airlock/G in range(src,range))
- if(G.id == src.id)
- spawn(0)
- if(G.glass)
- G.airlock_material = null
- G.glass = FALSE
- G.update_icon()
- if(G.density)
- G.opacity = 1
- else
- G.airlock_material = "glass"
- G.glass = TRUE
- G.update_icon()
- G.opacity = 0
- return
+ for(var/obj/structure/window/reinforced/polarized/window in range(src,range))
+ if(window.id == id || !window.id)
+ INVOKE_ASYNC(window, TYPE_PROC_REF(/obj/structure/window/reinforced/polarized, toggle))
-/obj/machinery/button/windowtint/power_change()
- ..()
+ for(var/obj/machinery/door/airlock/airlock in range(src,range))
+ if(airlock.id == id)
+ INVOKE_ASYNC(src, PROC_REF(async_update), airlock)
+
+
+/obj/machinery/button/windowtint/proc/async_update(obj/machinery/door/airlock/airlock)
+ if(airlock.glass)
+ airlock.airlock_material = null
+ airlock.glass = FALSE
+ airlock.update_icon()
+ if(airlock.density)
+ airlock.set_opacity(TRUE)
+ else
+ airlock.airlock_material = "glass"
+ airlock.glass = TRUE
+ airlock.update_icon()
+ airlock.set_opacity(FALSE)
+
+
+/obj/machinery/button/windowtint/power_change(forced = FALSE)
+ if(!..())
+ return
if(active && !powered(power_channel))
toggle_tint()
-/obj/machinery/button/windowtint/update_icon()
+/obj/machinery/button/windowtint/update_icon_state()
icon_state = "light[active]"
/obj/structure/window/plasmabasic
@@ -900,7 +906,7 @@ GLOBAL_LIST_INIT(wcCommon, pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e",
/obj/structure/window/reinforced/clockwork/ratvar_act()
obj_integrity = max_integrity
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/structure/window/reinforced/clockwork/narsie_act()
take_damage(rand(25, 75), BRUTE)
diff --git a/code/game/objects/structures/wryn.dm b/code/game/objects/structures/wryn.dm
index 5afad33eac2..c10d16b84ae 100644
--- a/code/game/objects/structures/wryn.dm
+++ b/code/game/objects/structures/wryn.dm
@@ -68,41 +68,29 @@
plane = FLOOR_PLANE
icon_state = "wax_floor"
max_integrity = 10
+ var/current_dir
var/static/list/floorImageCache
-/obj/structure/wryn/floor/proc/updateOverlays()
-
- overlays.Cut()
-
- if(!floorImageCache || !floorImageCache.len)
- floorImageCache = list()
- floorImageCache.len = 4
- floorImageCache["north"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32)
- floorImageCache["south"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32)
- floorImageCache["east"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32)
- floorImageCache["west"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32)
-
- var/turf/N = get_step(src, NORTH)
- var/turf/S = get_step(src, SOUTH)
- var/turf/E = get_step(src, EAST)
- var/turf/W = get_step(src, WEST)
- if(!locate(/obj/structure/wryn) in N.contents)
- if(istype(N, /turf/simulated/floor))
- overlays += floorImageCache["south"]
- if(!locate(/obj/structure/wryn) in S.contents)
- if(istype(S, /turf/simulated/floor))
- overlays += floorImageCache["north"]
- if(!locate(/obj/structure/wryn) in E.contents)
- if(istype(E, /turf/simulated/floor))
- overlays += floorImageCache["west"]
- if(!locate(/obj/structure/wryn) in W.contents)
- if(istype(W, /turf/simulated/floor))
- overlays += floorImageCache["east"]
+
+/obj/structure/wryn/floor/update_overlays()
+ . = ..()
+ for(var/check_dir in GLOB.cardinal)
+ var/turf/check = get_step(src, check_dir)
+ if(issimulatedturf(check) && !(locate(/obj/structure/wryn) in check))
+ . += floorImageCache["[GetOppositeDir(check_dir)]"]
/obj/structure/wryn/floor/proc/fullUpdateWeedOverlays()
- for(var/obj/structure/wryn/floor/W in range(1,src))
- W.updateOverlays()
+ if(!length(floorImageCache))
+ floorImageCache = list(4)
+ floorImageCache["[NORTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_n", layer=2.11, pixel_y = -32)
+ floorImageCache["[SOUTH]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_s", layer=2.11, pixel_y = 32)
+ floorImageCache["[EAST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_e", layer=2.11, pixel_x = -32)
+ floorImageCache["[WEST]"] = image('icons/obj/smooth_structures/wryn/floor.dmi', "wax_floor_side_w", layer=2.11, pixel_x = 32)
+
+ for(var/obj/structure/wryn/floor/floor in range(1,src))
+ floor.update_icon(UPDATE_OVERLAYS)
+
/obj/structure/wryn/floor/New(pos)
..()
diff --git a/code/game/turfs/simulated.dm b/code/game/turfs/simulated.dm
index 6d15f484e9e..e84c27e240e 100644
--- a/code/game/turfs/simulated.dm
+++ b/code/game/turfs/simulated.dm
@@ -3,6 +3,7 @@
name = "station"
var/wet = 0
var/image/wet_overlay = null
+ var/mutable_appearance/melting_olay
var/thermite = 0
oxygen = MOLES_O2STANDARD
diff --git a/code/game/turfs/simulated/floor.dm b/code/game/turfs/simulated/floor.dm
index b5c04cb2031..9f5842de11d 100644
--- a/code/game/turfs/simulated/floor.dm
+++ b/code/game/turfs/simulated/floor.dm
@@ -125,12 +125,11 @@ GLOBAL_LIST_INIT(icons_to_ignore_at_floor_init, list("damaged1","damaged2","dama
/turf/simulated/floor/blob_act(obj/structure/blob/B)
return
-/turf/simulated/floor/update_icon()
+/turf/simulated/floor/update_overlays()
+ . = ..()
update_visuals()
- overlays -= current_overlay
if(current_overlay)
- overlays.Add(current_overlay)
- return 1
+ . += current_overlay
/turf/simulated/floor/proc/break_tile_to_plating()
var/turf/simulated/floor/plating/T = make_plating(FALSE)
diff --git a/code/game/turfs/simulated/floor/fancy_floor.dm b/code/game/turfs/simulated/floor/fancy_floor.dm
index cdceea71b36..b3dcf69dee9 100644
--- a/code/game/turfs/simulated/floor/fancy_floor.dm
+++ b/code/game/turfs/simulated/floor/fancy_floor.dm
@@ -10,6 +10,11 @@
/turf/simulated/floor/wood/broken_states()
return list("wood-broken", "wood-broken2", "wood-broken3", "wood-broken4", "wood-broken5", "wood-broken6", "wood-broken7")
+/turf/simulated/floor/wood/airless
+ oxygen = 0
+ nitrogen = 0
+ temperature = TCMB
+
/turf/simulated/floor/wood/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -109,7 +114,7 @@
. = ..()
update_icon()
-/turf/simulated/floor/grass/update_icon()
+/turf/simulated/floor/grass/update_icon_state()
icon_state = "grass[pick("1","2","3","4")]"
/turf/simulated/floor/grass/attackby(obj/item/C, mob/user, params)
@@ -145,17 +150,22 @@
clawfootstep = FOOTSTEP_CARPET_BAREFOOT
heavyfootstep = FOOTSTEP_GENERIC_HEAVY
+/turf/simulated/floor/carpet/airless
+ oxygen = 0
+ nitrogen = 0
+ temperature = TCMB
+
/turf/simulated/floor/carpet/Initialize(mapload)
. = ..()
update_icon()
+
/turf/simulated/floor/carpet/broken_states()
return list("damaged")
-/turf/simulated/floor/carpet/update_icon()
- if(!..())
- return
- dir = 0 //Prevents wrong smoothing
+
+/turf/simulated/floor/carpet/update_icon_state()
+ dir = NONE //Prevents wrong smoothing
if(!broken && !burnt)
if(smooth)
queue_smooth(src)
diff --git a/code/game/turfs/simulated/floor/light_floor.dm b/code/game/turfs/simulated/floor/light_floor.dm
index dfd63d5ea4c..40851bd4313 100644
--- a/code/game/turfs/simulated/floor/light_floor.dm
+++ b/code/game/turfs/simulated/floor/light_floor.dm
@@ -23,49 +23,52 @@
. = ..()
update_icon()
+
/turf/simulated/floor/light/broken_states()
return list("light_broken")
-/turf/simulated/floor/light/update_icon()
- ..()
- if(on)
- switch(state)
- if(LIGHTFLOOR_ON)
- icon_state = "light_on"
- set_light(5, null,LIGHT_COLOR_LIGHTBLUE)
- if(LIGHTFLOOR_WHITE)
- icon_state = "light_on-w"
- set_light(5, null,LIGHT_COLOR_WHITE)
- if(LIGHTFLOOR_RED)
- icon_state = "light_on-r"
- set_light(5, null,LIGHT_COLOR_RED)
- if(LIGHTFLOOR_GREEN)
- icon_state = "light_on-g"
- set_light(5, null,LIGHT_COLOR_PURE_GREEN)
- if(LIGHTFLOOR_YELLOW)
- icon_state = "light_on-y"
- set_light(5, null,"#FFFF00")
- if(LIGHTFLOOR_BLUE)
- icon_state = "light_on-b"
- set_light(5, null,LIGHT_COLOR_DARKBLUE)
- if(LIGHTFLOOR_PURPLE)
- icon_state = "light_on-p"
- set_light(5, null,LIGHT_COLOR_PURPLE)
- if(LIGHTFLOOR_GENERICCYCLE)
- icon_state = "light_on-cycle_all"
- set_light(5, null,LIGHT_COLOR_WHITE)
- if(LIGHTFLOOR_CYCLEA)
- icon_state = "light_on-dancefloor_A"
- set_light(5,null,LIGHT_COLOR_RED)
- if(LIGHTFLOOR_CYCLEB)
- icon_state = "light_on-dancefloor_B"
- set_light(5, null,LIGHT_COLOR_DARKBLUE)
- else
- icon_state = "light_off"
- set_light(0)
- else
+
+/turf/simulated/floor/light/update_icon_state()
+ if(!on)
set_light(0)
icon_state = "light_off"
+ return
+
+ switch(state)
+ if(LIGHTFLOOR_ON)
+ icon_state = "light_on"
+ set_light(5, null,LIGHT_COLOR_LIGHTBLUE)
+ if(LIGHTFLOOR_WHITE)
+ icon_state = "light_on-w"
+ set_light(5, null,LIGHT_COLOR_WHITE)
+ if(LIGHTFLOOR_RED)
+ icon_state = "light_on-r"
+ set_light(5, null,LIGHT_COLOR_RED)
+ if(LIGHTFLOOR_GREEN)
+ icon_state = "light_on-g"
+ set_light(5, null,LIGHT_COLOR_PURE_GREEN)
+ if(LIGHTFLOOR_YELLOW)
+ icon_state = "light_on-y"
+ set_light(5, null,"#FFFF00")
+ if(LIGHTFLOOR_BLUE)
+ icon_state = "light_on-b"
+ set_light(5, null,LIGHT_COLOR_DARKBLUE)
+ if(LIGHTFLOOR_PURPLE)
+ icon_state = "light_on-p"
+ set_light(5, null,LIGHT_COLOR_PURPLE)
+ if(LIGHTFLOOR_GENERICCYCLE)
+ icon_state = "light_on-cycle_all"
+ set_light(5, null,LIGHT_COLOR_WHITE)
+ if(LIGHTFLOOR_CYCLEA)
+ icon_state = "light_on-dancefloor_A"
+ set_light(5,null,LIGHT_COLOR_RED)
+ if(LIGHTFLOOR_CYCLEB)
+ icon_state = "light_on-dancefloor_B"
+ set_light(5, null,LIGHT_COLOR_DARKBLUE)
+ else
+ icon_state = "light_off"
+ set_light(0)
+
/turf/simulated/floor/light/BeforeChange()
set_light(0)
diff --git a/code/game/turfs/simulated/floor/mineral.dm b/code/game/turfs/simulated/floor/mineral.dm
index dd3b20f0b17..4440de90854 100644
--- a/code/game/turfs/simulated/floor/mineral.dm
+++ b/code/game/turfs/simulated/floor/mineral.dm
@@ -17,12 +17,11 @@
/turf/simulated/floor/mineral/broken_states()
return list("[initial(icon_state)]_dam")
-/turf/simulated/floor/mineral/update_icon()
- if(!..())
- return 0
- if(!broken && !burnt)
- if(!(icon_state in icons))
- icon_state = initial(icon_state)
+
+/turf/simulated/floor/mineral/update_icon_state()
+ if(!broken && !burnt && !(icon_state in icons))
+ icon_state = initial(icon_state)
+
//PLASMA
/turf/simulated/floor/mineral/plasma
diff --git a/code/game/turfs/simulated/floor/plasteel_floor.dm b/code/game/turfs/simulated/floor/plasteel_floor.dm
index 99f943c53e4..366d9d2a12b 100644
--- a/code/game/turfs/simulated/floor/plasteel_floor.dm
+++ b/code/game/turfs/simulated/floor/plasteel_floor.dm
@@ -8,9 +8,7 @@
/turf/simulated/floor/plasteel/burnt_states()
return list("floorscorched1", "floorscorched2")
-/turf/simulated/floor/plasteel/update_icon()
- if(!..())
- return 0
+/turf/simulated/floor/plasteel/update_icon_state()
if(!broken && !burnt)
icon_state = icon_regular_floor
dir = floor_regular_dir
diff --git a/code/game/turfs/simulated/floor/plating.dm b/code/game/turfs/simulated/floor/plating.dm
index 8896f455dda..a37d7d83633 100644
--- a/code/game/turfs/simulated/floor/plating.dm
+++ b/code/game/turfs/simulated/floor/plating.dm
@@ -32,9 +32,7 @@
. = ..()
burn_tile()
-/turf/simulated/floor/plating/update_icon()
- if(!..())
- return
+/turf/simulated/floor/plating/update_icon_state()
if(!broken && !burnt)
icon_state = icon_plating //Because asteroids are 'platings' too.
@@ -191,7 +189,7 @@
/turf/simulated/floor/engine/attackby(obj/item/C, mob/user, params)
if(!C || !user)
return
- if(istype(C, /obj/item/wrench))
+ if(C.tool_behaviour == TOOL_WRENCH)
to_chat(user, span_notice("You begin removing rods..."))
playsound(src, C.usesound, 80, 1)
if(do_after(user, 30 * C.toolspeed * gettoolspeedmod(user), target = src))
@@ -227,12 +225,20 @@
/turf/simulated/floor/engine/cult
name = "engraved floor"
icon_state = "cult"
+ var/holy = FALSE
+
/turf/simulated/floor/engine/cult/Initialize(mapload)
. = ..()
- if(SSticker.mode)//only do this if the round is going..otherwise..fucking asteroid..
- if(!icon_state == "holy")
- icon_state = SSticker.cultdat.cult_floor_icon_state
+ update_icon(UPDATE_ICON_STATE)
+
+
+/turf/simulated/floor/engine/cult/update_icon_state()
+ if(SSticker?.cultdat && !holy)
+ icon_state = SSticker.cultdat.cult_floor_icon_state
+ return
+ icon_state = initial(icon_state)
+
/turf/simulated/floor/engine/cult/narsie_act()
return
@@ -246,6 +252,7 @@
/turf/simulated/floor/engine/cult/holy
icon_state = "holy"
+ holy = TRUE
//air filled floors; used in atmos pressure chambers
@@ -361,7 +368,7 @@
icon_state = "ironfoam"
metal = MFOAM_IRON
-/turf/simulated/floor/plating/metalfoam/update_icon()
+/turf/simulated/floor/plating/metalfoam/update_icon_state()
switch(metal)
if(MFOAM_ALUMINUM)
icon_state = "metalfoam"
@@ -418,14 +425,6 @@
/turf/simulated/floor/plating/metalfoam/proc/smash()
ChangeTurf(baseturf)
-/turf/simulated/floor/plating/abductor
- name = "alien floor"
- icon_state = "alienpod1"
-
-/turf/simulated/floor/plating/abductor/Initialize(mapload)
- . = ..()
- icon_state = "alienpod[rand(1,9)]"
-
/turf/simulated/floor/plating/ice
name = "ice sheet"
desc = "A sheet of solid ice. Looks slippery."
diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm
index 4c23b51b895..53f66b42a32 100644
--- a/code/game/turfs/simulated/minerals.dm
+++ b/code/game/turfs/simulated/minerals.dm
@@ -104,14 +104,16 @@
else
update_icon()
-/turf/simulated/mineral/update_icon()
+
+/turf/simulated/mineral/update_overlays()
+ . = ..()
if(hardness != initial(hardness))
var/amount = hardness
var/mutable_appearance/cracks = mutable_appearance('icons/turf/mining.dmi',"rock_cracks_[amount]",ON_EDGED_TURF_LAYER)
var/matrix/M = new
M.Translate(4,4)
cracks.transform = M
- add_overlay(cracks)
+ . += cracks
/turf/simulated/mineral/attack_animal(mob/living/simple_animal/user)
diff --git a/code/game/turfs/simulated/shuttle.dm b/code/game/turfs/simulated/shuttle.dm
index 10c78c46610..5d010f0649c 100644
--- a/code/game/turfs/simulated/shuttle.dm
+++ b/code/game/turfs/simulated/shuttle.dm
@@ -61,7 +61,7 @@
/turf/simulated/wall/shuttle/try_decon(obj/item/I, mob/user, params)
return
-/turf/simulated/wall/shuttle/thermitemelt(mob/user as mob, speed)
+/turf/simulated/wall/shuttle/thermitemelt(mob/user, time)
return
/turf/simulated/wall/shuttle/nodiagonal
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index 07d46679d71..752889d54f8 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -25,6 +25,8 @@
thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
heat_capacity = 312500 //a little over 5 cm thick , 312500 for 1 m by 2.5 m by 0.25 m plasteel wall
+ var/melting = FALSE //TRUE if wall is currently being melted with thermite
+
var/can_dismantle_with_welder = TRUE
var/hardness = 40 //lower numbers are harder. Used to determine the probability of a hulk smashing through.
var/slicing_duration = 100
@@ -71,27 +73,25 @@
if(rotting)
. += span_warning("There is fungus growing on [src].")
-/turf/simulated/wall/update_icon()
+
+/turf/simulated/wall/update_overlays()
+ . = ..()
if(!damage_overlays[1]) //list hasn't been populated
generate_overlays()
queue_smooth(src)
if(!damage)
- if(damage_overlay)
- overlays -= damage_overlays[damage_overlay]
- damage_overlay = 0
return
- var/overlay = round(damage / damage_cap * damage_overlays.len) + 1
- if(overlay > damage_overlays.len)
- overlay = damage_overlays.len
+ var/overlay = round(damage / damage_cap * length(damage_overlays)) + 1
+ if(overlay > length(damage_overlays))
+ overlay = length(damage_overlays)
if(damage_overlay && overlay == damage_overlay) //No need to update.
return
- if(damage_overlay)
- overlays -= damage_overlays[damage_overlay]
- overlays += damage_overlays[overlay]
- damage_overlay = overlay
+
+ . += damage_overlays[overlay]
+
/turf/simulated/wall/proc/generate_overlays()
var/alpha_inc = 256 / damage_overlays.len
@@ -245,35 +245,87 @@
/turf/simulated/wall/burn_down()
if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond))
return
- ChangeTurf(/turf/simulated/floor)
+ return ChangeTurf(/turf/simulated/floor)
+
-/turf/simulated/wall/proc/thermitemelt(mob/user as mob, speed)
- var/wait = 100
- if(speed)
- wait = speed
+#define THERMITE_PER_SECOND 2.5
+#define DAMAGE_PER_SECOND 60
+
+/**
+ * Melts down wall into its base turf.
+ *
+ * Arguments:
+ * * user - who used thermite, optional argument used to show message.
+ * * time - optional override; thermite reagent will not be used for melting, only passed time matters.
+ */
+/turf/simulated/wall/proc/thermitemelt(mob/user, time)
+ set waitfor = FALSE
+
+ if(melting)
+ return
if(istype(sheet_type, /obj/item/stack/sheet/mineral/diamond))
return
- var/obj/effect/overlay/O = new/obj/effect/overlay( src )
- O.name = "Thermite"
- O.desc = "Looks hot."
- O.icon = 'icons/effects/fire.dmi'
- O.icon_state = "2"
- O.anchored = 1
- O.density = 1
- O.layer = 5
+ var/obj/effect/overlay/visuals = new(src)
+ visuals.name = "Thermite"
+ visuals.desc = "Looks hot."
+ visuals.icon = 'icons/effects/fire.dmi'
+ visuals.icon_state = "2"
+ visuals.anchored = TRUE
+ visuals.density = TRUE
+ visuals.layer = FLY_LAYER
- src.ChangeTurf(/turf/simulated/floor/plating)
-
- var/turf/simulated/floor/F = src
- F.burn_tile()
- F.icon_state = "plating"
if(user)
- to_chat(user, span_warning("The thermite starts melting through the wall."))
+ to_chat(user, span_warning("The thermite starts melting through [src]."))
+
+ if(time)
+ melting = TRUE
+ var/sound_timer = 10
+ while(time > 0)
+ if(QDELETED(src))
+ return
+ sound_timer++
+ if(sound_timer >= 10)
+ sound_timer = 0
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+ time = max(0, time - 0.1 SECONDS)
+ sleep(0.1 SECONDS)
+ if(QDELETED(src))
+ return
+ var/turf/simulated/floor/our_floor = burn_down()
+ our_floor.burn_tile()
+ our_floor.cut_overlay(melting_olay)
+ if(visuals)
+ qdel(visuals)
+ return
+
+ melting = TRUE
+
+ while(reagents.get_reagent_amount("thermite") > 0)
+ if(QDELETED(src))
+ return
+ reagents.remove_reagent("thermite", THERMITE_PER_SECOND)
+ if(damage_cap - damage <= DAMAGE_PER_SECOND)
+ var/turf/simulated/floor/our_floor = burn_down()
+ our_floor.burn_tile()
+ break
+ take_damage(DAMAGE_PER_SECOND)
+ playsound(src, 'sound/items/welder.ogg', 100, TRUE)
+ sleep(1 SECONDS)
+
+ if(QDELETED(src))
+ return
+
+ if(iswallturf(src))
+ melting = FALSE
+
+ cut_overlay(melting_olay)
+ if(visuals)
+ qdel(visuals)
+
+#undef THERMITE_PER_SECOND
+#undef DAMAGE_PER_SECOND
- spawn(wait)
- if(O) qdel(O)
- return
//Interactions
@@ -353,7 +405,7 @@
/turf/simulated/wall/welder_act(mob/user, obj/item/I)
. = TRUE
- if(thermite && I.use_tool(src, user, volume = I.tool_volume))
+ if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume))
thermitemelt(user)
return
if(rotting)
diff --git a/code/game/turfs/simulated/walls_indestructible.dm b/code/game/turfs/simulated/walls_indestructible.dm
index 19d8ef7d187..739e68a34fd 100644
--- a/code/game/turfs/simulated/walls_indestructible.dm
+++ b/code/game/turfs/simulated/walls_indestructible.dm
@@ -59,7 +59,7 @@
/turf/simulated/wall/indestructible/rcd_deconstruct_act()
return RCD_NO_ACT
-/turf/simulated/wall/indestructible/thermitemelt(mob/user as mob, speed)
+/turf/simulated/wall/indestructible/thermitemelt(mob/user, time)
return
/turf/simulated/wall/indestructible/fakeglass
diff --git a/code/game/turfs/simulated/walls_mineral.dm b/code/game/turfs/simulated/walls_mineral.dm
index 5caf1ae9d52..ee8318877f8 100644
--- a/code/game/turfs/simulated/walls_mineral.dm
+++ b/code/game/turfs/simulated/walls_mineral.dm
@@ -267,7 +267,7 @@
/turf/simulated/wall/mineral/titanium/nodecon/try_decon(obj/item/I, mob/user, params)
return
-/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user as mob, speed)
+/turf/simulated/wall/mineral/titanium/nodecon/thermitemelt(mob/user, time)
return
/turf/simulated/wall/mineral/titanium/nodecon/burn_down()
diff --git a/code/game/turfs/simulated/walls_misc.dm b/code/game/turfs/simulated/walls_misc.dm
index 037bcda8ef2..b7afc177525 100644
--- a/code/game/turfs/simulated/walls_misc.dm
+++ b/code/game/turfs/simulated/walls_misc.dm
@@ -8,6 +8,7 @@
sheet_type = /obj/item/stack/sheet/runed_metal
sheet_amount = 1
girder_type = /obj/structure/girder/cult
+ var/holy = FALSE
/turf/simulated/wall/cult_fake
name = "runed metal wall"
@@ -20,12 +21,18 @@
sheet_amount = 1
girder_type = /obj/structure/girder/cult_fake
+
/turf/simulated/wall/cult/Initialize(mapload)
. = ..()
- if(SSticker.mode)//game hasn't started offically don't do shit..
- new /obj/effect/temp_visual/cult/turf(src)
- if(!icon_state == "holy")
- icon_state = SSticker.cultdat.cult_wall_icon_state
+ update_icon(UPDATE_ICON_STATE)
+
+
+/turf/simulated/wall/cult/update_icon_state()
+ if(SSticker?.cultdat && !holy)
+ icon_state = SSticker.cultdat.cult_wall_icon_state
+ return
+ icon_state = initial(icon_state)
+
/turf/simulated/wall/cult_fake/Initialize(mapload)
. = ..()
@@ -42,6 +49,7 @@
icon_state = "holy"
sheet_type = /obj/item/stack/sheet/metal
girder_type = /obj/structure/girder
+ holy = TRUE
/turf/simulated/wall/cult/artificer/break_wall()
new /obj/effect/temp_visual/cult/turf(get_turf(src))
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 6739b559b77..2a4ddf66252 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -93,7 +93,7 @@
return ..()
/turf/simulated/wall/r_wall/welder_act(mob/user, obj/item/I)
- if(thermite && I.use_tool(src, user, volume = I.tool_volume))
+ if(reagents?.get_reagent_amount("thermite") && I.use_tool(src, user, volume = I.tool_volume))
thermitemelt(user)
return TRUE
if(!(d_state in list(RWALL_COVER, RWALL_SUPPORT_RODS, RWALL_CUT_COVER)))
@@ -232,9 +232,8 @@
if(prob(30))
dismantle_wall()
-/turf/simulated/wall/r_wall/update_icon()
- . = ..()
+/turf/simulated/wall/r_wall/update_icon_state()
if(d_state)
icon_state = "r_wall-[d_state]"
smooth = SMOOTH_FALSE
@@ -243,6 +242,7 @@
smooth = SMOOTH_TRUE
icon_state = ""
+
/turf/simulated/wall/r_wall/devastate_wall()
new sheet_type(src, sheet_amount)
new /obj/item/stack/sheet/metal(src, 2)
diff --git a/code/game/turfs/space/transit.dm b/code/game/turfs/space/transit.dm
index e558733e1af..816a23dce65 100644
--- a/code/game/turfs/space/transit.dm
+++ b/code/game/turfs/space/transit.dm
@@ -62,9 +62,9 @@
/turf/space/transit/Initialize(mapload)
. = ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/turf/space/transit/update_icon()
+/turf/space/transit/update_icon_state()
var/p = 9
var/angle = 0
var/state = 1
diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
index 15e049bb4ae..03c09ca7fcc 100644
--- a/code/game/turfs/turf.dm
+++ b/code/game/turfs/turf.dm
@@ -8,6 +8,7 @@
var/slowdown = 0 //negative for faster, positive for slower
var/transparent_floor = FALSE //used to check if pipes should be visible under the turf or not
+ /// Set if the turf should appear on a different layer while in-game and map editing, otherwise use normal layer.
var/real_layer = TURF_LAYER
layer = MAP_EDITOR_TURF_LAYER
@@ -375,19 +376,24 @@
L.Add(T)
return L
-//Idem, but don't check for ID and goes through open doors
-/turf/proc/AdjacentTurfs(list/closed)
- var/list/L = new()
- var/turf/simulated/T
- for(var/dir in GLOB.alldirs2) //arbitrarily ordered list to favor non-diagonal moves in case of ties
+
+/// Returns the adjacent turfs. Can check for density or cardinal directions only instead of all 8, or just dense turfs entirely. dense_only takes precedence over open_only.
+/turf/proc/AdjacentTurfs(open_only = FALSE, cardinal_only = FALSE, dense_only = FALSE)
+ var/list/L = list()
+ var/turf/T
+ var/list/directions = cardinal_only ? GLOB.cardinal : GLOB.alldirs
+ for(var/dir in directions)
T = get_step(src, dir)
- if(T in closed) //turf already proceeded by A*
+ if(!istype(T))
continue
- if(istype(T) && !T.density)
- if(!CanAtmosPass(T))
- L.Add(T)
+ if(dense_only && !T.density)
+ continue
+ if((open_only && T.density) && !dense_only)
+ continue
+ L.Add(T)
return L
+
// check for all turfs, including space ones
/turf/proc/AdjacentTurfsSpace(obj/item/card/id/ID = null, list/closed)//check access if one is passed
var/list/L = new()
@@ -456,7 +462,7 @@
for(var/obj/O in contents) //this is for deleting things like wires contained in the turf
if(O.level != 1)
continue
- if(O.invisibility == INVISIBILITY_MAXIMUM)
+ if(O.invisibility == INVISIBILITY_MAXIMUM || O.invisibility == INVISIBILITY_ABSTRACT)
O.singularity_act()
ChangeTurf(baseturf)
return 2
diff --git a/code/modules/admin/admin_verbs.dm b/code/modules/admin/admin_verbs.dm
index ba431829557..a188617c0dd 100644
--- a/code/modules/admin/admin_verbs.dm
+++ b/code/modules/admin/admin_verbs.dm
@@ -283,6 +283,7 @@ GLOBAL_LIST_INIT(admin_verbs_ticket, list(
if(holder.rights & R_VIEWRUNTIMES)
verbs += /client/proc/view_runtimes
verbs += /client/proc/ss_breakdown
+ verbs += /client/proc/toggle_mctabs
spawn(1) // This setting exposes the profiler for people with R_VIEWRUNTIMES. They must still have it set in cfg/admin.txt
control_freak = 0
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index b2466aafa1b..13d3cf79412 100644
--- a/code/modules/admin/topic.dm
+++ b/code/modules/admin/topic.dm
@@ -2313,7 +2313,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += ""
P.update_icon()
P.faxmachineid = fax.UID()
@@ -2408,7 +2408,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += ""
P.update_icon()
fax.receivefax(P)
@@ -2620,14 +2620,14 @@
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp/centcom
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += ""
else if(stamptype == "text")
if(!P.stamped)
P.stamped = new
P.stamped += /obj/item/stamp
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += "[stampvalue]"
if(destination != "All Departments")
@@ -3647,10 +3647,8 @@
hunter_mob.equipOutfit(O, FALSE)
var/obj/item/pinpointer/advpinpointer/N = new /obj/item/pinpointer/advpinpointer(hunter_mob)
hunter_mob.equip_to_slot_or_del(N, slot_in_backpack)
- N.mode = 3 //MODE_ADV, not defined here
N.setting = 2 //SETTING_OBJECT, not defined here
- N.target = H
- N.pinpoint_at(N.target)
+ N.pinpoint_at(H)
N.modelocked = TRUE
if(!locate(/obj/item/implant/dust, hunter_mob))
var/obj/item/implant/dust/D = new /obj/item/implant/dust(hunter_mob)
diff --git a/code/modules/admin/verbs/gimmick_team.dm b/code/modules/admin/verbs/gimmick_team.dm
index 514faacf862..decd1e55ed2 100644
--- a/code/modules/admin/verbs/gimmick_team.dm
+++ b/code/modules/admin/verbs/gimmick_team.dm
@@ -93,6 +93,7 @@
H.mind.assigned_role = "Event Character"
H.mind.special_role = "Event Character"
H.mind.offstation_role = TRUE
+ H.change_voice()
H.key = thisplayer.key
if(dresscode != "Naked")
diff --git a/code/modules/admin/verbs/honksquad.dm b/code/modules/admin/verbs/honksquad.dm
index 64e9f48e82a..7ea997d11b1 100644
--- a/code/modules/admin/verbs/honksquad.dm
+++ b/code/modules/admin/verbs/honksquad.dm
@@ -98,6 +98,7 @@ GLOBAL_VAR_INIT(sent_clownsequritysquad, 0)
new_honksquad.mind.special_role = SPECIAL_ROLE_HONKSQUAD
new_honksquad.mind.offstation_role = TRUE
new_honksquad.add_language("Clownish")
+ new_honksquad.change_voice()
SSticker.mode.traitors |= new_honksquad.mind//Adds them to current traitor list. Which is really the extra antagonist list.
new_honksquad.equip_honksquad(honk_leader_selected, rankName)
return new_honksquad
diff --git a/code/modules/admin/verbs/infiltratorteam_syndicate.dm b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
index 8129f473f7b..a34d0222fcb 100644
--- a/code/modules/admin/verbs/infiltratorteam_syndicate.dm
+++ b/code/modules/admin/verbs/infiltratorteam_syndicate.dm
@@ -125,6 +125,7 @@ GLOBAL_VAR_INIT(sent_syndicate_infiltration_team, 0)
new_syndicate_infiltrator.mind.special_role = "Syndicate Infiltrator"
new_syndicate_infiltrator.mind.offstation_role = TRUE //they can flee to z2 so make them inelligible as antag targets
SSticker.mode.traitors |= new_syndicate_infiltrator.mind //Adds them to extra antag list
+ new_syndicate_infiltrator.change_voice()
new_syndicate_infiltrator.equip_syndicate_infiltrator(syndicate_leader_selected, uplink_tc, is_mgmt)
return new_syndicate_infiltrator
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm
index 13cb21e5661..b6c20d96783 100644
--- a/code/modules/admin/verbs/striketeam_syndicate.dm
+++ b/code/modules/admin/verbs/striketeam_syndicate.dm
@@ -119,6 +119,7 @@ GLOBAL_VAR_INIT(sent_syndicate_strike_team, 0)
new_syndicate_commando.mind.assigned_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.special_role = SPECIAL_ROLE_SYNDICATE_DEATHSQUAD
new_syndicate_commando.mind.offstation_role = TRUE
+ new_syndicate_commando.change_voice()
SSticker.mode.traitors |= new_syndicate_commando.mind //Adds them to current traitor list. Which is really the extra antagonist list.
if(is_leader)
new_syndicate_commando.equipOutfit(/datum/outfit/admin/syndicate_strike_team/officer)
diff --git a/code/modules/antagonists/space_dragon/carp_rift.dm b/code/modules/antagonists/space_dragon/carp_rift.dm
index ebaa9518fe9..a7e2f9cf6b4 100644
--- a/code/modules/antagonists/space_dragon/carp_rift.dm
+++ b/code/modules/antagonists/space_dragon/carp_rift.dm
@@ -92,6 +92,13 @@
return ..()
+/obj/structure/carp_rift/update_icon_state()
+ if(charge_state == CHARGE_COMPLETED)
+ icon_state = "carp_rift_charged"
+ return
+ icon_state = (carp_stored > 0) ? "carp_rift_carpspawn" : "carp_rift"
+
+
/obj/structure/carp_rift/process(seconds_per_tick)
// If we're fully charged, just start mass spawning carp.
if(charge_state == CHARGE_COMPLETED)
@@ -132,7 +139,7 @@
// Can we increase the carp spawn pool size?
if(last_carp_inc >= carp_interval)
carp_stored += 3
- icon_state = "carp_rift_carpspawn"
+ update_icon(UPDATE_ICON_STATE)
if(light_color != LIGHT_COLOR_PURPLE)
light_color = LIGHT_COLOR_PURPLE
update_light()
@@ -146,7 +153,7 @@
GLOB.command_announcement.Announce("Пространственный объект достиг максимального энергетического заряда в зоне [initial(A.name)]. Пожалуйста, ожидайте.", "Отдел Изучения Дикой Природы")
max_integrity = INFINITY
obj_integrity = INFINITY
- icon_state = "carp_rift_charged"
+ update_icon(UPDATE_ICON_STATE)
light_color = LIGHT_COLOR_YELLOW
update_light()
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 100, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
@@ -210,7 +217,7 @@
to_chat(newcarp, span_boldwarning("Вы прибыли, чтобы помочь космическому дракону защищать разломы. Следуйте поставленной миссии и защитите разлом любой ценой!"))
carp_stored--
if(carp_stored <= 0 && charge_state < CHARGE_COMPLETED)
- icon_state = "carp_rift"
+ update_icon(UPDATE_ICON_STATE)
light_color = LIGHT_COLOR_BLUE
update_light()
return TRUE
diff --git a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm
index 6f0077fe4e5..00d7a1f3c83 100644
--- a/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm
+++ b/code/modules/antagonists/space_ninja/creeping_widow/creeping_widow_martial_art.dm
@@ -15,7 +15,12 @@
icon = 'icons/obj/ninjaobjects.dmi'
icon_state = "injector"
attack_verb = list("poked", "prodded")
- var/used = 0
+ var/used = FALSE
+
+
+/obj/item/creeping_widow_injector/update_icon_state()
+ icon_state = "injector[used ? "-used" : ""]"
+
/obj/item/creeping_widow_injector/attack_self(mob/living/carbon/human/user as mob)
if(!used)
@@ -26,18 +31,19 @@
var/datum/martial_art/ninja_martial_art/N = new/datum/martial_art/ninja_martial_art(null)
N.teach(user)
- used = 1
- icon_state = "injector-used"
+ used = TRUE
+ update_icon(UPDATE_ICON_STATE)
desc = "A strange autoinjector made of a black metal. It appears to be used up and empty."
- return 0
- else
- to_chat(user, "The [src] has been used already!")
- return 1
+ return FALSE
+
+ to_chat(user, "The [src] has been used already!")
+ return TRUE
// Ninja martial art datum
/datum/martial_art/ninja_martial_art
name = "Creeping Widow"
+ weight = 10
combos = list( /datum/martial_combo/ninja_martial_art/energy_tornado,
/datum/martial_combo/ninja_martial_art/palm_strike,
/datum/martial_combo/ninja_martial_art/wrench_wrist,
diff --git a/code/modules/antagonists/space_ninja/ninja_borg_module.dm b/code/modules/antagonists/space_ninja/ninja_borg_module.dm
index d3fb2a1ea51..57b5319b055 100644
--- a/code/modules/antagonists/space_ninja/ninja_borg_module.dm
+++ b/code/modules/antagonists/space_ninja/ninja_borg_module.dm
@@ -26,7 +26,6 @@
/mob/living/silicon/robot/syndicate/saboteur/ninja/New(loc)
..()
mmi = new /obj/item/mmi/robotic_brain/ninja(src)
- mmi.icon_state = "wanter"
/mob/living/silicon/robot/syndicate/saboteur/ninja/init(alien = FALSE, mob/living/silicon/ai/ai_to_sync_to = null)
. = ..()
diff --git a/code/modules/antagonists/space_ninja/ninja_datum.dm b/code/modules/antagonists/space_ninja/ninja_datum.dm
index 404504579dc..5d1a77c26b4 100644
--- a/code/modules/antagonists/space_ninja/ninja_datum.dm
+++ b/code/modules/antagonists/space_ninja/ninja_datum.dm
@@ -222,7 +222,7 @@
var/warning = cell.charge >= check_percentage ? "" : "_warning"
hud.ninja_energy_display.icon_state = "ninja_energy_display_[my_suit.color_choice][warning]"
hud.ninja_energy_display.maptext = "
[round(cell.charge)]
"
- hud.ninja_energy_display.invisibility = my_suit.show_charge_UI ? 0 : 100
+ hud.ninja_energy_display.invisibility = my_suit.show_charge_UI ? 0 : INVISIBILITY_ABSTRACT
// concentration level
if(!hud.ninja_focus_display && owner.martial_art && istype(owner.martial_art, /datum/martial_art/ninja_martial_art))
@@ -237,7 +237,7 @@
// martial art update
if(creeping_widow && my_suit)
hud.ninja_focus_display.icon_state = creeping_widow.has_focus ? "focus_active_[my_suit.color_choice]" : "focus"
- hud.ninja_focus_display.invisibility = my_suit.show_concentration_UI ? 0 : 100
+ hud.ninja_focus_display.invisibility = my_suit.show_concentration_UI ? 0 : INVISIBILITY_ABSTRACT
/**
diff --git a/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm b/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
index 1d7f33f564f..8008622910c 100644
--- a/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
+++ b/code/modules/antagonists/traitor/contractor/items/contractor_pinpointer.dm
@@ -11,38 +11,41 @@
/// The minimum range for the pinpointer to function properly.
var/min_range = 15
/// The first person to have used the item. If this is set already, no one else can use it.
- var/mob/owner = null
-
-/obj/item/pinpointer/crew/contractor/pinpoint_at(atom/target)
- if(target && trackable(target))
- // Calc dir
- var/turf/T = get_turf(target)
- var/turf/L = get_turf(src)
- dir = get_dir(L, T)
- // Calc dist
- var/dist = get_dist(L, T)
- if(ISINRANGE(dist, -1, min_range))
- icon_state = icon_direct
- else if(ISINRANGE(dist, min_range + 1, min_range + 8))
- icon_state = icon_close
- else if(ISINRANGE(dist, min_range + 9, min_range + 16))
- icon_state = icon_medium
- else if(ISINRANGE(dist, min_range + 16, INFINITY))
- icon_state = icon_far
- else
+ var/mob/owner
+
+
+/obj/item/pinpointer/crew/contractor/update_icon_state()
+ if(mode == 0) // MODE_OFF
+ icon_state = icon_off
+ return
+
+ if(!target)
icon_state = icon_null
+ return
-/obj/item/pinpointer/crew/contractor/trackable(mob/living/carbon/human/H)
- var/turf/here = get_turf(src)
- var/turf/there = get_turf(H)
- return here && there && there.z == here.z
+ if(ISINRANGE(prev_dist, -1, min_range))
+ icon_state = icon_direct
+ else if(ISINRANGE(prev_dist, min_range + 1, min_range + 8))
+ icon_state = icon_close
+ else if(ISINRANGE(prev_dist, min_range + 9, min_range + 16))
+ icon_state = icon_medium
+ else if(ISINRANGE(prev_dist, min_range + 16, INFINITY))
+ icon_state = icon_far
-/obj/item/pinpointer/crew/contractor/attack_self(mob/living/user)
+
+/obj/item/pinpointer/crew/contractor/is_trackable(mob/living/carbon/human/pin_target)
+ source_turf = get_turf(src)
+ target_turf = get_turf(pin_target)
+ return source_turf && target_turf && source_turf.z == target_turf.z
+
+
+/obj/item/pinpointer/crew/contractor/cycle(mob/user, silent = FALSE)
if(owner)
if(owner != user)
- to_chat(user, "[src] refuses to do anything.")
+ to_chat(user, span_warning("[src] refuses to do anything."))
return
else
owner = user
- to_chat(user, "[src] now recognizes you as its sole user.")
+ to_chat(user, span_notice("[src] now recognizes you as its sole user."))
return ..()
+
diff --git a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
index 1facb14919b..b592f2d3a70 100644
--- a/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
+++ b/code/modules/antagonists/vampire/vampire_powers/gargantua_powers.dm
@@ -150,7 +150,7 @@
update_vampire_spell_name()
-/obj/effect/proc_holder/spell/fireball/demonic_grasp/update_icon()
+/obj/effect/proc_holder/spell/fireball/demonic_grasp/update_icon_state()
return
diff --git a/code/modules/arcade/arcade_base.dm b/code/modules/arcade/arcade_base.dm
index 2ecf5ecfd5b..e2c5e750c2a 100644
--- a/code/modules/arcade/arcade_base.dm
+++ b/code/modules/arcade/arcade_base.dm
@@ -60,7 +60,7 @@
return
/obj/machinery/arcade/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver) && anchored)
+ if(I.tool_behaviour == TOOL_SCREWDRIVER && anchored)
playsound(src.loc, I.usesound, 50, 1)
panel_open = !panel_open
to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
@@ -76,7 +76,7 @@
if(pay_with_cash(cash, user, token_price, name))
tokens += 1
return
- if(panel_open && component_parts && istype(I, /obj/item/crowbar))
+ if(panel_open && component_parts && I.tool_behaviour == TOOL_CROWBAR)
default_deconstruction_crowbar(user, I)
return
return ..()
diff --git a/code/modules/arcade/arcade_prize.dm b/code/modules/arcade/arcade_prize.dm
index fa669d5212b..0c84662dc14 100644
--- a/code/modules/arcade/arcade_prize.dm
+++ b/code/modules/arcade/arcade_prize.dm
@@ -7,20 +7,27 @@
desc = "A toy is a toy, but a prize ball could be anything! It could even be a toy!"
icon = 'icons/obj/machines/arcade.dmi'
icon_state = "prizeball_1"
- var/opening = 0
+ var/choose_icon_state
+ var/opening = FALSE
var/possible_contents = list(/obj/random/carp_plushie, /obj/random/plushie, /obj/random/figure, /obj/item/toy/eight_ball, /obj/item/stack/tickets)
-/obj/item/toy/prizeball/New()
- ..()
- icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
+/obj/item/toy/prizeball/Initialize(mapload)
+ . = ..()
+ choose_icon_state = pick("prizeball_1","prizeball_2","prizeball_3")
+ update_icon(UPDATE_ICON_STATE)
-/obj/item/toy/prizeball/attack_self(mob/user as mob)
+
+/obj/item/toy/prizeball/update_icon_state()
+ icon_state = opening ? "prizeconfetti" : choose_icon_state
+
+
+/obj/item/toy/prizeball/attack_self(mob/user)
if(opening)
return
- opening = 1
+ opening = TRUE
+ update_icon(UPDATE_ICON_STATE)
playsound(loc, 'sound/items/bubblewrap.ogg', 30, TRUE)
- icon_state = "prizeconfetti"
- src.color = pick(GLOB.random_color_list)
+ color = pick(GLOB.random_color_list)
var/prize_inside = pick(possible_contents)
spawn(10)
user.temporarily_remove_item_from_inventory(src)
@@ -72,14 +79,10 @@
/obj/item/stack/tickets/five
amount = 5
-/obj/item/stack/tickets/New(var/loc, var/amount=null)
- ..()
- update_icon()
-
-/obj/item/stack/tickets/attack_self(mob/user as mob)
+/obj/item/stack/tickets/attack_self(mob/user)
return
-/obj/item/stack/tickets/update_icon()
+/obj/item/stack/tickets/update_icon_state()
switch(get_amount())
if(1 to 3)
icon_state = "tickets_1" // One ticket
diff --git a/code/modules/arcade/claw_game.dm b/code/modules/arcade/claw_game.dm
index 6cbc35c4ebc..60117788f6c 100644
--- a/code/modules/arcade/claw_game.dm
+++ b/code/modules/arcade/claw_game.dm
@@ -20,7 +20,7 @@ GLOBAL_VAR(claw_game_html)
/obj/machinery/arcade/claw/New()
..()
machine_image = pick("_1", "_2")
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
component_parts = list()
component_parts += new /obj/item/circuitboard/clawgame(null)
@@ -39,7 +39,7 @@ GLOBAL_VAR(claw_game_html)
bin_upgrades = B.rating
bonus_prize_chance = bin_upgrades * 5 //equals +5% chance per matter bin rating level (+20% with rating 4)
-/obj/machinery/arcade/claw/update_icon()
+/obj/machinery/arcade/claw/update_icon_state()
if(stat & BROKEN)
icon_state = "clawmachine[machine_image]_broken"
else if(panel_open)
@@ -58,7 +58,7 @@ GLOBAL_VAR(claw_game_html)
atom_say("ПОБЕДИТЕЛЬ!")
new /obj/item/toy/prizeball(get_turf(src))
playsound(loc, 'sound/arcade/win.ogg', 50, TRUE)
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 10)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_ICON_STATE), 1 SECONDS)
/obj/machinery/arcade/claw/start_play(mob/user as mob)
..()
diff --git a/code/modules/arcade/prize_counter.dm b/code/modules/arcade/prize_counter.dm
index fa75b35bded..b661cfb5fab 100644
--- a/code/modules/arcade/prize_counter.dm
+++ b/code/modules/arcade/prize_counter.dm
@@ -40,16 +40,16 @@
else
to_chat(user, "\The [T] seems stuck to your hand!")
return
- if(istype(O, /obj/item/screwdriver) && anchored)
+ if(O.tool_behaviour == TOOL_SCREWDRIVER && anchored)
playsound(src.loc, O.usesound, 50, 1)
panel_open = !panel_open
to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.")
update_icon()
return
if(panel_open)
- if(istype(O, /obj/item/wrench))
+ if(O.tool_behaviour == TOOL_WRENCH)
default_unfasten_wrench(user, O)
- if(component_parts && istype(O, /obj/item/crowbar))
+ if(component_parts && O.tool_behaviour == TOOL_CROWBAR)
if(tickets) //save the tickets!
print_tickets()
default_deconstruction_crowbar(user, O)
diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm
index e1fa3b31a54..40733745909 100644
--- a/code/modules/assembly/assembly.dm
+++ b/code/modules/assembly/assembly.dm
@@ -1,8 +1,8 @@
-#define WIRE_RECEIVE (1<<0) //Allows pulse(0) to call Activate()
-#define WIRE_PULSE (1<<1) //Allows pulse(0) to act on the holder
-#define WIRE_PULSE_SPECIAL (1<<2) //Allows pulse(0) to act on the holders special assembly
-#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulse(1) to call Activate()
-#define WIRE_RADIO_PULSE (1<<4) //Allows pulse(1) to send a radio message
+#define WIRE_RECEIVE (1<<0) //Allows pulse(FALSE) to call Activate()
+#define WIRE_PULSE (1<<1) //Allows pulse(FALSE) to act on the holder
+#define WIRE_PULSE_SPECIAL (1<<2) //Allows pulse(FALSE) to act on the holders special assembly
+#define WIRE_RADIO_RECEIVE (1<<3) //Allows pulse(TRUE) to call Activate()
+#define WIRE_RADIO_PULSE (1<<4) //Allows pulse(TRUE) to send a radio message
/obj/item/assembly
name = "assembly"
@@ -30,54 +30,45 @@
var/wires = WIRE_RECEIVE | WIRE_PULSE
var/datum/wires/connected = null // currently only used by timer/signaler
-/obj/item/assembly/proc/activate() //What the device does when turned on
- return
-/obj/item/assembly/proc/pulsed(radio = FALSE) //Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
- return
+/obj/item/assembly/Destroy()
+ if(istype(loc, /obj/item/assembly_holder) || istype(holder))
+ var/obj/item/assembly_holder/A = loc
+ if(A.a_left == src)
+ A.a_left = null
+ else if(A.a_right == src)
+ A.a_right = null
+ holder = null
+ return ..()
-/obj/item/assembly/proc/toggle_secure() //Code that has to happen when the assembly is un\secured goes here
- return
-/obj/item/assembly/proc/attach_assembly(obj/A, mob/user) //Called when an assembly is attacked by another
+/// Called when the holder is moved
+/obj/item/assembly/proc/holder_movement(mob/user)
return
-/obj/item/assembly/proc/process_cooldown() //Called via spawn(10) to have it count down the cooldown var
- return
-/obj/item/assembly/proc/holder_movement(mob/user) //Called when the holder is moved
+/// Called when attack_self is called
+/obj/item/assembly/interact(mob/user)
return
-/obj/item/assembly/proc/describe() // Called by grenades to describe the state of the trigger (time left, etc)
- return "The trigger assembly looks broken!"
-/obj/item/assembly/interact(mob/user) //Called when attack_self is called
- return
-
-/obj/item/assembly/process_cooldown()
- cooldown--
- if(cooldown <= 0)
+/// Called via 1 SECONDS to have it count down the cooldown var
+/obj/item/assembly/proc/process_cooldown()
+ if(cooldown-- <= 0)
return FALSE
- addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
+ addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS)
return TRUE
-/obj/item/assembly/Destroy()
- if(istype(loc, /obj/item/assembly_holder) || istype(holder))
- var/obj/item/assembly_holder/A = loc
- if(A.a_left == src)
- A.a_left = null
- else if(A.a_right == src)
- A.a_right = null
- holder = null
- return ..()
-/obj/item/assembly/pulsed(radio = FALSE)
+/// Called when another assembly acts on this one, var/radio will determine where it came from for wire calcs
+/obj/item/assembly/proc/pulsed(radio = FALSE)
if(holder && (wires & WIRE_RECEIVE))
activate()
if(radio && (wires & WIRE_RADIO_RECEIVE))
activate()
return TRUE
+
/* Called when this device attempts to act on another device,
* var/radio determines if it was sent via radio or direct
* var/mob/user for logging
@@ -87,61 +78,72 @@
connected.pulse_assembly(src)
return TRUE
if(holder && (wires & WIRE_PULSE))
- holder.process_activation(src, 1, 0, user)
+ holder.process_activation(src, TRUE, FALSE, user)
if(holder && (wires & WIRE_PULSE_SPECIAL))
- holder.process_activation(src, 0, 1, user)
+ holder.process_activation(src, FALSE, TRUE, user)
if(istype(loc, /obj/item/grenade)) // This is a hack. Todo: Manage this better -Sayu
var/obj/item/grenade/G = loc
G.prime(user) // Adios, muchachos
return TRUE
-/obj/item/assembly/activate()
+
+/// What the device does when turned on
+/obj/item/assembly/proc/activate()
if(!secured || cooldown > 0)
return FALSE
cooldown = 2
addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
return TRUE
-/obj/item/assembly/toggle_secure()
+
+/// Code that has to happen when the assembly is un\secured goes here
+/obj/item/assembly/proc/toggle_secure()
secured = !secured
update_icon()
return secured
-/obj/item/assembly/attach_assembly(obj/item/assembly/A, mob/user)
- holder = new /obj/item/assembly_holder(get_turf(src))
- if(holder.attach(A, src, user))
- to_chat(user, "You attach [A] to [src]!")
+
+/// Called when an assembly is attacked by another
+/obj/item/assembly/proc/attach_assembly(obj/item/assembly/assembly, mob/user)
+ holder = new /obj/item/assembly_holder(drop_location())
+ user?.put_in_hands(holder, ignore_anim = FALSE)
+ if(holder.attach(assembly, src, user))
+ to_chat(user, span_notice("You attach [assembly] to [src]!"))
return TRUE
return FALSE
+
/obj/item/assembly/attackby(obj/item/W, mob/user, params)
if(isassembly(W))
var/obj/item/assembly/A = W
if(!A.secured && !secured)
attach_assembly(A, user)
return
-
return ..()
+
/obj/item/assembly/screwdriver_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
if(toggle_secure())
- to_chat(user, "[src] is ready!")
+ to_chat(user, span_notice("[src] is ready!"))
else
- to_chat(user, "[src] can now be attached!")
+ to_chat(user, span_notice("[src] can now be attached!"))
+
/obj/item/assembly/process()
- STOP_PROCESSING(SSobj, src)
+ return PROCESS_KILL
+
/obj/item/assembly/examine(mob/user)
. = ..()
- if(in_range(src, user) || loc == user)
+ if(in_range(src, user))
if(secured)
- . += "[src] is ready!"
+ . += span_notice("[src] need to be secured!")
else
- . += "[src] can be attached!"
+ . += span_notice("[src] can be attached!")
+
/obj/item/assembly/attack_self(mob/user)
if(!user)
@@ -150,5 +152,3 @@
interact(user)
return TRUE
-/obj/item/assembly/interact(mob/user)
- return
diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
index 9189df8560f..60efca14515 100644
--- a/code/modules/assembly/bomb.dm
+++ b/code/modules/assembly/bomb.dm
@@ -12,21 +12,29 @@
var/obj/item/tank/bombtank = null //the second part of the bomb is a plasma tank
origin_tech = "materials=1;engineering=1"
+
/obj/item/onetankbomb/ComponentInitialize()
. = ..()
AddComponent(/datum/component/proximity_monitor)
+
/obj/item/onetankbomb/examine(mob/user)
. = ..()
. += bombtank.examine(user)
-/obj/item/onetankbomb/update_icon()
+
+/obj/item/onetankbomb/update_icon_state()
if(bombtank)
icon_state = bombtank.icon_state
+
+
+/obj/item/onetankbomb/update_overlays()
+ . = ..()
if(bombassembly)
- overlays += bombassembly.icon_state
- overlays += bombassembly.overlays
- overlays += "bomb_assembly"
+ . += bombassembly.icon_state
+ . += bombassembly.overlays
+ . += "bomb_assembly"
+
/obj/item/onetankbomb/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/analyzer))
@@ -34,13 +42,14 @@
return
return ..()
+
/obj/item/onetankbomb/wrench_act(mob/user, obj/item/I) //This is basically bomb assembly code inverted. apparently it works.
if(status)
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- to_chat(user, "You disassemble [src].")
+ to_chat(user, span_notice("You disassemble [src]."))
bombassembly.loc = user.loc
bombassembly.master = null
bombassembly = null
@@ -49,6 +58,7 @@
bombtank = null
qdel(src)
+
/obj/item/onetankbomb/welder_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, volume = I.tool_volume))
@@ -56,6 +66,7 @@
if(!status)
status = TRUE
investigate_log("[key_name_log(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", INVESTIGATE_BOMB)
+ log_game("[key_name(user)] welded a single tank bomb. Temperature: [bombtank.air_contents.temperature - T0C]")
to_chat(user, "A pressure hole has been bored to [bombtank] valve. [bombtank] can now be ignited.")
add_attack_logs(user, src, "welded a single tank bomb. Temperature: [bombtank.air_contents.temperature-T0C]", ATKLOG_FEW)
else
@@ -70,9 +81,10 @@
add_fingerprint(user)
return
+
/obj/item/onetankbomb/receive_signal() //This is mainly called by the sensor through sense() to the holder, and from the holder to here.
visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
- sleep(10)
+ sleep(1 SECONDS)
if(!src)
return
if(status)
@@ -80,26 +92,32 @@
else
bombtank.release()
+
/obj/item/onetankbomb/HasProximity(atom/movable/AM)
if(bombassembly)
bombassembly.HasProximity(AM)
+
/obj/item/onetankbomb/Crossed(atom/movable/AM, oldloc) //for mousetraps
if(bombassembly)
bombassembly.Crossed(AM, oldloc)
+
/obj/item/onetankbomb/on_found(mob/finder) //for mousetraps
if(bombassembly)
bombassembly.on_found(finder)
+
/obj/item/onetankbomb/hear_talk(mob/living/M, list/message_pieces)
if(bombassembly)
bombassembly.hear_talk(M, message_pieces)
+
/obj/item/onetankbomb/hear_message(mob/living/M, msg)
if(bombassembly)
bombassembly.hear_message(M, msg)
+
// ---------- Procs below are for tanks that are used exclusively in 1-tank bombs ----------
/obj/item/tank/proc/bomb_assemble(W,user) //Bomb assembly proc. This turns assembly+tank into a bomb
@@ -126,6 +144,7 @@
R.update_icon()
return
+
/obj/item/tank/proc/detonate() //This happens when a bomb is told to explode
var/fuel_moles = air_contents.toxins + air_contents.oxygen/6
var/strength = 1
@@ -175,6 +194,7 @@
qdel(master)
qdel(src)
+
/obj/item/tank/proc/release() //This happens when the bomb is not welded. Tank contents are just spat out.
var/datum/gas_mixture/removed = air_contents.remove(air_contents.total_moles())
var/turf/simulated/T = get_turf(src)
@@ -182,3 +202,4 @@
return
T.assume_air(removed)
air_update_turf()
+
diff --git a/code/modules/assembly/health.dm b/code/modules/assembly/health.dm
index 0372ed7d2e6..641e559ae7c 100644
--- a/code/modules/assembly/health.dm
+++ b/code/modules/assembly/health.dm
@@ -1,3 +1,6 @@
+#define MAX_HEALTH_ACTIVATE 0
+#define MIN_HEALTH_ACTIVATE -90
+
/obj/item/assembly/health
name = "health sensor"
desc = "Used for scanning and monitoring health."
@@ -6,10 +9,12 @@
origin_tech = "magnets=1;biotech=1"
secured = FALSE
+ /// Are we scanning our user's health?
var/scanning = FALSE
- var/health_scan
- var/alarm_health = 0
-
+ /// Our user's health
+ var/user_health
+ /// The health amount on which to activate
+ var/alarm_health = MAX_HEALTH_ACTIVATE
/obj/item/assembly/health/activate()
@@ -18,47 +23,51 @@
toggle_scan()
return FALSE
+
/obj/item/assembly/health/toggle_secure()
secured = !secured
if(secured && scanning)
START_PROCESSING(SSobj, src)
else
scanning = FALSE
+ user_health = null // Clear out the user data, we're no longer scanning
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
+
/obj/item/assembly/health/multitool_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- if(alarm_health == 0)
- alarm_health = -90
+ if(alarm_health == MAX_HEALTH_ACTIVATE)
+ alarm_health = MIN_HEALTH_ACTIVATE
user.show_message("You toggle [src] to \"detect death\" mode.")
else
- alarm_health = 0
+ alarm_health = MAX_HEALTH_ACTIVATE
user.show_message("You toggle [src] to \"detect critical state\" mode.")
+
/obj/item/assembly/health/process()
if(!scanning || !secured)
+ STOP_PROCESSING(SSobj, src) // It should never reach here, but if it somehow does stop processing
return
- var/atom/A = src
- if(connected && connected.holder)
- A = connected.holder
-
- for(A, A && !ismob(A), A=A.loc);
- // like get_turf(), but for mobs.
- var/mob/living/M = A
+ var/atom/our_source = src
+ if(connected?.holder)
+ our_source = connected.holder
- if(M)
- health_scan = M.health
- if(health_scan <= alarm_health)
- pulse(FALSE, M)
- audible_message("[bicon(src)] *beep* *beep*")
- toggle_scan()
+ if(!get(our_source, /mob/living))
+ user_health = null // We aint on a living thing, remove the previous data
return
- return
+
+ var/mob/living/user = our_source
+ user_health = user.health
+ if(user_health <= alarm_health) // Its a health detector, not a death detector
+ pulse(FALSE, user)
+ audible_message("[bicon(src)] *beep* *beep*")
+ toggle_scan()
+
/obj/item/assembly/health/proc/toggle_scan()
if(!secured)
@@ -67,40 +76,44 @@
if(scanning)
START_PROCESSING(SSobj, src)
else
+ user_health = null // Clear out the user data, we're no longer scanning
STOP_PROCESSING(SSobj, src)
- return
+
/obj/item/assembly/health/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
- user.show_message("The [name] is unsecured!")
+ user.show_message(span_warning("The [name] is unsecured!"))
return FALSE
var/dat = text({"Health Sensor[scanning?"On":"Off"]"})
- if(scanning && health_scan)
- dat += " Health: [health_scan]"
+ if(scanning && user_health)
+ dat += " Health: [user_health]"
var/datum/browser/popup = new(user, "hscan", name, 400, 400, src)
popup.set_content(dat)
popup.open()
- return
/obj/item/assembly/health/Topic(href, href_list)
..()
- if(!ismob(usr))
+ if(!isliving(usr))
return
- var/mob/user = usr
+ var/mob/living/user = usr
- if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
- usr << browse(null, "window=hscan")
- onclose(usr, "hscan")
+ if(user.incapacitated() || user.restrained() || !in_range(loc, user))
+ user << browse(null, "window=hscan")
+ onclose(user, "hscan")
return
if(href_list["scanning"])
toggle_scan()
if(href_list["close"])
- usr << browse(null, "window=hscan")
+ user << browse(null, "window=hscan")
return
attack_self(user)
- return
+
+
+#undef MAX_HEALTH_ACTIVATE
+#undef MIN_HEALTH_ACTIVATE
+
diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
index 7a27cf88768..1c48989a0a5 100644
--- a/code/modules/assembly/holder.dm
+++ b/code/modules/assembly/holder.dm
@@ -13,11 +13,6 @@
var/obj/item/assembly/a_left = null
var/obj/item/assembly/a_right = null
-/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user)
- return
-
-/obj/item/assembly_holder/proc/process_activation(var/obj/item/D)
- return
/obj/item/assembly_holder/Destroy()
if(a_left)
@@ -26,7 +21,8 @@
a_right.holder = null
return ..()
-/obj/item/assembly_holder/attach(obj/item/D, obj/item/D2, mob/user)
+
+/obj/item/assembly_holder/proc/attach(obj/item/D, obj/item/D2, mob/user)
if(!D || !D2)
return FALSE
if(!isassembly(D) || !isassembly(D2))
@@ -50,35 +46,52 @@
if(has_prox_sensors())
AddComponent(/datum/component/proximity_monitor)
name = "[A1.name]-[A2.name] assembly"
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return TRUE
+
/obj/item/assembly_holder/proc/has_prox_sensors()
if(istype(a_left, /obj/item/assembly/prox_sensor) || istype(a_right, /obj/item/assembly/prox_sensor))
return TRUE
return FALSE
-/obj/item/assembly_holder/update_icon()
- overlays.Cut()
+
+/obj/item/assembly_holder/proc/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user)
+ if(!D)
+ return FALSE
+ if(normal && a_right && a_left)
+ if(a_right != D)
+ a_right.pulsed()
+ if(a_left != D)
+ a_left.pulsed()
+ if(master)
+ var/datum/signal/signal = new
+ signal.source = src
+ signal.user = user
+ master.receive_signal(signal)
+ return TRUE
+
+
+/obj/item/assembly_holder/update_overlays()
+ . = ..()
if(a_left)
- overlays += "[a_left.icon_state]_left"
+ . += "[a_left.icon_state]_left"
for(var/O in a_left.attached_overlays)
- overlays += "[O]_l"
+ . += "[O]_l"
if(a_right)
- overlays += "[a_right.icon_state]_right"
+ . += "[a_right.icon_state]_right"
for(var/O in a_right.attached_overlays)
- overlays += "[O]_r"
- if(master)
- master.update_icon()
+ . += "[O]_r"
+ master?.update_icon()
/obj/item/assembly_holder/examine(mob/user)
. = ..()
- if(in_range(src, user) || loc == user)
+ if(in_range(src, user))
if(secured)
- . += "[src] is ready!"
+ . += span_notice("[src] can be attached!")
else
- . += "[src] can be attached!"
+ . += span_notice("[src] need to be secured!")
/obj/item/assembly_holder/HasProximity(atom/movable/AM)
@@ -94,6 +107,7 @@
if(a_right)
a_right.Crossed(AM, oldloc)
+
/obj/item/assembly_holder/on_found(mob/finder)
if(a_left)
a_left.on_found(finder)
@@ -107,26 +121,31 @@
if(a_right)
a_right.hear_talk(M, message_pieces)
+
/obj/item/assembly_holder/hear_message(mob/living/M, msg)
if(a_left)
a_left.hear_message(M, msg)
if(a_right)
a_right.hear_message(M, msg)
+
/obj/item/assembly_holder/proc/process_movement(mob/user) // infrared beams and prox sensors
if(a_left && a_right)
a_left.holder_movement(user)
a_right.holder_movement(user)
+
/obj/item/assembly_holder/Move()
. = ..()
process_movement()
return
+
/obj/item/assembly_holder/pickup(mob/user)
. = ..()
process_movement(user)
+
/obj/item/assembly_holder/Bump(atom/A)
..()
var/triggered
@@ -138,6 +157,7 @@
triggered = AM
process_movement(triggered)
+
/obj/item/assembly_holder/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum) // called when a throw stops
..()
var/triggered
@@ -145,16 +165,17 @@
triggered = throwing.thrower
process_movement(triggered)
+
/obj/item/assembly_holder/attack_hand(mob/user)//Perhapse this should be a holder_pickup proc instead, can add if needbe I guess
if(a_left && a_right)
a_left.holder_movement(user)
a_right.holder_movement(user)
..()
- return
+
/obj/item/assembly_holder/screwdriver_act(mob/user, obj/item/I)
if(!a_left || !a_right)
- to_chat(user, "BUG:Assembly part missing, please report this!")
+ to_chat(user, span_warning("BUG:Assembly part missing, please report this!"))
return
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
@@ -163,16 +184,17 @@
a_right.toggle_secure()
secured = !secured
if(secured)
- to_chat(user, "[src] is ready!")
+ to_chat(user, span_notice("[src] can now be attached!"))
else
- to_chat(user, "[src] can now be taken apart!")
+ to_chat(user, span_notice("[src] can now be taken apart!"))
update_icon()
+
/obj/item/assembly_holder/attack_self(mob/user)
add_fingerprint(user)
if(secured)
if(!a_left || !a_right)
- to_chat(user, "Assembly part missing!")
+ to_chat(user, span_warning("Assembly part missing!"))
return
if(istype(a_left, a_right.type))//If they are the same type it causes issues due to window code
switch(alert("Which side would you like to use?",,"Left","Right"))
@@ -190,24 +212,11 @@
return FALSE
if(a_left)
a_left.holder = null
- a_left.loc = T
+ a_left.forceMove(T)
+ user.put_in_hands(a_left, ignore_anim = FALSE)
if(a_right)
a_right.holder = null
- a_right.loc = T
+ a_right.forceMove(T)
+ user.put_in_hands(a_left, ignore_anim = FALSE)
qdel(src)
-
-/obj/item/assembly_holder/process_activation(obj/D, normal = TRUE, special = TRUE, mob/user)
- if(!D)
- return FALSE
- if(normal && a_right && a_left)
- if(a_right != D)
- a_right.pulsed(0)
- if(a_left != D)
- a_left.pulsed(0)
- if(master)
- var/datum/signal/signal = new
- signal.source = src
- signal.user = user
- master.receive_signal(signal)
- return TRUE
diff --git a/code/modules/assembly/igniter.dm b/code/modules/assembly/igniter.dm
index b81acbbe2b0..0389339efb7 100644
--- a/code/modules/assembly/igniter.dm
+++ b/code/modules/assembly/igniter.dm
@@ -4,42 +4,62 @@
icon_state = "igniter"
materials = list(MAT_METAL=500, MAT_GLASS=50)
origin_tech = "magnets=1"
- var/datum/effect_system/spark_spread/sparks = new /datum/effect_system/spark_spread
+ var/datum/effect_system/spark_spread/sparks
-/obj/item/assembly/igniter/New()
- ..()
- sparks.set_up(2, 0, src)
+
+/obj/item/assembly/igniter/Initialize(mapload)
+ . = ..()
+ sparks = new /datum/effect_system/spark_spread
+ sparks.set_up(2, FALSE, src)
sparks.attach(src)
+
/obj/item/assembly/igniter/Destroy()
QDEL_NULL(sparks)
return ..()
-/obj/item/assembly/igniter/describe()
- return "The igniter is [secured ? "secured." : "unsecured."]"
+/obj/item/assembly/igniter/examine(mob/user)
+ . = ..()
+ . += span_notice("The igniter is [secured ? "secured." : "unsecured."]")
/obj/item/assembly/igniter/activate()
if(!..())
- return FALSE//Cooldown check
+ return FALSE //Cooldown check
+
var/turf/location = get_turf(loc)
if(location)
- location.hotspot_expose(1000,1000)
+ location.hotspot_expose(1000, 1000)
+
+ sparks.start()
+
if(istype(loc, /obj/item/assembly_holder))
- if(istype(loc.loc, /obj/structure/reagent_dispensers/fueltank))
- var/obj/structure/reagent_dispensers/fueltank/tank = loc.loc
+ var/locloc = loc.loc
+ if(istype(locloc, /obj/structure/reagent_dispensers/fueltank))
+ var/obj/structure/reagent_dispensers/fueltank/tank = locloc
if(tank)
- tank.boom(TRUE)
- if(istype(loc.loc, /obj/item/reagent_containers/glass/beaker))
- var/obj/item/reagent_containers/glass/beaker/beakerbomb = loc.loc
+ tank.boom(TRUE) // this qdel's `src`
+
+ if(istype(locloc, /obj/item/onetankbomb))
+ var/obj/item/onetankbomb/bomb = locloc
+ if(bomb?.bombtank)
+ bomb.bombtank.detonate()
+
+ else if(istype(locloc, /obj/item/reagent_containers/glass/beaker))
+ var/obj/item/reagent_containers/glass/beaker/beakerbomb = locloc
if(beakerbomb)
beakerbomb.heat_beaker()
- sparks.start()
+
+ else if(istype(locloc, /obj/item/grenade/chem_grenade))
+ var/obj/item/grenade/chem_grenade/CG = locloc
+ CG.prime()
+
return TRUE
/obj/item/assembly/igniter/attack_self(mob/user)
- activate()
+ if(!istype(loc, /obj/item/assembly_holder))
+ activate()
add_fingerprint(user)
- return
+
diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
index 7211b74d433..01506870ac0 100644
--- a/code/modules/assembly/infrared.dm
+++ b/code/modules/assembly/infrared.dm
@@ -7,7 +7,7 @@
bomb_name = "tripwire mine"
- secured = FALSE // toggle_secure()'ed in New() for correct adding to processing_objects, won't work otherwise
+ secured = FALSE // toggle_secure()'ed in Initialize() for correct adding to processing_objects, won't work otherwise
dir = EAST
var/on = FALSE
var/visible = TRUE
@@ -18,6 +18,13 @@
var/emission_cycles = 0
var/emission_cap = 20
+
+/obj/item/assembly/infra/Initialize(mapload)
+ . = ..()
+ if(!secured)
+ toggle_secure()
+
+
/obj/item/assembly/infra/Destroy()
if(first)
QDEL_NULL(first)
@@ -25,12 +32,12 @@
fire_location = null
return ..()
-/obj/item/assembly/infra/describe()
- return "The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"]."
/obj/item/assembly/infra/examine(mob/user)
. = ..()
- . += describe()
+ . += span_notice("The assembly is [secured ? "secure" : "not secure"]. The infrared trigger is [on ? "on" : "off"].")
+ . += span_info("Alt-Click to rotate it.")
+
/obj/item/assembly/infra/activate()
if(!..())
@@ -39,6 +46,7 @@
update_icon()
return TRUE
+
/obj/item/assembly/infra/toggle_secure()
secured = !secured
if(secured)
@@ -51,25 +59,22 @@
update_icon()
return secured
-/obj/item/assembly/infra/New()
- ..()
- if(!secured)
- toggle_secure()
-/obj/item/assembly/infra/proc/arm() // Forces the device to arm no matter its current state.
+/// Forces the device to arm no matter its current state.
+/obj/item/assembly/infra/proc/arm()
if(!secured) // Checked because arm() might be called sometime after the object is spawned.
toggle_secure()
- on = 1
+ on = TRUE
-/obj/item/assembly/infra/update_icon()
- overlays.Cut()
+
+/obj/item/assembly/infra/update_overlays()
+ . = ..()
attached_overlays = list()
if(on)
- overlays += "infrared_on"
+ . += "infrared_on"
attached_overlays += "infrared_on"
+ holder?.update_icon()
- if(holder)
- holder.update_icon()
/obj/item/assembly/infra/process()
var/turf/T = get_turf(src)
@@ -89,7 +94,7 @@
emission_cycles = 0
var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(T)
I.master = src
- I.density = 1
+ I.density = TRUE
I.dir = dir
I.update_icon()
first = I
@@ -100,30 +105,36 @@
I.limit = 8
I.process()
+
/obj/item/assembly/infra/attack_hand()
qdel(first)
..()
-/obj/item/assembly/infra/Move()
- var/t = dir
+
+/obj/item/assembly/infra/Move(atom/newloc, direct = 0, movetime)
+ var/prev_dir = dir
. = ..()
- dir = t
+ dir = prev_dir
qdel(first)
+
/obj/item/assembly/infra/holder_movement()
if(!holder)
return FALSE
qdel(first)
return TRUE
+
/obj/item/assembly/infra/equipped(mob/user, slot, initial)
qdel(first)
return ..()
+
/obj/item/assembly/infra/pickup(mob/user)
qdel(first)
return ..()
+
/obj/item/assembly/infra/proc/trigger_beam(atom/movable/AM)
var/mob/triggered
if(AM.throwing?.thrower)
@@ -132,15 +143,17 @@
triggered = AM
if(!secured || !on || cooldown > 0)
return FALSE
+ cooldown = 2
+ pulse(FALSE, triggered)
audible_message("[bicon(src)] *beep* *beep*", hearing_distance = 3)
if(first)
qdel(first)
- cooldown = 2
- addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
- pulse(FALSE, triggered)
+ addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS)
+
/obj/item/assembly/infra/interact(mob/user)//TODO: change this this to the wire control panel
- if(!secured) return
+ if(!secured)
+ return
user.set_machine(src)
var/dat = {"Infrared LaserStatus: [on ? "On" : "Off"]
@@ -153,6 +166,7 @@
popup.set_content(dat)
popup.open()
+
/obj/item/assembly/infra/Topic(href, href_list)
..()
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
@@ -167,38 +181,51 @@
if(first)
first.vis_spread(visible)
if(href_list["rotate"])
- rotate()
+ rotate(usr)
if(href_list["close"])
usr << browse(null, "window=infra")
return
if(usr)
attack_self(usr)
-/obj/item/assembly/infra/verb/rotate()//This could likely be better
+
+/obj/item/assembly/infra/AltClick(mob/user)
+ if(!Adjacent(user))
+ return ..()
+ rotate(user)
+
+
+/obj/item/assembly/infra/verb/rotate_verb()
set name = "Rotate Infrared Laser"
set category = "Object"
set src in usr
- if(usr.stat || !usr.canmove || usr.restrained())
+ rotate(usr)
+
+
+/obj/item/assembly/infra/proc/rotate(mob/living/user = usr)
+ if(!isliving(user) || user.incapacitated() || user.restrained())
return
dir = turn(dir, 90)
- if(usr.machine == src)
- interact(usr)
+ if(user.machine == src)
+ interact(user)
if(first)
qdel(first)
+/obj/item/assembly/infra/armed/Initialize(mapload)
+ . = ..()
+ addtimer(CALLBACK(src, PROC_REF(delayed_arm)), 0.3 SECONDS)
+
+
+/obj/item/assembly/infra/armed/proc/delayed_arm()
+ if(holder?.master)
+ dir = holder.master.dir
+ arm()
-/obj/item/assembly/infra/armed/New()
- ..()
- spawn(3)
- if(holder)
- if(holder.master)
- dir = holder.master.dir
- arm()
/obj/item/assembly/infra/armed/stealth
visible = FALSE
@@ -222,19 +249,31 @@
pass_flags = PASSTABLE | PASSGLASS | PASSGRILLE | PASSFENCE
+/obj/effect/beam/i_beam/Destroy()
+ if(master && master.first == src)
+ master.first = null
+ QDEL_NULL(next)
+ if(previous)
+ previous.next = null
+ master?.last = previous
+ return ..()
+
+
/obj/effect/beam/i_beam/proc/hit(atom/movable/AM)
- if(master)
- master.trigger_beam(AM)
+ master?.trigger_beam(AM)
qdel(src)
-/obj/effect/beam/i_beam/proc/vis_spread(v)
- visible = v
+
+/obj/effect/beam/i_beam/proc/vis_spread(new_visibility)
+ visible = new_visibility
if(next)
- next.vis_spread(v)
+ next.vis_spread(new_visibility)
+
-/obj/effect/beam/i_beam/update_icon()
+/obj/effect/beam/i_beam/update_icon_state()
transform = turn(matrix(), dir2angle(dir))
+
/obj/effect/beam/i_beam/process()
life_cycles++
if(loc.density || !master || life_cycles >= life_cap)
@@ -242,18 +281,15 @@
return
if(left > 0)
left--
- if(left < 1)
- if(!(visible))
- invisibility = INVISIBILITY_ABSTRACT
- else
- invisibility = FALSE
+ if(left < 1 && !visible)
+ invisibility = INVISIBILITY_ABSTRACT
else
- invisibility = FALSE
+ invisibility = 0
if(!next && (limit > 0))
var/obj/effect/beam/i_beam/I = new /obj/effect/beam/i_beam(loc)
I.master = master
- I.density = 1
+ I.density = TRUE
I.dir = dir
I.update_icon()
I.previous = src
@@ -266,12 +302,15 @@
master.last = I
I.process()
+
/obj/effect/beam/i_beam/Bump()
qdel(src)
+
/obj/effect/beam/i_beam/Bumped(atom/movable/moving_atom)
hit(moving_atom)
+
/obj/effect/beam/i_beam/Crossed(atom/movable/AM, oldloc)
if(!isobj(AM) && !isliving(AM))
return
@@ -279,11 +318,3 @@
return
hit(AM)
-/obj/effect/beam/i_beam/Destroy()
- if(master.first == src)
- master.first = null
- QDEL_NULL(next)
- if(previous)
- previous.next = null
- master.last = previous
- return ..()
diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
index dde6183ca6f..01a1b6734a6 100644
--- a/code/modules/assembly/mousetrap.dm
+++ b/code/modules/assembly/mousetrap.dm
@@ -8,133 +8,165 @@
bomb_name = "contact mine"
+
/obj/item/assembly/mousetrap/examine(mob/user)
. = ..()
if(armed)
- . += "It looks like it's armed."
+ . += span_warning("It looks like it's armed.")
+ . += span_info("Alt-Click to hide it.")
+
/obj/item/assembly/mousetrap/activate()
- if(..())
- armed = !armed
- if(!armed)
- if(ishuman(usr))
- var/mob/living/carbon/human/user = usr
- if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))
- to_chat(user, "Your hand slips, setting off the trigger.")
- pulse(0, user)
- update_icon()
- if(usr)
- playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
-
-/obj/item/assembly/mousetrap/describe()
- return "The pressure switch is [armed ? "primed" : "safe"]."
-
-/obj/item/assembly/mousetrap/update_icon()
- if(armed)
- icon_state = "mousetraparmed"
- else
- icon_state = "mousetrap"
+ if(!..())
+ return
+
+ armed = !armed
+ if(!armed && ishuman(usr))
+ var/mob/living/carbon/human/user = usr
+ if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))
+ to_chat(user, "Your hand slips, setting off the trigger.")
+ pulse(FALSE, user)
+
+ update_icon()
+
+ if(usr)
+ playsound(usr.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3)
+
+
+/obj/item/assembly/mousetrap/update_icon_state()
+ icon_state = "mousetrap[armed ? "armed": ""]"
if(holder)
holder.update_icon()
+
/obj/item/assembly/mousetrap/proc/triggered(mob/target, type = "feet")
if(!armed)
return
+
var/obj/item/organ/external/affecting = null
+
if(ishuman(target))
- var/mob/living/carbon/human/H = target
- if(PIERCEIMMUNE in H.dna.species.species_traits)
+ var/mob/living/carbon/human/h_target = target
+ if(h_target.dna && (PIERCEIMMUNE in h_target.dna.species.species_traits))
playsound(src, 'sound/effects/snap.ogg', 50, TRUE)
armed = FALSE
update_icon()
- pulse(FALSE, target)
+ pulse(FALSE, h_target)
return FALSE
+
switch(type)
if("feet")
- if(!H.shoes)
- affecting = H.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
- H.Weaken(6 SECONDS)
+ if(!h_target.shoes)
+ affecting = h_target.get_organ(pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG))
+ h_target.Weaken(6 SECONDS)
+
if(BODY_ZONE_PRECISE_L_HAND, BODY_ZONE_PRECISE_R_HAND)
- if(!H.gloves)
- affecting = H.get_organ(type)
- H.Stun(6 SECONDS)
+ if(!h_target.gloves)
+ affecting = h_target.get_organ(type)
+ h_target.Stun(6 SECONDS)
+
if(affecting)
affecting.receive_damage(1, 0)
- else if(ismouse(target))
- var/mob/living/simple_animal/mouse/M = target
- visible_message("SPLAT!")
- M.apply_damage(5, "brute")
- if (M.stat == DEAD)
- M.splat(item = src)
- playsound(loc, 'sound/effects/snap.ogg', 50, 1)
+
+ else if(ismouse(target) && target.stat != DEAD)
+ var/mob/living/simple_animal/mouse/mouse = target
+ visible_message(span_danger("SPLAT!"))
+ mouse.death()
+ mouse.splat(src)
+
+ playsound(loc, 'sound/effects/snap.ogg', 50, TRUE)
layer = MOB_LAYER - 0.2
armed = FALSE
update_icon()
- pulse(0, target)
+ pulse(FALSE, target)
+
/obj/item/assembly/mousetrap/attack_self(mob/living/user)
if(!armed)
- to_chat(user, "You arm [src].")
+ to_chat(user, span_notice("You arm [src]."))
else
if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))
triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND)
- user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \
- "You accidentally trigger [src]!")
+ user.visible_message(
+ span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."),
+ span_warning("You accidentally trigger [src]!"),
+ )
return
- to_chat(user, "You disarm [src].")
+ to_chat(user, span_notice("You disarm [src]."))
armed = !armed
update_icon()
- playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, 1, -3)
+ playsound(user.loc, 'sound/weapons/handcuffs.ogg', 30, TRUE, -3)
+
/obj/item/assembly/mousetrap/attack_hand(mob/living/user)
- if(armed)
- if((user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))
- triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND)
- user.visible_message("[user] accidentally sets off [src], breaking [user.p_their()] fingers.", \
- "You accidentally trigger [src]!")
- return
+ if(armed && (user.getBrainLoss() >= 60 || (CLUMSY in user.mutations)) && prob(50))
+ triggered(user, user.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND)
+ user.visible_message(
+ span_warning("[user] accidentally sets off [src], breaking [user.p_their()] fingers."),
+ span_warning("You accidentally trigger [src]!"),
+ )
+ return
..()
+
/obj/item/assembly/mousetrap/Crossed(atom/movable/AM, oldloc)
if(armed)
if(ishuman(AM))
- var/mob/living/carbon/H = AM
- if(H.m_intent == MOVE_INTENT_RUN)
- triggered(H)
- H.visible_message("[H] accidentally steps on [src].", \
- "You accidentally step on [src]")
+ var/mob/living/carbon/h_target = AM
+ if(h_target.m_intent == MOVE_INTENT_RUN)
+ triggered(h_target)
+ h_target.visible_message(
+ span_warning("[h_target] accidentally steps on [src]."),
+ span_warning("You accidentally step on [src]!"),
+ )
else if(ismouse(AM))
triggered(AM)
else if(AM.density) // For mousetrap grenades, set off by anything heavy
triggered(AM)
..()
+
/obj/item/assembly/mousetrap/on_found(mob/finder)
if(armed)
- finder.visible_message("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers.", \
- "You accidentally trigger [src]!")
+ finder.visible_message(
+ span_warning("[finder] accidentally sets off [src], breaking [finder.p_their()] fingers."),
+ span_warning("You accidentally trigger [src]!"),
+ )
triggered(finder, finder.hand ? BODY_ZONE_PRECISE_L_HAND : BODY_ZONE_PRECISE_R_HAND)
return TRUE //end the search!
return FALSE
+
/obj/item/assembly/mousetrap/hitby(atom/movable/AM, skipcatch, hitpush, blocked, datum/thrownthing/throwingdatum)
if(!armed)
return ..()
- visible_message("[src] is triggered by [AM].")
- triggered(null)
+ visible_message(span_warning("[src] is triggered by [AM]."))
+ triggered()
+
/obj/item/assembly/mousetrap/armed
icon_state = "mousetraparmed"
- armed = 1
+ armed = TRUE
-/obj/item/assembly/mousetrap/verb/hide_under()
+/obj/item/assembly/mousetrap/AltClick(mob/user)
+ if(!Adjacent(user))
+ return ..()
+ hide_under(user)
+
+
+/obj/item/assembly/mousetrap/verb/hide_under_verb()
set src in oview(1)
set name = "Hide"
set category = "Object"
- if(usr.stat)
+ hide_under(usr)
+
+
+/obj/item/assembly/mousetrap/proc/hide_under(mob/user = usr)
+ if(!isliving(user) || user.incapacitated() || user.restrained())
return
- layer = TURF_LAYER+0.2
- to_chat(usr, "You hide [src].")
+ layer = TURF_LAYER + 0.2
+ to_chat(user, span_notice("You hide [src]."))
+
diff --git a/code/modules/assembly/proximity.dm b/code/modules/assembly/proximity.dm
index cce1f06410f..671c69b23be 100644
--- a/code/modules/assembly/proximity.dm
+++ b/code/modules/assembly/proximity.dm
@@ -5,22 +5,27 @@
materials = list(MAT_METAL = 800, MAT_GLASS = 200)
origin_tech = "magnets=1;engineering=1"
- secured = 0
+ secured = FALSE
bomb_name = "proximity mine"
- var/scanning = 0
- var/timing = 0
+ var/scanning = FALSE
+ var/timing = FALSE
var/time = 10
+
/obj/item/assembly/prox_sensor/ComponentInitialize()
. = ..()
AddComponent(/datum/component/proximity_monitor)
-/obj/item/assembly/prox_sensor/describe()
+
+/obj/item/assembly/prox_sensor/examine(mob/user)
+ . = ..()
if(timing)
- return "The proximity sensor is arming."
- return "The proximity sensor is [scanning ? "armed" : "disarmed"]."
+ . += span_notice("The proximity sensor is arming.")
+ else
+ . += span_notice("The proximity sensor is [scanning ? "armed" : "disarmed"].")
+
/obj/item/assembly/prox_sensor/activate()
if(!..())
@@ -29,17 +34,19 @@
update_icon()
return FALSE
+
/obj/item/assembly/prox_sensor/toggle_secure()
secured = !secured
if(secured)
START_PROCESSING(SSobj, src)
else
- scanning = 0
- timing = 0
+ scanning = FALSE
+ timing = FALSE
STOP_PROCESSING(SSobj, src)
update_icon()
return secured
+
/obj/item/assembly/prox_sensor/HasProximity(atom/movable/AM)
if(!isobj(AM) && !isliving(AM))
return
@@ -48,6 +55,7 @@
if(AM.move_speed < 12)
sense(AM)
+
/obj/item/assembly/prox_sensor/proc/sense(atom/movable/AM)
var/mob/triggered
if(ismob(AM))
@@ -55,23 +63,24 @@
if(!secured || !scanning || cooldown > 0)
return FALSE
cooldown = 2
- visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
- addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
pulse(FALSE, triggered)
+ visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+ addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 1 SECONDS)
+
/obj/item/assembly/prox_sensor/process()
if(timing && (time >= 0))
time--
if(timing && time <= 0)
- timing = 0
+ timing = FALSE
toggle_scan()
time = 10
+
/obj/item/assembly/prox_sensor/dropped(mob/user, silent = FALSE)
- ..()
- spawn(0)
- sense(user)
- return
+ . = ..()
+ INVOKE_ASYNC(src, PROC_REF(sense), user)
+
/obj/item/assembly/prox_sensor/proc/toggle_scan()
if(!secured)
@@ -79,28 +88,31 @@
scanning = !scanning
update_icon()
-/obj/item/assembly/prox_sensor/update_icon()
- overlays.Cut()
+
+/obj/item/assembly/prox_sensor/update_overlays()
+ . = ..()
attached_overlays = list()
if(timing)
- overlays += "prox_timing"
+ . += "prox_timing"
attached_overlays += "prox_timing"
if(scanning)
- overlays += "prox_scanning"
+ . += "prox_scanning"
attached_overlays += "prox_scanning"
- if(holder)
- holder.update_icon()
+ holder?.update_icon()
-/obj/item/assembly/prox_sensor/Move()
+
+/obj/item/assembly/prox_sensor/Move(atom/newloc, direct = NONE, movetime)
. = ..()
sense()
+
/obj/item/assembly/prox_sensor/holder_movement(user)
sense(user)
+
/obj/item/assembly/prox_sensor/interact(mob/user)//TODO: Change this to the wires thingy
if(!secured)
- user.show_message("The [name] is unsecured!")
+ user.show_message(span_warning("The [name] is unsecured!"))
return FALSE
var/second = time % 60
var/minute = (time - second) / 60
@@ -112,6 +124,7 @@
popup.set_content(dat)
popup.open()
+
/obj/item/assembly/prox_sensor/Topic(href, href_list)
..()
if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
@@ -137,3 +150,4 @@
if(usr)
attack_self(usr)
+
diff --git a/code/modules/assembly/shock_kit.dm b/code/modules/assembly/shock_kit.dm
index 4c1e8ae6d1b..e2ccef0b2bc 100644
--- a/code/modules/assembly/shock_kit.dm
+++ b/code/modules/assembly/shock_kit.dm
@@ -9,26 +9,27 @@
w_class = WEIGHT_CLASS_HUGE
flags = CONDUCT
+
/obj/item/assembly/shock_kit/Destroy()
QDEL_NULL(part1)
QDEL_NULL(part2)
return ..()
-/obj/item/assembly/shock_kit/attackby(obj/item/W as obj, mob/user as mob, params)
- if(istype(W, /obj/item/wrench) && !status)
- var/turf/T = loc
- if(ismob(T))
- T = T.loc
- part1.loc = T
- part2.loc = T
- part1.master = null
- part2.master = null
- part1 = null
- part2 = null
- qdel(src)
- return
+
+/obj/item/assembly/shock_kit/wrench_act(mob/living/user, obj/item/I)
+ . = TRUE
+ if(!status)
+ return .
add_fingerprint(user)
- return
+ var/drop_loc = drop_location()
+ part1.forceMove(drop_loc)
+ part2.forceMove(drop_loc)
+ part1.master = null
+ part2.master = null
+ part1 = null
+ part2 = null
+ qdel(src)
+
/obj/item/assembly/shock_kit/screwdriver_act(mob/user, obj/item/I)
. = TRUE
@@ -36,18 +37,19 @@
return
status = !status
if(status)
- to_chat(user, "[src] is now ready to be attached to a chair!")
+ to_chat(user, span_notice("[src] is now ready to be attached to a chair!"))
else
- to_chat(user, "[src] is now ready!")
+ to_chat(user, span_notice("[src] is now ready!"))
+
-/obj/item/assembly/shock_kit/attack_self(mob/user as mob)
+/obj/item/assembly/shock_kit/attack_self(mob/user)
part1.attack_self(user, status)
part2.attack_self(user, status)
add_fingerprint(user)
- return
+
/obj/item/assembly/shock_kit/receive_signal()
if(istype(loc, /obj/structure/chair/e_chair))
- var/obj/structure/chair/e_chair/C = loc
- C.shock()
- return
+ var/obj/structure/chair/e_chair/chair = loc
+ chair.shock()
+
diff --git a/code/modules/assembly/signaler.dm b/code/modules/assembly/signaler.dm
index 406f70f17c0..9d0f1b830e4 100644
--- a/code/modules/assembly/signaler.dm
+++ b/code/modules/assembly/signaler.dm
@@ -7,7 +7,7 @@
origin_tech = "magnets=1;bluespace=1"
wires = WIRE_RECEIVE | WIRE_PULSE | WIRE_RADIO_PULSE | WIRE_RADIO_RECEIVE
- secured = 1
+ secured = TRUE
var/receiving = FALSE
bomb_name = "remote-control bomb"
@@ -18,24 +18,32 @@
var/datum/radio_frequency/radio_connection
var/airlock_wire = null
-/obj/item/assembly/signaler/New()
- ..()
- if(SSradio)
- set_frequency(frequency)
/obj/item/assembly/signaler/Initialize()
- ..()
+ . = ..()
if(SSradio)
set_frequency(frequency)
+
/obj/item/assembly/signaler/Destroy()
if(SSradio)
SSradio.remove_object(src, frequency)
radio_connection = null
return ..()
-/obj/item/assembly/signaler/describe()
- return "[src]'s power light is [receiving ? "on" : "off"]"
+
+/obj/item/assembly/signaler/examine(mob/user)
+ . = ..()
+ . += span_notice("The power light is [receiving ? "on" : "off"].")
+ . += span_info("Alt+Click to send a signal.")
+
+
+/obj/item/assembly/signaler/AltClick(mob/user)
+ if(!isliving(user) || user.incapacitated() || user.restrained() || !Adjacent(user))
+ return ..()
+ to_chat(user, span_notice("You activate [src]."))
+ activate()
+
/obj/item/assembly/signaler/activate()
if(cooldown > 0)
@@ -46,10 +54,10 @@
signal()
return TRUE
-/obj/item/assembly/signaler/update_icon()
- if(holder)
- holder.update_icon()
- return
+
+/obj/item/assembly/signaler/update_icon_state()
+ holder?.update_icon()
+
/obj/item/assembly/signaler/interact(mob/user, flag1)
var/t1 = "-------"
@@ -81,13 +89,14 @@
"}
var/datum/browser/popup = new(user, "radio", name, 400, 400)
popup.set_content(dat)
- popup.open(0)
+ popup.open(FALSE)
onclose(user, "radio")
+
/obj/item/assembly/signaler/Topic(href, href_list)
..()
- if(!usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
+ if(usr.incapacitated() || usr.restrained() || !Adjacent(usr))
usr << browse(null, "window=radio")
onclose(usr, "radio")
return
@@ -103,16 +112,17 @@
code = round(code)
code = min(100, code)
code = max(1, code)
+
if(href_list["receive"])
receiving = !receiving
if(href_list["send"])
- spawn( 0 )
- signal()
+ INVOKE_ASYNC(src, PROC_REF(signal))
if(usr)
attack_self(usr)
+
/obj/item/assembly/signaler/proc/signal()
if(!radio_connection)
return
@@ -129,6 +139,7 @@
if(usr)
GLOB.lastsignalers.Add("[time] : [usr.key] used [src] @ location ([T.x],[T.y],[T.z]) : [format_frequency(frequency)]/[code]")
+
/obj/item/assembly/signaler/receive_signal(datum/signal/signal)
if(!receiving || !signal)
return FALSE
@@ -140,15 +151,15 @@
return FALSE
pulse(1, signal.user)
- for(var/mob/O in hearers(1, loc))
- O.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
+ for(var/mob/hearer in hearers(1, loc))
+ hearer.show_message("[bicon(src)] *beep* *beep*", 3, "*beep* *beep*", 2)
return TRUE
+
/obj/item/assembly/signaler/proc/set_frequency(new_frequency)
- if(!SSradio)
- sleep(20)
if(!SSradio)
return
SSradio.remove_object(src, frequency)
frequency = new_frequency
radio_connection = SSradio.add_object(src, frequency, RADIO_CHAT)
+
diff --git a/code/modules/assembly/timer.dm b/code/modules/assembly/timer.dm
index c4393ce999f..6084f4cd5ec 100644
--- a/code/modules/assembly/timer.dm
+++ b/code/modules/assembly/timer.dm
@@ -15,10 +15,18 @@
var/set_time = 10
var/mob/user // for logging
-/obj/item/assembly/timer/describe()
+
+/obj/item/assembly/timer/Destroy()
+ user = null
+ return ..()
+
+/obj/item/assembly/timer/examine(mob/user)
+ . = ..()
if(timing)
- return "The timer is counting down from [time]!"
- return "The timer is set for [time] seconds."
+ . += span_notice("The timer is counting down from [time]!")
+ else
+ . += span_notice("The timer is set for [time] seconds.")
+
/obj/item/assembly/timer/activate()
if(!..())
@@ -27,6 +35,7 @@
update_icon()
return FALSE
+
/obj/item/assembly/timer/toggle_secure()
secured = !secured
if(secured)
@@ -37,13 +46,17 @@
update_icon()
return secured
+
/obj/item/assembly/timer/proc/timer_end()
if(!secured || cooldown > 0)
return FALSE
- visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
cooldown = 2
- addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
pulse(FALSE, user)
+ update_icon()
+ if(loc)
+ loc.visible_message("[bicon(src)] *beep* *beep*", "*beep* *beep*")
+ addtimer(CALLBACK(src, PROC_REF(process_cooldown)), 10)
+
/obj/item/assembly/timer/process()
if(timing && (time > 0))
@@ -53,18 +66,19 @@
timer_end()
time = set_time
-/obj/item/assembly/timer/update_icon()
- overlays.Cut()
+
+/obj/item/assembly/timer/update_overlays()
+ . = ..()
attached_overlays = list()
if(timing)
- overlays += "timer_timing"
+ . += "timer_timing"
attached_overlays += "timer_timing"
- if(holder)
- holder.update_icon()
+ holder?.update_icon()
+
-/obj/item/assembly/timer/interact(mob/user as mob)//TODO: Have this use the wires
+/obj/item/assembly/timer/interact(mob/user)//TODO: Have this use the wires
if(!secured)
- user.show_message("The [name] is unsecured!")
+ user.show_message(span_warning("The [name] is unsecured!"))
return FALSE
var/second = time % 60
var/minute = (time - second) / 60
@@ -90,9 +104,10 @@
popup.set_content(dat)
popup.open()
+
/obj/item/assembly/timer/Topic(href, href_list)
..()
- if(usr.incapacitated() || !in_range(loc, usr))
+ if(usr.incapacitated() || usr.restrained() || !Adjacent(usr))
usr << browse(null, "window=timer")
onclose(usr, "timer")
return
diff --git a/code/modules/assembly/voice.dm b/code/modules/assembly/voice.dm
index 7dc382cde69..61b965b8c23 100644
--- a/code/modules/assembly/voice.dm
+++ b/code/modules/assembly/voice.dm
@@ -4,38 +4,48 @@
icon_state = "voice"
materials = list(MAT_METAL=500, MAT_GLASS=50)
origin_tech = "magnets=1;engineering=1"
- var/listening = 0
+ var/listening = FALSE
var/recorded = null //the activation message
var/recorded_type = 0 // 0 for say, 1 for emote
bomb_name = "voice-activated bomb"
-/obj/item/assembly/voice/describe()
+
+/obj/item/assembly/voice/examine(mob/user)
+ . = ..()
if(recorded || listening)
- return "A meter on [src] flickers with every nearby sound."
+ . += span_notice("A meter on it flickers with every nearby sound.")
else
- return "[src] is deactivated."
+ . += span_notice("It is deactivated.")
-/obj/item/assembly/voice/hear_talk(mob/living/M as mob, list/message_pieces)
+
+/obj/item/assembly/voice/hear_talk(mob/living/M, list/message_pieces)
hear_input(M, multilingual_to_message(message_pieces), 0)
-/obj/item/assembly/voice/hear_message(mob/living/M as mob, msg)
+
+/obj/item/assembly/voice/hear_message(mob/living/M, msg)
hear_input(M, msg, 1)
-/obj/item/assembly/voice/proc/hear_input(mob/living/M as mob, msg, type)
+
+/obj/item/assembly/voice/proc/hear_input(mob/living/M, msg, type)
if(!istype(M,/mob/living))
return
if(listening)
+ if(findtext(msg, ""))
+ recorded = strip_html_properly(msg)
+ else
+ recorded = msg
recorded = msg
recorded_type = type
- listening = 0
+ listening = FALSE
var/turf/T = get_turf(src) //otherwise it won't work in hand
T.visible_message("[bicon(src)] beeps, \"Activation message is [type ? "the sound when one [recorded]" : "'[recorded]'."]\"")
else if(findtext(msg, recorded) && type == recorded_type)
var/turf/T = get_turf(src) //otherwise it won't work in hand
- T.visible_message("[bicon(src)] beeps!")
+ T.visible_message(span_warning("[bicon(src)] beeps!"))
pulse(0, M)
+
/obj/item/assembly/voice/activate()
return // previously this toggled listning when not in a holder, that's a little silly. It was only called in attack_self that way.
@@ -52,7 +62,8 @@
/obj/item/assembly/voice/toggle_secure()
. = ..()
- listening = 0
+ listening = FALSE
+
/obj/item/assembly/voice/noise
name = "noise sensor"
@@ -62,16 +73,22 @@
origin_tech = "magnets=1;engineering=1"
bomb_name = "noise-activated bomb"
+
/obj/item/assembly/voice/noise/attack_self(mob/user)
return
-/obj/item/assembly/voice/noise/describe()
- return "[src] does not appear to have any controls."
-/obj/item/assembly/voice/noise/hear_talk(mob/living/M as mob, list/message_pieces)
+/obj/item/assembly/voice/noise/examine(mob/user)
+ . = ..()
+ . += span_notice("It does not appear to have any controls.")
+
+
+/obj/item/assembly/voice/noise/hear_talk(mob/living/M, list/message_pieces)
return
-/obj/item/assembly/voice/noise/hear_message(mob/living/M as mob, msg)
+
+/obj/item/assembly/voice/noise/hear_message(mob/living/M, msg)
pulse(0, M)
var/turf/T = get_turf(src) //otherwise it won't work in hand
- T.visible_message("[bicon(src)] beeps!")
+ T.visible_message(span_warning("[bicon(src)] beeps!"))
+
diff --git a/code/modules/awaymissions/mission_code/academy.dm b/code/modules/awaymissions/mission_code/academy.dm
index 3e488ba1edc..065b2749f7d 100644
--- a/code/modules/awaymissions/mission_code/academy.dm
+++ b/code/modules/awaymissions/mission_code/academy.dm
@@ -44,191 +44,6 @@
icon_state = "monocle"
item_state = "headset"
-// Die of Fate
-/obj/item/dice/d20/fate
- name = "\improper Die of Fate"
- desc = "A die with twenty sides. You can feel unearthly energies radiating from it. Using this might be VERY risky."
- icon_state = "d20"
- var/reusable = TRUE
- var/used = FALSE
-
-/obj/item/dice/d20/fate/stealth
- name = "d20"
- desc = "A die with twenty sides. The preferred die to throw at the GM."
-
-/obj/item/dice/d20/fate/one_use
- reusable = FALSE
-
-/obj/item/dice/d20/fate/one_use/stealth
- name = "d20"
- desc = "A die with twenty sides. The preferred die to throw at the GM."
-
-/obj/item/dice/d20/fate/cursed
- name = "cursed Die of Fate"
- desc = "A die with twenty sides. You feel that rolling this is a REALLY bad idea."
- color = "#00BB00"
-
- rigged = DICE_TOTALLY_RIGGED
- rigged_value = 1
-
-/obj/item/dice/d20/fate/diceroll(mob/user)
- . = ..()
- if(!used)
- if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
- to_chat(user, "You feel the magic of the dice is restricted to ordinary humans!")
- return
-
- if(!reusable)
- used = TRUE
-
- var/turf/T = get_turf(src)
- T.visible_message("[src] flares briefly.")
-
- addtimer(CALLBACK(src, PROC_REF(effect), user, .), 1 SECONDS)
-
-/obj/item/dice/d20/fate/equipped(mob/user, slot, initial)
- . = ..()
-
- if(!ishuman(user) || !user.mind || (user.mind in SSticker.mode.wizards))
- to_chat(user, "You feel the magic of the dice is restricted to ordinary humans! You should leave it alone.")
- user.drop_item_ground(src)
-
-/obj/item/dice/d20/fate/proc/create_smoke(amount)
- var/datum/effect_system/smoke_spread/smoke = new
- smoke.set_up(amount, 0, drop_location())
- smoke.start()
-
-/obj/item/dice/d20/fate/proc/effect(var/mob/living/carbon/human/user, roll)
- var/turf/T = get_turf(src)
- switch(roll)
- if(1)
- //Dust
- T.visible_message("[user] turns to dust!")
- user.dust()
- if(2)
- //Death
- T.visible_message("[user] suddenly dies!")
- user.death()
- if(3)
- //Swarm of creatures
- T.visible_message("A swarm of creatures surround [user]!")
- for(var/direction in GLOB.alldirs)
- new /mob/living/simple_animal/hostile/netherworld(get_step(get_turf(user),direction))
- if(4)
- //Destroy Equipment
- T.visible_message("Everything [user] is holding and wearing disappears!")
- for(var/obj/item/I in user)
- if(istype(I, /obj/item/implant) || istype(I, /obj/item/organ))
- continue
- qdel(I)
- if(5)
- //Monkeying
- T.visible_message("[user] transforms into a monkey!")
- user.monkeyize()
- if(6)
- //Cut speed
- T.visible_message("[user] starts moving slower!")
- var/datum/species/S = user.dna.species
- S.speed_mod += 1
- if(7)
- //Throw
- T.visible_message("Unseen forces throw [user]!")
- user.Stun(12 SECONDS)
- user.adjustBruteLoss(50)
- var/throw_dir = GLOB.cardinal
- var/atom/throw_target = get_edge_target_turf(user, throw_dir)
- user.throw_at(throw_target, 200, 4)
- if(8)
- //Fueltank Explosion
- T.visible_message("An explosion bursts into existence around [user]!")
- explosion(get_turf(user),-1,0,2, flame_range = 2, cause = src)
- if(9)
- //Cold
- T.visible_message("[user] looks a little under the weather!")
- var/datum/disease/virus/cold/D = new
- D.Contract(user)
- if(10)
- //Nothing
- T.visible_message("Nothing seems to happen.")
- if(11)
- //Cookie
- T.visible_message("A cookie appears out of thin air!")
- var/obj/item/reagent_containers/food/snacks/cookie/C = new(drop_location())
- create_smoke(2)
- C.name = "Cookie of Fate"
- if(12)
- //Healing
- T.visible_message("[user] looks very healthy!")
- user.revive()
- if(13)
- //Mad Dosh
- T.visible_message("Mad dosh shoots out of [src]!")
- var/turf/Start = get_turf(src)
- for(var/direction in GLOB.alldirs)
- var/turf/dirturf = get_step(Start,direction)
- if(rand(0,1))
- new /obj/item/stack/spacecash/c1000(dirturf)
- else
- var/obj/item/storage/bag/money/M = new(dirturf)
- for(var/i in 1 to rand(5,50))
- new /obj/item/coin/gold(M)
- if(14)
- //Free Gun
- T.visible_message("An impressive gun appears!")
- create_smoke(2)
- new /obj/item/gun/projectile/revolver/mateba(drop_location())
- if(15)
- //Random One-use spellbook
- T.visible_message("A magical looking book drops to the floor!")
- create_smoke(2)
- new /obj/item/spellbook/oneuse/random(drop_location())
- if(16)
- //Servant & Servant Summon
- T.visible_message("A Dice Servant appears in a cloud of smoke!")
- var/mob/living/carbon/human/H = new(drop_location())
- create_smoke(2)
-
- H.equipOutfit(/datum/outfit/butler)
- var/datum/mind/servant_mind = new /datum/mind()
- var/datum/objective/O = new
- O.owner = servant_mind
- O.target = user.mind
- O.explanation_text = "Serve [user.real_name]."
- servant_mind.objectives += O
- servant_mind.transfer_to(H)
-
- var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the servant of [user.real_name]?", ROLE_WIZARD, poll_time = 30 SECONDS, source = H)
- if(LAZYLEN(candidates))
- var/mob/dead/observer/C = pick(candidates)
- message_admins("[ADMIN_LOOKUPFLW(C)] was spawned as Dice Servant")
- H.key = C.key
- to_chat(H, "You are a servant of [user.real_name]. You must do everything in your power to follow their orders.")
-
- var/obj/effect/proc_holder/spell/summonmob/S = new
- S.target_mob = H
- user.mind.AddSpell(S)
-
- if(17)
- //Tator Kit
- T.visible_message("A suspicious box appears!")
- new /obj/item/storage/box/syndicate(drop_location())
- create_smoke(2)
- if(18)
- //Captain ID
- T.visible_message("A golden identification card appears!")
- new /obj/item/card/id/captains_spare(drop_location())
- create_smoke(2)
- if(19)
- //Instrinct Resistance
- T.visible_message("[user] looks very robust!")
- var/datum/species/S = user.dna.species
- S.brute_mod *= 0.5
- S.burn_mod *= 0.5
-
- if(20)
- //Free wizard!
- T.visible_message("Magic flows out of [src] and into [user]!")
- user.mind.make_Wizard()
// Butler outfit
/datum/outfit/butler
diff --git a/code/modules/awaymissions/mission_code/blackmarketpackers.dm b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
index 37f1ef8b212..b8966d78d3b 100644
--- a/code/modules/awaymissions/mission_code/blackmarketpackers.dm
+++ b/code/modules/awaymissions/mission_code/blackmarketpackers.dm
@@ -188,7 +188,7 @@
icon_state = "destroyed_target_prism"
/obj/machinery/broken/porta_turret/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/crowbar))
+ if(I.tool_behaviour == TOOL_CROWBAR)
to_chat(user, "You begin prying the metal coverings off.")
if(do_after(user, 20 * I.toolspeed * gettoolspeedmod(user), target = src))
if(prob(70))
diff --git a/code/modules/awaymissions/mission_code/ruins/graveyard.dm b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
index cfd23a2cac0..f6da0b0e414 100644
--- a/code/modules/awaymissions/mission_code/ruins/graveyard.dm
+++ b/code/modules/awaymissions/mission_code/ruins/graveyard.dm
@@ -36,11 +36,10 @@
icon_state = "case-0"
allowed_books = list(/obj/item/storage/funeral_urn)
-/obj/structure/bookcase/ashframe/update_icon()
- if(contents.len < 5)
- icon_state = "case-[contents.len]"
- else
- icon_state = "case-5"
+
+/obj/structure/bookcase/ashframe/update_icon_state()
+ icon_state = "case-[min(length(contents), 5)]"
+
/obj/structure/bookcase/ashframe/random
diff --git a/code/modules/awaymissions/mission_code/spacebattle.dm b/code/modules/awaymissions/mission_code/spacebattle.dm
index 90958a14048..ee0cd344ec5 100644
--- a/code/modules/awaymissions/mission_code/spacebattle.dm
+++ b/code/modules/awaymissions/mission_code/spacebattle.dm
@@ -689,26 +689,33 @@
shoes = /obj/item/clothing/shoes/black
suit = /obj/item/clothing/suit/storage/labcoat/science
+
/obj/item/clothing/suit/space/hardsuit/syndi/damaged
name = "damaged blood-red hardsuit"
desc = "Damaged advanced hardsuit designed for work in special operations. There are a many patches visible on the suit. Its mode switcher system looks damaged and forced in travel mode. Property of Gorlex Marauders."
armor = list("melee" = 30, "bullet" = 40, "laser" = 20, "energy" = 20, "bomb" = 30, "bio" = 100, "rad" = 50, "fire" = 50, "acid" = 90)
w_class = WEIGHT_CLASS_NORMAL
- on = 1
+ icon_state = "hardsuit1-syndi"
+ on = TRUE
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged
actions_types = list(/datum/action/item_action/toggle_helmet)
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/attack_self(mob/user) //Toggle Helmet
- if(!on)
- to_chat(user, "You cant switch your hardsuit to combat mode.")
- playsound(src.loc, 'sound/machines/buzz-two.ogg', 50, 1)
- .=..()
/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged
- on = 1
icon_state = "hardsuit1-syndi"
item_state = "syndie_helm"
actions_types = list(/datum/action/item_action/toggle_helmet_light)
+ on = TRUE
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/update_icon_state()
+ return
+
+
+/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/adjust_headgear(mob/living/carbon/human/user, toggle = FALSE)
+ if(user)
+ to_chat(user, span_notice("You cant switch your hardsuit to combat mode."))
+ playsound(user, 'sound/machines/buzz-two.ogg', 50, TRUE)
+ return
+ ..()
-/obj/item/clothing/head/helmet/space/hardsuit/syndi/damaged/update_icon()
- icon_state = "hardsuit1-syndi"
diff --git a/code/modules/awaymissions/mission_code/stationCollision.dm b/code/modules/awaymissions/mission_code/stationCollision.dm
index c37899eba9f..02b57d03a95 100644
--- a/code/modules/awaymissions/mission_code/stationCollision.dm
+++ b/code/modules/awaymissions/mission_code/stationCollision.dm
@@ -69,8 +69,8 @@
//Syndicate sub-machine guns.
/obj/item/gun/projectile/automatic/c20r/sc_c20r
-/obj/item/gun/projectile/automatic/c20r/sc_c20r/New()
- ..()
+/obj/item/gun/projectile/automatic/c20r/sc_c20r/Initialize(mapload)
+ . = ..()
for(var/ammo in magazine.stored_ammo)
if(prob(95)) //95% chance
magazine.stored_ammo -= ammo
@@ -78,8 +78,8 @@
//Barman's shotgun
/obj/item/gun/projectile/shotgun/sc_pump
-/obj/item/gun/projectile/shotgun/sc_pump/New()
- ..()
+/obj/item/gun/projectile/shotgun/sc_pump/Initialize(mapload)
+ . = ..()
for(var/ammo in magazine.stored_ammo)
if(prob(95)) //95% chance
magazine.stored_ammo -= ammo
@@ -178,7 +178,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
if(prob(25))
mezzer()
-/obj/singularity/narsie/sc_Narsie/consume(var/atom/A)
+/obj/singularity/narsie/sc_Narsie/consume(atom/A)
if(!A.simulated)
return FALSE
if(is_type_in_list(A, uneatable))
@@ -196,7 +196,7 @@ GLOBAL_VAR_INIT(sc_safecode5, "[rand(0,9)]")
for(var/obj/O in T.contents)
if(O.level != 1)
continue
- if(O.invisibility == INVISIBILITY_ABSTRACT)
+ if(O.invisibility == INVISIBILITY_MAXIMUM || O.invisibility == INVISIBILITY_ABSTRACT)
src.consume(O)
T.ChangeTurf(T.baseturf)
return
diff --git a/code/modules/awaymissions/pamphlet.dm b/code/modules/awaymissions/pamphlet.dm
index ffbb188ada2..77e3f053ef1 100644
--- a/code/modules/awaymissions/pamphlet.dm
+++ b/code/modules/awaymissions/pamphlet.dm
@@ -34,5 +34,5 @@
environs."
//we don't want the silly text overlay!
-/obj/item/paper/pamphlet/update_icon()
+/obj/item/paper/pamphlet/update_icon_state()
return
diff --git a/code/modules/buildmode/buttons.dm b/code/modules/buildmode/buttons.dm
index 9f74ac9aeff..ac6ded10777 100644
--- a/code/modules/buildmode/buttons.dm
+++ b/code/modules/buildmode/buttons.dm
@@ -26,7 +26,7 @@
update_icon()
return TRUE
-/obj/screen/buildmode/mode/update_icon()
+/obj/screen/buildmode/mode/update_icon_state()
icon_state = bd.mode.get_button_iconstate()
/obj/screen/buildmode/help
@@ -43,7 +43,7 @@
screen_loc = "NORTH,WEST+2"
name = "Change Dir"
-/obj/screen/buildmode/bdir/update_icon()
+/obj/screen/buildmode/bdir/update_icon_state()
dir = bd.build_dir
/obj/screen/buildmode/bdir/Click()
diff --git a/code/modules/client/client_procs.dm b/code/modules/client/client_procs.dm
index e2028b4ea82..95c8c0da5d4 100644
--- a/code/modules/client/client_procs.dm
+++ b/code/modules/client/client_procs.dm
@@ -10,6 +10,7 @@
//I would just like the code ready should it ever need to be used.
#define SUGGESTED_CLIENT_VERSION 514 // only integers (e.g: 513, 514) are useful here. This is the part BEFORE the ".", IE 513 out of 513.1536
#define SUGGESTED_CLIENT_BUILD 1568 // only integers (e.g: 1536, 1539) are useful here. This is the part AFTER the ".", IE 1536 out of 513.1536
+#define MINIMUM_FPS_VERSION 511 // used as check, if you can update fps or not
#define SSD_WARNING_TIMER 30 // cycles, not seconds, so 30=60s
@@ -310,6 +311,7 @@
prefs = GLOB.preferences_datums[ckey]
if(!prefs)
prefs = new /datum/preferences(src)
+ set_macros()
GLOB.preferences_datums[ckey] = prefs
else
prefs.parent = src
@@ -321,10 +323,10 @@
prefs.init_keybindings(prefs.keybindings_overrides) //The earliest sane place to do it where prefs are not null, if they are null you can't do crap at lobby
prefs.last_ip = address //these are gonna be used for banning
prefs.last_id = computer_id //these are gonna be used for banning
- if(world.byond_version >= 511 && byond_version >= 511 && prefs.clientfps)
+ if(world.byond_version >= MINIMUM_FPS_VERSION && byond_version >= MINIMUM_FPS_VERSION && prefs.clientfps)
fps = prefs.clientfps
- if(world.byond_version >= 511 && byond_version >= 511 && !prefs.clientfps)
+ if(world.byond_version >= MINIMUM_FPS_VERSION && byond_version >= MINIMUM_FPS_VERSION && !prefs.clientfps)
fps = CONFIG_GET(number/clientfps)
// Check if the client has or has not accepted TOS
@@ -977,33 +979,40 @@
/client/proc/activate_darkmode()
///// BUTTONS /////
/* Rpane */
- winset(src, "rpane.fullscreenb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.textb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.infob", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.wikib", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.forumb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.rulesb", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "rpane.githubb", "background-color=#40628a;text-color=#FFFFFF")
+ winset(src, "rpane.fullscreenb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.textb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.infob", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.wikib", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.rulesb", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "rpane.githubb", "background-color=#494949;text-color=#a4bad6")
winset(src, "rpane.webmap", "background-color=#494949;text-color=#a4bad6")
- /* Mainwindow */
- winset(src, "mainwindow.saybutton", "background-color=#40628a;text-color=#FFFFFF")
- winset(src, "mainwindow.mebutton", "background-color=#40628a;text-color=#FFFFFF")
+ /* Outputwindow */
+ winset(src, "outputwindow.saybutton", "background-color=#494949;text-color=#a4bad6")
+ winset(src, "outputwindow.mebutton", "background-color=#494949;text-color=#a4bad6")
+
///// UI ELEMENTS /////
/* Mainwindow */
- winset(src, "mainwindow", "background-color=#272727")
- winset(src, "mainwindow.mainvsplit", "background-color=#272727")
- winset(src, "mainwindow.tooltip", "background-color=#272727")
+ winset(src, "mainwindow", "background-color=#171717")
+ winset(src, "mainwindow.mainvsplit", "background-color=#202020")
+ winset(src, "mainwindow.tooltip", "background-color=#171717")
/* Outputwindow */
- winset(src, "outputwindow.browseroutput", "background-color=#272727")
+ winset(src, "outputwindow", "background-color=#202020")
+ winset(src, "outputwindow.input", "text-color=#a4bad6;background-color=#202020")
+ winset(src, "outputwindow.browseroutput", "background-color=#202020")
/* Rpane */
- winset(src, "rpane", "background-color=#272727")
- winset(src, "rpane.rpanewindow", "background-color=#272727")
+ winset(src, "rpane", "background-color=#202020")
+ winset(src, "rpane.rpanewindow", "background-color=#202020")
/* Browserwindow */
- winset(src, "browserwindow", "background-color=#272727")
- winset(src, "browserwindow.browser", "background-color=#272727")
+
+ //winset(src, "browserwindow", "background-color=#272727")
+ //winset(src, "browserwindow.browser", "background-color=#272727")
/* Infowindow */
- winset(src, "infowindow", "background-color=#272727;text-color=#FFFFFF")
- winset(src, "infowindow.info", "background-color=#272727;text-color=#FFFFFF;highlight-color=#009900;tab-text-color=#FFFFFF;tab-background-color=#272727")
+ winset(src, "infowindow", "background-color=#202020;text-color=#a4bad6")
+ winset(src, "infowindow.info", "background-color=#171717;text-color=#a4bad6;highlight-color=#009900;tab-text-color=#a4bad6;tab-background-color=#202020")
+ //Macros
+ winset(src, "default-Tab", "parent=default;name=Tab;command=\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_DARK_INPUT_ENABLED]\\\"\"")
+ winset(src, "legacy-Tab", "parent=legacy;name=Tab;command=\".winset \\\"mainwindow.macro=default map.focus=true input.background-color=[COLOR_DARK_INPUT_DISABLED]\\\"\"")
+
// NOTIFY USER
to_chat(src, "Darkmode Enabled")
@@ -1014,29 +1023,36 @@
winset(src, "rpane.textb", "background-color=none;text-color=#000000")
winset(src, "rpane.infob", "background-color=none;text-color=#000000")
winset(src, "rpane.wikib", "background-color=none;text-color=#000000")
- winset(src, "rpane.forumb", "background-color=none;text-color=#000000")
+ //winset(src, "rpane.forumb", "background-color=none;text-color=#000000")
winset(src, "rpane.rulesb", "background-color=none;text-color=#000000")
winset(src, "rpane.githubb", "background-color=none;text-color=#000000")
- winset(src, "rpane.webmap", "background-color=#494949;text-color=#a4bad6")
- /* Mainwindow */
- winset(src, "mainwindow.saybutton", "background-color=none;text-color=#000000")
- winset(src, "mainwindow.mebutton", "background-color=none;text-color=#000000")
+ winset(src, "rpane.webmap", "background-color=none;text-color=#000000")
+ /* Outputwindow */
+ winset(src, "outputwindow.saybutton", "background-color=none;text-color=#000000")
+ winset(src, "outputwindow.mebutton", "background-color=none;text-color=#000000")
+
///// UI ELEMENTS /////
/* Mainwindow */
winset(src, "mainwindow", "background-color=none")
winset(src, "mainwindow.mainvsplit", "background-color=none")
winset(src, "mainwindow.tooltip", "background-color=none")
/* Outputwindow */
+ winset(src, "outputwindow", "background-color=none")
+ winset(src, "outputwindow.input", "text-color=none; background-color=#F0F0F0")
winset(src, "outputwindow.browseroutput", "background-color=none")
/* Rpane */
winset(src, "rpane", "background-color=none")
winset(src, "rpane.rpanewindow", "background-color=none")
/* Browserwindow */
- winset(src, "browserwindow", "background-color=none")
- winset(src, "browserwindow.browser", "background-color=none")
+ //winset(src, "browserwindow", "background-color=none")
+ //winset(src, "browserwindow.browser", "background-color=none")
/* Infowindow */
winset(src, "infowindow", "background-color=none;text-color=#000000")
winset(src, "infowindow.info", "background-color=none;text-color=#000000;highlight-color=#007700;tab-text-color=#000000;tab-background-color=none")
+ //Macros
+ winset(src, "default-Tab", "parent=default;name=Tab;command=\".winset \\\"mainwindow.macro=legacy input.focus=true input.background-color=[COLOR_INPUT_ENABLED]\\\"\"")
+ winset(src, "legacy-Tab", "parent=legacy;name=Tab;command=\".winset \\\"mainwindow.macro=default map.focus=true input.background-color=[COLOR_INPUT_DISABLED]\\\"\"")
+
///// NOTIFY USER /////
to_chat(src, "Darkmode Disabled") // what a sick fuck
@@ -1347,7 +1363,14 @@
log_adminwarn("[key] has just connected with BYOND v[byond_version].[byond_build] for the first time. BYOND account registered on [byondacc_date] ([byondacc_age] days old)")
/client/proc/show_update_notice()
- to_chat(src, "Your BYOND client (v: [byond_version].[byond_build]) is out of date. This can cause glitches. We highly suggest you download the latest client from byond.com before playing. You can also update via the BYOND launcher application.")
+ var/list/msg = list({""})
+ msg += "Ваша версия BYOND устарела: "
+ msg += "Это может привести к проблемам, таким как к неправильному отображением вещей или лагам.
"
+ msg += "Ваша версия: [byond_version].[byond_build] "
+ msg += "Требуемая версия, чтобы убрать это окно: [SUGGESTED_CLIENT_VERSION].[SUGGESTED_CLIENT_BUILD] или выше "
+ msg += "Посетите сайт BYOND, чтобы скачать последнюю версию. "
+ src << browse(msg.Join(""), "window=warning_popup")
+ to_chat(src, span_userdanger("Ваш клиент BYOND (версия: [byond_version].[byond_build]) устарел. Это может вызвать лаги. Мы крайне рекомендуем скачать последнюю версию с byond.com Прежде чем играть. Также можете обновиться через приложение BYOND."))
/client/proc/update_ambience_pref()
@@ -1401,7 +1424,7 @@
/// Returns the biggest number from client.view so we can do easier maths
/client/proc/maxview()
var/list/screensize = getviewsize(view)
- return max(screensize[1], screensize[2])
+ return round(max(screensize[1], screensize[2]) / 2)
#undef LIMITER_SIZE
diff --git a/code/modules/client/preference/loadout/loadout_donor.dm b/code/modules/client/preference/loadout/loadout_donor.dm
index 338ecaa832a..bc1229a279c 100644
--- a/code/modules/client/preference/loadout/loadout_donor.dm
+++ b/code/modules/client/preference/loadout/loadout_donor.dm
@@ -3,6 +3,18 @@
sort_category = "Donor"
subtype_path = /datum/gear/donor
+/datum/gear/donor/ussptracksuit_black
+ donator_tier = 1
+ cost = 1
+ display_name = "track suit (black)"
+ path = /obj/item/clothing/under/ussptracksuit_black
+
+/datum/gear/donor/ussptracksuit_white
+ donator_tier = 1
+ cost = 1
+ display_name = "track suit (white)"
+ path = /obj/item/clothing/under/ussptracksuit_white
+
/datum/gear/donor/kittyears
display_name = "Kitty ears"
path = /obj/item/clothing/head/kitty
diff --git a/code/modules/client/preference/loadout/loadout_glasses.dm b/code/modules/client/preference/loadout/loadout_glasses.dm
index a84af914c49..b53c8bd360e 100644
--- a/code/modules/client/preference/loadout/loadout_glasses.dm
+++ b/code/modules/client/preference/loadout/loadout_glasses.dm
@@ -22,3 +22,8 @@
/datum/gear/glasses/prescription
display_name = "Prescription glasses"
path = /obj/item/clothing/glasses/regular
+
+/datum/gear/glasses/sectacticool
+ display_name = "Security tactical glasses"
+ path = /obj/item/clothing/glasses/hud/security/sunglasses/tacticool
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_hat.dm b/code/modules/client/preference/loadout/loadout_hat.dm
index 3844d89b851..8e08be9c49c 100644
--- a/code/modules/client/preference/loadout/loadout_hat.dm
+++ b/code/modules/client/preference/loadout/loadout_hat.dm
@@ -202,3 +202,8 @@
/datum/gear/hat/capsolgov
display_name = "cap, Sol Gov"
path = /obj/item/clothing/head/soft/solgov
+
+/datum/gear/hat/lwhelmet
+ display_name = "security lightweight helmet"
+ path = /obj/item/clothing/head/helmet/lightweighthelmet
+ allowed_roles = list("Head of Security", "Warden", "Security Officer", "Security Pod Pilot")
diff --git a/code/modules/client/preference/loadout/loadout_uniform.dm b/code/modules/client/preference/loadout/loadout_uniform.dm
index 6dec7683054..025838ff869 100644
--- a/code/modules/client/preference/loadout/loadout_uniform.dm
+++ b/code/modules/client/preference/loadout/loadout_uniform.dm
@@ -127,6 +127,10 @@
/datum/gear/uniform/skirt
subtype_path = /datum/gear/uniform/skirt
+/datum/gear/uniform/skirt/syndi
+ display_name = "skirt, tactical"
+ path = /obj/item/clothing/under/syndicate/tacticool/skirt
+
/datum/gear/uniform/skirt/blue
display_name = "plaid skirt, blue"
path = /obj/item/clothing/under/dress/plaid_blue
@@ -265,6 +269,7 @@
display_name = "skirt, chaplain"
path = /obj/item/clothing/under/rank/chaplain/skirt
allowed_roles = list("Chaplain")
+
/datum/gear/uniform/skirt/job/barber
display_name = "skirt, barber"
path = /obj/item/clothing/under/barber/skirt
@@ -437,3 +442,13 @@
display_name = "hawaiian shirt (orange)"
description = "Come one step closer and I will knock his teeth out!"
path = /obj/item/clothing/under/orangehawaiianshirt
+
+/datum/gear/uniform/ussptracksuit_red
+ display_name = "track suit (red)"
+ description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
+ path = /obj/item/clothing/under/ussptracksuit_red
+
+/datum/gear/uniform/ussptracksuit_blue
+ display_name = "track suit (blue)"
+ description = "A classic track suit. There is a small tag on the clothes that says \"Made in the USSP\"."
+ path = /obj/item/clothing/under/ussptracksuit_blue
diff --git a/code/modules/client/preference/preferences.dm b/code/modules/client/preference/preferences.dm
index cb0827a3c31..f976ade0de9 100644
--- a/code/modules/client/preference/preferences.dm
+++ b/code/modules/client/preference/preferences.dm
@@ -196,6 +196,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/med_record = ""
var/sec_record = ""
var/gen_record = ""
+ var/exploit_record = ""
var/disabilities = 0
var/nanotrasen_relation = "Neutral"
@@ -245,6 +246,8 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/list/keybindings_overrides = null
/// View range preference for this client
var/viewrange = DEFAULT_CLIENT_VIEWSIZE
+ /// How dark things are if client is a ghost, 0-255
+ var/ghost_darkness_level = LIGHTING_PLANE_ALPHA_VISIBLE
/// Minigames notification about their end, start and etc.
var/minigames_notifications = TRUE
@@ -253,7 +256,6 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
/datum/preferences/New(client/C)
parent = C
b_type = pick(4;"O-", 36;"O+", 3;"A-", 28;"A+", 1;"B-", 20;"B+", 1;"AB-", 5;"AB+")
- parent?.set_macros()
max_gear_slots = CONFIG_GET(number/max_loadout_points)
var/loaded_preferences_successfully = FALSE
if(istype(C))
@@ -313,7 +315,7 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
dat += "Name: "
dat += "[real_name]"
dat += "(Randomize)"
- dat += "(Always Randomize) "
+ dat += "(Always Randomize) "
dat += "
"
dat += "
"
dat += "Slot [default_slot][saved ? "" : " (empty)"] "
@@ -748,13 +750,13 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
var/list/html = list()
html += ""
if(!length(SSjobs.occupations))
- html += "The Jobs subsystem is not yet finished creating jobs, please try again later"
- html += "
"
continue
if((job.title in GLOB.command_positions) || (job.title == "AI"))//Bold head jobs
- html += "[rank]"
+ html += "[rank]"
else
- html += "[rank]"
+ html += "[rank]"
+ if((job_support_low & JOB_CIVILIAN) && (job.title != "Civilian"))
+ html += "
"
continue
- /*
- if(GetJobDepartment(job, 1) & job.flag)
- HTML += " \[High]"
- else if(GetJobDepartment(job, 2) & job.flag)
- HTML += " \[Medium]"
- else if(GetJobDepartment(job, 3) & job.flag)
- HTML += " \[Low]"
+
+ if(prefLowerLevel>1)
+ html += "[prefLevelLabel]"
else
- HTML += " \[NEVER]"
- */
- html += "[prefLevelLabel]"
+ html += "[prefLevelLabel]"
html += ""
+ index += 1
for(var/i in 1 to limit - index) // Finish the column so it is even
html += "
"
@@ -885,22 +888,23 @@ GLOBAL_LIST_INIT(special_role_times, list( //minimum age (in days) for accounts
switch(alternate_option)
if(GET_RANDOM_JOB)
- html += "
"}
- var/datum/db_query/query = SSdbcore.NewQuery("SELECT id, title, flagged FROM [format_table_name("library")] WHERE flagged > 0 ORDER BY flagged DESC")
+ var/datum/db_query/query = SSdbcore.NewQuery("SELECT id, title, flagged FROM [format_table_name("library")] WHERE \
+ flagged > 0 ORDER BY flagged DESC LIMIT :lowerlimit, :upperlimit", list(
+ "lowerlimit" = text2num((page_num - 1) * FLAGGED_BOOKS_PER_PAGE),
+ "upperlimit" = FLAGGED_BOOKS_PER_PAGE
+ ))
+
if(!query.warn_execute())
qdel(query)
return
@@ -58,7 +65,8 @@
if(!books)
dat = "
No flagged books! :)
"
- var/datum/browser/popup = new(usr, "admin_view_flagged_books", "Flagged Books", 700, 400)
+ var/datum/browser/popup = new(usr, "admin_view_flagged_books", "Flagged Books (Shown first [FLAGGED_BOOKS_PER_PAGE] books)", 700, 400)
popup.set_content(dat)
popup.open(0)
+#undef FLAGGED_BOOKS_PER_PAGE
diff --git a/code/modules/library/lib_items.dm b/code/modules/library/lib_items.dm
index fc5b09873bd..f5b62b93ae6 100644
--- a/code/modules/library/lib_items.dm
+++ b/code/modules/library/lib_items.dm
@@ -21,97 +21,104 @@
resistance_flags = FLAMMABLE
max_integrity = 200
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 0)
- var/tmp/busy = 0
- var/list/allowed_books = list(/obj/item/book, /obj/item/spellbook, /obj/item/storage/bible, /obj/item/tome) //Things allowed in the bookcase
+ /// Things allowed in the bookcase
+ var/list/allowed_books = list(
+ /obj/item/book,
+ /obj/item/spellbook,
+ /obj/item/storage/bible,
+ /obj/item/tome,
+ )
+
/obj/structure/bookcase/Initialize()
..()
for(var/obj/item/I in loc)
if(is_type_in_list(I, allowed_books))
I.forceMove(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/structure/bookcase/attackby(obj/item/O as obj, mob/user as mob, params)
- if(busy) //So that you can't mess with it while deconstructing
- return TRUE
+
+/obj/structure/bookcase/attackby(obj/item/O, mob/user, params)
if(is_type_in_list(O, allowed_books))
if(!user.drop_transfer_item_to_loc(O, src))
return
add_fingerprint(user)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
- else if(istype(O, /obj/item/storage/bag/books))
+ if(istype(O, /obj/item/storage/bag/books))
var/obj/item/storage/bag/books/B = O
for(var/obj/item/T in B.contents)
- if(istype(T, /obj/item/book) || istype(T, /obj/item/spellbook) || istype(T, /obj/item/tome) || istype(T, /obj/item/storage/bible))
+ if(is_type_in_list(T, allowed_books))
T.add_fingerprint(user)
B.remove_from_storage(T, src)
add_fingerprint(user)
- to_chat(user, "You empty [O] into [src].")
- update_icon()
+ to_chat(user, span_notice("You empty [O] into [src]."))
+ update_icon(UPDATE_ICON_STATE)
return TRUE
- else if(istype(O, /obj/item/wrench))
- user.visible_message("[user] starts disassembling \the [src].", \
- "You start disassembling \the [src].")
- playsound(get_turf(src), O.usesound, 50, 1)
- busy = TRUE
-
- if(do_after(user, 50 * O.toolspeed * gettoolspeedmod(user), target = src))
- playsound(get_turf(src), O.usesound, 75, 1)
- user.visible_message("[user] disassembles \the [src].", \
- "You disassemble \the [src].")
- busy = FALSE
- density = 0
- deconstruct(TRUE)
- else
- busy = FALSE
- return TRUE
- else if(istype(O, /obj/item/pen))
+ if(is_pen(O))
add_fingerprint(user)
rename_interactive(user, O)
return TRUE
- else
- return ..()
+ return ..()
+
+
+/obj/structure/bookcase/screwdriver_act(mob/user, obj/item/I)
+ if(flags & NODECONSTRUCT)
+ return
+ . = TRUE
+ if(!I.tool_use_check(user, 0))
+ return
+ TOOL_ATTEMPT_DISMANTLE_MESSAGE
+ if(!I.use_tool(src, user, 2 SECONDS, volume = I.tool_volume))
+ return
+ TOOL_DISMANTLE_SUCCESS_MESSAGE
+ deconstruct(TRUE)
+
+
+/obj/structure/bookcase/wrench_act(mob/user, obj/item/I)
+ . = TRUE
+ default_unfasten_wrench(user, I, 0)
+
+
+/obj/structure/bookcase/attack_hand(mob/user)
+ if(!length(contents))
+ return
+
+ var/obj/item/book/choice = tgui_input_list(user, "Which book would you like to remove from [src]?", "Bookcase", contents)
+ if(!choice || user.incapacitated() || !Adjacent(user))
+ return
+ add_fingerprint(user)
+ choice.forceMove_turf()
+ user.put_in_hands(choice, ignore_anim = FALSE)
+ update_icon(UPDATE_ICON_STATE)
-/obj/structure/bookcase/attack_hand(var/mob/user as mob)
- if(contents.len)
- var/obj/item/book/choice = tgui_input_list(user, "Which book would you like to remove from [src]?", "Bookcase", contents)
- if(choice)
- if(user.incapacitated() || user.lying || !Adjacent(user))
- return
- add_fingerprint(user)
- if(!user.get_active_hand())
- choice.forceMove_turf()
- user.put_in_hands(choice, ignore_anim = FALSE)
- else
- choice.forceMove(get_turf(src))
- update_icon()
/obj/structure/bookcase/deconstruct(disassembled = TRUE)
new /obj/item/stack/sheet/wood(loc, 5)
for(var/obj/item/I in contents)
if(is_type_in_list(I, allowed_books))
I.forceMove(get_turf(src))
- qdel(src)
+ ..()
+
+
+/obj/structure/bookcase/update_icon_state()
+ icon_state = "book-[min(length(contents), 5)]"
-/obj/structure/bookcase/update_icon()
- if(contents.len < 5)
- icon_state = "book-[contents.len]"
- else
- icon_state = "book-5"
/obj/structure/bookcase/manuals/medical
name = "Medical Manuals bookcase"
+
/obj/structure/bookcase/manuals/medical/Initialize()
. = ..()
new /obj/item/book/manual/medical_cloning(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/bookcase/manuals/engineering
name = "Engineering Manuals bookcase"
+
/obj/structure/bookcase/manuals/engineering/Initialize()
. = ..()
new /obj/item/book/manual/engineering_construction(src)
@@ -120,15 +127,17 @@
new /obj/item/book/manual/engineering_guide(src)
new /obj/item/book/manual/engineering_singularity_safety(src)
new /obj/item/book/manual/robotics_cyborgs(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/structure/bookcase/manuals/research_and_development
name = "R&D Manuals bookcase"
+
/obj/structure/bookcase/manuals/research_and_development/Initialize()
. = ..()
new /obj/item/book/manual/research_and_development(src)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/*
diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm
index be10f84a7e6..316fc48657e 100644
--- a/code/modules/library/lib_machines.dm
+++ b/code/modules/library/lib_machines.dm
@@ -78,6 +78,8 @@ GLOBAL_LIST_INIT(library_section_names, list("Any", "Fiction", "Non-Fiction", "A
books_flagged_this_round["[id]"] = 1
message_admins("[key_name_admin(user)] has flagged book #[id] as inappropriate.")
+ log_game("[user] (ckey: [user.key]) has flagged book #[id] as inappropriate.")
+
var/datum/db_query/query = SSdbcore.NewQuery("UPDATE [format_table_name("library")] SET flagged = flagged + 1 WHERE id=:id", list(
"id" = text2num(id)
))
diff --git a/code/modules/martial_arts/adminfu.dm b/code/modules/martial_arts/adminfu.dm
index dca93adf7ba..020f44f1156 100644
--- a/code/modules/martial_arts/adminfu.dm
+++ b/code/modules/martial_arts/adminfu.dm
@@ -2,6 +2,7 @@
name = "Way of the Dancing Admin"
has_explaination_verb = TRUE
combos = list(/datum/martial_combo/adminfu/healing_palm)
+ weight = 99999999
/datum/martial_art/adminfu/harm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
MARTIAL_ARTS_ACT_CHECK
@@ -37,9 +38,24 @@
desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism."
icon = 'icons/obj/wizard.dmi'
icon_state ="scroll2"
- var/used = 0
+ var/used = FALSE
-/obj/item/adminfu_scroll/attack_self(mob/user as mob)
+
+/obj/item/adminfu_scroll/update_icon_state()
+ icon_state = used ? "blankscroll" : initial(icon_state)
+
+
+/obj/item/adminfu_scroll/update_name(updates = ALL)
+ . = ..()
+ name = used ? "empty scroll" : initial(name)
+
+
+/obj/item/adminfu_scroll/update_desc(updates = ALL)
+ . = ..()
+ desc = used ? "It's completely blank." : initial(desc)
+
+
+/obj/item/adminfu_scroll/attack_self(mob/user)
if(!ishuman(user))
return
if(!used)
@@ -47,7 +63,6 @@
var/datum/martial_art/adminfu/F = new/datum/martial_art/adminfu(null)
F.teach(H)
to_chat(H, "You have learned the ancient martial art of the Admins.")
- used = 1
- desc = "It's completely blank."
- name = "empty scroll"
- icon_state = "blankscroll"
+ used = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
+
diff --git a/code/modules/martial_arts/brawling.dm b/code/modules/martial_arts/brawling.dm
index dae3805d38b..56402a38ed2 100644
--- a/code/modules/martial_arts/brawling.dm
+++ b/code/modules/martial_arts/brawling.dm
@@ -1,6 +1,7 @@
/datum/martial_art/boxing
name = "Boxing"
has_dirslash = FALSE
+ weight = 1
/datum/martial_art/boxing/disarm_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
to_chat(A, "Can't disarm while boxing!")
@@ -48,6 +49,7 @@
/datum/martial_art/drunk_brawling
name = "Drunken Brawling"
+ weight = 2
/datum/martial_art/drunk_brawling/grab_act(var/mob/living/carbon/human/A, var/mob/living/carbon/human/D)
if(prob(70))
diff --git a/code/modules/martial_arts/cqc.dm b/code/modules/martial_arts/cqc.dm
index b324cae076a..1d4d0cedbc9 100644
--- a/code/modules/martial_arts/cqc.dm
+++ b/code/modules/martial_arts/cqc.dm
@@ -1,5 +1,6 @@
/datum/martial_art/cqc
name = "CQC"
+ weight = 7
block_chance = 75
has_explaination_verb = TRUE
combos = list(/datum/martial_combo/cqc/slam, /datum/martial_combo/cqc/kick, /datum/martial_combo/cqc/restrain, /datum/martial_combo/cqc/pressure, /datum/martial_combo/cqc/consecutive)
@@ -13,6 +14,22 @@
/datum/martial_art/cqc/under_siege
name = "Close Quarters Cooking"
+ weight = 5
+
+/datum/martial_art/cqc/under_siege/teach(mob/living/carbon/human/H, make_temporary)
+ RegisterSignal(H, COMSIG_AREA_ENTERED, PROC_REF(kitchen_check))
+ return ..()
+
+/datum/martial_art/cqc/under_siege/remove(mob/living/carbon/human/H)
+ UnregisterSignal(H, COMSIG_AREA_ENTERED)
+ return ..()
+
+/datum/martial_art/cqc/under_siege/proc/kitchen_check(mob/living/carbon/human/H, area/entered_area)
+ SIGNAL_HANDLER //COMSIG_AREA_ENTERED
+ if(!is_type_in_typecache(entered_area, areas_under_siege))
+ weight = 0
+ else
+ weight = initial(weight)
/datum/martial_art/cqc/under_siege/can_use(mob/living/carbon/human/H)
var/area/A = get_area(H)
@@ -20,6 +37,12 @@
return FALSE
return ..()
+/datum/martial_art/cqc/teach(mob/living/carbon/human/H, make_temporary)
+ if(H.mind)
+ for(var/datum/martial_art/cqc/under_siege/chef_art in H.mind.known_martial_arts)
+ chef_art.remove(H)
+ return ..()
+
/datum/martial_art/cqc/proc/drop_restraining()
restraining = FALSE
diff --git a/code/modules/martial_arts/grav_stomp.dm b/code/modules/martial_arts/grav_stomp.dm
index 0f8a54ecf88..40bd4fc6a16 100644
--- a/code/modules/martial_arts/grav_stomp.dm
+++ b/code/modules/martial_arts/grav_stomp.dm
@@ -1,5 +1,6 @@
/datum/martial_art/grav_stomp
name = "Gravitational Boots"
+ weight = 4
/datum/martial_art/grav_stomp/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D)
MARTIAL_ARTS_ACT_CHECK
diff --git a/code/modules/martial_arts/krav_maga.dm b/code/modules/martial_arts/krav_maga.dm
index 40579af2ff6..2b6e211ab6d 100644
--- a/code/modules/martial_arts/krav_maga.dm
+++ b/code/modules/martial_arts/krav_maga.dm
@@ -1,6 +1,7 @@
/datum/martial_art/krav_maga
name = "Krav Maga"
has_dirslash = FALSE
+ weight = 8 //Higher weight, since you can choose to put on or take off the gloves
var/datum/action/neck_chop/neckchop = new/datum/action/neck_chop()
var/datum/action/leg_sweep/legsweep = new/datum/action/leg_sweep()
var/datum/action/lung_punch/lungpunch = new/datum/action/lung_punch()
@@ -25,12 +26,15 @@
button_icon_state = "neckchop"
/datum/action/neck_chop/Trigger(left_click = TRUE)
+ var/mob/living/carbon/human/H = owner
+ if(!istype(H.mind.martial_art, /datum/martial_art/krav_maga))
+ to_chat(owner, span_warning("You don't know how to do that right now."))
+ return
if(owner.incapacitated())
to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
return
to_chat(owner, "Your next attack will be a Neck Chop.")
owner.visible_message("[owner] assumes the Neck Chop stance!")
- var/mob/living/carbon/human/H = owner
H.mind.martial_art.combos.Cut()
H.mind.martial_art.combos.Add(/datum/martial_combo/krav_maga/neck_chop)
H.mind.martial_art.reset_combos()
@@ -41,12 +45,15 @@
button_icon_state = "legsweep"
/datum/action/leg_sweep/Trigger(left_click = TRUE)
+ var/mob/living/carbon/human/H = owner
+ if(!istype(H.mind.martial_art, /datum/martial_art/krav_maga))
+ to_chat(owner, span_warning("You don't know how to do that right now."))
+ return
if(owner.incapacitated())
to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
return
to_chat(owner, "Your next attack will be a Leg Sweep.")
owner.visible_message("[owner] assumes the Leg Sweep stance!")
- var/mob/living/carbon/human/H = owner
H.mind.martial_art.combos.Cut()
H.mind.martial_art.combos.Add(/datum/martial_combo/krav_maga/leg_sweep)
H.mind.martial_art.reset_combos()
@@ -57,12 +64,15 @@
button_icon_state = "lungpunch"
/datum/action/lung_punch/Trigger(left_click = TRUE)
+ var/mob/living/carbon/human/H = owner
+ if(!istype(H.mind.martial_art, /datum/martial_art/krav_maga))
+ to_chat(owner, span_warning("You don't know how to do that right now."))
+ return
if(owner.incapacitated())
to_chat(owner, "You can't use Krav Maga while you're incapacitated.")
return
to_chat(owner, "Your next attack will be a Lung Punch.")
owner.visible_message("[owner] assumes the Lung Punch stance!")
- var/mob/living/carbon/human/H = owner
H.mind.martial_art.combos.Cut()
H.mind.martial_art.combos.Add(/datum/martial_combo/krav_maga/lung_punch)
H.mind.martial_art.reset_combos()
diff --git a/code/modules/martial_arts/martial.dm b/code/modules/martial_arts/martial.dm
index 05752f0ac57..59c27c21b1c 100644
--- a/code/modules/martial_arts/martial.dm
+++ b/code/modules/martial_arts/martial.dm
@@ -39,6 +39,8 @@
var/combo_timer
/// If the user is preparing a martial arts stance.
var/in_stance = FALSE
+ /// The priority of which martial art is picked from all the ones someone knows, the higher the number, the higher the priority.
+ var/weight = 0
/datum/martial_art/New()
. = ..()
@@ -59,7 +61,7 @@
/datum/martial_art/proc/can_use(mob/living/carbon/human/H)
return !HAS_TRAIT(H, TRAIT_PACIFISM)
-/datum/martial_art/proc/act(step, mob/living/carbon/human/user, mob/living/carbon/human/target)
+/datum/martial_art/proc/act(step, mob/living/carbon/human/user, mob/living/carbon/human/target, could_start_new_combo = TRUE)
if(!can_use(user))
return MARTIAL_ARTS_CANNOT_USE
/*
@@ -73,19 +75,21 @@
combo_timer = addtimer(CALLBACK(src, PROC_REF(reset_combos)), COMBO_ALIVE_TIME, TIMER_UNIQUE | TIMER_STOPPABLE)
streak += intent_to_streak(step)
var/mob/living/carbon/human/owner = locateUID(owner_UID)
- owner?.hud_used.combo_display.update_icon(ALL, streak)
- return check_combos(step, user, target)
+ if(istype(owner) && !QDELETED(owner))
+ owner.hud_used.combo_display.update_icon(ALL, streak)
+ return check_combos(step, user, target, could_start_new_combo)
return FALSE
/datum/martial_art/proc/reset_combos()
current_combos.Cut()
streak = ""
var/mob/living/carbon/human/owner = locateUID(owner_UID)
- owner?.hud_used.combo_display.update_icon(ALL, streak)
+ if(istype(owner) && !QDELETED(owner))
+ owner.hud_used.combo_display.update_icon(ALL, streak)
for(var/combo_type in combos)
current_combos.Add(new combo_type())
-/datum/martial_art/proc/check_combos(step, mob/living/carbon/human/user, mob/living/carbon/human/target)
+/datum/martial_art/proc/check_combos(step, mob/living/carbon/human/user, mob/living/carbon/human/target, could_start_new_combo = TRUE)
. = FALSE
for(var/thing in current_combos)
var/datum/martial_combo/MC = thing
@@ -111,6 +115,8 @@
return TRUE
if(!LAZYLEN(current_combos))
reset_combos()
+ if(HAS_COMBOS && could_start_new_combo)
+ act(step, user, target, could_start_new_combo = FALSE)
/datum/martial_art/proc/basic_hit(mob/living/carbon/human/A, mob/living/carbon/human/D)
@@ -175,38 +181,40 @@
/datum/martial_art/proc/teach(mob/living/carbon/human/H, make_temporary = FALSE)
if(!H.mind)
return FALSE
- if(istype(H.mind.martial_art, src.type))
- return FALSE
+ for(var/datum/martial_art/MA in H.mind.known_martial_arts)
+ if(istype(MA, src))
+ return FALSE
if(has_explaination_verb)
H.verbs |= /mob/living/carbon/human/proc/martial_arts_help
- if(make_temporary)
- temporary = TRUE
if(has_dirslash)
H.verbs |= /mob/living/carbon/human/proc/dirslash_enabling
H.dirslash_enabled = TRUE
- if(temporary)
- if(H.mind.martial_art)
- base = H.mind.martial_art.base
- else
- base = src
+ temporary = make_temporary
+ H.mind.known_martial_arts.Add(src)
+ H.mind.martial_art = get_highest_weight(H)
owner_UID = H.UID()
- H.mind.martial_art = src
return TRUE
-/datum/martial_art/proc/remove(var/mob/living/carbon/human/H)
+/datum/martial_art/proc/remove(mob/living/carbon/human/H)
+ var/datum/martial_art/MA = src
if(!H.mind)
return FALSE
- if(H.mind.martial_art != src)
- return FALSE
- H.mind.martial_art = null // Remove reference
+ deltimer(combo_timer)
+ H.mind.known_martial_arts.Remove(MA)
+ H.mind.martial_art = get_highest_weight(H)
H.verbs -= /mob/living/carbon/human/proc/martial_arts_help
H.verbs -= /mob/living/carbon/human/proc/dirslash_enabling
H.dirslash_enabled = initial(H.dirslash_enabled)
- if(base)
- base.teach(H)
- base = null
return TRUE
+/// Returns the martial art with the highest weight from all the ones someone knows.
+/datum/martial_art/proc/get_highest_weight(mob/living/carbon/human/H)
+ var/datum/martial_art/highest_weight = null
+ for(var/datum/martial_art/MA in H.mind.known_martial_arts)
+ if(!highest_weight || MA.weight > highest_weight.weight)
+ highest_weight = MA
+ return highest_weight
+
/mob/living/carbon/human/proc/martial_arts_help()
set name = "Show Info"
set desc = "Gives information about the martial arts you know."
@@ -275,7 +283,7 @@
return
if(slot == slot_gloves)
var/mob/living/carbon/human/H = user
- style.teach(H,1)
+ style.teach(H, TRUE)
/obj/item/clothing/gloves/boxing/dropped(mob/user, silent = FALSE)
. = ..()
@@ -304,7 +312,7 @@
if(HAS_TRAIT(user, TRAIT_PACIFISM))
to_chat(user, "In spite of the grandiosity of the belt, you don't feel like getting into any fights.")
return
- style.teach(H,1)
+ style.teach(H, TRUE)
to_chat(user, "You have an urge to flex your muscles and get into a fight. You have the knowledge of a thousand wrestlers before you. You can remember more by using the show info verb in the martial arts tab.")
/obj/item/storage/belt/champion/wrestling/dropped(mob/user, silent = FALSE)
@@ -322,7 +330,22 @@
desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism."
icon = 'icons/obj/wizard.dmi'
icon_state ="scroll2"
- var/used = 0
+ var/used = FALSE
+
+
+/obj/item/plasma_fist_scroll/update_icon_state()
+ icon_state = used ? "blankscroll" : initial(icon_state)
+
+
+/obj/item/plasma_fist_scroll/update_name(updates = ALL)
+ . = ..()
+ name = used ? "empty scroll" : initial(name)
+
+
+/obj/item/plasma_fist_scroll/update_desc(updates = ALL)
+ . = ..()
+ desc = used ? "It's completely blank." : initial(desc)
+
/obj/item/plasma_fist_scroll/attack_self(mob/user as mob)
if(!ishuman(user))
@@ -333,10 +356,9 @@
var/datum/martial_art/plasma_fist/F = new/datum/martial_art/plasma_fist(null)
F.teach(H)
to_chat(H, "You have learned the ancient martial art of Plasma Fist.")
- used = 1
- desc = "It's completely blank."
- name = "empty scroll"
- icon_state = "blankscroll"
+ used = TRUE
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
+
/obj/item/sleeping_carp_scroll
name = "mysterious scroll"
@@ -404,7 +426,7 @@
item_state = "syringe_0"
/obj/item/CQC_manual/chef/attack_self(mob/living/carbon/human/user)
- if(!istype(user) || !user)
+ if(!istype(user))
return
if(user.mind && user.mind.assigned_role == "Chef")
to_chat(user, "You completely memorise the basics of CQC.")
@@ -476,9 +498,10 @@
icon_state = "bostaff0"
block_chance = 50
-/obj/item/twohanded/bostaff/update_icon()
- icon_state = "bostaff[wielded]"
- return
+
+/obj/item/twohanded/bostaff/update_icon_state()
+ icon_state = "bostaff[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user)
add_fingerprint(user)
@@ -504,7 +527,7 @@
return
switch(user.a_intent)
if(INTENT_DISARM)
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
if(!ishuman(target))
return ..()
@@ -535,9 +558,9 @@
return ..()
/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK)
- if(wielded)
+ if(HAS_TRAIT(src, TRAIT_WIELDED))
return ..()
- return 0
+ return FALSE
/obj/screen/combo
icon_state = ""
@@ -546,24 +569,33 @@
layer = ABOVE_HUD_LAYER
var/streak
+
/obj/screen/combo/proc/clear_streak()
cut_overlays()
streak = ""
icon_state = ""
+
/obj/screen/combo/update_icon(updates, _streak)
streak = _streak
- icon_state = ""
- if(!streak)
- clear_streak()
- return
- icon_state = "combo"
+ return ..()
+
+
+/obj/screen/combo/update_overlays()
+ . = list()
for(var/i in 1 to length(streak))
var/intent_text = copytext(streak, i, i + 1)
var/image/intent_icon = image(icon, src, "combo_[intent_text]")
intent_icon.pixel_x = 16 * (i - 1) - 8 * length(streak)
- overlays += intent_icon
- return ..()
+ . += intent_icon
+
+
+/obj/screen/combo/update_icon_state()
+ icon_state = ""
+ if(!streak)
+ return
+ icon_state = "combo"
+
#undef HAS_COMBOS
#undef COMBO_ALIVE_TIME
diff --git a/code/modules/martial_arts/mimejutsu.dm b/code/modules/martial_arts/mimejutsu.dm
index 941ce7ff6e6..edc19826470 100644
--- a/code/modules/martial_arts/mimejutsu.dm
+++ b/code/modules/martial_arts/mimejutsu.dm
@@ -1,5 +1,6 @@
/datum/martial_art/mimejutsu
name = "Mimejutsu"
+ weight = 6
block_chance = 50
has_explaination_verb = TRUE
combos = list(/datum/martial_combo/mimejutsu/mimechucks, /datum/martial_combo/mimejutsu/silent_palm, /datum/martial_combo/mimejutsu/silencer, /datum/martial_combo/mimejutsu/execution)
diff --git a/code/modules/martial_arts/mrchang.dm b/code/modules/martial_arts/mrchang.dm
index b7053152bbe..1a97aa3e0bf 100644
--- a/code/modules/martial_arts/mrchang.dm
+++ b/code/modules/martial_arts/mrchang.dm
@@ -1,6 +1,7 @@
//Техника агрессивного маркетинга мистера Ченга
/datum/martial_art/mr_chang
name = "Mr. Chang's Aggressive Marketing"
+ weight = 6
combos = list(/datum/martial_combo/mr_chang/steal_card)
has_explaination_verb = TRUE
var/stun_on_cooldown = FALSE
diff --git a/code/modules/martial_arts/plasma_fist.dm b/code/modules/martial_arts/plasma_fist.dm
index a216a5d730f..a8acd3e3f4b 100644
--- a/code/modules/martial_arts/plasma_fist.dm
+++ b/code/modules/martial_arts/plasma_fist.dm
@@ -1,5 +1,6 @@
/datum/martial_art/plasma_fist
name = "Plasma Fist"
+ weight = 6
combos = list(/datum/martial_combo/plasma_fist/tornado_sweep, /datum/martial_combo/plasma_fist/throwback, /datum/martial_combo/plasma_fist/plasma_fist)
has_explaination_verb = TRUE
diff --git a/code/modules/martial_arts/sleeping_carp.dm b/code/modules/martial_arts/sleeping_carp.dm
index 183fbdd0258..45c285be665 100644
--- a/code/modules/martial_arts/sleeping_carp.dm
+++ b/code/modules/martial_arts/sleeping_carp.dm
@@ -1,6 +1,7 @@
//Used by the gang of the same name. Uses combos. Basic attacks bypass armor and never miss
/datum/martial_art/the_sleeping_carp
name = "Спящий Карп"
+ weight = 9
deflection_chance = 100
reroute_deflection = TRUE
no_guns = TRUE
diff --git a/code/modules/martial_arts/synthojitsu.dm b/code/modules/martial_arts/synthojitsu.dm
index dc3f6fabd5b..ca81d5a326f 100644
--- a/code/modules/martial_arts/synthojitsu.dm
+++ b/code/modules/martial_arts/synthojitsu.dm
@@ -1,5 +1,6 @@
/datum/martial_art/synthojitsu
name = "Synthojitsu"
+ weight = 4
block_chance = 0
has_explaination_verb = TRUE
combos = list(/datum/martial_combo/synthojitsu/lock, /datum/martial_combo/synthojitsu/overload, /datum/martial_combo/synthojitsu/reanimate)
@@ -42,7 +43,20 @@
icon_state ="viable"
var/is_used = FALSE
-/obj/item/ipc_combat_upgrade/attack_self(mob/user as mob)
+
+/obj/item/ipc_combat_upgrade/update_icon_state()
+ icon_state = "[is_used ? "un" : ""]viable"
+
+
+/obj/item/ipc_combat_upgrade/update_desc(updates = ALL)
+ . = ..()
+ if(!is_used)
+ desc = initial(desc)
+ return
+ desc = "Advanced data storage designed to be compatible with positronic systems.This one include melee algorithms along with overwritten microbattery safety protocols.It's hardlocked"
+
+
+/obj/item/ipc_combat_upgrade/attack_self(mob/user)
if(!ismachineperson(user) || is_used == TRUE)
return
to_chat(user, "Installation sequence initialized. It will take some time...")
@@ -54,9 +68,8 @@
H.Weaken(10 SECONDS)
to_chat(H, "Melee algorithms installed. Safety disabled.")
is_used = TRUE
- desc = "Advanced data storage designed to be compatible with positronic systems.This one include melee algorithms along with overwritten microbattery safety protocols.It's hardlocked"
- name = "IPC combat upgrade"
- icon_state = "unviable"
+ update_appearance(UPDATE_ICON_STATE|UPDATE_DESC)
+
/datum/martial_art/synthojitsu/explaination_header(user)
to_chat(user, "You reapload some of the basics of synthojitsu.")
diff --git a/code/modules/martial_arts/throwing_knives.dm b/code/modules/martial_arts/throwing_knives.dm
index 7213f7a9b2b..b7e0d9ef5af 100644
--- a/code/modules/martial_arts/throwing_knives.dm
+++ b/code/modules/martial_arts/throwing_knives.dm
@@ -1,5 +1,6 @@
/datum/martial_art/throwing
name = "Knife techniques"
+ weight = 6
combos = list(/datum/martial_combo/throwing/remove_embended)
block_chance = 50 //if holding knife in hand
has_explaination_verb = TRUE
diff --git a/code/modules/martial_arts/wrestling.dm b/code/modules/martial_arts/wrestling.dm
index 3eb26bca97d..9647feb07f8 100644
--- a/code/modules/martial_arts/wrestling.dm
+++ b/code/modules/martial_arts/wrestling.dm
@@ -1,5 +1,6 @@
/datum/martial_art/wrestling
name = "Wrestling"
+ weight = 3
has_explaination_verb = TRUE
has_dirslash = FALSE
diff --git a/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm b/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm
index 3a0e9469852..c0469590cd4 100644
--- a/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm
+++ b/code/modules/mini_games/thunderdome/gamemodes/gamemode.dm
@@ -39,8 +39,6 @@
/obj/item/CQC_manual = 1,
/obj/item/sleeping_carp_scroll = 1,
/obj/item/clothing/gloves/fingerless/rapid = 1,
- /obj/item/storage/box/thunderdome/mr_chang_technique = 1,
- /obj/item/storage/box/thunderdome/mr_chang_technique/spicy = 1,
/obj/item/storage/box/thunderdome/spears = 1,
/obj/item/storage/box/thunderdome/maga = 1,
/obj/item/storage/box/thunderdome/singulatiry = 1,
@@ -72,7 +70,7 @@
/obj/item/gun/projectile/shotgun/boltaction = 1,
/obj/item/gun/projectile/shotgun/automatic/combat = 2,
/obj/item/gun/projectile/automatic/pistol/APS = 1,
- /obj/item/gun/projectile/automatic/pistol/sp8ar = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8ar = 1,
/obj/item/gun/projectile/automatic/pistol/m1911 = 1,
/obj/item/gun/projectile/revolver/golden = 1,
/obj/item/gun/projectile/revolver/nagant = 1,
@@ -132,7 +130,7 @@
/obj/item/gun/projectile/shotgun/boltaction = 1,
/obj/item/gun/projectile/shotgun/automatic/combat = 2,
/obj/item/gun/projectile/automatic/pistol/APS = 1,
- /obj/item/gun/projectile/automatic/pistol/sp8ar = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8ar = 1,
/obj/item/gun/projectile/automatic/pistol/m1911 = 1,
/obj/item/gun/projectile/revolver/golden = 1,
/obj/item/gun/projectile/revolver/nagant = 1,
@@ -142,4 +140,25 @@
/obj/item/storage/box/thunderdome/crossbow/energy = 1,
/obj/item/storage/box/thunderdome/laser_eyes = 1,
/obj/item/implanter/adrenalin = 1,
+ /obj/item/melee/rapier = 1,
+ /obj/item/melee/energy/axe = 1,
+ /obj/item/melee/energy/sword/saber/red = 1,
+ /obj/item/melee/energy/cleaving_saw = 1,
+ /obj/item/twohanded/mjollnir = 1,
+ /obj/item/twohanded/chainsaw = 1,
+ /obj/item/twohanded/dualsaber = 1,
+ /obj/item/twohanded/fireaxe = 1,
+ /obj/item/melee/icepick = 1,
+ /obj/item/melee/candy_sword = 1,
+ /obj/item/melee/energy/sword/pirate = 1,
+ /obj/item/storage/toolbox/surgery = 1,
+ /obj/item/storage/toolbox/mechanical = 1,
+ /obj/item/storage/toolbox/syndicate = 1,
+ /obj/item/storage/box/syndie_kit/mantisblade = 1,
+ /obj/item/CQC_manual = 1,
+ /obj/item/sleeping_carp_scroll = 1,
+ /obj/item/clothing/gloves/fingerless/rapid = 1,
+ /obj/item/storage/box/thunderdome/spears = 1,
+ /obj/item/storage/box/thunderdome/maga = 1,
+ /obj/item/storage/box/thunderdome/singulatiry = 1,
)
diff --git a/code/modules/mining/abandonedcrates.dm b/code/modules/mining/abandonedcrates.dm
index 5e6561bd36d..d0c4aed9906 100644
--- a/code/modules/mining/abandonedcrates.dm
+++ b/code/modules/mining/abandonedcrates.dm
@@ -180,7 +180,7 @@
if(istype(W, /obj/item/card/emag))
boom(user)
return 1
- if(istype(W, /obj/item/multitool))
+ if(W.tool_behaviour == TOOL_MULTITOOL)
add_fingerprint(user)
to_chat(user, "DECA-CODE LOCK REPORT:")
if(attempts == 1)
diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm
index 59738cd2fa3..2d35238543f 100644
--- a/code/modules/mining/equipment/explorer_gear.dm
+++ b/code/modules/mining/equipment/explorer_gear.dm
@@ -75,15 +75,18 @@
allowed = list(/obj/item/flashlight, /obj/item/tank, /obj/item/resonator, /obj/item/mining_scanner, /obj/item/t_scanner/adv_mining_scanner, /obj/item/gun/energy/kinetic_accelerator, /obj/item/pickaxe, /obj/item/twohanded/kinetic_crusher, /obj/item/hierophant_club, /obj/item/twohanded/fireaxe/boneaxe)
jetpack = /obj/item/tank/jetpack/suit
-/obj/item/clothing/suit/space/hostile_environment/New()
+
+/obj/item/clothing/suit/space/hostile_environment/Initialize(mapload)
+ . = ..()
AddComponent(/datum/component/spraycan_paintable)
START_PROCESSING(SSobj, src)
- ..()
+
/obj/item/clothing/suit/space/hostile_environment/Destroy()
STOP_PROCESSING(SSobj, src)
return ..()
+
/obj/item/clothing/suit/space/hostile_environment/process()
var/mob/living/carbon/C = loc
if(istype(C) && prob(2)) //cursed by bubblegum
@@ -103,17 +106,17 @@
armor = list("melee" = 70, "bullet" = 50, "laser" = 50, "energy" = 50, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
resistance_flags = FIRE_PROOF | LAVA_PROOF | ACID_PROOF
-/obj/item/clothing/head/helmet/space/hostile_environment/New()
- ..()
+
+/obj/item/clothing/head/helmet/space/hostile_environment/Initialize(mapload)
+ . = ..()
AddComponent(/datum/component/spraycan_paintable)
- update_icon()
-
-/obj/item/clothing/head/helmet/space/hostile_environment/update_icon()
- ..()
- cut_overlays()
- var/mutable_appearance/glass_overlay = mutable_appearance(icon, "hostile_env_glass")
- glass_overlay.appearance_flags = RESET_COLOR
- add_overlay(glass_overlay)
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/clothing/head/helmet/space/hostile_environment/update_overlays()
+ . = ..()
+ . += mutable_appearance(icon, "hostile_env_glass", appearance_flags = RESET_COLOR)
+
/obj/item/clothing/head/helmet/space/hardsuit/champion
name = "champion's helmet"
diff --git a/code/modules/mining/equipment/kinetic_crusher.dm b/code/modules/mining/equipment/kinetic_crusher.dm
index ca7de1c5a13..3677a45ea47 100644
--- a/code/modules/mining/equipment/kinetic_crusher.dm
+++ b/code/modules/mining/equipment/kinetic_crusher.dm
@@ -62,7 +62,7 @@
to_chat(user, "There are no trophies on [src].")
/obj/item/twohanded/kinetic_crusher/attack(mob/living/target, mob/living/carbon/user)
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
to_chat(user, "[src] is too heavy to use with one hand. You fumble and drop everything.")
user.drop_r_hand()
user.drop_l_hand()
@@ -90,7 +90,7 @@
/obj/item/twohanded/kinetic_crusher/afterattack(atom/target, mob/living/user, proximity_flag, clickparams)
. = ..()
- if(!wielded)
+ if(!HAS_TRAIT(src, TRAIT_WIELDED))
return
if(user.has_status_effect(STATUS_EFFECT_DASH) && user.a_intent == INTENT_HELP)
if(user.throw_at(target, range = 3, speed = 3, spin = FALSE, diagonals_first = TRUE))
@@ -164,21 +164,27 @@
else
set_light(0)
-/obj/item/twohanded/kinetic_crusher/update_icon()
- ..()
- cut_overlays()
+
+/obj/item/twohanded/kinetic_crusher/update_icon_state()
+ if(upgraded)
+ item_state = "magmite_crusher[HAS_TRAIT(src, TRAIT_WIELDED)]"
+ else
+ item_state = "crusher[HAS_TRAIT(src, TRAIT_WIELDED)]"
+
+
+/obj/item/twohanded/kinetic_crusher/update_overlays()
+ . = ..()
if(!charged)
- add_overlay("[icon_state]_uncharged")
+ . += "[icon_state]_uncharged"
if(light_on)
- add_overlay("[icon_state]_lit")
- spawn(1)
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
- if(!upgraded)
- item_state = "crusher[wielded]"
- else
- item_state = "magmite_crusher[wielded]"
+ . += "[icon_state]_lit"
+ addtimer(CALLBACK(src, PROC_REF(buttons_update)), 0.1 SECONDS)
+
+
+/obj/item/twohanded/kinetic_crusher/proc/buttons_update()
+ for(var/datum/action/action as anything in actions)
+ action.UpdateButtonIcon()
+
//destablizing force
/obj/item/projectile/destabilizer
@@ -402,7 +408,8 @@
if(.)
H.force += bonus_value * 0.2
H.force_unwielded += bonus_value * 0.2
- H.force_wielded += bonus_value * 0.2
+ // don't update force since KCs have 0 force by default
+ H.AddComponent(/datum/component/two_handed, force_wielded = H.force_wielded, force_unwielded = H.force)
H.detonation_damage += bonus_value * 0.8
/obj/item/crusher_trophy/demon_claws/remove_from(obj/item/twohanded/kinetic_crusher/H, mob/living/user)
@@ -410,7 +417,7 @@
if(.)
H.force -= bonus_value * 0.2
H.force_unwielded -= bonus_value * 0.2
- H.force_wielded -= bonus_value * 0.2
+ H.AddComponent(/datum/component/two_handed, force_wielded = H.force_wielded, force_unwielded = H.force)
H.detonation_damage -= bonus_value * 0.8
/obj/item/crusher_trophy/demon_claws/on_melee_hit(mob/living/target, mob/living/user)
diff --git a/code/modules/mining/equipment/lazarus_injector.dm b/code/modules/mining/equipment/lazarus_injector.dm
index cd9aeb3677f..66cea2273d0 100644
--- a/code/modules/mining/equipment/lazarus_injector.dm
+++ b/code/modules/mining/equipment/lazarus_injector.dm
@@ -10,10 +10,15 @@
w_class = WEIGHT_CLASS_SMALL
throw_speed = 3
throw_range = 5
- var/loaded = 1
+ var/loaded = TRUE
var/malfunctioning = 0
var/revive_type = SENTIENCE_ORGANIC //So you can't revive boss monsters or robots with it
+
+/obj/item/lazarus_injector/update_icon_state()
+ icon_state = "lazarus_[loaded ? "hypo" : "empty"]"
+
+
/obj/item/lazarus_injector/afterattack(atom/target, mob/user, proximity_flag)
if(!loaded)
return
@@ -37,10 +42,10 @@
add_game_logs("[user] has revived hostile mob [target] with a malfunctioning lazarus injector", user)
else
H.attack_same = 0
- loaded = 0
+ loaded = FALSE
user.visible_message("[user] injects [M] with [src], reviving it.")
playsound(src,'sound/effects/refill.ogg',50,1)
- icon_state = "lazarus_empty"
+ update_icon(UPDATE_ICON_STATE)
return
else
to_chat(user, "[src] is only effective on the dead.")
@@ -116,9 +121,14 @@
captured.forceMove(get_turf(src))
captured = null
+
+/obj/item/mobcapsule/update_icon_state()
+ icon_state = "mobcap[colorindex]"
+
+
/obj/item/mobcapsule/attack_self(mob/user)
colorindex += 1
if(colorindex >= 6)
colorindex = 0
- icon_state = "mobcap[colorindex]"
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
diff --git a/code/modules/mining/equipment/marker_beacons.dm b/code/modules/mining/equipment/marker_beacons.dm
index 761d8560314..43619296302 100644
--- a/code/modules/mining/equipment/marker_beacons.dm
+++ b/code/modules/mining/equipment/marker_beacons.dm
@@ -34,14 +34,14 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/item/stack/marker_beacon/Initialize(mapload)
. = ..()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/item/stack/marker_beacon/examine(mob/user)
. = ..()
. += "Use in-hand to place a [singular_name]."
. += "Alt-click to select a color. Current color is [picked_color]."
-/obj/item/stack/marker_beacon/update_icon()
+/obj/item/stack/marker_beacon/update_icon_state()
icon_state = "[initial(icon_state)][lowertext(picked_color)]"
/obj/item/stack/marker_beacon/attack_self(mob/user)
@@ -65,7 +65,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
return
if(input_color)
picked_color = input_color
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
/obj/structure/marker_beacon
name = "marker beacon"
@@ -84,25 +84,31 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
/obj/structure/marker_beacon/Initialize(mapload, set_color)
. = ..()
picked_color = set_color
- update_icon()
+ update_state()
/obj/structure/marker_beacon/deconstruct(disassembled = TRUE)
if(!(flags & NODECONSTRUCT))
var/obj/item/stack/marker_beacon/M = new(loc)
M.picked_color = picked_color
- M.update_icon()
+ M.update_icon(UPDATE_ICON_STATE)
qdel(src)
/obj/structure/marker_beacon/examine(mob/user)
. = ..()
. += "Alt-click to select a color. Current color is [picked_color]."
-/obj/structure/marker_beacon/update_icon()
+
+/obj/structure/marker_beacon/update_icon_state()
while(!picked_color || !GLOB.marker_beacon_colors[picked_color])
picked_color = pick(GLOB.marker_beacon_colors)
icon_state = "[initial(icon_state)][lowertext(picked_color)]-on"
+
+
+/obj/structure/marker_beacon/proc/update_state()
+ update_icon(UPDATE_ICON_STATE)
set_light(light_range, light_power, GLOB.marker_beacon_colors[picked_color])
+
/obj/structure/marker_beacon/attack_hand(mob/living/user)
. = ..()
if(.)
@@ -114,7 +120,7 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
if(do_after(user, remove_speed, target = src))
var/obj/item/stack/marker_beacon/M = new(drop_location())
M.picked_color = picked_color
- M.update_icon()
+ M.update_icon(UPDATE_ICON_STATE)
transfer_fingerprints_to(M)
user.put_in_hands(M, ignore_anim = FALSE)
playsound(src, 'sound/items/deconstruct.ogg', 50, TRUE)
@@ -140,4 +146,4 @@ GLOBAL_LIST_INIT(marker_beacon_colors, list(
return
if(input_color)
picked_color = input_color
- update_icon()
+ update_state()
diff --git a/code/modules/mining/equipment/mineral_scanner.dm b/code/modules/mining/equipment/mineral_scanner.dm
index fc49ee0993f..cf3f2508f58 100644
--- a/code/modules/mining/equipment/mineral_scanner.dm
+++ b/code/modules/mining/equipment/mineral_scanner.dm
@@ -43,6 +43,7 @@
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results. This one has an extended range. \nIt has a speaker that can be toggled with alt+click"
name = "advanced automatic mining scanner"
icon_state = "adv_mining0"
+ base_icon_state = "adv_mining"
item_state = "analyzer"
w_class = WEIGHT_CLASS_SMALL
flags = CONDUCT
@@ -67,6 +68,7 @@
/obj/item/t_scanner/adv_mining_scanner/lesser
name = "automatic mining scanner"
icon_state = "mining0"
+ base_icon_state = "mining"
desc = "A scanner that automatically checks surrounding rock for useful minerals; it can also be used to stop gibtonite detonations. Wear meson scanners for optimal results. \nIt has a speaker that can be toggled with alt+click"
range = 4
cooldown = 50
diff --git a/code/modules/mining/equipment/mining_charges.dm b/code/modules/mining/equipment/mining_charges.dm
index 6a3bddc3667..4895441d3db 100644
--- a/code/modules/mining/equipment/mining_charges.dm
+++ b/code/modules/mining/equipment/mining_charges.dm
@@ -5,7 +5,7 @@
icon = 'icons/obj/mining.dmi'
icon_state = "mining-charge-2"
item_state = "charge_indust"
- det_time = 5
+ det_time = 5 SECONDS
notify_admins = FALSE // no need to make adminlogs on lavaland, while they are "safe" to use
var/timer_off = FALSE
var/installed = FALSE
@@ -192,13 +192,13 @@
. += "[bicon(charge)] [charge]. Current status: [charge.installed ? "ready to detonate" : "ready to deploy"]."
-/obj/item/detonator/update_icon()
- . = ..()
- if(bombs.len)
+/obj/item/detonator/update_icon_state()
+ if(length(bombs))
icon_state = "Detonator-1"
else
icon_state = initial(icon_state)
+
/obj/item/detonator/attack_self(mob/user)
playsound(src, 'sound/items/detonator.ogg', 40)
if(bombs.len)
@@ -213,5 +213,5 @@
charge.detonate()
else
to_chat(user, span_warning("There is no charges linked to a detonator!"))
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
. = ..()
diff --git a/code/modules/mining/equipment/regenerative_core.dm b/code/modules/mining/equipment/regenerative_core.dm
index a2f37176169..48b30d10617 100644
--- a/code/modules/mining/equipment/regenerative_core.dm
+++ b/code/modules/mining/equipment/regenerative_core.dm
@@ -120,14 +120,22 @@
. = ..()
update_icon()
-/obj/item/organ/internal/regenerative_core/legion/update_icon()
+
+/obj/item/organ/internal/regenerative_core/legion/update_icon_state()
icon_state = inert ? "legion_soul_inert" : "legion_soul"
- cut_overlays()
+
+
+/obj/item/organ/internal/regenerative_core/legion/update_overlays()
+ . = ..()
if(!inert && !preserved)
- add_overlay("legion_soul_crackle")
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
+ . += "legion_soul_crackle"
+ addtimer(CALLBACK(src, PROC_REF(buttons_update)), 0.1 SECONDS)
+
+
+/obj/item/organ/internal/regenerative_core/legion/proc/buttons_update()
+ for(var/datum/action/action as anything in actions)
+ action.UpdateButtonIcon()
+
/obj/item/organ/internal/regenerative_core/legion/go_inert()
..()
diff --git a/code/modules/mining/equipment/survival_pod.dm b/code/modules/mining/equipment/survival_pod.dm
index b1fb1e4a627..d8068e82f76 100644
--- a/code/modules/mining/equipment/survival_pod.dm
+++ b/code/modules/mining/equipment/survival_pod.dm
@@ -202,7 +202,7 @@
pixel_y = -32
/obj/item/gps/computer/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
playsound(loc, W.usesound, 50, 1)
user.visible_message("[user] disassembles the gps.", \
"You start to disassemble the gps...", "You hear clanking and banging noises.")
@@ -295,7 +295,7 @@
qdel(src)
/obj/structure/fans/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
playsound(loc, W.usesound, 50, 1)
user.visible_message("[user] disassembles the fan.", \
"You start to disassemble the fan...", "You hear clanking and banging noises.")
@@ -338,7 +338,7 @@
density = 0
/obj/structure/tubes/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
playsound(loc, W.usesound, 50, 1)
user.visible_message("[user] disassembles [src].", \
"You start to disassemble [src]...", "You hear clanking and banging noises.")
@@ -365,7 +365,7 @@
/obj/item/gun/magic/staff/spellblade,
/obj/item/gun/magic/wand/death,
/obj/item/gun/magic/wand/fireball,
- /obj/item/stack/telecrystal/hundread,
+ /obj/item/stack/telecrystal/hundred,
/obj/item/banhammer)
/obj/item/fakeartefact/New()
diff --git a/code/modules/mining/equipment/upgrades.dm b/code/modules/mining/equipment/upgrades.dm
index 715b95301bb..e45ecaf8b21 100644
--- a/code/modules/mining/equipment/upgrades.dm
+++ b/code/modules/mining/equipment/upgrades.dm
@@ -18,24 +18,39 @@
. = ..()
addtimer(CALLBACK(src, PROC_REF(go_inert)), 50 SECONDS) //you know...
+
+/obj/item/magmite_parts/update_icon_state()
+ icon_state = "upgrade_parts[inert ? "_inert" : ""]"
+
+
+/obj/item/magmite_parts/update_name(updates = ALL)
+ . = ..()
+ name = initial(name)
+ if(inert)
+ name = "inert [name]"
+
+
+/obj/item/magmite_parts/update_desc(updates = ALL)
+ . = ..()
+ desc = inert ? "It appears to have lost its magma-like glow." : initial(desc)
+
+
/obj/item/magmite_parts/proc/go_inert()
if(inert)
return
visible_message(span_warning("The [src] loses it's glow!"))
inert = TRUE
- name = "inert plasma magmite upgrade parts"
- icon_state = "upgrade_parts_inert"
- desc += "It appears to have lost its magma-like glow."
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
+
/obj/item/magmite_parts/proc/restore()
if(!inert)
return
inert = FALSE
- name = initial(name)
- icon_state = initial(icon_state)
- desc = initial(desc)
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME|UPDATE_DESC)
addtimer(CALLBACK(src, PROC_REF(go_inert)), 50 SECONDS)
+
/obj/item/magmite_parts/afterattack(atom/target, mob/user, proximity_flag, click_parameters)
if(!proximity_flag)
return
diff --git a/code/modules/mining/equipment/weather_radio.dm b/code/modules/mining/equipment/weather_radio.dm
index 1c7937541f8..389f9954ebb 100644
--- a/code/modules/mining/equipment/weather_radio.dm
+++ b/code/modules/mining/equipment/weather_radio.dm
@@ -28,7 +28,7 @@
START_PROCESSING(SSprocessing, src)
set_frequency(SUP_FREQ)
update_light_color()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/radio/weather_monitor/Destroy()
. = ..()
@@ -41,18 +41,18 @@
if(previous_level == warning_level && previous_danger == is_weather_dangerous)
return // No change
atom_say(get_warning_message())
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
update_light_color()
-/obj/item/radio/weather_monitor/update_icon()
- overlays.Cut()
+/obj/item/radio/weather_monitor/update_overlays()
+ . = ..()
switch(warning_level)
if(WEATHER_ALERT_CLEAR)
- overlays += state_normal
+ . += state_normal
if(WEATHER_ALERT_INCOMING)
- overlays += state_warning
+ . += state_warning
if(WEATHER_ALERT_IMMINENT_OR_ACTIVE)
- overlays += (is_weather_dangerous) ? state_danger : state_warning
+ . += is_weather_dangerous ? state_danger : state_warning
/obj/item/radio/weather_monitor/proc/update_light_color()
switch(warning_level)
diff --git a/code/modules/mining/fulton.dm b/code/modules/mining/fulton.dm
index f880c90c394..3f2e15fa28b 100644
--- a/code/modules/mining/fulton.dm
+++ b/code/modules/mining/fulton.dm
@@ -38,15 +38,15 @@ GLOBAL_LIST_EMPTY(total_extraction_beacons)
beacon = A
to_chat(user, "You link the extraction pack to the beacon system.")
-/obj/item/extraction_pack/MouseDrop(atom/over)
+/obj/item/extraction_pack/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
if(!..())
return FALSE
- if(!(loc == usr && loc.Adjacent(over)))
+ if(!(loc == usr && loc.Adjacent(over_object)))
return FALSE
- if(usr.stat || !ishuman(usr) || usr.incapacitated())
+ if(!ishuman(usr) || usr.incapacitated())
return FALSE
- over.add_fingerprint(usr)
- afterattack(over, usr, TRUE)
+ over_object.add_fingerprint(usr)
+ afterattack(over_object, usr, TRUE, params)
return TRUE
/obj/item/extraction_pack/afterattack(atom/movable/A, mob/living/carbon/human/user, flag, params)
diff --git a/code/modules/mining/lavaland/loot/hierophant_loot.dm b/code/modules/mining/lavaland/loot/hierophant_loot.dm
index 1cd2ac26826..29958f11501 100644
--- a/code/modules/mining/lavaland/loot/hierophant_loot.dm
+++ b/code/modules/mining/lavaland/loot/hierophant_loot.dm
@@ -109,19 +109,18 @@
chaser_speed = max(chaser_speed + health_percent, 0.5) //one tenth of a second faster for each missing 10% of health
blast_range -= round(health_percent * 10) //one additional range for each missing 10% of health
-/obj/item/hierophant_club/update_icon()
+
+/obj/item/hierophant_club/update_icon_state()
icon_state = "hierophant_club[timer <= world.time ? "_ready":""][(beacon && !QDELETED(beacon)) ? "":"_beacon"]"
item_state = icon_state
- if(ismob(loc))
- var/mob/M = loc
- M.update_inv_l_hand()
- M.update_inv_r_hand()
- M.update_inv_back()
+ update_equipped_item()
+
/obj/item/hierophant_club/proc/prepare_icon_update()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
sleep(timer - world.time)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/hierophant_club/ui_action_click(mob/user, actiontype)
if(actiontype == /datum/action/item_action/toggle_unfriendly_fire) //toggle friendly fire...
@@ -174,7 +173,8 @@
user.visible_message("[user] starts to glow faintly...")
timer = world.time + 50
INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
- beacon.icon_state = "hierophant_tele_on"
+ beacon.teleporting = TRUE
+ beacon.update_icon(UPDATE_ICON_STATE)
var/obj/effect/temp_visual/hierophant/telegraph/edge/TE1 = new /obj/effect/temp_visual/hierophant/telegraph/edge(user.loc)
var/obj/effect/temp_visual/hierophant/telegraph/edge/TE2 = new /obj/effect/temp_visual/hierophant/telegraph/edge(beacon.loc)
if(do_after(user, 40, target = user) && user && beacon)
@@ -186,7 +186,8 @@
user.update_action_buttons_icon()
timer = world.time
INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
- beacon.icon_state = "hierophant_tele_off"
+ beacon.teleporting = FALSE
+ beacon.update_icon(UPDATE_ICON_STATE)
return
new /obj/effect/temp_visual/hierophant/telegraph(T, user)
new /obj/effect/temp_visual/hierophant/telegraph(source, user)
@@ -199,7 +200,8 @@
timer = world.time
INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
if(beacon)
- beacon.icon_state = "hierophant_tele_off"
+ beacon.teleporting = FALSE
+ beacon.update_icon(UPDATE_ICON_STATE)
return
if(is_blocked_turf(T, TRUE))
teleporting = FALSE
@@ -207,7 +209,8 @@
user.update_action_buttons_icon()
timer = world.time
INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
- beacon.icon_state = "hierophant_tele_off"
+ beacon.teleporting = FALSE
+ beacon.update_icon(UPDATE_ICON_STATE)
return
add_attack_logs(user, beacon, "Teleported self from ([AREACOORD(source)]) to ([AREACOORD(beacon)])")
new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, user)
@@ -222,14 +225,16 @@
INVOKE_ASYNC(src, PROC_REF(teleport_mob), source, L, T, user) //regardless, take all mobs near us along
sleep(6) //at this point the blasts detonate
if(beacon)
- beacon.icon_state = "hierophant_tele_off"
+ beacon.teleporting = FALSE
+ beacon.update_icon(UPDATE_ICON_STATE)
else
qdel(TE1)
qdel(TE2)
timer = world.time
INVOKE_ASYNC(src, PROC_REF(prepare_icon_update))
if(beacon)
- beacon.icon_state = "hierophant_tele_off"
+ beacon.teleporting = FALSE
+ beacon.update_icon(UPDATE_ICON_STATE)
teleporting = FALSE
if(user)
user.update_action_buttons_icon()
@@ -295,4 +300,260 @@
var/obj/effect/temp_visual/hierophant/blast/B = new(t, user, friendly_fire_check)
B.damage = 15 //keeps monster damage boost due to lower damage
+/obj/item/clothing/accessory/necklace/hierophant_talisman
+ name = "Dormnant talisman of warding"
+ desc = "Hierophant's talisman of warding. It will save you."
+ icon = 'icons/obj/lavaland/artefacts.dmi'
+ icon_state = "hierophant_talisman_nonactive"
+ item_state = "hierophant_talisman_nonactive"
+ item_color = "hierophant_talisman_nonactive"
+ armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 5, "bomb" = 20, "bio" = 20, "rad" = 5, "fire" = 100, "acid" = 100)
+ slot_flags = SLOT_TIE
+ allow_duplicates = FALSE
+ var/possessed = FALSE
+ var/mob/living/simple_animal/shade/talisman/slave // Talisman
+ var/obj/effect/proc_holder/spell/hierophant_talisman_heal/spell_heal
+ var/obj/effect/proc_holder/spell/hierophant_talisman_teleport/spell_teleport
+ var/obj/effect/proc_holder/spell/hierophant_talisman_message/spell_message
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/attack_self(mob/living/user)
+ if(possessed)
+ if(!slave)
+ to_chat(user, span_hierophant("Still searching unique soul for you.."))
+ return
+ if(slave.master != user.ckey)
+ to_chat(slave, span_hierophant("Now you are serving to [user.real_name]. You must ward him."))
+ to_chat(user, span_hierophant("Now this talisman is yours... It will ward you..."))
+ log_game("[user.real_name] has become master of [slave.ckey] hierophant's talisman.")
+ slave.master = user.ckey
+ else
+ to_chat(user, span_hierophant("This talisman is already yours... WHAT ELSE YOU NEED!?"))
+ return
+
+
+ to_chat(user, span_hierophant("You attempt to awake my appertience..."))
+
+ possessed = TRUE
+
+ var/list/mob/dead/observer/candidates = SSghost_spawns.poll_candidates("Do you want to play as the spirit of [user.real_name]'s talisman of warding?", ROLE_PAI, FALSE, 15 SECONDS, source = src)
+ var/mob/dead/observer/theghost = null
+
+ if(length(candidates))
+ theghost = pick(candidates)
+ slave = new(src)
+ slave.ckey = theghost.ckey
+ slave.master = user.ckey
+ name = "Talisman of warding"
+ slave.real_name = name
+ slave.name = name
+ var/input = stripped_input(slave, "What are you named?", null, "", MAX_NAME_LEN)
+ if(QDELETED(src))
+ return
+ if(input)
+ name = input
+ slave.real_name = input
+ slave.name = input
+ log_game("[slave.ckey] has become spirit of [user.real_name]'s talisman.")
+ to_chat(slave, span_hierophant("Now you are serving to [user.real_name]. You must ward him."))
+ update_icon(UPDATE_ICON_STATE)
+ else
+ log_game("No one has decided to be [user.real_name]'s talisman.")
+ to_chat(user, span_hierophant("This talisman is dormnant... Try again or later..."))
+ possessed = FALSE
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/update_icon_state()
+ icon_state = "hierpohant_talisman_active"
+ item_state = "hierpohant_talisman_active"
+ item_color = "hierophant_talisman_active"
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/Initialize(mapload)
+ .=..()
+ spell_heal = new
+ spell_teleport = new
+ spell_message = new
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/Destroy()
+ for(var/mob/living/simple_animal/shade/talisman/S in contents)
+ to_chat(S, span_hierophant("You were destroyed! So... I will create another one in future."))
+ playsound(get_turf(src),'sound/magic/repulse.ogg', 200, 1)
+ S.ghostize()
+ qdel(S)
+ QDEL_NULL(spell_heal)
+ QDEL_NULL(spell_teleport)
+ QDEL_NULL(spell_message)
+ return ..()
+
+/obj/effect/proc_holder/spell/hierophant_talisman_heal
+ name = "Beacon of help"
+ desc = "Healing your master."
+ base_cooldown = 20 SECONDS
+ clothes_req = FALSE
+ human_req = FALSE
+ phase_allowed = TRUE
+ should_recharge_after_cast = FALSE
+ stat_allowed = UNCONSCIOUS
+ action_icon_state = "hierophant_talisman_heal"
+ action_background_icon_state = "bg_hierophant_talisman"
+ panel = "Hierophant Talisman"
+
+/obj/effect/proc_holder/spell/hierophant_talisman_heal/create_new_targeting()
+ var/datum/spell_targeting/targeted/T = new()
+ T.target_priority = SPELL_TARGET_CLOSEST
+ T.max_targets = 1
+ T.range = 1
+ T.use_turf_of_user = TRUE
+ return T
+
+/obj/effect/proc_holder/spell/hierophant_talisman_heal/valid_target(mob/living/carbon/human/target, mob/living/simple_animal/shade/talisman/user)
+ if (target.ckey == user.master)
+ return TRUE
+ return FALSE
+
+/obj/effect/proc_holder/spell/hierophant_talisman_heal/cast(list/targets, mob/living/simple_animal/shade/talisman/user = usr)
+ var/mob/living/carbon/human/target = targets[1]
+ target.adjustBruteLoss(-15)
+ target.adjustFireLoss(-15)
+ target.adjustToxLoss(-15)
+ if(target.health / target.maxHealth <= 0.25)
+ cooldown_handler.start_recharge(10 SECONDS)
+ to_chat(user, span_hierophant("This creature is dying... Pathetic but... You must protect this creature..."))
+ else
+ cooldown_handler.start_recharge(20 SECONDS)
+ to_chat(user, span_hierophant("You are warding... This creature... Very well my apprentice."))
+ to_chat(target, span_hierophant("My talisman is warding you... Pathetic..."))
+
+/obj/effect/proc_holder/spell/hierophant_talisman_teleport
+ name = "Hierophant's lesser teleportation"
+ desc = "Blink your master to location."
+ base_cooldown = 30 SECONDS
+ clothes_req = FALSE
+ human_req = FALSE
+ phase_allowed = TRUE
+ should_recharge_after_cast = FALSE
+ stat_allowed = UNCONSCIOUS
+ centcom_cancast = FALSE
+ action_icon_state = "hierophant_talisman_teleport"
+ action_background_icon_state = "bg_hierophant_talisman"
+ panel = "Hierophant Talisman"
+
+/obj/effect/proc_holder/spell/hierophant_talisman_teleport/create_new_targeting()
+ var/datum/spell_targeting/click/T = new()
+ T.allowed_type = /turf/simulated
+ T.range = 3
+ T.use_turf_of_user = TRUE
+ return T
+
+/obj/effect/proc_holder/spell/hierophant_talisman_teleport/cast(list/targets, mob/living/simple_animal/shade/talisman/user)
+ var/turf/target_turf = get_turf(targets[1])
+ for(var/mob/living/carbon/human/H in GLOB.human_list)
+ if(H.ckey == user.master)
+ var/turf/start_turf = get_turf(H)
+ H.forceMove(target_turf)
+ new /obj/effect/temp_visual/hierophant/telegraph(target_turf, src)
+ new /obj/effect/temp_visual/hierophant/telegraph(start_turf, src)
+ playsound(start_turf,'sound/machines/airlock_open.ogg', 200, 1)
+ if(H.health / H.maxHealth <= 0.25)
+ cooldown_handler.start_recharge(15 SECONDS)
+ to_chat(user, span_hierophant("Blink! Blink! Blink! You shall never surrender."))
+ user.say("Instant teleportation, my fellow friend!")
+ else
+ cooldown_handler.start_recharge(30 SECONDS)
+ to_chat(user, span_hierophant("Dance, my pretties!"))
+ user.say("Blink, my fellow friend!")
+ addtimer(CALLBACK(src, PROC_REF(talisman_teleport_2), target_turf, start_turf), 2)
+ break
+
+/obj/effect/proc_holder/spell/hierophant_talisman_teleport/proc/talisman_teleport_2(turf/T, turf/S)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(T, src)
+ new /obj/effect/temp_visual/hierophant/telegraph/teleport(S, src)
+ animate(src, alpha = 0, time = 2, easing = EASE_OUT) //fade out
+ visible_message(span_hierophant("[src] fades out!"))
+ set_density(FALSE)
+ addtimer(CALLBACK(src, PROC_REF(talisman_teleport_3), T), 2)
+
+/obj/effect/proc_holder/spell/hierophant_talisman_teleport/proc/talisman_teleport_3(turf/T)
+ animate(src, alpha = 255, time = 2, easing = EASE_IN) //fade IN
+ set_density(TRUE)
+ visible_message(span_hierophant("[src] fades in!"))
+
+/obj/effect/proc_holder/spell/hierophant_talisman_message
+ name = "Telepathtic Message"
+ desc = "Send a telepathic message to those humans."
+ base_cooldown = 5 SECONDS
+ clothes_req = FALSE
+ human_req = FALSE
+ phase_allowed = TRUE
+ should_recharge_after_cast = TRUE
+ stat_allowed = UNCONSCIOUS
+ action_icon_state = "hierophant_talisman_message"
+ action_background_icon_state = "bg_hierophant_talisman"
+ panel = "Hierophant Talisman"
+
+/obj/effect/proc_holder/spell/hierophant_talisman_message/create_new_targeting()
+ var/datum/spell_targeting/click/T = new()
+ T.selection_type = SPELL_SELECTION_RANGE
+ T.use_turf_of_user = TRUE
+ return T
+
+/obj/effect/proc_holder/spell/hierophant_talisman_message/cast(list/targets, mob/living/simple_animal/shade/talisman/user)
+ var/mob/living/carbon/human/choice = targets[1]
+ var/msg = stripped_input(usr, "What do you wish to tell [choice]?", null, "")
+ if(!(msg))
+ return
+ add_say_logs(usr, msg, choice, "SLAUGHTER")
+ to_chat(usr, span_hierophant("You translating directly to mind [choice]: [msg]"))
+ to_chat(choice, "[span_deadsay(span_hierophant("A strange, magical and at the same time alien broadcast conveys to you... "))][span_hierophant("[msg]")]")
+ for(var/mob/dead/observer/G in GLOB.player_list)
+ G.show_message(span_hierophant("Hierophant's message from [usr] ([ghost_follow_link(usr, ghost=G)]) to [choice] ([ghost_follow_link(choice, ghost=G)]): [msg]"))
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/on_attached(obj/item/clothing/under/S, mob/user)
+ . = ..()
+ if(!ishuman(user) || !slave)
+ return
+ if(slave.master == user.ckey)
+ slave.mob_spell_list += spell_heal
+ slave.mob_spell_list += spell_teleport
+ slave.mob_spell_list += spell_message
+ spell_heal.action.Grant(slave)
+ spell_teleport.action.Grant(slave)
+ spell_message.action.Grant(slave)
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/on_removed(mob/user)
+ . = ..()
+ if(!ishuman(user) || !slave)
+ return
+ slave.mob_spell_list -= spell_heal
+ slave.mob_spell_list -= spell_teleport
+ slave.mob_spell_list -= spell_message
+ spell_heal.action.Remove(slave)
+ spell_teleport.action.Remove(slave)
+ spell_message.action.Remove(slave)
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/attached_unequip()
+ if(!ishuman(usr))
+ return
+ if(!slave)
+ return ..()
+ slave.mob_spell_list -= spell_heal
+ slave.mob_spell_list -= spell_teleport
+ slave.mob_spell_list -= spell_message
+ spell_heal.action.Remove(slave)
+ spell_teleport.action.Remove(slave)
+ spell_message.action.Remove(slave)
+ return ..()
+
+/obj/item/clothing/accessory/necklace/hierophant_talisman/attached_equip()
+ if(!ishuman(usr))
+ return
+ if(!slave)
+ return ..()
+ if(slave.master == usr.ckey)
+ slave.mob_spell_list += spell_heal
+ slave.mob_spell_list += spell_teleport
+ slave.mob_spell_list += spell_message
+ spell_heal.action.Grant(slave)
+ spell_teleport.action.Grant(slave)
+ spell_message.action.Grant(slave)
+ return ..()
+
#undef HIEROPHANT_CLUB_CARDINAL_DAMAGE
diff --git a/code/modules/mining/lavaland/loot/tendril_loot.dm b/code/modules/mining/lavaland/loot/tendril_loot.dm
index b8cf1d16289..1d1413d8bc7 100644
--- a/code/modules/mining/lavaland/loot/tendril_loot.dm
+++ b/code/modules/mining/lavaland/loot/tendril_loot.dm
@@ -21,62 +21,50 @@
name = "paradox bag"
desc = "Somehow, it's in two places at once."
-/obj/item/shared_storage/red/New()
- ..()
+/obj/item/shared_storage/red/Initialize(mapload)
+ . = ..()
if(!bag)
- var/obj/item/storage/backpack/shared/S = new(src)
+ var/obj/item/storage/backpack/shared/shared_storage = new(src)
var/obj/item/shared_storage/blue = new(loc)
+ bag = shared_storage
+ blue.bag = shared_storage
- bag = S
- blue.bag = S
/obj/item/shared_storage/attackby(obj/item/W, mob/user, params)
if(bag)
bag.loc = user
bag.attackby(W, user, params)
+ add_fingerprint(user)
+
+
+/obj/item/shared_storage/proc/open_bag(mob/user)
+ if(bag)
+ bag.loc = user
+ bag.attack_hand(user)
+ add_fingerprint(user)
+
/obj/item/shared_storage/attack_self(mob/living/carbon/user)
- if(!iscarbon(user))
- return
- if(src == user.l_hand || src == user.r_hand)
- if(bag)
- bag.loc = user
- bag.attack_hand(user)
- else
- ..()
+ if(!bag || !iscarbon(user) || !user.is_in_hands(src))
+ return ..()
-/obj/item/shared_storage/attack_hand(mob/living/carbon/user)
- if(!iscarbon(user))
- return
- if(loc == user && user.back && user.back == src)
- if(bag)
- bag.loc = user
- bag.attack_hand(user)
- else
- ..()
+ open_bag(user)
+
+
+/obj/item/shared_storage/AltClick(mob/user)
+ if(!bag || !iscarbon(user) || !Adjacent(user))
+ return ..()
-/obj/item/shared_storage/MouseDrop(atom/over_object)
- if(iscarbon(usr))
- var/mob/M = usr
+ open_bag(user)
- if(!over_object)
- return
- if(istype(M.loc, /obj/mecha))
- return
- if(!M.restrained() && !M.stat)
- playsound(loc, "rustle", 50, 1, -5)
+/obj/item/shared_storage/attack_hand(mob/living/carbon/user)
+ if(!iscarbon(user) || !bag || loc != user || !user.back || user.back != src)
+ return ..()
- if(istype(over_object, /obj/screen/inventory/hand))
- if(!M.drop_item_ground(src))
- return
- M.put_in_active_hand(src)
- else if(bag)
- bag.loc = usr
- bag.attack_hand(usr)
+ open_bag(user)
- add_fingerprint(M)
//Book of Babel
@@ -104,7 +92,7 @@
desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
list_reagents = list("flightpotion" = 5)
-/obj/item/reagent_containers/glass/bottle/potion/update_icon()
+/obj/item/reagent_containers/glass/bottle/potion/update_icon_state()
if(reagents.total_volume)
icon_state = "potionflask"
else
@@ -243,18 +231,26 @@
var/sight_flags = SEE_MOBS
var/lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
+
+/obj/item/wisp_lantern/update_icon_state()
+ if(!wisp)
+ icon_state = "lantern"
+ return
+ icon_state = "lantern[wisp.loc == src ? "" : "-blue"]"
+
+
/obj/item/wisp_lantern/attack_self(mob/user)
if(!wisp)
to_chat(user, "The wisp has gone missing!")
- icon_state = "lantern"
+ update_icon(UPDATE_ICON_STATE)
return
if(wisp.loc == src)
RegisterSignal(user, COMSIG_MOB_UPDATE_SIGHT, PROC_REF(update_user_sight))
to_chat(user, "You release the wisp. It begins to bob around your head.")
- icon_state = "lantern"
- spawn() wisp.orbit(user, 20) // spawn prevents endless loop in .orbit from blocking code execution here
+ update_icon(UPDATE_ICON_STATE)
+ INVOKE_ASYNC(src, TYPE_PROC_REF(/atom/movable, orbit), user, 20)
set_light(0)
user.update_sight()
@@ -272,7 +268,7 @@
user.update_sight()
to_chat(user, "Your vision returns to normal.")
- icon_state = "lantern-blue"
+ update_icon(UPDATE_ICON_STATE)
SSblackbox.record_feedback("tally", "wisp_lantern", 1, "Returned") // returned
/obj/item/wisp_lantern/Initialize(mapload)
diff --git a/code/modules/mining/lavaland/world_anvil.dm b/code/modules/mining/lavaland/world_anvil.dm
index 0912589648f..f4359696e61 100644
--- a/code/modules/mining/lavaland/world_anvil.dm
+++ b/code/modules/mining/lavaland/world_anvil.dm
@@ -29,13 +29,18 @@
GLOB.anvils -= src
. = ..()
-/obj/structure/world_anvil/update_icon()
+/obj/structure/world_anvil/update_icon_state()
icon_state = forge_charges > 0 ? "anvil_a" : "anvil"
+
+
+/obj/structure/world_anvil/proc/update_state()
+ update_icon(UPDATE_ICON_STATE)
if(forge_charges > 0)
set_light(4,1,LIGHT_COLOR_ORANGE)
else
set_light(0)
+
/obj/structure/world_anvil/examine(mob/user)
. = ..()
. += "It currently has [forge_charges] forge[forge_charges != 1 ? "s" : ""] remaining."
@@ -46,14 +51,14 @@
forge_charges = forge_charges + placed_ore.quality
to_chat(user,"You place down the gibtonite on the World Anvil, and watch as the gibtonite melts into it. The World Anvil is now heated enough for [forge_charges] forge[forge_charges > 1 ? "s" : ""].")
qdel(placed_ore)
- update_icon()
+ update_state()
return
if(istype(I, /obj/item/gem/amber))
var/obj/item/gem/amber/gem = I
forge_charges += 3
to_chat(user,"You place down the draconic amber on the World Anvil, and watch as amber melts into it. The World Anvil is now heated enough for [forge_charges] forge[forge_charges > 1 ? "s" : ""].")
qdel(gem)
- update_icon()
+ update_state()
return
if(forge_charges <= 0)
to_chat(user,"The World Anvil is not hot enough to be usable!")
@@ -83,5 +88,5 @@
forge_charges--
if(forge_charges <= 0)
visible_message("The World Anvil cools down.")
- update_icon()
+ update_state()
diff --git a/code/modules/mining/machine_vending.dm b/code/modules/mining/machine_vending.dm
index 74acb4926e6..6ea89c3a630 100644
--- a/code/modules/mining/machine_vending.dm
+++ b/code/modules/mining/machine_vending.dm
@@ -229,7 +229,7 @@
add_fingerprint(user)
return
if(panel_open)
- if(istype(I, /obj/item/crowbar))
+ if(I.tool_behaviour == TOOL_CROWBAR)
remove_id() //Prevents deconstructing the ORM from deleting whatever ID was inside it.
default_deconstruction_crowbar(user, I)
return TRUE
diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm
index ca8016d5e59..266e00e97c4 100644
--- a/code/modules/mining/ores_coins.dm
+++ b/code/modules/mining/ores_coins.dm
@@ -16,25 +16,31 @@
var/refined_type = null //What this ore defaults to being refined into
var/list/stack_overlays
-/obj/item/stack/ore/update_icon()
+
+/obj/item/stack/ore/update_overlays()
+ . = ..()
+
var/difference = min(ORESTACK_OVERLAYS_MAX, amount) - (LAZYLEN(stack_overlays)+1)
if(difference == 0)
+ . += stack_overlays
return
- else if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess.
- cut_overlays()
- if (LAZYLEN(stack_overlays)-difference <= 0)
- stack_overlays = null;
+
+ if(difference < 0 && LAZYLEN(stack_overlays)) //amount < stack_overlays, remove excess.
+ if(LAZYLEN(stack_overlays)-difference <= 0)
+ stack_overlays = null
else
stack_overlays.len += difference
+
else if(difference > 0) //amount > stack_overlays, add some.
- cut_overlays()
for(var/i in 1 to difference)
var/mutable_appearance/newore = mutable_appearance(icon, icon_state)
newore.pixel_x = rand(-8,8)
newore.pixel_y = rand(-8,8)
LAZYADD(stack_overlays, newore)
+
if(stack_overlays)
- add_overlay(stack_overlays)
+ . += stack_overlays
+
/obj/item/stack/ore/Initialize(mapload, new_amount , merge = TRUE)
. = ..()
@@ -269,7 +275,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
return
if(wires && !primed)
- if(istype(I, /obj/item/wirecutters) || istype(I, /obj/item/multitool) || istype(I, /obj/item/assembly/signaler))
+ if(I.tool_behaviour == TOOL_WIRECUTTER || I.tool_behaviour == TOOL_MULTITOOL || istype(I, /obj/item/assembly/signaler))
wires.Interact(user)
return
@@ -277,7 +283,7 @@ GLOBAL_LIST_INIT(sand_recipes, list(\
GibtoniteReaction(user)
return
if(primed)
- if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) || istype(I, /obj/item/multitool) || istype(I, /obj/item/mecha_parts/mecha_equipment/mining_scanner))
+ if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner) || I.tool_behaviour == TOOL_MULTITOOL || istype(I, /obj/item/mecha_parts/mecha_equipment/mining_scanner))
primed = 0
user.visible_message("The chain reaction was stopped! ...The ore's quality looks diminished.", "You stopped the chain reaction. ...The ore's quality looks diminished.")
icon_state = "Gibtonite ore"
diff --git a/code/modules/mining/satchel_ore_boxdm.dm b/code/modules/mining/satchel_ore_boxdm.dm
index 056d86386c0..f33fc6814e0 100644
--- a/code/modules/mining/satchel_ore_boxdm.dm
+++ b/code/modules/mining/satchel_ore_boxdm.dm
@@ -22,7 +22,7 @@
S.remove_from_storage(O, src) //This will move the item to this item's contents
CHECK_TICK
to_chat(user, "You empty the satchel into the box.")
- else if(istype(W, /obj/item/crowbar))
+ else if(W.tool_behaviour == TOOL_CROWBAR)
playsound(src, W.usesound, 50, 1)
var/obj/item/crowbar/C = W
if(do_after(user, 50 * C.toolspeed * gettoolspeedmod(user), target = src))
diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
index aa3a71e62d3..3e71a7c912a 100644
--- a/code/modules/mob/dead/observer/observer.dm
+++ b/code/modules/mob/dead/observer/observer.dm
@@ -95,11 +95,13 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
//starts ghosts off with all HUDs.
show_me_the_hud(THOUGHTS_HUD)
toggle_all_huds_on(body)
+ RegisterSignal(src, COMSIG_MOB_HUD_CREATED, PROC_REF(set_ghost_darkness_level)) //something something don't call this until we have a HUD
..()
/mob/dead/observer/Destroy()
toggle_all_huds_off()
+ UnregisterSignal(src, COMSIG_MOB_HUD_CREATED)
if(ghostimage)
GLOB.ghost_images -= ghostimage
QDEL_NULL(ghostimage)
@@ -114,6 +116,14 @@ GLOBAL_VAR_INIT(observer_default_invisibility, INVISIBILITY_OBSERVER)
if(!invisibility)
. += "It seems extremely obvious."
+/mob/dead/observer/proc/set_ghost_darkness_level()
+ if(!client)
+ return
+ UnregisterSignal(src, COMSIG_MOB_HUD_CREATED)
+ lighting_alpha = client.prefs.ghost_darkness_level //Remembers ghost lighting pref
+ update_sight()
+
+
// This seems stupid, but it's the easiest way to avoid absolutely ridiculous shit from happening
// Copying an appearance directly from a mob includes it's verb list, it's invisibility, it's alpha, and it's density
// You might recognize these things as "fucking ridiculous to put in an appearance"
@@ -605,19 +615,22 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
update_sight()
to_chat(usr, "You [(ghostvision?"now":"no longer")] have ghost vision.")
-/mob/dead/observer/verb/toggle_darkness()
- set name = "Toggle Darkness"
+/mob/dead/observer/verb/pick_darkness()
+ set name = "Pick Darkness"
+ set desc = "Choose how much darkness you want to see."
set category = "Ghost"
- switch(lighting_alpha)
- if (LIGHTING_PLANE_ALPHA_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE
- if (LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE
- if (LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE)
- lighting_alpha = LIGHTING_PLANE_ALPHA_INVISIBLE
- else
- lighting_alpha = LIGHTING_PLANE_ALPHA_VISIBLE
-
+ var/list/ghost_darkness_levels = list("Strong Darkness" = LIGHTING_PLANE_ALPHA_VISIBLE,
+ "Darkness" = LIGHTING_PLANE_ALPHA_MOSTLY_VISIBLE,
+ "Light Darkness" = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE,
+ "No Darkness" = LIGHTING_PLANE_ALPHA_INVISIBLE)
+ var/desired_dark = tgui_input_list(usr, "Choose how much darkness you want to see", "Pick darkness", ghost_darkness_levels)
+ if(isnull(desired_dark))
+ return
+ if(!client)
+ return
+ client.prefs.ghost_darkness_level = ghost_darkness_levels[desired_dark]
+ client.prefs.save_preferences(src)
+ lighting_alpha = client.prefs.ghost_darkness_level
update_sight()
/mob/dead/observer/update_sight()
diff --git a/code/modules/mob/dead/observer/orbit.dm b/code/modules/mob/dead/observer/orbit.dm
index 5de82961ce8..06614e40139 100644
--- a/code/modules/mob/dead/observer/orbit.dm
+++ b/code/modules/mob/dead/observer/orbit.dm
@@ -39,11 +39,13 @@
var/list/data = list()
var/list/alive = list()
+ var/list/highlights = list()
var/list/antagonists = list()
var/list/dead = list()
var/list/ghosts = list()
var/list/misc = list()
var/list/npcs = list()
+ var/length_of_ghosts = length(get_observers())
var/list/pois = getpois(mobs_only = FALSE, skip_mindless = FALSE)
for(var/name in pois)
@@ -62,6 +64,12 @@
continue
serialized["ref"] = "\ref[M]"
+ var/orbiters = 0
+ if(ismob(M))
+ orbiters = M.ghost_orbiting
+
+ if(orbiters > 0)
+ serialized["orbiters"] = orbiters
if(istype(M))
if(isnewplayer(M)) // People in the lobby screen; only have their ckey as a name.
@@ -73,6 +81,8 @@
else if(M.stat == DEAD)
dead += list(serialized)
else
+ if(orbiters >= 0.2 * length_of_ghosts) // They're important if 20% of observers are watching them
+ highlights += list(serialized)
alive += list(serialized)
var/datum/mind/mind = M.mind
@@ -130,10 +140,13 @@
antagonists += list(antag_serialized)
else
+ if(length(orbiters) >= 0.2 * length_of_ghosts) // If a bunch of people are orbiting an object, like the nuke disk.
+ highlights += list(serialized)
misc += list(serialized)
data["alive"] = alive
data["antagonists"] = antagonists
+ data["highlights"] = highlights
data["dead"] = dead
data["ghosts"] = ghosts
data["misc"] = misc
diff --git a/code/modules/mob/holder.dm b/code/modules/mob/holder.dm
index 055dbed573c..5d0e54e2500 100644
--- a/code/modules/mob/holder.dm
+++ b/code/modules/mob/holder.dm
@@ -37,8 +37,7 @@
if(ishuman(user)) //eating holder
if(target == user)
for(var/mob/M in src.contents)
- if(devoured(M, user))
- return TRUE
+ return devoured(M, user)
. = ..()
/obj/item/holder/proc/show_message(var/message, var/m_type)
@@ -77,6 +76,22 @@
/mob/living
var/holder_type = null
+/mob/living/simple_animal/MouseDrop(atom/over_object)
+ var/mob/living/carbon/human/human_to_ask = over_object //changed to human to avoid stupid issues like xenos holding animals.
+ if(!istype(human_to_ask) || !Adjacent(human_to_ask) || !holder_type)
+ return ..()
+ if(usr == src)
+ switch(alert(human_to_ask, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
+ if("Yes")
+ if(Adjacent(human_to_ask))
+ get_scooped(human_to_ask)
+ else
+ to_chat(src, "You need to stay in reaching distance to be picked up.")
+ if("No")
+ to_chat(src, "[human_to_ask] decided not to pick you up.")
+ else
+ return ..()
+
/mob/living/proc/get_scooped(var/mob/living/carbon/grabber)
if(!holder_type)
return
diff --git a/code/modules/mob/holder_pet_carrier.dm b/code/modules/mob/holder_pet_carrier.dm
index d0b337b7c1e..25a2bc9199d 100644
--- a/code/modules/mob/holder_pet_carrier.dm
+++ b/code/modules/mob/holder_pet_carrier.dm
@@ -1,6 +1,6 @@
/obj/item/pet_carrier
name = "маленькая переноска"
- desc = "Переноска для маленьких животных. "
+ desc = "Переноска для маленьких животных."
icon_state = "pet_carrier"
item_state = "pet_carrier"
max_integrity = 100
@@ -15,9 +15,10 @@
var/contains_pet_color_open = "#d8d8d8ff"
var/contains_pet_color_close = "#949494ff"
+
/obj/item/pet_carrier/normal
name = "переноска"
- desc = "Переноска для небольших животных. "
+ desc = "Переноска для небольших животных."
icon_state = "pet_carrier_normal"
item_state = "pet_carrier_normal"
max_integrity = 200
@@ -29,16 +30,19 @@
. = ..()
if(!color_skin)
color_skin = pick(possible_skins)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/pet_carrier/Destroy()
free_content()
. = ..()
+
/obj/item/pet_carrier/attack_self(mob/user)
..()
change_state()
+
/obj/item/pet_carrier/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/holder))
var/obj/item/holder/H = I
@@ -49,73 +53,89 @@
return FALSE
. = ..()
-/obj/item/pet_carrier/emp_act(var/intensity)
+
+/obj/item/pet_carrier/emp_act(intensity)
for(var/mob/living/M in contents)
M.emp_act(intensity)
-/obj/item/pet_carrier/ex_act(var/intensity)
+
+/obj/item/pet_carrier/ex_act(intensity)
for(var/mob/living/M in contents)
M.ex_act(intensity)
+
/obj/item/pet_carrier/AltClick(mob/user)
if(ishuman(user) && Adjacent(user) && !user.incapacitated(FALSE, TRUE, TRUE))
- try_free_content(user = user)
+ try_free_content(null, user)
-/obj/item/pet_carrier/proc/put_in_carrier(var/mob/living/target, var/mob/living/user)
+
+/obj/item/pet_carrier/proc/put_in_carrier(mob/living/target, mob/living/user)
if(!opened)
- to_chat(user, "Ваша переноска закрыта!")
+ to_chat(user, span_warning("Ваша переноска закрыта!"))
return FALSE
if(contains_pet)
- to_chat(user, "Ваша переноска заполнена!")
+ to_chat(user, span_warning("Ваша переноска заполнена!"))
return FALSE
if(target.mob_size > mob_size)
- to_chat(user, "Ваша переноска слишком мала!")
+ to_chat(user, span_warning("Ваша переноска слишком мала!"))
return FALSE
if(istype(target, /mob/living/simple_animal/revenant))
return FALSE
- //if(target.mob_size < mob_size)
- // to_chat(user, "Ваша переноска слишком большая!")
- // return FALSE
target.forceMove(src)
- name += " ([target.name])"
- if(target.desc)
- desc += "\n\nВнутри [target.name]\n"
- desc += target.desc
contains_pet = TRUE
+ update_appearance(UPDATE_OVERLAYS|UPDATE_NAME|UPDATE_DESC)
- to_chat(user, "Вы поместили [target.name] в [src.name].")
- to_chat(target, "[user.name] поместил[genderize_ru(user.gender,"","а","о","и")] вас в [src.name].")
- update_icon()
+ to_chat(user, span_notice("Вы поместили [target.name] в [name]."))
+ to_chat(target, span_notice("[user.name] поместил[genderize_ru(user.gender,"","а","о","и")] вас в [name]."))
return TRUE
+
/obj/item/pet_carrier/proc/try_free_content(atom/new_location, mob/user)
+ add_fingerprint(user)
if(!opened)
if(user)
- to_chat(user, "Ваша переноска закрыта! Содержимое невозможно выгрузить!")
+ to_chat(user, span_warning("Ваша переноска закрыта! Содержимое невозможно выгрузить!"))
return FALSE
free_content(new_location)
+
/obj/item/pet_carrier/proc/free_content(atom/new_location)
- if(istype(loc,/turf) || length(contents))
- for(var/mob/living/L in contents)
- var/atom/movable/mob_container
- mob_container = L
- mob_container.forceMove(new_location ? new_location : get_turf(src))
+ if(isturf(loc) || length(contents))
+ var/atom/drop_loc = new_location ? new_location : get_turf(src)
+ for(var/mob/living/animal in contents)
+ animal.forceMove(drop_loc)
contains_pet = FALSE
- name = initial(name)
- desc = initial(desc)
- update_icon()
- L.resting = FALSE
+ update_appearance(UPDATE_OVERLAYS|UPDATE_NAME|UPDATE_DESC)
+ animal.resting = FALSE
return TRUE
return FALSE
+
/obj/item/pet_carrier/proc/change_state()
opened = !opened
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/pet_carrier/update_name(updates = ALL)
+ . = ..()
+ name = initial(name)
+ var/mob/living/animal = locate() in src
+ if(animal)
+ name += " ([animal.name])"
-/obj/item/pet_carrier/update_icon()
- overlays.Cut()
+
+/obj/item/pet_carrier/update_desc(updates = ALL)
+ . = ..()
+ desc = initial(desc)
+ var/mob/living/animal = locate() in src
+ if(animal)
+ desc += "\n\nВнутри [animal.name]\n"
+ desc += animal.desc
+
+
+/obj/item/pet_carrier/update_overlays()
+ . = ..()
if(contains_pet)
var/mob/living/M
for(var/mob/living/temp_M in contents)
@@ -124,59 +144,59 @@
var/image/I = image(M.icon, icon_state = M.icon_state)
I.color = opened ? contains_pet_color_open : contains_pet_color_close
I.pixel_y = M.mob_size <= MOB_SIZE_TINY ? 6 : 3
- overlays += I
+ . += I
if(!opened)
- var/image/I = image(icon, icon_state = "[icon_state]_door")
- overlays += I
+ . += image(icon, icon_state = "[icon_state]_door")
if(color_skin)
- var/image/I = image(icon, icon_state = "[icon_state]_[color_skin]")
- overlays += I
+ . += image(icon, icon_state = "[icon_state]_[color_skin]")
-/obj/item/pet_carrier/emp_act(var/intensity)
+
+/obj/item/pet_carrier/emp_act(intensity)
for(var/mob/living/M in contents)
M.emp_act(intensity)
-/obj/item/pet_carrier/ex_act(var/intensity)
+
+/obj/item/pet_carrier/ex_act(intensity)
for(var/mob/living/M in contents)
M.ex_act(intensity)
-/obj/item/pet_carrier/container_resist(var/mob/living/L)
- var/breakout_time = 60 //1 minute
- var/breakout_time_open = 5 //seconds for escape
- var/dcsec = 10 //seconds * 10deciseconds
- to_chat(L, "Вы начали вылезать из переноски (это займет [breakout_time_open] секунд, не двигайтесь)")
+/obj/item/pet_carrier/container_resist(mob/living/L)
+ var/breakout_time = 60 SECONDS
+ var/breakout_time_open = 5 SECONDS
+
+ to_chat(L, span_warning("Вы начали вылезать из переноски (это займет [breakout_time_open/10] секунд, не двигайтесь)."))
var/atom/target_atom = src
- if(ishuman(src.loc))
- target_atom = src.loc
+ if(ishuman(loc))
+ target_atom = loc
if(opened && L.loc == src)
spawn(0)
- if(do_after(L,(breakout_time_open*dcsec), target = target_atom))
+ if(do_after(L, (breakout_time_open), target = target_atom))
if(!src || !L || L.stat != CONSCIOUS || L.loc != src || !opened)
- to_chat(L, "Побег прерван!")
+ to_chat(L, span_warning("Побег прерван!"))
return
free_content()
- visible_message("[L.name] вылез из переноски.")
+ visible_message(span_warning("[L.name] вылез из переноски."))
return
- to_chat(L, "Вы начали ломиться в закрытую дверцу переноски и пытаетесь её выбить или открыть. (это займет [breakout_time] секунд, не двигайтесь)")
+ to_chat(L, span_warning("Вы начали ломиться в закрытую дверцу переноски и пытаетесь её выбить или открыть (это займет [breakout_time/10] секунд, не двигайтесь)."))
for(var/mob/O in viewers(usr.loc))
- O.show_message("[src.name] начинает трястись!", 1)
+ O.show_message(span_danger("[name] начинает трястись!"), 1)
spawn(0)
- if(do_after(L,(breakout_time*dcsec), target = target_atom))
+ if(do_after(L, (breakout_time), target = target_atom))
if(!src || !L || L.stat != CONSCIOUS || L.loc != src || opened) //closet/user destroyed OR user dead/unconcious OR user no longer in closet OR closet opened
- to_chat(L, "Побег прерван!")
+ to_chat(L, span_warning("Побег прерван!"))
return
- var/mob/M = src.loc
+ var/mob/M = loc
if(istype(M))
- to_chat(M, "[src.name] вырывается из вашей переноски!")
+ to_chat(M, "[name] вырывается из вашей переноски!")
to_chat(L, "Вы вырываетесь из переноски [M.name]!")
else
to_chat(L, "Вы выбираетесь из переноски.")
@@ -186,6 +206,7 @@
change_state()
return
+
/obj/item/pet_carrier/verb/open_close()
set name = "Открыть/закрыть переноску"
set desc = "Меняет состояние дверцы переноски, блокируя или разблокируя возможность достать содержимое."
@@ -196,6 +217,7 @@
change_state()
+
/obj/item/pet_carrier/verb/unload_content()
set name = "Опустошить переноску"
set desc = "Вытаскивает животное из переноски."
@@ -204,51 +226,40 @@
if(usr.stat || !ishuman(usr) || !usr.canmove || usr.restrained())
return
- try_free_content(user = usr)
+ try_free_content(null, usr)
-/obj/item/pet_carrier/MouseDrop(obj/over_object)
- if(ishuman(usr))
- var/mob/M = usr
- if(istype(M.loc,/obj/mecha) || M.incapacitated(FALSE, TRUE, TRUE)) // Stops inventory actions in a mech as well as while being incapacitated
- return
- if(over_object == M && Adjacent(M)) // this must come before the screen objects only block
- try_free_content(M, M)
- return
+/obj/item/pet_carrier/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ if(!ishuman(usr))
+ return FALSE
+
+ var/mob/living/carbon/human/user = usr
+
+ // Stops inventory actions in a mech, while ventcrawling and while being incapacitated
+ if(ismecha(user.loc) || is_ventcrawling(user) || user.incapacitated(FALSE, TRUE, TRUE))
+ return FALSE
+
+ if(over_object == user && user.Adjacent(src)) // this must come before the screen objects only block
+ try_free_content(user = user)
+ return FALSE
+
+ if(opened && (istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor) \
+ && length(contents) && loc == user && !user.incapacitated() && user.Adjacent(over_object)))
+
+ if(alert(user, "Вытащить питомца из [name] на [over_object.name]?", "Подтверждение", "Да", "Нет") != "Да")
+ return FALSE
+
+ if(!opened || !user || !over_object || user.incapacitated() || loc != user || !user.Adjacent(over_object))
+ return FALSE
+
+ user.face_atom(over_object)
+ user.visible_message(
+ span_notice("[user] вытащил питомца из [name] на [over_object.name]."),
+ span_notice("Вы вытащили питомца из [name] на [over_object.name]."),
+ )
+ try_free_content(get_turf(over_object), user)
+ return FALSE
+
+ return ..()
- if((istype(over_object, /obj/structure/table) || istype(over_object, /turf/simulated/floor)) \
- && length(contents) && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && over_object.Adjacent(usr))
- var/turf/T = get_turf(over_object)
- if(istype(over_object, /turf/simulated/floor))
- if(get_turf(usr) != T)
- return // Can only empty containers onto the floor under you
- if("Да" != alert(usr,"Вытащить питомца из [src.name] на [T.name]?","Подтверждение","Да","Нет"))
- return
- if(!(usr && over_object && contents.len && loc == usr && !usr.stat && !usr.restrained() && usr.canmove && get_turf(usr) == T))
- return // Something happened while the player was thinking
-
- usr.face_atom(over_object)
- usr.visible_message("[usr] вытащил питомца из [src.name] на [over_object.name].",
- "Вы вытащили питомца из [src.name] на [over_object.name].")
-
- try_free_content(T, usr)
- return TRUE
-
- if(!(istype(over_object, /obj/screen)))
- return ..()
- if(!(loc == usr) || (loc && loc.loc == usr))
- return
- playsound(loc, "rustle", 50, TRUE, -5)
- if(!(M.restrained()) && !(M.stat))
- switch(over_object.name)
- if("r_hand")
- if(!M.drop_item_ground(src))
- return
- M.put_in_r_hand(src, ignore_anim = FALSE)
- if("l_hand")
- if(!M.drop_item_ground(src))
- return
- M.put_in_l_hand(src, ignore_anim = FALSE)
- add_fingerprint(usr)
- return
diff --git a/code/modules/mob/living/carbon/brain/MMI.dm b/code/modules/mob/living/carbon/brain/MMI.dm
index 5e6a36acf48..e468fff446e 100644
--- a/code/modules/mob/living/carbon/brain/MMI.dm
+++ b/code/modules/mob/living/carbon/brain/MMI.dm
@@ -6,9 +6,8 @@
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "biotech=3"
origin_tech = "biotech=2;programming=3;engineering=2"
-
//Revised. Brainmob is now contained directly within object of transfer. MMI in this case.
- var/alien = 0
+ var/alien = FALSE
var/clock = 0
var/syndiemmi = 0 //Whether or not this is a Syndicate MMI
var/syndicate = 0 //Used to replace standart modules with the syndicate modules in module pick proc
@@ -29,7 +28,28 @@
/// Time at which the ghost belonging to the mind in the mmi can be pinged again to be borged
var/next_possible_ghost_ping
-/obj/item/mmi/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+
+/obj/item/mmi/update_icon_state()
+ if(held_brain)
+ icon = held_brain.mmi_icon
+ icon_state = held_brain.mmi_icon_state
+ else
+ icon = initial(icon)
+ icon_state = initial(icon_state)
+
+
+/obj/item/mmi/update_name(updates = ALL)
+ . = ..()
+ if(brainmob)
+ if(alien)
+ name = "Man-Machine Interface: Alien - [brainmob.real_name]"
+ else
+ name = "Man-Machine Interface: [brainmob.real_name]"
+ else
+ name = initial(name)
+
+
+/obj/item/mmi/attackby(obj/item/O, mob/user, params)
if(istype(O, /obj/item/organ/internal/brain/crystal))
to_chat(user, " This brain is too malformed to be able to use with the [src].")
return
@@ -57,19 +77,9 @@
GLOB.dead_mob_list -= brainmob//Update dem lists
GLOB.alive_mob_list += brainmob
brainmob.update_sight()
-
held_brain = B
- if(istype(O,/obj/item/organ/internal/brain/xeno)) // kept the type check, as it still does other weird stuff
- name = "Man-Machine Interface: Alien - [brainmob.real_name]"
- icon = 'icons/mob/alien.dmi'
- become_occupied("AlienMMI")
- alien = 1
- else
- name = "Man-Machine Interface: [brainmob.real_name]"
- icon = B.mmi_icon
- become_occupied("[B.mmi_icon_state]")
- alien = 0
-
+ alien = istype(O, /obj/item/organ/internal/brain/xeno)
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
if(radio_action)
radio_action.UpdateButtonIcon()
SSblackbox.record_feedback("amount", "mmis_filled", 1)
@@ -121,17 +131,15 @@
"You uninstall the radio from [src].")
-/obj/item/mmi/attack_self(mob/user as mob)
+/obj/item/mmi/attack_self(mob/user)
if(!brainmob)
to_chat(user, "You upend the MMI, but there's nothing in it.")
else
to_chat(user, "You unlock and upend the MMI, spilling the brain onto the floor.")
dropbrain(get_turf(user))
- icon = 'icons/obj/assemblies.dmi'
- icon_state = "mmi_empty"
- name = "Man-Machine Interface"
-/obj/item/mmi/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people.
+
+/obj/item/mmi/proc/transfer_identity(mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->robot people.
brainmob = new(src)
brainmob.name = H.real_name
brainmob.real_name = H.real_name
@@ -147,10 +155,9 @@
held_brain = new brain_path(src) // Slime people will keep their slimy brains this way
held_brain.dna = brainmob.dna.Clone()
held_brain.name = "\the [brainmob.name]'s [initial(held_brain.name)]"
-
- name = "Man-Machine Interface: [brainmob.real_name]"
- become_occupied("mmi_full")
brainmob.update_sight()
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
+
//I made this proc as a way to have a brainmob be transferred to any created brain, and to solve the
//problem i was having with alien/nonalien brain drops.
@@ -171,11 +178,8 @@
brainmob = null//Set mmi brainmob var to null
held_brain.forceMove(dropspot)
held_brain = null
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
-/obj/item/mmi/proc/become_occupied(var/new_icon)
- icon_state = new_icon
- if(radio)
- radio_action.ApplyIcon()
/obj/item/mmi/examine(mob/user)
. = ..()
@@ -200,7 +204,7 @@
procname = "ui_interact"
var/obj/item/mmi = null
-/datum/action/generic/configure_mmi_radio/New(var/Target, var/obj/item/mmi/M)
+/datum/action/generic/configure_mmi_radio/New(Target, obj/item/mmi/M)
. = ..()
mmi = M
diff --git a/code/modules/mob/living/carbon/brain/robotic_brain.dm b/code/modules/mob/living/carbon/brain/robotic_brain.dm
index 2513a6882e5..53a21f1886d 100644
--- a/code/modules/mob/living/carbon/brain/robotic_brain.dm
+++ b/code/modules/mob/living/carbon/brain/robotic_brain.dm
@@ -48,6 +48,22 @@
imprinted_master = null
return ..()
+
+/obj/item/mmi/robotic_brain/update_icon_state()
+ if(brainmob?.key)
+ icon_state = occupied_icon
+ return
+ icon_state = searching ? searching_icon : blank_icon
+
+
+/obj/item/mmi/robotic_brain/update_name(updates = ALL)
+ . = ..()
+ if(brainmob)
+ name = "[src] ([brainmob.name])"
+ else
+ name = initial(name)
+
+
/obj/item/mmi/robotic_brain/attack_self(mob/user)
if(isgolem(user))
to_chat(user, "Your golem fingers are too large to press the switch on [src].")
@@ -59,24 +75,28 @@
if(brainmob && !brainmob.key && !searching)
//Start the process of searching for a new user.
to_chat(user, "You carefully locate the manual activation switch and start [src]'s boot process.")
- icon_state = searching_icon
- ghost_volunteers.Cut()
searching = TRUE
+ update_icon(UPDATE_ICON_STATE)
+ ghost_volunteers.Cut()
request_player()
- spawn(600)
- if(ghost_volunteers.len)
- var/mob/dead/observer/O
- while(!istype(O) && ghost_volunteers.len)
- O = pick_n_take(ghost_volunteers)
- if(istype(O) && check_observer(O))
- transfer_personality(O)
- reset_search()
+ addtimer(CALLBACK(src, PROC_REF(check_volunteers)), 60 SECONDS)
else
silenced = !silenced
to_chat(user, "You toggle the speaker [silenced ? "off" : "on"].")
if(brainmob && brainmob.key)
to_chat(brainmob, "Your internal speaker has been toggled [silenced ? "off" : "on"].")
+
+/obj/item/mmi/robotic_brain/proc/check_volunteers()
+ if(length(ghost_volunteers))
+ var/mob/dead/observer/observer
+ while(!istype(observer) && length(ghost_volunteers))
+ observer = pick_n_take(ghost_volunteers)
+ if(istype(observer) && check_observer(observer))
+ transfer_personality(observer)
+ reset_search()
+
+
/obj/item/mmi/robotic_brain/proc/request_player()
for(var/mob/dead/observer/O in GLOB.player_list)
if(check_observer(O))
@@ -110,7 +130,6 @@
log_runtime(EXCEPTION("[src] at [loc] attempted to drop brain without a contained brain."), src)
/obj/item/mmi/robotic_brain/transfer_identity(mob/living/carbon/H)
- name = "[src] ([H])"
if(isnull(brainmob.dna))
brainmob.dna = H.dna.Clone()
brainmob.name = brainmob.dna.real_name
@@ -122,9 +141,9 @@
if(H.mind)
H.mind.transfer_to(brainmob)
to_chat(brainmob, "You feel slightly disoriented. That's normal when you're just a [ejected_flavor_text].")
- become_occupied(occupied_icon)
- if(radio)
- radio_action.ApplyIcon()
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
+ if(radio_action)
+ radio_action.UpdateButtonIcon()
/obj/item/mmi/robotic_brain/attempt_become_organ(obj/item/organ/external/parent, mob/living/carbon/human/target)
@@ -137,26 +156,24 @@
searching = FALSE
brainmob.revive() /// in case of death
brainmob.key = candidate.key
- name = "[src] ([brainmob.name])"
-
to_chat(brainmob, "You are a [src], brought into existence on [station_name()].")
to_chat(brainmob, "As a non-sentient synthetic intelligence, you answer to [imprinted_master], unless otherwise placed inside of a lawed synthetic structure or mech.")
to_chat(brainmob, "Remember, the purpose of your existence is to serve [imprinted_master]'s every word, unless lawed or placed into a mech in the future.")
brainmob.mind.assigned_role = "Positronic Brain"
-
visible_message("[src] chimes quietly.")
- become_occupied(occupied_icon)
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
+ if(radio_action)
+ radio_action.UpdateButtonIcon()
/obj/item/mmi/robotic_brain/proc/reset_search() //We give the players sixty seconds to decide, then reset the timer.
if(brainmob && brainmob.key)
return
-
searching = FALSE
- icon_state = blank_icon
-
+ update_icon(UPDATE_ICON_STATE)
visible_message("[src] buzzes quietly as the light fades out. Perhaps you could try again?")
+
/obj/item/mmi/robotic_brain/Topic(href, href_list)
if("signup" in href_list)
var/mob/dead/observer/O = locate(href_list["signup"])
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 48432a075e1..42fff9cdb8d 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -399,11 +399,6 @@
mind.disrupt_spells(0)
-
-/mob/living/carbon/proc/tintcheck()
- return 0
-
-
/mob/living/carbon/proc/create_dna()
if(!dna)
dna = new()
@@ -807,8 +802,13 @@ so that different stomachs can handle things in different ways VB*/
clear_fullscreen("tint", 0)
-/mob/living/carbon/proc/get_total_tint()
+/// Checks eye covering items for visually impairing tinting, such as welding masks. 0 & 1 = no impairment, 2 = welding mask overlay, 3 = casual blindness.
+/mob/living/proc/get_total_tint()
. = 0
+
+
+/mob/living/carbon/get_total_tint()
+ . = ..()
if(istype(head, /obj/item/clothing/head))
var/obj/item/clothing/head/HT = head
. += HT.tint
diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm
index 3f561ea3cec..a8269370b7d 100644
--- a/code/modules/mob/living/carbon/human/examine.dm
+++ b/code/modules/mob/living/carbon/human/examine.dm
@@ -33,12 +33,8 @@
msg += "[bicon(icon(icon, dir=SOUTH))] " //fucking BYOND: this should stop dreamseeker crashing if we -somehow- examine somebody before their icon is generated
msg += "[name]"
- var/displayed_species = dna.species.name
+ var/displayed_species = get_visible_species()
var/examine_color = dna.species.flesh_color
- for(var/obj/item/clothing/C in src) //Disguise checks
- if(C == src.head || C == src.wear_suit || C == src.wear_mask || C == src.w_uniform || C == src.belt || C == src.back)
- if(C.species_disguise)
- displayed_species = C.species_disguise
if(skipjumpsuit && skipface || (NO_EXAMINE in dna.species.species_traits)) //either obscured or on the nospecies list
msg += "!\n" //omit the species when examining
else if(displayed_species == "Slime People") //snowflakey because Slime People are defined as a plural
@@ -428,40 +424,45 @@
. = list(msg)
SEND_SIGNAL(src, COMSIG_PARENT_EXAMINE, user, .)
+
+/mob/living/carbon/human/get_examine_time()
+ return 1 SECONDS
+
+
//Helper procedure. Called by /mob/living/carbon/human/examine() and /mob/living/carbon/human/Topic() to determine HUD access to security and medical records.
-/proc/hasHUD(mob/M, hudtype)
+/proc/hasHUD(mob/M, hud_exam)
if(istype(M, /mob/living/carbon/human))
- var/have_hudtypes = list()
+ var/have_hud_exam = 0
var/mob/living/carbon/human/H = M
if(istype(H.glasses, /obj/item/clothing/glasses/hud))
var/obj/item/clothing/glasses/hud/hudglasses = H.glasses
if(hudglasses?.examine_extensions)
- have_hudtypes += hudglasses.examine_extensions
+ have_hud_exam |= hudglasses.examine_extensions
if(istype(H.head, /obj/item/clothing/head/helmet/space/plasmaman))
var/obj/item/clothing/head/helmet/space/plasmaman/helmet = H.head
if(helmet?.examine_extensions)
- have_hudtypes += helmet.examine_extensions
+ have_hud_exam |= helmet.examine_extensions
var/obj/item/organ/internal/cyberimp/eyes/hud/CIH = H.get_int_organ(/obj/item/organ/internal/cyberimp/eyes/hud)
if(CIH?.examine_extensions)
- have_hudtypes += CIH.examine_extensions
+ have_hud_exam |= CIH.examine_extensions
- return (hudtype in have_hudtypes)
+ return (have_hud_exam & hud_exam)
else if(isrobot(M) || isAI(M)) //Stand-in/Stopgap to prevent pAIs from freely altering records, pending a more advanced Records system
- return (hudtype in list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE, EXAMINE_HUD_MEDICAL))
+ return hud_exam & EXAMINE_HUD_SECURITY_READ || hud_exam & EXAMINE_HUD_SECURITY_WRITE || hud_exam & EXAMINE_HUD_MEDICAL
else if(ispAI(M))
var/mob/living/silicon/pai/P = M
if(P.adv_secHUD)
- return (hudtype in list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE))
+ return hud_exam & EXAMINE_HUD_SECURITY_READ || hud_exam & EXAMINE_HUD_SECURITY_WRITE
else if(isobserver(M))
var/mob/dead/observer/O = M
if(DATA_HUD_SECURITY_ADVANCED in O.data_hud_seen)
- return (hudtype in list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SKILLS))
+ return hud_exam & EXAMINE_HUD_SECURITY_READ || hud_exam & EXAMINE_HUD_SKILLS
return FALSE
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index 8a99c7a2941..1f81bdc89f6 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -987,24 +987,6 @@
return HEARING_PROTECTION_MINOR
-///tintcheck()
-///Checks eye covering items for visually impairing tinting, such as welding masks
-///Checked in life.dm. 0 & 1 = no impairment, 2 = welding mask overlay, 3 = You can see jack, but you can't see shit.
-/mob/living/carbon/human/tintcheck()
- var/tinted = 0
- if(istype(src.head, /obj/item/clothing/head))
- var/obj/item/clothing/head/HT = src.head
- tinted += HT.tint
- if(istype(src.glasses, /obj/item/clothing/glasses))
- var/obj/item/clothing/glasses/GT = src.glasses
- tinted += GT.tint
- if(istype(src.wear_mask, /obj/item/clothing/mask))
- var/obj/item/clothing/mask/MT = src.wear_mask
- tinted += MT.tint
-
- return tinted
-
-
/mob/living/carbon/human/abiotic(var/full_body = 0)
if(full_body && ((src.l_hand && !(src.l_hand.flags & ABSTRACT)) || (src.r_hand && !(src.r_hand.flags & ABSTRACT)) || (src.back || src.wear_mask || src.head || src.shoes || src.w_uniform || src.wear_suit || src.glasses || src.l_ear || src.r_ear || src.gloves)))
return 1
@@ -1094,13 +1076,21 @@
return 0
return 1
-/mob/living/carbon/human/proc/get_visible_gender()
+/mob/living/carbon/human/get_visible_gender()
var/list/obscured = check_obscured_slots()
var/skipface = (wear_mask && (wear_mask.flags_inv & HIDENAME)) || (head && (head.flags_inv & HIDENAME))
if((slot_w_uniform in obscured) && skipface)
return PLURAL
return gender
+/mob/living/carbon/human/get_visible_species()
+ var/displayed_species = dna.species.name
+ for(var/obj/item/clothing/C in src) //Disguise checks
+ if(C == head || C == wear_suit || C == wear_mask || C == w_uniform || C == belt || C == back)
+ if(C.species_disguise)
+ displayed_species = C.species_disguise
+ return displayed_species
+
/mob/living/carbon/human/proc/increase_germ_level(n)
if(gloves)
gloves.germ_level += n
@@ -1726,10 +1716,10 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
if(!H.check_has_mouth())
to_chat(src, "They don't have a mouth, you cannot perform CPR!")
return
- if((head && (head.flags_cover & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && !wear_mask.mask_adjusted))
+ if((head && (head.flags_cover & HEADCOVERSMOUTH)) || (wear_mask && (wear_mask.flags_cover & MASKCOVERSMOUTH) && !wear_mask.up))
to_chat(src, "Remove your mask first!")
return
- if((H.head && (H.head.flags_cover & HEADCOVERSMOUTH)) || (H.wear_mask && (H.wear_mask.flags_cover & MASKCOVERSMOUTH) && !H.wear_mask.mask_adjusted))
+ if((H.head && (H.head.flags_cover & HEADCOVERSMOUTH)) || (H.wear_mask && (H.wear_mask.flags_cover & MASKCOVERSMOUTH) && !H.wear_mask.up))
to_chat(src, "Remove [H.p_their()] mask first!")
return
if(H.receiving_cpr) // To prevent spam stacking
@@ -2124,3 +2114,14 @@ Eyes need to have significantly high darksight to shine unless the mob has the X
set category = "IC"
update_flavor_text()
+
+/mob/living/carbon/human/harvest(mob/living/user)
+ if(QDELETED(src))
+ return
+
+ if(issmall(src))
+ while(meatleft > 0)
+ new dna.species.meat_type(loc)
+ meatleft--
+ visible_message(span_notice("[user] butchers [src]."))
+ gib()
diff --git a/code/modules/mob/living/carbon/human/human_defense.dm b/code/modules/mob/living/carbon/human/human_defense.dm
index e99832f3abf..cd6c3f2fbfc 100644
--- a/code/modules/mob/living/carbon/human/human_defense.dm
+++ b/code/modules/mob/living/carbon/human/human_defense.dm
@@ -419,12 +419,7 @@ emp_act
return FALSE
if((istype(I, /obj/item/kitchen/knife/butcher/meatcleaver) || istype(I, /obj/item/twohanded/chainsaw)) && stat == DEAD && user.a_intent == INTENT_HARM)
- var/obj/item/reagent_containers/food/snacks/meat/human/newmeat = new /obj/item/reagent_containers/food/snacks/meat/human(get_turf(loc))
- newmeat.name = real_name + newmeat.name
- newmeat.subjectname = real_name
- newmeat.subjectjob = job
- newmeat.reagents.add_reagent("nutriment", (nutrition / 15) / 3)
- reagents.trans_to(newmeat, round((reagents.total_volume) / 3, 1))
+ new dna.species.meat_type(get_turf(loc), src)
add_mob_blood(src)
--meatleft
to_chat(user, span_warning("You hack off a chunk of meat from [name]."))
@@ -529,7 +524,6 @@ emp_act
forcesay(GLOB.hit_appends) //forcesay checks stat already
dna.species.spec_attacked_by(I, user, affecting, user.a_intent, src)
- return TRUE
/**
* This proc handles being hit by a thrown atom.
diff --git a/code/modules/mob/living/carbon/human/human_defines.dm b/code/modules/mob/living/carbon/human/human_defines.dm
index 9d1f6e03cb2..206769217a6 100644
--- a/code/modules/mob/living/carbon/human/human_defines.dm
+++ b/code/modules/mob/living/carbon/human/human_defines.dm
@@ -2,6 +2,7 @@
hud_possible = list(HEALTH_HUD,STATUS_HUD,ID_HUD,WANTED_HUD,IMPMINDSHIELD_HUD,IMPCHEM_HUD,IMPTRACK_HUD,SPECIALROLE_HUD,GLAND_HUD,THOUGHT_HUD)
pressure_resistance = 25
+ blocks_emissive = EMISSIVE_BLOCK_UNIQUE
//Marking colour and style
var/list/m_colours = DEFAULT_MARKING_COLOURS //All colours set to #000000.
var/list/m_styles = DEFAULT_MARKING_STYLES //All markings set to None.
diff --git a/code/modules/mob/living/carbon/human/interactions.dm b/code/modules/mob/living/carbon/human/interactions.dm
index 6e71e0bcabe..2fcc2c3752c 100644
--- a/code/modules/mob/living/carbon/human/interactions.dm
+++ b/code/modules/mob/living/carbon/human/interactions.dm
@@ -2,10 +2,11 @@
*******Interactions code by HONKERTRON feat TestUnit********
***********************************/
-/mob/living/carbon/human/MouseDrop(mob/M as mob)
- ..()
+/mob/living/carbon/human/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ . = ..()
if(src == usr)
- interact(M)
+ interact(over_object)
+
/mob/proc/make_interaction()
return
diff --git a/code/modules/mob/living/carbon/human/inventory.dm b/code/modules/mob/living/carbon/human/inventory.dm
index d840e0560d4..23e3648a583 100644
--- a/code/modules/mob/living/carbon/human/inventory.dm
+++ b/code/modules/mob/living/carbon/human/inventory.dm
@@ -56,7 +56,7 @@
if(istype(mask) && mask.tint || initial(mask.tint))
update_tint()
- if(mask.flags & BLOCKHAIR || mask.flags & BLOCKHEADHAIR)
+ if((mask.flags & (BLOCKHAIR|BLOCKHEADHAIR|BLOCKFACIALHAIR)) || (initial(mask.flags) & (BLOCKHAIR|BLOCKHEADHAIR|BLOCKFACIALHAIR)))
update_hair() //rebuild hair
update_fhair()
update_head_accessory()
@@ -65,9 +65,9 @@
internal = null
update_action_buttons_icon()
- if(mask.flags_inv & HIDEGLASSES)
+ if((mask.flags_inv & HIDEGLASSES) || (initial(mask.flags_inv) & HIDEGLASSES))
update_inv_glasses()
- if(mask.flags_inv & HIDEHEADSETS)
+ if((mask.flags_inv & HIDEHEADSETS) || (initial(mask.flags_inv) & HIDEHEADSETS))
update_inv_ears()
sec_hud_set_ID()
@@ -82,7 +82,7 @@
if(!check_item)
return
- if(forced || (check_item.flags & BLOCKHAIR) || (check_item.flags & BLOCKHEADHAIR))
+ if(forced || (check_item.flags & (BLOCKHAIR|BLOCKHEADHAIR|BLOCKFACIALHAIR)) || (initial(check_item.flags) & (BLOCKHAIR|BLOCKHEADHAIR|BLOCKFACIALHAIR)))
update_hair() //rebuild hair
update_fhair()
update_head_accessory()
@@ -96,11 +96,11 @@
if(forced || hat.vision_flags || hat.see_in_dark || !isnull(hat.lighting_alpha))
update_sight()
- if(forced || (check_item.flags_inv & HIDEHEADSETS))
+ if(forced || (check_item.flags_inv & HIDEHEADSETS) || (initial(check_item.flags_inv) & HIDEHEADSETS))
update_inv_ears()
- if(forced || (check_item.flags_inv & HIDEMASK))
+ if(forced || (check_item.flags_inv & HIDEMASK) || (initial(check_item.flags_inv) & HIDEMASK))
update_inv_wear_mask()
- if(forced || (check_item.flags_inv & HIDEGLASSES))
+ if(forced || (check_item.flags_inv & HIDEGLASSES) || (initial(check_item.flags_inv) & HIDEGLASSES))
update_inv_glasses()
sec_hud_set_ID()
@@ -111,11 +111,11 @@
* Handles stuff to update when a mob equips/unequips a suit.
*/
/mob/living/carbon/human/wear_suit_update(obj/item/clothing/suit)
- if(suit.flags_inv & HIDEJUMPSUIT)
+ if((suit.flags_inv & HIDEJUMPSUIT) || (initial(suit.flags_inv) & HIDEJUMPSUIT))
update_inv_w_uniform()
- if(suit.flags_inv & HIDESHOES)
+ if((suit.flags_inv & HIDESHOES) || (initial(suit.flags_inv) & HIDESHOES))
update_inv_shoes()
- if(suit.flags_inv & HIDEGLOVES)
+ if((suit.flags_inv & HIDEGLOVES) || (initial(suit.flags_inv) & HIDEGLOVES))
update_inv_gloves()
update_inv_wear_suit()
@@ -412,7 +412,7 @@
if(slot_wear_mask)
return head && (head.flags_inv & HIDEMASK)
if(slot_glasses)
- return head && (head.flags_inv & HIDEGLASSES)
+ return head && (head.flags_inv & HIDEGLASSES) || wear_mask && (wear_mask.flags_inv & HIDEGLASSES)
if(slot_l_ear, slot_r_ear)
return head && (head.flags_inv & HIDEHEADSETS)
else
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index ec3125614c7..b2f3ab81c4b 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -99,16 +99,12 @@
/mob/living/carbon/human/handle_disabilities()
//Vision //god knows why this is here
- var/obj/item/organ/vision
- if(dna.species.vision_organ)
- vision = get_int_organ(dna.species.vision_organ)
-
- if(!dna.species.vision_organ) // Presumably if a species has no vision organs, they see via some other means.
+ var/obj/item/organ/vision = dna?.species?.get_vision_organ(src)
+ if(vision == NO_VISION_ORGAN)
SetEyeBlind(0)
SetEyeBlurry(0)
-
- else if(!vision || vision.is_traumatized()) // Vision organs cut out or broken? Permablind.
- EyeBlind(4 SECONDS)
+ else if(!vision || vision.is_traumatized()) // Vision organs cut out or broken? Permablind.
+ SetEyeBlind(4 SECONDS)
if(getBrainLoss() >= 60 && stat != DEAD)
if(prob(3))
diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm
index cdc69b1e6e7..ca48bd80510 100644
--- a/code/modules/mob/living/carbon/human/species/_species.dm
+++ b/code/modules/mob/living/carbon/human/species/_species.dm
@@ -190,8 +190,7 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
- /// If set, this organ is required for vision. Defaults to "eyes" if the species has them.
- var/vision_organ
+ var/meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid
var/list/has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
@@ -223,10 +222,6 @@
var/list/autohiss_exempt = null
/datum/species/New()
- //If the species has eyes, they are the default vision organ
- if(!vision_organ && has_organ[INTERNAL_ORGAN_EYES])
- vision_organ = /obj/item/organ/internal/eyes
-
unarmed = new unarmed_type()
/datum/species/proc/get_random_name(gender)
@@ -366,8 +361,7 @@
H.faction += i //Using +=/-= for this in case you also gain the faction from a different source.
/datum/species/proc/on_species_loss(mob/living/carbon/human/H)
- if(H.butcher_results) //clear it out so we don't butcher a actual human.
- H.butcher_results = null
+ H.meatleft = initial(H.meatleft)
H.ventcrawler = initial(H.ventcrawler)
if(inherent_factions)
@@ -1159,7 +1153,20 @@ It'll return null if the organ doesn't correspond, so include null checks when u
/datum/species/proc/can_hear(mob/living/carbon/human/user)
var/obj/item/organ/internal/ears/ears = user.get_organ_slot(INTERNAL_ORGAN_EARS)
- return ears && !(DEAF in user.mutations) && !HAS_TRAIT(user, TRAIT_DEAF)
+ return ears && !HAS_TRAIT(user, TRAIT_DEAF)
+
+
+/datum/species/proc/has_vision(mob/living/carbon/human/user, information_only = FALSE)
+ if(information_only && user.stat == DEAD)
+ return TRUE
+ if(user.AmountBlinded() || (BLINDNESS in user.mutations) || user.stat)
+ return FALSE
+ var/obj/item/organ/vision = get_vision_organ(user)
+ return vision && (vision == NO_VISION_ORGAN || !vision.is_traumatized())
+
+
+/datum/species/proc/get_vision_organ(mob/living/carbon/human/user)
+ return user.get_organ_slot(INTERNAL_ORGAN_EYES)
/datum/species/proc/spec_Process_Spacemove(mob/living/carbon/human/H)
diff --git a/code/modules/mob/living/carbon/human/species/abductor.dm b/code/modules/mob/living/carbon/human/species/abductor.dm
index 5155d8f4f99..c76dfbebea1 100644
--- a/code/modules/mob/living/carbon/human/species/abductor.dm
+++ b/code/modules/mob/living/carbon/human/species/abductor.dm
@@ -16,6 +16,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/grey
+
species_traits = list(NO_BLOOD, NO_BREATHE, VIRUSIMMUNE, NOGUNS, NO_HUNGER, NO_EXAMINE)
dies_at_threshold = TRUE
diff --git a/code/modules/mob/living/carbon/human/species/diona.dm b/code/modules/mob/living/carbon/human/species/diona.dm
index 643b9724526..2611b5f8a6e 100644
--- a/code/modules/mob/living/carbon/human/species/diona.dm
+++ b/code/modules/mob/living/carbon/human/species/diona.dm
@@ -46,6 +46,8 @@
INTERNAL_ORGAN_HEART = /obj/item/organ/internal/heart/diona,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/diona
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest/diona),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin/diona),
diff --git a/code/modules/mob/living/carbon/human/species/drask.dm b/code/modules/mob/living/carbon/human/species/drask.dm
index f2dee15f777..4646a5c7a46 100644
--- a/code/modules/mob/living/carbon/human/species/drask.dm
+++ b/code/modules/mob/living/carbon/human/species/drask.dm
@@ -69,6 +69,8 @@
INTERNAL_ORGAN_BRAIN = /obj/item/organ/internal/brain/drask,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/drask
+
disliked_food = SUGAR | GROSS
liked_food = DAIRY
diff --git a/code/modules/mob/living/carbon/human/species/golem.dm b/code/modules/mob/living/carbon/human/species/golem.dm
index 133308e84d1..10fb1bb2cec 100644
--- a/code/modules/mob/living/carbon/human/species/golem.dm
+++ b/code/modules/mob/living/carbon/human/species/golem.dm
@@ -162,6 +162,11 @@
H.name = H.real_name
to_chat(H, info_text)
+
+/datum/species/golem/get_vision_organ(mob/living/carbon/human/user)
+ return NO_VISION_ORGAN
+
+
//Random Golem
/datum/species/golem/random
diff --git a/code/modules/mob/living/carbon/human/species/grey.dm b/code/modules/mob/living/carbon/human/species/grey.dm
index 0dd88292f69..e37bd321c08 100644
--- a/code/modules/mob/living/carbon/human/species/grey.dm
+++ b/code/modules/mob/living/carbon/human/species/grey.dm
@@ -18,6 +18,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/grey
+
total_health = 90
oxy_mod = 1.2 //greys are fragile
stamina_mod = 1.2
diff --git a/code/modules/mob/living/carbon/human/species/human.dm b/code/modules/mob/living/carbon/human/species/human.dm
index eb93d1ec2e4..784a49f2145 100644
--- a/code/modules/mob/living/carbon/human/species/human.dm
+++ b/code/modules/mob/living/carbon/human/species/human.dm
@@ -17,5 +17,7 @@
interests, rampant cyber and bio-augmentation and secretive factions make life on most human \
worlds tumultous at best."
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/human
+
reagent_tag = PROCESS_ORG
//Has standard darksight of 2.
diff --git a/code/modules/mob/living/carbon/human/species/kidan.dm b/code/modules/mob/living/carbon/human/species/kidan.dm
index 15b637dc698..942eafc42cf 100644
--- a/code/modules/mob/living/carbon/human/species/kidan.dm
+++ b/code/modules/mob/living/carbon/human/species/kidan.dm
@@ -1,3 +1,6 @@
+#define PHEROMONES_LIFESPAN 15 MINUTES
+#define PHEROMONES_MAX 3
+
/datum/species/kidan
name = "Kidan"
name_plural = "Kidan"
@@ -34,6 +37,8 @@
INTERNAL_ORGAN_LANTERN = /obj/item/organ/internal/lantern,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/kidan
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest/kidan),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin/kidan),
@@ -110,6 +115,13 @@
H.verbs -= /mob/living/carbon/human/verb/emote_frown
H.verbs -= /mob/living/carbon/human/verb/emote_sniff
H.verbs -= /mob/living/carbon/human/verb/emote_glare
+ // HUD for detecting pheromones
+ var/datum/atom_hud/kidan_hud = GLOB.huds[DATA_HUD_KIDAN_PHEROMONES]
+ kidan_hud.add_hud_to(H)
+
+ // Action for creating pheromones
+ var/datum/action/innate/produce_pheromones/produce_pheromones = new()
+ produce_pheromones.Grant(H)
/datum/species/kidan/on_species_loss(mob/living/carbon/human/H)
..()
@@ -130,3 +142,150 @@
H.verbs |= /mob/living/carbon/human/verb/emote_sniff
H.verbs |= /mob/living/carbon/human/verb/emote_glare
+ // Removing the HUD for detecting pheromones
+ var/datum/atom_hud/kidan_hud = GLOB.huds[DATA_HUD_KIDAN_PHEROMONES]
+ kidan_hud.remove_hud_from(H)
+
+ // Removing the action for creating pheromones
+ for(var/datum/action/innate/produce_pheromones/action in H.actions)
+ action.Remove(H)
+
+
+/// Pheromones spawnable by kida, only perceivable by other kida
+/obj/effect/kidan_pheromones
+ name = "kidan pheromones"
+ desc = "Special pheromones secreted by a kidan."
+ gender = PLURAL
+ hud_possible = list(KIDAN_PHEROMONES_HUD)
+
+ // This is to make it visible for observers and mappers at the same time
+ invisibility = INVISIBILITY_OBSERVER
+ icon_state = "kidan_pheromones"
+ alpha = 220
+
+ var/lifespan = PHEROMONES_LIFESPAN
+
+ /// The message added by its creator, visible upon examine
+ var/encoded_message
+
+/obj/effect/kidan_pheromones/Initialize(mapload)
+ . = ..()
+
+ // Add itself to the kidan hud
+ prepare_huds()
+ for(var/datum/atom_hud/kidan_pheromones/kidan_hud in GLOB.huds)
+ kidan_hud.add_to_hud(src)
+ var/image/holder = hud_list[KIDAN_PHEROMONES_HUD]
+ holder.icon = icon
+ holder.icon_state = icon_state
+ holder.alpha = 220
+
+ // Delete itself after some time if it is not permanent variant
+ if(lifespan)
+ QDEL_IN(src, lifespan)
+
+/obj/effect/kidan_pheromones/examine(mob/user)
+ . = ..()
+ if(encoded_message)
+ . += "It has the following message: \"[encoded_message]\""
+ // Failsafe for mappers/adminspawns if they forgot to add a message
+ else
+ . += "Its meaning is incomprehensible."
+
+// For mappers/adminspawns, this one does not self-delete
+/obj/effect/kidan_pheromones/permanent
+ lifespan = null
+
+// Innate action for creating pheromones and destroying current ones, owned by all kida
+/datum/action/innate/produce_pheromones
+ name = "Produce Pheromones"
+ check_flags = AB_CHECK_CONSCIOUS
+ icon_icon = 'icons/effects/effects.dmi'
+ button_icon_state = "kidan_pheromones_static"
+
+ /// How long our message can be (characters)
+ var/maximum_message_length = 30
+
+ /// How many active pheromones we can have
+ var/active_pheromones_maximum = PHEROMONES_MAX
+
+ /// Which currently existing pheromones belong to us
+ var/list/active_pheromones_current
+
+/datum/action/innate/produce_pheromones/Activate()
+ var/mob/living/carbon/human/H = owner
+
+ // Do we want to make or destroy them?
+ switch(alert(H, "Would you like to produce or destroy nearby pheromones?", "Produce Pheromones", "Produce", "Destroy", "Cancel"))
+ // We look for nearby pheromones, if they belong to us, we can destroy them
+ if("Destroy")
+ var/obj/effect/kidan_pheromones/pheromones_to_destroy = locate(/obj/effect/kidan_pheromones) in range(1, H)
+ // No pheromones nearby
+ if(!pheromones_to_destroy)
+ to_chat(H, "You cannot find any pheromones nearby.")
+ return
+ // These are not ours, do not touch them
+ if(!(pheromones_to_destroy in active_pheromones_current))
+ to_chat(H, "These pheromones were created by someone else, you are unable to dissipate them.")
+ return
+ // These are ours and we now destroy them
+ if(do_after(H, 3 SECONDS, FALSE, pheromones_to_destroy))
+ // Log the action
+ H.create_log(MISC_LOG, "destroyed pheromones that had the message of \"[pheromones_to_destroy.encoded_message]\"")
+
+ // Destroy it; the pheromones remove themselves from our list via signals
+ to_chat(H, "You dissipate your old pheromones.")
+ qdel(pheromones_to_destroy)
+
+ // We decide to produce new ones
+ if("Produce")
+ // Can we create more pheromones?
+ if(length(active_pheromones_current) >= active_pheromones_maximum)
+ to_chat(H, "You already have [length(active_pheromones_current)] sets of pheromones active and are unable to produce any more.")
+ return
+
+ // Encode the message
+ var/message_to_encode = input(H, "What message do you wish to encode? (max. [maximum_message_length] characters) Leave it empty to cancel.", "Produce Pheromones")
+ if(!message_to_encode)
+ to_chat(H, "You decide against producing pheromones.")
+ return
+ if(length(message_to_encode) > maximum_message_length)
+ to_chat(H, "Your message was too long, the pheromones instantly dissipate.")
+ return
+ // Strip the message now so it does not mess with the length
+ message_to_encode = strip_html(message_to_encode)
+
+ // One batch of pheromones per tile
+ if(locate(/obj/effect/kidan_pheromones) in get_turf(H))
+ to_chat(H, "There are pheromones here already!")
+ return
+
+ // Create the pheromones
+ if(do_after(H, 3 SECONDS, FALSE, H))
+ to_chat(H, "You produce new pheromones with the message of \"[message_to_encode]\".")
+ var/obj/effect/kidan_pheromones/pheromones_to_create = new get_turf(H)
+ pheromones_to_create.encoded_message = message_to_encode
+ LAZYADD(active_pheromones_current, pheromones_to_create)
+
+ // Add a signal to the new pheromones so it clears its own references when it gets destroyed
+ RegisterSignal(pheromones_to_create, COMSIG_PARENT_QDELETING, PROC_REF(remove_pheromones_from_list))
+
+ // Log the action
+ H.create_log(MISC_LOG, "produced pheromones with the message of \"[message_to_encode]\"")
+ if("Cancel")
+ return
+
+// This handles proper GCing whether we destroyed the pheromones or something else did
+/datum/action/innate/produce_pheromones/proc/remove_pheromones_from_list(obj/effect/kidan_pheromones/pheromones)
+ SIGNAL_HANDLER
+
+ UnregisterSignal(pheromones, COMSIG_PARENT_QDELETING)
+ LAZYREMOVE(active_pheromones_current, pheromones)
+
+// Clear references if the holder gets destroyed
+/datum/action/innate/produce_pheromones/Destroy()
+ active_pheromones_current = null
+ ..()
+
+#undef PHEROMONES_LIFESPAN
+#undef PHEROMONES_MAX
diff --git a/code/modules/mob/living/carbon/human/species/machine.dm b/code/modules/mob/living/carbon/human/species/machine.dm
index 43a5f6df776..76450d06c93 100644
--- a/code/modules/mob/living/carbon/human/species/machine.dm
+++ b/code/modules/mob/living/carbon/human/species/machine.dm
@@ -54,7 +54,7 @@
INTERNAL_ORGAN_R_ARM_DEVICE = /obj/item/organ/internal/cyberimp/arm/power_cord,
)
- vision_organ = /obj/item/organ/internal/eyes/optical_sensor
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/machine
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest/ipc),
diff --git a/code/modules/mob/living/carbon/human/species/monkey.dm b/code/modules/mob/living/carbon/human/species/monkey.dm
index e9a2e4e2a40..3e0d87ae678 100644
--- a/code/modules/mob/living/carbon/human/species/monkey.dm
+++ b/code/modules/mob/living/carbon/human/species/monkey.dm
@@ -40,6 +40,8 @@
brute_mod = 1.5
burn_mod = 1.5
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/monkey
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
@@ -70,7 +72,7 @@
..()
H.real_name = "[lowertext(name)] ([rand(100,999)])"
H.name = H.real_name
- H.butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/monkey = 5)
+ H.meatleft = 5
/datum/species/monkey/handle_dna(mob/living/carbon/human/H, remove)
..()
@@ -91,6 +93,7 @@
flesh_color = "#AFA59E"
base_color = "#000000"
tail = "farwatail"
+ skinned_type = /obj/item/stack/sheet/animalhide/farwa
reagent_tag = PROCESS_ORG
has_organ = list(
@@ -104,6 +107,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/farwa
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
@@ -133,6 +138,7 @@
flesh_color = "#966464"
base_color = "#000000"
tail = "wolpintail"
+ skinned_type = /obj/item/stack/sheet/animalhide/wolpin
reagent_tag = PROCESS_ORG
has_organ = list(
@@ -146,6 +152,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/wolpin
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
@@ -173,6 +181,7 @@
blood_species = "Skrell"
flesh_color = "#8CD7A3"
blood_color = "#1D2CBF"
+ skinned_type = /obj/item/stack/sheet/animalhide/neara
reagent_tag = PROCESS_ORG
tail = null
@@ -187,6 +196,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/neara
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
@@ -223,6 +234,7 @@
blood_species = "Unathi"
flesh_color = "#34AF10"
base_color = "#000000"
+ skinned_type = /obj/item/stack/sheet/animalhide/stok
reagent_tag = PROCESS_ORG
bodyflags = HAS_TAIL
@@ -238,6 +250,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/stok
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/moth.dm b/code/modules/mob/living/carbon/human/species/moth.dm
index 02856a2679b..c4febf4511b 100644
--- a/code/modules/mob/living/carbon/human/species/moth.dm
+++ b/code/modules/mob/living/carbon/human/species/moth.dm
@@ -48,6 +48,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/nian
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/nucleation.dm b/code/modules/mob/living/carbon/human/species/nucleation.dm
index 93a9c156876..d8e2fd45f43 100644
--- a/code/modules/mob/living/carbon/human/species/nucleation.dm
+++ b/code/modules/mob/living/carbon/human/species/nucleation.dm
@@ -28,7 +28,9 @@
INTERNAL_ORGAN_STRANGE_CRYSTAL = /obj/item/organ/internal/nucleation/strange_crystal,
INTERNAL_ORGAN_RESONANT_CRYSTAL = /obj/item/organ/internal/nucleation/resonant_crystal,
)
- vision_organ = /obj/item/organ/internal/eyes/luminescent_crystal
+
+
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/nucleation
/datum/species/nucleation/on_species_gain(mob/living/carbon/human/H)
..()
diff --git a/code/modules/mob/living/carbon/human/species/plasmaman.dm b/code/modules/mob/living/carbon/human/species/plasmaman.dm
index 86c45e7a33c..14049fbfba6 100644
--- a/code/modules/mob/living/carbon/human/species/plasmaman.dm
+++ b/code/modules/mob/living/carbon/human/species/plasmaman.dm
@@ -43,6 +43,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/plasmaman
+
speciesbox = /obj/item/storage/box/survival_plasmaman
flesh_color = "#8b3fba"
diff --git a/code/modules/mob/living/carbon/human/species/skeleton.dm b/code/modules/mob/living/carbon/human/species/skeleton.dm
index 8c48b003f88..78afab06e39 100644
--- a/code/modules/mob/living/carbon/human/species/skeleton.dm
+++ b/code/modules/mob/living/carbon/human/species/skeleton.dm
@@ -72,3 +72,8 @@
return TRUE
return ..()
+
+
+/datum/species/skeleton/get_vision_organ(mob/living/carbon/human/user)
+ return NO_VISION_ORGAN
+
diff --git a/code/modules/mob/living/carbon/human/species/skrell.dm b/code/modules/mob/living/carbon/human/species/skrell.dm
index ed6f6562901..73e8bf812ce 100644
--- a/code/modules/mob/living/carbon/human/species/skrell.dm
+++ b/code/modules/mob/living/carbon/human/species/skrell.dm
@@ -51,6 +51,8 @@
INTERNAL_ORGAN_HEADPOCKET = /obj/item/organ/internal/headpocket,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/skrell
+
suicide_messages = list(
"пытается откусить себе язык!",
"выдавливает большими пальцами свои глазницы!",
diff --git a/code/modules/mob/living/carbon/human/species/slime.dm b/code/modules/mob/living/carbon/human/species/slime.dm
index 39220045d7b..38662dfe077 100644
--- a/code/modules/mob/living/carbon/human/species/slime.dm
+++ b/code/modules/mob/living/carbon/human/species/slime.dm
@@ -45,6 +45,8 @@
INTERNAL_ORGAN_LUNGS = /obj/item/organ/internal/lungs/slime,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/skrell
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest/unbreakable),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin/unbreakable),
@@ -143,7 +145,11 @@
/datum/species/slime/can_hear(mob/living/carbon/human/user)
- return !(DEAF in user.mutations) && !HAS_TRAIT(user, TRAIT_DEAF)
+ return !HAS_TRAIT(user, TRAIT_DEAF)
+
+
+/datum/species/slime/get_vision_organ(mob/living/carbon/human/user)
+ return NO_VISION_ORGAN
/datum/action/innate/slimecolor
diff --git a/code/modules/mob/living/carbon/human/species/tajaran.dm b/code/modules/mob/living/carbon/human/species/tajaran.dm
index b8ad91b1dbb..6dc7561b9e7 100644
--- a/code/modules/mob/living/carbon/human/species/tajaran.dm
+++ b/code/modules/mob/living/carbon/human/species/tajaran.dm
@@ -46,6 +46,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/tajaran
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/unathi.dm b/code/modules/mob/living/carbon/human/species/unathi.dm
index a83e48de6b2..788a8c4a107 100644
--- a/code/modules/mob/living/carbon/human/species/unathi.dm
+++ b/code/modules/mob/living/carbon/human/species/unathi.dm
@@ -60,6 +60,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/unathi
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/vox.dm b/code/modules/mob/living/carbon/human/species/vox.dm
index 0584cb6395e..75f48ccf266 100644
--- a/code/modules/mob/living/carbon/human/species/vox.dm
+++ b/code/modules/mob/living/carbon/human/species/vox.dm
@@ -67,6 +67,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/vox
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/vulpkanin.dm b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
index 582825ef1a5..23acc7ada8f 100644
--- a/code/modules/mob/living/carbon/human/species/vulpkanin.dm
+++ b/code/modules/mob/living/carbon/human/species/vulpkanin.dm
@@ -39,6 +39,8 @@
INTERNAL_ORGAN_EARS = /obj/item/organ/internal/ears,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/vulpkanin
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin),
diff --git a/code/modules/mob/living/carbon/human/species/wryn.dm b/code/modules/mob/living/carbon/human/species/wryn.dm
index 6499c5192d3..a5d144f9c5b 100644
--- a/code/modules/mob/living/carbon/human/species/wryn.dm
+++ b/code/modules/mob/living/carbon/human/species/wryn.dm
@@ -37,6 +37,8 @@
INTERNAL_ORGAN_WAX_GLANDS = /obj/item/organ/internal/wryn/glands,
)
+ meat_type = /obj/item/reagent_containers/food/snacks/meat/humanoid/wryn
+
has_limbs = list(
BODY_ZONE_CHEST = list("path" = /obj/item/organ/external/chest/wryn),
BODY_ZONE_PRECISE_GROIN = list("path" = /obj/item/organ/external/groin/wryn),
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index 527690de353..96be79797fe 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -433,7 +433,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
return
//masks and helmets can obscure our facial hair, unless we're a synthetic
- if((head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR)))
+ if((head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKFACIALHAIR)))
return
//base icons
@@ -704,6 +704,7 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
remove_overlay(GLASSES_LAYER)
remove_overlay(GLASSES_OVER_LAYER)
remove_overlay(OVER_MASK_LAYER)
+ remove_overlay(OVER_HEAD_LAYER)
if(client && hud_used)
var/obj/screen/inventory/inv = hud_used.inv_slots[slot_glasses]
@@ -727,7 +728,11 @@ GLOBAL_LIST_EMPTY(damage_icon_parts)
var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style]
var/obj/item/clothing/glasses/G = glasses
- if(istype(G) && G.over_mask) //If the user's used the 'wear over mask' verb on the glasses.
+ if(head && !(head.flags_inv & MASKCOVERSEYES || head.flags_cover & HEADCOVERSEYES) && G.over_hat && istype(G))
+ new_glasses.layer = -OVER_HEAD_LAYER
+ overlays_standing[OVER_HEAD_LAYER] = new_glasses
+ apply_overlay(OVER_HEAD_LAYER)
+ else if(istype(G) && G.over_mask) //If the user's used the 'wear over mask' verb on the glasses.
new_glasses.layer = -OVER_MASK_LAYER
overlays_standing[OVER_MASK_LAYER] = new_glasses
apply_overlay(OVER_MASK_LAYER)
diff --git a/code/modules/mob/living/carbon/human/update_stat.dm b/code/modules/mob/living/carbon/human/update_stat.dm
index 1a88a0fa867..afb708a6496 100644
--- a/code/modules/mob/living/carbon/human/update_stat.dm
+++ b/code/modules/mob/living/carbon/human/update_stat.dm
@@ -23,5 +23,11 @@
return ..() // Fallback if we don't have a species or DNA
+/mob/living/carbon/human/has_vision(information_only = FALSE)
+ if(dna?.species)
+ return dna.species.has_vision(src, information_only)
+ return ..()
+
+
/mob/living/carbon/human/check_death_method()
return dna.species.dies_at_threshold
diff --git a/code/modules/mob/living/carbon/life.dm b/code/modules/mob/living/carbon/life.dm
index 6fd4348a94b..e39b81920b8 100644
--- a/code/modules/mob/living/carbon/life.dm
+++ b/code/modules/mob/living/carbon/life.dm
@@ -97,6 +97,8 @@
if(breath)
loc.assume_air(breath)
air_update_turf()
+ if(ishuman(src) && !internal && environment.temperature < 278 && environment.return_pressure() > 20)
+ new /obj/effect/frosty_breath(loc, src)
//Third link in a breath chain, calls handle_breath_temperature()
/mob/living/carbon/proc/check_breath(datum/gas_mixture/breath)
@@ -259,7 +261,9 @@
continue
if(times_fired % 3 == 1)
M.adjustBruteLoss(5)
- adjust_nutrition(10)
+ //Vampires don't get nutrition from devouring mobs
+ if(!isvampire(src))
+ adjust_nutrition(10)
//this updates all special effects: only stamina for now
/mob/living/carbon/handle_status_effects()
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c9c156b2cac..537d6b6f1ad 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -328,16 +328,17 @@
return TRUE
target.visible_message(
- span_danger("[declent_ru(NOMINATIVE)] указыва[pluralize_ru(src.gender,"ет","ют")] [hand_item.declent_ru(INSTRUMENTAL)] на [pointed_object]!"),
- span_userdanger("[declent_ru(NOMINATIVE)] указыва[pluralize_ru(src.gender,"ет","ют")] [hand_item.declent_ru(INSTRUMENTAL)] на [pluralize_ru(target.gender,"тебя","вас")]!"),
+ span_danger("[declent_ru(NOMINATIVE)] направля[pluralize_ru(src.gender,"ет","ют")] [hand_item.declent_ru(INSTRUMENTAL)] на [pointed_object]!"),
+ span_userdanger("[declent_ru(NOMINATIVE)] направля[pluralize_ru(src.gender,"ет","ют")] [hand_item.declent_ru(INSTRUMENTAL)] на [pluralize_ru(target.gender,"тебя","вас")]!"),
)
- SEND_SOUND(target, sound('sound/weapons/targeton.ogg'))
+ SEND_SOUND(target, 'sound/weapons/targeton.ogg')
+ SEND_SOUND(src, 'sound/weapons/targeton.ogg')
add_emote_logs(src, "point [hand_item] HARM to [key_name(target)] [COORD(target)]")
return TRUE
if(istype(hand_item, /obj/item/toy/russian_revolver/trick_revolver) && target != hand_item)
var/obj/item/toy/russian_revolver/trick_revolver/trick = hand_item
- visible_message(span_danger("[declent_ru(NOMINATIVE)] указыва[pluralize_ru(src.gender,"ет","ют")] [trick.declent_ru(INSTRUMENTAL)] на... и [trick.declent_ru(NOMINATIVE)] срабатывает у [genderize_ru(gender, "него","неё","него","них")] в руке!"))
+ visible_message(span_danger("[declent_ru(NOMINATIVE)] направля[pluralize_ru(src.gender,"ет","ют")] [trick.declent_ru(INSTRUMENTAL)] на... и [trick.declent_ru(NOMINATIVE)] срабатывает у [genderize_ru(gender, "него","неё","него","них")] в руках!"))
trick.shoot_gun(src)
add_emote_logs(src, "point to [key_name(target)] [COORD(target)]")
return TRUE
@@ -375,7 +376,7 @@
return 1
/mob/living/welder_act(mob/user, obj/item/I)
- if(!I.tool_use_check(null, 0)) //Don't need the message, just if it succeeded
+ if(!I.tool_use_check(user, 0, silent = TRUE)) //Don't need the message, just if it succeeded
return
if(IgniteMob())
message_admins("[key_name_admin(user)] set [key_name_admin(src)] on fire with [I]")
@@ -1119,7 +1120,7 @@
return 0
/mob/living/proc/attempt_harvest(obj/item/I, mob/user)
- if(user.a_intent == INTENT_HARM && stat == DEAD && butcher_results) //can we butcher it?
+ if(user.a_intent == INTENT_HARM && stat == DEAD && (butcher_results || issmall(src))) //can we butcher it?
var/sharpness = is_sharp(I)
if(sharpness)
to_chat(user, "You begin to butcher [src]...")
@@ -1241,7 +1242,7 @@
/mob/living/extinguish_light(force = FALSE)
for(var/atom/A in src)
if(A.light_range > 0)
- A.extinguish_light()
+ A.extinguish_light(force)
/mob/living/vv_edit_var(var_name, var_value)
switch(var_name)
@@ -1379,3 +1380,48 @@ GLOBAL_LIST_INIT(ventcrawl_machinery, list(/obj/machinery/atmospherics/unary/ven
if(target_move)
remove_ventcrawl()
add_ventcrawl(loc, target_move)
+
+
+/mob/living/proc/get_visible_species() // Used only in /mob/living/carbon/human and /mob/living/simple_animal/hostile/morph
+ return "Unknown"
+
+
+/mob/living/run_examinate(atom/target)
+ var/datum/status_effect/staring/user_staring_effect = has_status_effect(STATUS_EFFECT_STARING)
+ face_atom(target)
+
+ if(user_staring_effect || hindered_inspection(target))
+ return
+
+ var/examine_time = target.get_examine_time()
+ if(examine_time && target != src)
+ var/visible_gender = target.get_visible_gender()
+ var/visible_species = "Unknown"
+
+ if(isliving(target))
+ var/mob/living/target_living = target
+ visible_species = target_living.get_visible_species()
+
+ if(ishuman(target)) // Yep. Only humans affected by catched looks.
+ var/datum/status_effect/staring/target_staring_effect = target_living.has_status_effect(STATUS_EFFECT_STARING)
+ if(target_staring_effect)
+ target_staring_effect.catch_look(src)
+
+ user_staring_effect = apply_status_effect(STATUS_EFFECT_STARING, examine_time, target, visible_gender, visible_species)
+ if(do_mob(src, src, examine_time, TRUE, list(CALLBACK(src, PROC_REF(hindered_inspection), target)), TRUE))
+ ..()
+ else
+ ..()
+
+
+/mob/living/proc/hindered_inspection(atom/target)
+ if(QDELETED(src) || QDELETED(target))
+ return TRUE
+ if(!(target in view(client.maxview(), client.eye)))
+ for(var/obj/screen/storage/box in client.screen)
+ if(!box.is_item_accessible(target, src))
+ return TRUE
+ if(!has_vision(information_only = TRUE))
+ to_chat(src, span_notice("Здесь что-то есть, но вы не видите — что именно."))
+ return TRUE
+ return FALSE
diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm
index 70e0b8222fc..2e83cacdcf7 100644
--- a/code/modules/mob/living/silicon/ai/ai.dm
+++ b/code/modules/mob/living/silicon/ai/ai.dm
@@ -71,7 +71,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/can_dominate_mechs = 0
var/shunted = 0 //1 if the AI is currently shunted. Used to differentiate between shunted and ghosted/braindead
- var/control_disabled = 0 // Set to 1 to stop AI from interacting via Click() -- TLE
+ var/control_disabled = FALSE // Set to TRUE to stop AI from interacting via Click() -- TLE
var/malfhacking = 0 // More or less a copy of the above var, so that malf AIs can hack and still get new cyborgs -- NeoFite
var/malf_cooldown = 0 //Cooldown var for malf modules, stores a worldtime + cooldown
@@ -85,7 +85,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
var/datum/trackable/track = new()
var/last_paper_seen = null
- var/can_shunt = 1
+ var/can_shunt = TRUE
var/last_announcement = ""
var/datum/announcement/priority/announcement
var/mob/living/simple_animal/bot/Bot
@@ -148,10 +148,9 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
proc_holder_list = new()
- if(B?.clock || isclocker(B?.brainmob))
- laws = new /datum/ai_laws/ratvar
- overlays += "clockwork_frame"
- if(L)
+ if(B?.clock)
+ ratvar_act()
+ else if(L)
if(istype(L, /datum/ai_laws))
laws = L
else
@@ -339,7 +338,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
use_power = ACTIVE_POWER_USE
power_channel = EQUIP
var/mob/living/silicon/ai/powered_ai = null
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
/obj/machinery/ai_powersupply/New(mob/living/silicon/ai/ai=null)
powered_ai = ai
@@ -1239,7 +1238,7 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
/mob/living/silicon/ai/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
if(anchored)
user.visible_message("\The [user] starts to unbolt \the [src] from the plating...")
if(!do_after(user, 40 * W.toolspeed * gettoolspeedmod(user), target = src))
@@ -1307,8 +1306,8 @@ GLOBAL_LIST_INIT(ai_verbs_default, list(
on_the_card = TRUE
aiRestorePowerRoutine = 0//So the AI initially has power.
update_blind_effects()
- control_disabled = 1//Can't control things remotely if you're stuck in a card!
- aiRadio.disabledAi = 1 //No talking on the built-in radio for you either!
+ control_disabled = TRUE//Can't control things remotely if you're stuck in a card!
+ aiRadio.disabledAi = TRUE //No talking on the built-in radio for you either!
forceMove(card) //Throw AI into the card.
to_chat(src, "You have been downloaded to a mobile storage device. Remote device connection severed.")
to_chat(user, "Transfer successful: [name] ([rand(1000,9999)].exe) removed from host terminal and stored within local memory.")
diff --git a/code/modules/mob/living/silicon/pai/pai.dm b/code/modules/mob/living/silicon/pai/pai.dm
index 7e4eecf31cd..44947315756 100644
--- a/code/modules/mob/living/silicon/pai/pai.dm
+++ b/code/modules/mob/living/silicon/pai/pai.dm
@@ -214,7 +214,7 @@
return 0
..()
-/mob/living/silicon/pai/MouseDrop(atom/over_object)
+/mob/living/silicon/pai/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
return
/mob/living/silicon/pai/emp_act(severity)
@@ -608,21 +608,21 @@
return H
-/mob/living/silicon/pai/MouseDrop(atom/over_object)
- var/mob/living/carbon/human/H = over_object //changed to human to avoid stupid issues like xenos holding pAIs.
- if(!istype(H) || !Adjacent(H)) return ..()
+/mob/living/silicon/pai/MouseDrop(mob/living/carbon/human/user, src_location, over_location, src_control, over_control, params)
+ if(!ishuman(user) || !Adjacent(user))
+ return ..()
if(usr == src)
- switch(alert(H, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
+ switch(alert(user, "[src] wants you to pick [p_them()] up. Do it?",,"Yes","No"))
if("Yes")
- if(Adjacent(H))
- get_scooped(H)
+ if(Adjacent(user))
+ get_scooped(user)
else
- to_chat(src, "You need to stay in reaching distance to be picked up.")
+ to_chat(src, span_warning("You need to stay in reaching distance to be picked up."))
if("No")
- to_chat(src, "[H] decided not to pick you up.")
+ to_chat(src, span_warning("[user] decided not to pick you up."))
else
- if(Adjacent(H))
- get_scooped(H)
+ if(Adjacent(user))
+ get_scooped(user)
else
return ..()
diff --git a/code/modules/mob/living/silicon/pai/software/pai_toggles.dm b/code/modules/mob/living/silicon/pai/software/pai_toggles.dm
index bf95c21d34d..a83fd1df484 100644
--- a/code/modules/mob/living/silicon/pai/software/pai_toggles.dm
+++ b/code/modules/mob/living/silicon/pai/software/pai_toggles.dm
@@ -7,10 +7,12 @@
toggle_software = TRUE
/datum/pai_software/sec_hud/toggle(mob/living/silicon/pai/user)
- user.secHUD = !user.secHUD
user.remove_med_sec_hud()
+ user.secHUD = !user.secHUD
if(user.secHUD)
user.add_sec_hud()
+ user.medHUD = FALSE
+ user.adv_secHUD = FALSE
/datum/pai_software/sec_hud/is_active(mob/living/silicon/pai/user)
return user.secHUD
@@ -24,10 +26,12 @@
toggle_software = TRUE
/datum/pai_software/med_hud/toggle(mob/living/silicon/pai/user)
- user.medHUD = !user.medHUD
user.remove_med_sec_hud()
+ user.medHUD = !user.medHUD
if(user.medHUD)
user.add_med_hud()
+ user.secHUD = FALSE
+ user.adv_secHUD = FALSE
/datum/pai_software/med_hud/is_active(mob/living/silicon/pai/user)
return user.medHUD
@@ -133,10 +137,12 @@
only_syndi = TRUE
/datum/pai_software/adv_sec_hud/toggle(mob/living/silicon/pai/user)
- user.adv_secHUD = !user.adv_secHUD
user.remove_med_sec_hud()
+ user.adv_secHUD = !user.adv_secHUD
if(user.adv_secHUD)
user.add_sec_hud()
+ user.medHUD = FALSE
+ user.secHUD = FALSE
/datum/pai_software/adv_sec_hud/is_active(mob/living/silicon/pai/user)
return user.adv_secHUD
diff --git a/code/modules/mob/living/silicon/robot/drone/drone.dm b/code/modules/mob/living/silicon/robot/drone/drone.dm
index e9f6984c588..72c78236e10 100644
--- a/code/modules/mob/living/silicon/robot/drone/drone.dm
+++ b/code/modules/mob/living/silicon/robot/drone/drone.dm
@@ -156,7 +156,7 @@
to_chat(user, "The maintenance drone chassis not compatible with \the [W].")
return
- else if(istype(W, /obj/item/crowbar))
+ else if(W.tool_behaviour == TOOL_CROWBAR)
to_chat(user, "The machine is hermetically sealed. You can't open the case.")
return
@@ -345,18 +345,6 @@
to_chat(src, "Don't invade their worksites, don't steal their resources, don't tell them about the changeling in the toilets.")
to_chat(src, "Make sure crew members do not notice you..")
-/*
- sprite["Default"] = "repairbot"
- sprite["Mk2 Mousedrone"] = "mk2"
- sprite["Mk3 Monkeydrone"] = "mk3"
- var/icontype
- icontype = input(player,"Pick an icon") in sprite
- icon_state = sprite[icontype]
- updateicon()
-
- choose_icon(6,sprite)
-*/
-
/mob/living/silicon/robot/drone/Bump(atom/movable/AM, yes)
if(is_type_in_list(AM, allowed_bumpable_objects))
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index 07f27af883d..781ea202a76 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1663,7 +1663,7 @@ GLOBAL_LIST_INIT(robot_verbs_default, list(
/mob/living/silicon/robot/extinguish_light(force = FALSE)
..()
- update_headlamp(1, 150)
+ update_headlamp(turn_off = TRUE, cooldown = 15 SECONDS)
/mob/living/silicon/robot/rejuvenate()
..()
diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm
index 14fadcff07b..5502d93a434 100644
--- a/code/modules/mob/living/silicon/robot/robot_modules.dm
+++ b/code/modules/mob/living/silicon/robot/robot_modules.dm
@@ -396,6 +396,7 @@
modules += new /obj/item/lightreplacer/cyborg(src)
modules += new /obj/item/holosign_creator/janitor(src)
modules += new /obj/item/extinguisher/mini(src)
+ modules += new /obj/item/reagent_containers/spray/pestspray(src) //kill all kidans!
modules += new /obj/item/crowbar/cyborg(src)
modules += new /obj/item/gps/cyborg(src)
emag = new /obj/item/reagent_containers/spray(src)
diff --git a/code/modules/mob/living/simple_animal/bot/cleanbot.dm b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
index 5b40a820fa9..18efda2bdd7 100644
--- a/code/modules/mob/living/simple_animal/bot/cleanbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/cleanbot.dm
@@ -41,10 +41,16 @@
var/datum/job/janitor/J = new/datum/job/janitor
access_card.access += J.get_access()
prev_access = access_card.access
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/mob/living/simple_animal/bot/cleanbot/update_icon_state()
+ return
+
+
+/mob/living/simple_animal/bot/cleanbot/update_overlays()
+ . = ..()
-/mob/living/simple_animal/bot/cleanbot/update_icon()
- overlays.Cut()
var/overlay_state
switch(mode)
if(BOT_CLEANING)
@@ -52,15 +58,10 @@
if(BOT_IDLE)
overlay_state = "[on]"
- var/mutable_appearance/state_appearance = mutable_appearance(icon, "[icon_state][overlay_state]")
- state_appearance.appearance_flags |= RESET_COLOR
- overlays += state_appearance
+ . += mutable_appearance(icon, "[icon_state][overlay_state]", appearance_flags = RESET_COLOR)
if(mask_color)
- var/mutable_appearance/casing_mask = mutable_appearance(icon, "cleanbot_mask")
- casing_mask.appearance_flags |= RESET_COLOR
- casing_mask.color = mask_color
- overlays += casing_mask
+ . += mutable_appearance(icon, "cleanbot_mask", appearance_flags = RESET_COLOR, color = mask_color)
/mob/living/simple_animal/bot/cleanbot/bot_reset()
diff --git a/code/modules/mob/living/simple_animal/bot/construction.dm b/code/modules/mob/living/simple_animal/bot/construction.dm
index 392b965c497..179bcc64f43 100644
--- a/code/modules/mob/living/simple_animal/bot/construction.dm
+++ b/code/modules/mob/living/simple_animal/bot/construction.dm
@@ -14,7 +14,7 @@
var/created_name = "Cleanbot"
var/robot_arm = /obj/item/robot_parts/l_arm
-/obj/item/bucket_sensor/attackby(obj/item/W, mob/user as mob, params)
+/obj/item/bucket_sensor/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
if(!user.drop_transfer_item_to_loc(W, src))
@@ -45,6 +45,52 @@
var/build_step = 0
var/created_name = "\improper ED-209 Security Robot" //To preserve the name if it's a unique securitron I guess
var/lasercolor = ""
+ var/new_name = ""
+
+
+/obj/item/ed209_assembly/update_name(updates = ALL)
+ . = ..()
+ switch(build_step)
+ if(1,2)
+ name = "legs/frame assembly"
+ if(3)
+ name = "vest/legs/frame assembly"
+ if(4)
+ name = "shielded frame assembly"
+ if(5)
+ name = "covered and shielded frame assembly"
+ if(6)
+ name = "covered, shielded and sensored frame assembly"
+ if(7)
+ name = "wired ED-209 assembly"
+ if(8)
+ name = new_name
+ if(9)
+ name = "armed [name]"
+
+
+/obj/item/ed209_assembly/update_icon_state()
+ switch(build_step)
+ if(1)
+ item_state = "ed209_leg"
+ icon_state = "ed209_leg"
+ if(2)
+ item_state = "ed209_legs"
+ icon_state = "ed209_legs"
+ if(3,4)
+ item_state = "[lasercolor]ed209_shell"
+ icon_state = "[lasercolor]ed209_shell"
+ if(5)
+ item_state = "[lasercolor]ed209_hat"
+ icon_state = "[lasercolor]ed209_hat"
+ if(6,7)
+ item_state = "[lasercolor]ed209_prox"
+ icon_state = "[lasercolor]ed209_prox"
+ if(8,9)
+ item_state = "[lasercolor]ed209_taser"
+ icon_state = "[lasercolor]ed209_taser"
+
+
/obj/item/ed209_assembly/attackby(obj/item/W, mob/user, params)
..()
@@ -64,13 +110,7 @@
qdel(W)
build_step++
to_chat(user, "You add the robot leg to [src].")
- name = "legs/frame assembly"
- if(build_step == 1)
- item_state = "ed209_leg"
- icon_state = "ed209_leg"
- else
- item_state = "ed209_legs"
- icon_state = "ed209_legs"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
if(2)
var/newcolor = ""
@@ -85,14 +125,12 @@
qdel(W)
build_step++
to_chat(user, "You add the armor to [src].")
- name = "vest/legs/frame assembly"
- item_state = "[lasercolor]ed209_shell"
- icon_state = "[lasercolor]ed209_shell"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
if(3)
if(W.tool_behaviour == TOOL_WELDER && W.use_tool(src, user, volume = W.tool_volume))
build_step++
- name = "shielded frame assembly"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
to_chat(user, "You weld the vest to [src].")
if(4)
switch(lasercolor)
@@ -113,9 +151,7 @@
qdel(W)
build_step++
to_chat(user, "You add the helmet to [src].")
- name = "covered and shielded frame assembly"
- item_state = "[lasercolor]ed209_hat"
- icon_state = "[lasercolor]ed209_hat"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
if(5)
if(isprox(W))
@@ -124,9 +160,7 @@
qdel(W)
build_step++
to_chat(user, "You add the prox sensor to [src].")
- name = "covered, shielded and sensored frame assembly"
- item_state = "[lasercolor]ed209_prox"
- icon_state = "[lasercolor]ed209_prox"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
if(6)
if(istype(W, /obj/item/stack/cable_coil))
@@ -141,43 +175,32 @@
build_step = 7
playsound(loc, W.usesound, 50, 1)
to_chat(user, "You wire the ED-209 assembly.")
- name = "wired ED-209 assembly"
+ update_appearance(UPDATE_NAME)
if(7)
- var/newname = ""
+ new_name = ""
switch(lasercolor)
if("b")
if(!istype(W, /obj/item/gun/energy/laser/tag/blue))
return
- newname = "bluetag ED-209 assembly"
+ new_name = "bluetag ED-209 assembly"
if("r")
if(!istype(W, /obj/item/gun/energy/laser/tag/red))
return
- newname = "redtag ED-209 assembly"
+ new_name = "redtag ED-209 assembly"
if("")
if(!istype(W, /obj/item/gun/energy/gun/advtaser))
return
- newname = "taser ED-209 assembly"
+ new_name = "taser ED-209 assembly"
else
return
if(!user.drop_transfer_item_to_loc(W, src))
return
- name = newname
build_step++
to_chat(user, "You add [W] to [src].")
- item_state = "[lasercolor]ed209_taser"
- icon_state = "[lasercolor]ed209_taser"
+ update_appearance(UPDATE_NAME|UPDATE_ICON_STATE)
qdel(W)
- if(8)
- if(istype(W, /obj/item/screwdriver))
- playsound(loc, W.usesound, 100, 1)
- to_chat(user, "You start attaching the gun to the frame...")
- if(do_after(user, 40 * W.toolspeed * gettoolspeedmod(user), target = src))
- build_step++
- name = "armed [name]"
- to_chat(user, "Taser gun attached.")
-
if(9)
if(istype(W, /obj/item/stock_parts/cell))
if(!user.drop_transfer_item_to_loc(W, src))
@@ -190,6 +213,19 @@
user.temporarily_remove_item_from_inventory(src, force = TRUE)
qdel(src)
+
+/obj/item/ed209_assembly/screwdriver_act(mob/living/user, obj/item/I)
+ if(build_step != 8)
+ return
+ I.play_tool_sound(src)
+ to_chat(user, "You start attaching the gun to the frame...")
+ if(do_after(user, 4 SECONDS * I.toolspeed, target = src))
+ build_step++
+ update_appearance(UPDATE_NAME)
+ to_chat(user, "You attach the gun to the frame.")
+ return TRUE
+
+
//Floorbot assemblies
/obj/item/toolbox_tiles
desc = "It's a toolbox with tiles sticking out the top"
@@ -242,7 +278,7 @@
B.toolbox_color = "s"
if(/obj/item/storage/toolbox/fakesyndi)
B.toolbox_color = "s"
- B.icon_state = "[B.toolbox_color]toolbox_tiles"
+ B.update_icon(UPDATE_ICON_STATE)
user.put_in_hands(B, ignore_anim = FALSE)
to_chat(user, "You add the tiles into the empty toolbox. They protrude from the top.")
user.temporarily_remove_item_from_inventory(src, force = TRUE)
@@ -251,6 +287,11 @@
to_chat(user, "You need 10 floor tiles to start building a floorbot.")
return
+
+/obj/item/toolbox_tiles/update_icon_state()
+ icon_state = "[toolbox_color]toolbox_tiles"
+
+
/obj/item/toolbox_tiles/attackby(obj/item/W, mob/user, params)
..()
if(isprox(W))
@@ -260,7 +301,7 @@
var/obj/item/toolbox_tiles/sensor/B = new /obj/item/toolbox_tiles/sensor(drop_location())
B.created_name = created_name
B.toolbox_color = src.toolbox_color
- B.icon_state = "[B.toolbox_color]toolbox_tiles_sensor"
+ B.update_icon(UPDATE_ICON_STATE)
user.put_in_hands(B, ignore_anim = FALSE)
to_chat(user, "You add the sensor to the toolbox and tiles.")
user.temporarily_remove_item_from_inventory(src, force = TRUE)
@@ -272,6 +313,11 @@
created_name = t
add_game_logs("[key_name(user)] has renamed a robot to [t]", user)
+
+/obj/item/toolbox_tiles/sensor/update_icon_state()
+ icon_state = "[toolbox_color]toolbox_tiles_sensor"
+
+
/obj/item/toolbox_tiles/sensor/attackby(obj/item/W, mob/user, params)
..()
if(istype(W, /obj/item/robot_parts/l_arm) || istype(W, /obj/item/robot_parts/r_arm))
@@ -340,14 +386,21 @@
..()
if(new_skin)
skin = new_skin
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
-/obj/item/firstaid_arm_assembly/update_icon()
- overlays.Cut()
+/obj/item/firstaid_arm_assembly/update_overlays()
+ . = ..()
if(skin)
- overlays += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
+ . += image('icons/obj/aibots.dmi', "kit_skin_[skin]")
if(build_step > 0)
- overlays += image('icons/obj/aibots.dmi', "na_scanner")
+ . += image('icons/obj/aibots.dmi', "na_scanner")
+
+
+/obj/item/firstaid_arm_assembly/update_name(updates = ALL)
+ . = ..()
+ if(build_step == 1)
+ name = "First aid/robot arm/health analyzer assembly"
/obj/item/firstaid_arm_assembly/attackby(obj/item/I, mob/user, params)
@@ -366,8 +419,7 @@
qdel(I)
build_step++
to_chat(user, "You add the health sensor to [src].")
- name = "First aid/robot arm/health analyzer assembly"
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
if(1)
if(isprox(I))
@@ -403,32 +455,77 @@
var/build_step = 0
var/robot_arm = /obj/item/robot_parts/l_arm
+
+/obj/item/secbot_assembly/update_name(updates = ALL)
+ . = ..()
+ switch(build_step)
+ if(2)
+ name = "helmet/signaler/prox sensor assembly"
+ if(3)
+ name = "helmet/signaler/prox sensor/robot arm assembly"
+
+
+/obj/item/secbot_assembly/update_overlays()
+ . = ..()
+ switch(build_step)
+ if(1)
+ . += "hs_hole"
+ if(2)
+ . += "hs_eye"
+ if(3)
+ . += "hs_arm"
+
+
+/obj/item/secbot_assembly/screwdriver_act(mob/living/user, obj/item/I)
+ if(build_step != 0 && build_step != 2 && build_step != 3)
+ return
+
+ switch(build_step)
+ if(0)
+ new /obj/item/assembly/signaler(get_turf(src))
+ new /obj/item/clothing/head/helmet(get_turf(src))
+ to_chat(user, "You disconnect the signaler from the helmet.")
+ qdel(src)
+ if(2)
+ new /obj/item/assembly/prox_sensor(get_turf(src))
+ to_chat(user, "You detach the proximity sensor from [src].")
+ build_step--
+ if(3)
+ new /obj/item/robot_parts/l_arm(get_turf(src))
+ to_chat(user, "You remove the robot arm from [src].")
+ build_step--
+
+ I.play_tool_sound(src)
+ update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
+ return TRUE
+
+
/obj/item/clothing/head/helmet/attackby(obj/item/assembly/signaler/S, mob/user, params)
..()
if(!issignaler(S))
..()
return
- if(!S.secured)
- qdel(S)
- var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly(drop_location())
- user.put_in_hands(A, ignore_anim = FALSE)
- to_chat(user, "You add the signaler to the helmet.")
- user.temporarily_remove_item_from_inventory(src, force = TRUE)
- qdel(src)
- else
+ if(S.secured)
+ to_chat(user, "[S] is secured.")
return
+ qdel(S)
+ var/obj/item/secbot_assembly/A = new /obj/item/secbot_assembly(drop_location())
+ user.put_in_hands(A, ignore_anim = FALSE)
+ to_chat(user, "You add the signaler to the helmet.")
+ user.temporarily_remove_item_from_inventory(src, force = TRUE)
+ qdel(src)
+
+
/obj/item/secbot_assembly/attackby(obj/item/I, mob/user, params)
..()
if(I.tool_behaviour == TOOL_WELDER && I.use_tool(src, user, volume = I.tool_volume))
if(!build_step)
build_step++
- overlays += "hs_hole"
to_chat(user, "You weld a hole in [src]!")
else if(build_step == 1)
build_step--
- overlays -= "hs_hole"
to_chat(user, "You weld the hole in [src] shut!")
else if(isprox(I) && (build_step == 1))
@@ -436,8 +533,6 @@
return
build_step++
to_chat(user, "You add the prox sensor to [src]!")
- overlays += "hs_eye"
- name = "helmet/signaler/prox sensor assembly"
qdel(I)
else if(((istype(I, /obj/item/robot_parts/l_arm)) || (istype(I, /obj/item/robot_parts/r_arm))) && (build_step == 2))
@@ -445,8 +540,6 @@
return
build_step++
to_chat(user, "You add the robot arm to [src]!")
- name = "helmet/signaler/prox sensor/robot arm assembly"
- overlays += "hs_arm"
robot_arm = I.type
qdel(I)
@@ -467,7 +560,7 @@
created_name = t
add_game_logs("[key_name(user)] has renamed a robot to [t]", user)
- else if(istype(I, /obj/item/screwdriver))
+ else if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(!build_step)
new /obj/item/assembly/signaler(get_turf(src))
new /obj/item/clothing/head/helmet(get_turf(src))
@@ -486,15 +579,18 @@
to_chat(user, "You remove the robot arm from [src].")
build_step--
-//General Griefsky
-
- else if((istype(I, /obj/item/wrench)) && (build_step == 3))
+ else if((I.tool_behaviour == TOOL_WRENCH) && (build_step == 3))
var/obj/item/griefsky_assembly/A = new /obj/item/griefsky_assembly(drop_location())
user.put_in_hands(A, ignore_anim = FALSE)
to_chat(user, "You adjust the arm slots for extra weapons!.")
user.temporarily_remove_item_from_inventory(src, force = TRUE)
qdel(src)
+ update_appearance(UPDATE_NAME|UPDATE_OVERLAYS)
+
+
+//General Griefsky
+
/obj/item/griefsky_assembly
name = "\improper Griefsky assembly"
desc = "Some sort of bizarre assembly."
@@ -506,7 +602,7 @@
/obj/item/griefsky_assembly/attackby(obj/item/I, mob/user, params)
..()
- if((istype(I, /obj/item/melee/energy/sword)) && (!toy_step == 0 ))
+ if((istype(I, /obj/item/melee/energy/sword)) && (toy_step != 0 ))
to_chat(user, "You can't add an energy sword to [src]!.")
else if((istype(I, /obj/item/melee/energy/sword)) && (build_step < 3 ))
@@ -524,7 +620,7 @@
qdel(I)
qdel(src)
- else if((istype(I, /obj/item/toy/sword)) && (!build_step == 0 ))
+ else if((istype(I, /obj/item/toy/sword)) && (build_step != 0 ))
to_chat(user, "You can't add a toy sword to [src]!.")
else if((istype(I, /obj/item/toy/sword)) && (toy_step < 3 ))
@@ -542,7 +638,7 @@
qdel(I)
qdel(src)
- else if(istype(I, /obj/item/screwdriver))
+ else if(I.tool_behaviour == TOOL_SCREWDRIVER)
if((build_step == 1) || (build_step == 2) || (build_step == 3) || (build_step == 4))
new /obj/item/melee/energy/sword(get_turf(src))
to_chat(user, "You detach the energy sword from [src].")
@@ -552,6 +648,23 @@
to_chat(user, "You detach the toy sword from [src].")
toy_step--
+
+/obj/item/griefsky_assembly/screwdriver_act(mob/living/user, obj/item/I)
+ if(!build_step && !toy_step)
+ return
+
+ if(build_step)
+ new /obj/item/melee/energy/sword(get_turf(src))
+ to_chat(user, "You detach the energy sword from [src].")
+ build_step--
+ else if(toy_step)
+ new /obj/item/toy/sword(get_turf(src))
+ to_chat(user, "You detach the toy sword from [src].")
+ toy_step--
+ I.play_tool_sound(src)
+ return TRUE
+
+
//Honkbot Assembly
/obj/item/storage/box/clown/attackby(obj/item/W, mob/user, params)
if(!istype(W, /obj/item/robot_parts/l_arm) && !istype(W, /obj/item/robot_parts/r_arm))
@@ -589,7 +702,6 @@
return
build_step++
to_chat(user, "You add the proximity sensor to [src].")
- icon_state = "honkbot_proxy"
qdel(W)
else if(build_step == 1)
if(istype(W, /obj/item/bikehorn))
@@ -597,7 +709,6 @@
return
build_step++
to_chat(user, "You add the bikehorn to [src]! Honk!")
- desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished"
qdel(W)
else if(build_step == 2)
if(istype(W, /obj/item/instrument/trombone))
@@ -608,3 +719,17 @@
var/mob/living/simple_animal/bot/honkbot/A = new /mob/living/simple_animal/bot/honkbot(get_turf(src))
A.robot_arm = robot_arm
qdel(src)
+
+ update_appearance(UPDATE_DESC|UPDATE_ICON_STATE)
+
+
+/obj/item/honkbot_arm_assembly/update_icon_state()
+ if(build_step == 1)
+ icon_state = "honkbot_proxy"
+
+
+/obj/item/honkbot_arm_assembly/update_desc(updates = ALL)
+ . = ..()
+ if(build_step == 2)
+ desc = "A clown box with a robot arm and a bikehorn permanently grafted to it. It needs a trombone to be finished"
+
diff --git a/code/modules/mob/living/simple_animal/bot/floorbot.dm b/code/modules/mob/living/simple_animal/bot/floorbot.dm
index 4f286b054c4..8f9e83d5007 100644
--- a/code/modules/mob/living/simple_animal/bot/floorbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/floorbot.dm
@@ -427,7 +427,7 @@
update_icon()
-/mob/living/simple_animal/bot/floorbot/update_icon()
+/mob/living/simple_animal/bot/floorbot/update_icon_state()
if(mode == BOT_REPAIRING)
icon_state = "[toolbox_color]floorbot-c"
return
diff --git a/code/modules/mob/living/simple_animal/bot/medbot.dm b/code/modules/mob/living/simple_animal/bot/medbot.dm
index ebee011df78..63435a01a0b 100644
--- a/code/modules/mob/living/simple_animal/bot/medbot.dm
+++ b/code/modules/mob/living/simple_animal/bot/medbot.dm
@@ -116,10 +116,7 @@
drops_parts = FALSE
-/mob/living/simple_animal/bot/medbot/update_icon()
- overlays.Cut()
- if(skin)
- overlays += "medskin_[skin]"
+/mob/living/simple_animal/bot/medbot/update_icon_state()
if(!on)
icon_state = "medibot0"
return
@@ -132,6 +129,12 @@
icon_state = "medibot1"
+/mob/living/simple_animal/bot/medbot/update_overlays()
+ . = ..()
+ if(skin)
+ . += "medskin_[skin]"
+
+
/mob/living/simple_animal/bot/medbot/New(loc, new_skin)
..()
var/datum/job/doctor/J = new /datum/job/doctor
@@ -467,7 +470,7 @@
..()
-/mob/living/simple_animal/bot/medbot/examinate(atom/A as mob|obj|turf in view(client.maxview()))
+/mob/living/simple_animal/bot/medbot/examinate(atom/A as mob|obj|turf in view(client.maxview(), client.eye))
..()
if(has_vision(information_only = TRUE))
chemscan(src, A)
diff --git a/code/modules/mob/living/simple_animal/bot/mulebot.dm b/code/modules/mob/living/simple_animal/bot/mulebot.dm
index 510197dc34e..661c06d0bec 100644
--- a/code/modules/mob/living/simple_animal/bot/mulebot.dm
+++ b/code/modules/mob/living/simple_animal/bot/mulebot.dm
@@ -117,14 +117,14 @@
visible_message("[user] inserts a cell into [src].",
span_notice("You insert the new cell into [src]."))
update_controls()
- else if(istype(I, /obj/item/crowbar) && open && cell)
+ else if(I.tool_behaviour == TOOL_CROWBAR && open && cell)
cell.add_fingerprint(usr)
cell.forceMove(loc)
cell = null
visible_message("[user] crowbars out the power cell from [src].",
span_notice("You pry the powercell out of [src]."))
update_controls()
- else if(istype(I, /obj/item/wrench))
+ else if(I.tool_behaviour == TOOL_WRENCH)
if(health < maxHealth)
adjustBruteLoss(-25)
updatehealth()
@@ -132,7 +132,7 @@
span_notice("You repair [src]!"))
else
to_chat(user, span_notice("[src] does not need a repair!"))
- else if((istype(I, /obj/item/multitool) || istype(I, /obj/item/wirecutters)) && open)
+ else if((I.tool_behaviour == TOOL_MULTITOOL || I.tool_behaviour == TOOL_WIRECUTTER) && open)
return attack_hand(user)
else if(load && ismob(load)) // chance to knock off rider
if(prob(1 + I.force * 2))
@@ -168,17 +168,22 @@
playsound(loc, 'sound/effects/sparks1.ogg', 100, FALSE)
-/mob/living/simple_animal/bot/mulebot/update_icon()
+/mob/living/simple_animal/bot/mulebot/update_icon_state()
if(open)
icon_state="mulebot-hatch"
else
icon_state = "mulebot[wires.is_cut(WIRE_MOB_AVOIDANCE)]"
- overlays.Cut()
+
+
+/mob/living/simple_animal/bot/mulebot/update_overlays()
+ . = ..()
if(load && !ismob(load))//buckling handles the mob offsets
- load.pixel_y = initial(load.pixel_y) + 9
+ var/image/load_overlay = image(icon = load.icon, icon_state = load.icon_state)
+ load_overlay.pixel_y = initial(load.pixel_y) + 9
if(load.layer < layer)
- load.layer = layer + 0.1
- overlays += load
+ load_overlay.layer = layer + 0.1
+ load_overlay.overlays = load.overlays
+ . += load_overlay
/mob/living/simple_animal/bot/mulebot/ex_act(severity)
@@ -371,7 +376,7 @@
// mousedrop a crate to load the bot
// can load anything if hacked
-/mob/living/simple_animal/bot/mulebot/MouseDrop_T(atom/movable/AM, mob/user)
+/mob/living/simple_animal/bot/mulebot/MouseDrop_T(atom/movable/AM, mob/user, params)
if(!istype(AM) || user.incapacitated() || user.lying || !in_range(user, src))
return FALSE
@@ -451,8 +456,6 @@
mode = BOT_IDLE
- overlays.Cut()
-
unbuckle_all_mobs()
if(load)
@@ -467,6 +470,8 @@
step(load, dirn)
load = null
+ update_icon(UPDATE_OVERLAYS)
+
// in case non-load items end up in contents, dump every else too
// this seems to happen sometimes due to race conditions
// with items dropping as mobs are loaded
diff --git a/code/modules/mob/living/simple_animal/bot/syndicate.dm b/code/modules/mob/living/simple_animal/bot/syndicate.dm
index 3f81984e7d5..2b94268db81 100644
--- a/code/modules/mob/living/simple_animal/bot/syndicate.dm
+++ b/code/modules/mob/living/simple_animal/bot/syndicate.dm
@@ -39,7 +39,7 @@
prev_access = access_card.access
-/mob/living/simple_animal/bot/ed209/syndicate/update_icon()
+/mob/living/simple_animal/bot/ed209/syndicate/update_icon_state()
icon_state = initial(icon_state)
diff --git a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
index b7e6d671c3e..a30f8ec63bb 100644
--- a/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+++ b/code/modules/mob/living/simple_animal/friendly/spiderbot.dm
@@ -83,8 +83,6 @@
user.drop_transfer_item_to_loc(B, src)
mmi = B
transfer_personality(B)
-
- update_icon()
return 1
else if(O.GetID())
@@ -140,15 +138,25 @@
melee_damage_upper = 15
attack_sound = 'sound/machines/defib_zap.ogg'
+
/mob/living/simple_animal/spiderbot/proc/transfer_personality(obj/item/mmi/M)
mind = M.brainmob.mind
mind.key = M.brainmob.key
ckey = M.brainmob.ckey
- name = "Spider-bot ([M.brainmob.name])"
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
if(emagged)
to_chat(src, "You have been emagged; you are now completely loyal to [emagged_master] and [emagged_master.p_their()] every order!")
-/mob/living/simple_animal/spiderbot/update_icon()
+
+/mob/living/simple_animal/spiderbot/update_name(updates = ALL)
+ . = ..()
+ if(mmi)
+ name = "Spider-bot ([mmi.brainmob.name])"
+ else
+ name = "Spider-bot"
+
+
+/mob/living/simple_animal/spiderbot/update_icon_state()
if(mmi)
if(istype(mmi, /obj/item/mmi))
icon_state = "spiderbot-chassis-mmi"
@@ -161,6 +169,7 @@
icon_state = "spiderbot-chassis"
icon_living = "spiderbot-chassis"
+
/mob/living/simple_animal/spiderbot/proc/eject_brain()
if(mmi)
var/turf/T = get_turf(src)
@@ -168,5 +177,4 @@
if(mind)
mind.transfer_to(mmi.brainmob)
mmi = null
- name = "Spider-bot"
- update_icon()
+ update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
index 70af8c35472..9ec779ac62a 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
@@ -57,6 +57,7 @@ Difficulty: Medium
death_sound = "bodyfall"
footstep_type = FOOTSTEP_MOB_HEAVY
enraged_loot = /obj/item/disk/fauna_research/blood_drunk_miner
+ enraged_unique_loot = /obj/item/clothing/suit/hooded/explorer/blood
attack_action_types = list(/datum/action/innate/megafauna_attack/dash,
/datum/action/innate/megafauna_attack/kinetic_accelerator,
/datum/action/innate/megafauna_attack/transform_weapon)
@@ -65,7 +66,87 @@ Difficulty: Medium
icon_state = null
gpstag = "Mysterious Signal"
desc = "The sweet blood, oh, it sings to me."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
+
+/* New costume */
+
+/obj/item/clothing/suit/hooded/explorer/blood
+ name = "empowered explorer suit"
+ desc = "An armoured hood for exploring harsh environments. The sweet blood, oh, it sings to you."
+ armor = list("melee" = 55, "bullet" = 35, "laser" = 25, "energy" = 25, "bomb" = 75, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
+ hoodtype = /obj/item/clothing/head/hooded/explorer/blood
+ var/obj/effect/proc_holder/spell/blood_suit/blood_spell
+
+/obj/item/clothing/head/hooded/explorer/blood
+ name = "empowered explorer hood"
+ desc = "An armoured hood for exploring harsh environments. The sweet blood, oh, it sings to you."
+ armor = list("melee" = 55, "bullet" = 35, "laser" = 25, "energy" = 25, "bomb" = 75, "bio" = 100, "rad" = 50, "fire" = 100, "acid" = 100)
+
+/obj/item/clothing/suit/hooded/explorer/blood/Initialize(mapload)
+ .=..()
+ blood_spell = new
+
+/obj/item/clothing/suit/hooded/explorer/blood/Destroy()
+ QDEL_NULL(blood_spell)
+ return ..()
+
+/obj/effect/proc_holder/spell/blood_suit
+ name = "Bloodlust"
+ desc = "The sweet blood. My swetty blood I love you!"
+ base_cooldown = 20 SECONDS
+ clothes_req = FALSE
+ human_req = FALSE
+ phase_allowed = TRUE
+ should_recharge_after_cast = TRUE
+ stat_allowed = UNCONSCIOUS
+ sound = 'sound/misc/enter_blood.ogg'
+ action_icon_state = "bloodcrawl"
+ panel = "Blood Drunk"
+
+/obj/effect/proc_holder/spell/blood_suit/create_new_targeting()
+ return new /datum/spell_targeting/self
+
+/obj/effect/proc_holder/spell/blood_suit/cast(list/targets, mob/living/user = usr)
+ if(is_mining_level(user.z) || istype(get_area(user), /area/ruin/space/bubblegum_arena))
+ if(user.lying)
+ to_chat(user, span_colossus("Fight right now my bloody warrior!"))
+ else
+ to_chat(user, span_colossus("The blood sings to me. How pretty!"))
+ user.say("Oh sweet blood. I hear you singing!")
+ user.SetWeakened(0)
+ user.SetStunned(0)
+ user.SetParalysis(0)
+ user.SetSleeping(0)
+ user.SetConfused(0)
+ user.SetImmobilized(0)
+ user.adjustStaminaLoss(-100)
+ user.lying = FALSE
+ user.resting = FALSE
+ user.update_canmove()
+ else
+ to_chat(user, span_colossus("COME BACK TO ME, BLOODY WARRIOR."))
+ user.say("I don't hear a blood's sing!")
+ user.Stun(5 SECONDS)
+ user.Confused(20 SECONDS)
+ user.Slowed(20 SECONDS)
+ user.Dizzy(20 SECONDS)
+
+/obj/item/clothing/suit/hooded/explorer/blood/equipped(mob/living/carbon/human/user, slot, initial)
+ . = ..()
+ if(!ishuman(user))
+ return
+ if(slot == slot_wear_suit)
+ user.mob_spell_list += blood_spell
+ blood_spell.action.Grant(user)
+
+/obj/item/clothing/suit/hooded/explorer/blood/dropped(mob/living/carbon/human/user)
+ . = ..()
+
+ if(!ishuman(user))
+ return
+ if(user.get_item_by_slot(slot_wear_suit) == src)
+ user.mob_spell_list -= blood_spell
+ blood_spell.action.Remove(user)
/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner/Initialize(mapload)
. = ..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
index 2b631ef3898..6ed97039ab0 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
@@ -82,7 +82,7 @@ Difficulty: Hard
icon_state = null
gpstag = "Mysterious Signal"
desc = "You're not quite sure how a signal can be bloody."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
/mob/living/simple_animal/hostile/megafauna/bubblegum/Initialize(mapload)
. = ..()
@@ -488,7 +488,7 @@ Difficulty: Hard
/obj/effect/decal/cleanable/blood/gibs/bubblegum/can_bloodcrawl_in()
return TRUE
-/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon)
+/mob/living/simple_animal/hostile/megafauna/bubblegum/do_attack_animation(atom/A, visual_effect_icon, obj/item/used_item, no_effect)
if(!charging)
..()
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
index 3cd88392f41..938bb1f0c98 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
@@ -355,7 +355,7 @@ Difficulty: Very Hard
icon_state = null
gpstag = "Mysterious Signal"
desc = "Get in the fucking robot."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
#undef RANDOM_SHOTS
#undef BLAST
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
index c5a1f972e33..dd1dec43930 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
@@ -100,7 +100,7 @@ Difficulty: Medium
icon_state = null
gpstag = "Mysterious Signal"
desc = "Here there be dragons."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
/mob/living/simple_animal/hostile/megafauna/dragon/OpenFire()
if(swooping)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
index 5aa5034258e..2bdd4d2e3c7 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
@@ -64,6 +64,7 @@ Difficulty: Hard
del_on_death = TRUE
death_sound = 'sound/magic/repulse.ogg'
enraged_loot = /obj/item/disk/fauna_research/hierophant
+ enraged_unique_loot = /obj/item/clothing/accessory/necklace/hierophant_talisman
attack_action_types = list(/datum/action/innate/megafauna_attack/blink,
/datum/action/innate/megafauna_attack/chaser_swarm,
/datum/action/innate/megafauna_attack/cross_blasts,
@@ -765,6 +766,12 @@ Difficulty: Hard
light_range = 2
layer = LOW_OBJ_LAYER
anchored = TRUE
+ var/teleporting = FALSE
+
+
+/obj/effect/hierophant/update_icon_state()
+ icon_state = "hierophant_tele_[teleporting ? "on" : "off"]"
+
/obj/effect/hierophant/ex_act()
return
@@ -797,4 +804,4 @@ Difficulty: Hard
icon_state = null
gpstag = "Mysterious Signal"
desc = "Heed its words."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
index eae3590a2b2..5e3694824de 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/legion.dm
@@ -189,6 +189,9 @@ Difficulty: Medium
if(ismineralturf(t))
var/turf/simulated/mineral/M = t
M.attempt_drill(src)
+ if(iswallturf(t))
+ var/turf/simulated/wall/W = t
+ W.thermitemelt(time = 1 SECONDS)
for(var/mob/living/M in t)
if(faction_check(M.faction, faction, FALSE))
continue
@@ -228,4 +231,4 @@ Difficulty: Medium
icon_state = null
gpstag = "Mysterious Signal"
desc = "The message repeats."
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
index fd328613316..697c96554be 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
@@ -44,6 +44,9 @@
var/enraged = FALSE
/// Path of the hardmode loot disk, if applicable.
var/enraged_loot
+ /// Hardmode one loot
+ var/enraged_unique_loot
+ /// Only one loot from hardmode
/mob/living/simple_animal/hostile/megafauna/Initialize(mapload)
. = ..()
@@ -79,6 +82,8 @@
if(C && crusher_loot && C.total_damage >= maxHealth * 0.6)
spawn_crusher_loot()
if(enraged && length(loot) && enraged_loot) //Don't drop a disk if the boss drops no loot. Important for legion.
+ if(enraged_unique_loot)
+ loot += enraged_unique_loot
for(var/mob/living/M in urange(20, src)) //Yes big range, but for bubblegum arena
if(M.client)
loot += enraged_loot //Disk for each miner / borg.
@@ -154,6 +159,7 @@
mob_attack_logs += "[time_stamp()] Aggrod on [L][COORD(L)] at [COORD(src)]"
..()
+
/mob/living/simple_animal/hostile/megafauna/LoseTarget()
var/mob/living/L = target
if(istype(L) && L.mind)
diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
index c02f592f185..a460b45e7dd 100644
--- a/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
+++ b/code/modules/mob/living/simple_animal/hostile/megafauna/swarmer.dm
@@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(AISwarmerCapsByType, list(/mob/living/simple_animal/hostile/swa
icon_state = null
gpstag = "Hungry Signal"
desc = "Transmitted over the signal is a strange message repeated in every language you know of, and some you don't too..." //the message is "nom nom nom"
- invisibility = 100
+ invisibility = INVISIBILITY_ABSTRACT
//SWARMER AI
//AI versions of the swarmer mini-antag
diff --git a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
index fbaa26489b4..bcd8ddd048f 100644
--- a/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
+++ b/code/modules/mob/living/simple_animal/hostile/mining/basilisk.dm
@@ -146,7 +146,7 @@
. = ..()
if(.)
var/mob/living/L = target
- if(istype(L))
+ if(istype(L) && !isrobot(L))
L.AdjustWeakened(1 SECONDS)
L.Slowed(3 SECONDS)
L.Confused(3 SECONDS)
diff --git a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
index 61d25da2df4..51a857c9a2d 100644
--- a/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+++ b/code/modules/mob/living/simple_animal/hostile/spaceworms.dm
@@ -100,11 +100,12 @@
currentWormSeg = newSegment
for(var/mob/living/simple_animal/hostile/spaceWorm/SW in totalWormSegments)
- SW.update_icon()
+ SW.update_icon(UPDATE_ICON_STATE)
-/mob/living/simple_animal/hostile/spaceWorm/wormHead/update_icon()
+
+/mob/living/simple_animal/hostile/spaceWorm/wormHead/update_icon_state()
if(stat == CONSCIOUS || stat == UNCONSCIOUS)
- icon_state = "spacewormhead[previousWorm ? 1 : 0]"
+ icon_state = "spacewormhead[previousWorm ? "1" : "0"]"
if(previousWorm)
dir = get_dir(previousWorm,src)
else
@@ -113,7 +114,7 @@
for(var/mob/living/simple_animal/hostile/spaceWorm/SW in totalWormSegments)
if(SW == src)//incase src ends up in here we don't want an infinite loop
continue
- SW.update_icon()
+ SW.update_icon(UPDATE_ICON_STATE)
//Try to move onto target's turf and eat them
@@ -207,7 +208,7 @@
if(prob(stomachProcessProbability))
ProcessStomach()
- update_icon()//While most mobs don't call this on Life(), the worm would probably look stupid without it
+ update_icon(UPDATE_ICON_STATE)//While most mobs don't call this on Life(), the worm would probably look stupid without it
//Plus the worm's update_icon() isn't as beefy.
..() //Really high fuckin priority that this is at the bottom.
@@ -227,11 +228,11 @@
if(.)
if(previousWorm)
previousWorm.Move(segmentNextPos)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
//Update the appearence of this big weird chain-worm-thingy
-/mob/living/simple_animal/hostile/spaceWorm/update_icon()
+/mob/living/simple_animal/hostile/spaceWorm/update_icon_state()
if(stat != DEAD)
if(previousWorm)
icon_state = "spaceworm[get_dir(src,previousWorm) | get_dir(src,nextWorm)]"
diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/abillities.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/abillities.dm
index 39c9ca6325f..68d1ac5325e 100644
--- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/abillities.dm
+++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/abillities.dm
@@ -91,7 +91,7 @@
fireball_type = /obj/item/projectile/terrorspider/widow/venom
-/obj/effect/proc_holder/spell/fireball/venom_spit/update_icon()
+/obj/effect/proc_holder/spell/fireball/venom_spit/update_icon_state()
return
@@ -132,7 +132,7 @@
fireball_type = /obj/item/projectile/terrorspider/widow/smoke
-/obj/effect/proc_holder/spell/fireball/smoke_spit/update_icon()
+/obj/effect/proc_holder/spell/fireball/smoke_spit/update_icon_state()
return
diff --git a/code/modules/mob/living/simple_animal/hulk_power.dm b/code/modules/mob/living/simple_animal/hulk_power.dm
index 31dc1c2b4e8..10ccb9d5f15 100644
--- a/code/modules/mob/living/simple_animal/hulk_power.dm
+++ b/code/modules/mob/living/simple_animal/hulk_power.dm
@@ -485,7 +485,7 @@
return ..()
-/obj/effect/proc_holder/spell/fireball/hulk_spit/update_icon()
+/obj/effect/proc_holder/spell/fireball/hulk_spit/update_icon_state()
return
diff --git a/code/modules/mob/living/simple_animal/parrot.dm b/code/modules/mob/living/simple_animal/parrot.dm
index bf2095c0f4b..2a66e06b085 100644
--- a/code/modules/mob/living/simple_animal/parrot.dm
+++ b/code/modules/mob/living/simple_animal/parrot.dm
@@ -35,6 +35,7 @@
icon_resting = "parrot_sit"
pass_flags = PASSTABLE
can_collar = TRUE
+ blocks_emissive = EMISSIVE_BLOCK_UNIQUE
tts_seed = "Sniper"
faction = list("neutral", "jungle")
diff --git a/code/modules/mob/living/simple_animal/posessed_object.dm b/code/modules/mob/living/simple_animal/posessed_object.dm
index 25b295fd4e1..560cb2bc7b2 100644
--- a/code/modules/mob/living/simple_animal/posessed_object.dm
+++ b/code/modules/mob/living/simple_animal/posessed_object.dm
@@ -168,4 +168,3 @@
overlays = possessed_item.overlays
set_opacity(possessed_item.opacity)
return ..(NONE)
-
diff --git a/code/modules/mob/living/simple_animal/shade.dm b/code/modules/mob/living/simple_animal/shade.dm
index 8a6333566b4..f846ffa5dbc 100644
--- a/code/modules/mob/living/simple_animal/shade.dm
+++ b/code/modules/mob/living/simple_animal/shade.dm
@@ -45,6 +45,10 @@
else
..()
+/mob/living/simple_animal/shade/update_icon_state()
+ icon_state = holy ? "shade_angelic" : "shade"
+
+
/mob/living/simple_animal/shade/Process_Spacemove()
return TRUE
@@ -64,3 +68,18 @@
/mob/living/simple_animal/shade/sword/Initialize(mapload)
.=..()
status_flags |= GODMODE
+
+/mob/living/simple_animal/shade/talisman
+ faction = list("neutral")
+ tts_seed = "Alextraza_echo"
+ // Ckey check for master of talisman
+ var/master
+
+/mob/living/simple_animal/shade/talisman/Initialize(mapload)
+ .=..()
+ status_flags |= GODMODE
+
+/mob/living/simple_animal/shade/talisman/New()
+ ..()
+ var/datum/atom_hud/medsensor = GLOB.huds[DATA_HUD_MEDICAL_ADVANCED]
+ medsensor.add_hud_to(src)
diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm
index fd04de44d15..35bc800f4c9 100644
--- a/code/modules/mob/living/status_procs.dm
+++ b/code/modules/mob/living/status_procs.dm
@@ -737,14 +737,9 @@
/mob/living/proc/AdjustDeaf(amount, bound_lower = 0, bound_upper = INFINITY)
SetDeaf(directional_bounded_sum(AmountDeaf(), amount, bound_lower, bound_upper))
-/mob/living/proc/BecomeDeaf()
- mutations |= DEAF
-
/mob/living/proc/CureDeaf()
- mutations -= DEAF
CureIfHasDisability(GLOB.deafblock)
-
//
// DISABILITIES
//
diff --git a/code/modules/mob/living/taste.dm b/code/modules/mob/living/taste.dm
index fc1f100be9b..fd6deb1358e 100644
--- a/code/modules/mob/living/taste.dm
+++ b/code/modules/mob/living/taste.dm
@@ -15,7 +15,7 @@
/mob/living/proc/taste(datum/reagents/from)
if(last_taste_time + 50 < world.time)
var/taste_sensitivity = get_taste_sensitivity()
- var/text_output = from.generate_taste_message(taste_sensitivity)
+ var/text_output = from.generate_taste_message(taste_sensitivity, src)
// We dont want to spam the same message over and over again at the
// person. Give it a bit of a buffer.
if(AmountHallucinate() > 50 SECONDS && prob(25))
diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm
index 6dc0db4082e..1f53ae52427 100644
--- a/code/modules/mob/living/update_status.dm
+++ b/code/modules/mob/living/update_status.dm
@@ -1,12 +1,12 @@
/mob/living/update_blind_effects()
- if(!has_vision(information_only=TRUE))
- overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
- throw_alert("blind", /obj/screen/alert/blind)
- return 1
- else
+ if(has_vision(information_only = TRUE))
clear_fullscreen("blind")
clear_alert("blind")
- return 0
+ return FALSE
+
+ overlay_fullscreen("blind", /obj/screen/fullscreen/blind)
+ throw_alert("blind", /obj/screen/alert/blind)
+ return TRUE
/mob/living/update_blurry_effects()
@@ -46,13 +46,13 @@
// Whether the mob can hear things
/mob/living/can_hear()
- return !(DEAF in mutations) && !HAS_TRAIT(src, TRAIT_DEAF)
+ return !HAS_TRAIT(src, TRAIT_DEAF)
// Whether the mob is able to see
// `information_only` is for stuff that's purely informational - like blindness overlays
// This flag exists because certain things like angel statues expect this to be false for dead people
/mob/living/has_vision(information_only = FALSE)
- return (information_only && stat == DEAD) || !(AmountBlinded() || (BLINDNESS in mutations) || stat)
+ return (information_only && stat == DEAD) || !(AmountBlinded() || (BLINDNESS in mutations) || stat || get_total_tint() >= 3)
// Whether the mob is capable of talking
/mob/living/can_speak()
diff --git a/code/modules/mob/mob.dm b/code/modules/mob/mob.dm
index e65e901721a..3b63977c9f6 100644
--- a/code/modules/mob/mob.dm
+++ b/code/modules/mob/mob.dm
@@ -79,26 +79,25 @@
return
if(type)
- if((type & EMOTE_VISIBLE) && !has_vision(information_only = TRUE)) // Vision related
- if(!(alt))
+ if((type & EMOTE_VISIBLE) && !has_vision(information_only = TRUE)) //Vision related
+ if(!alt)
return
- else
- msg = alt
- type = alt_type
- if((type & EMOTE_AUDIBLE) && !can_hear()) // Hearing related
- if(!(alt))
+ msg = alt
+ type = alt_type
+
+ if(type & EMOTE_AUDIBLE && !can_hear()) //Hearing related
+ if(!alt)
return
- else
- msg = alt
- type = alt_type
- if((type & EMOTE_VISIBLE) && !has_vision(information_only=TRUE))
- return
+ msg = alt
+ type = alt_type
+ if((type & EMOTE_VISIBLE) && !has_vision(information_only = TRUE))
+ return
+
// Added voice muffling for Issue 41.
if(stat == UNCONSCIOUS)
to_chat(src, "…Вам почти удаётся расслышать чьи-то слова…")
else
to_chat(src, msg)
- return
// Show a message to all mobs in sight of this one
@@ -299,18 +298,13 @@
popup.open()
//mob verbs are faster than object verbs. See http://www.byond.com/forum/?post=1326139&page=2#comment8198716 for why this isn't atom/verb/examine()
-/mob/verb/examinate(atom/A as mob|obj|turf in view(client.maxview()))
+/mob/verb/examinate(atom/A as mob|obj|turf in view(client.maxview(), client.eye))
set name = "Examine"
set category = "IC"
DEFAULT_QUEUE_OR_CALL_VERB(VERB_CALLBACK(src, PROC_REF(run_examinate), A))
/mob/proc/run_examinate(atom/A)
- if(!has_vision(information_only = TRUE) && !isobserver(src))
- to_chat(src, chat_box_regular("Здесь что-то есть, но вы не видите — что именно."))
- return TRUE
-
- face_atom(A)
var/list/result = A.examine(src)
to_chat(src, chat_box_examine(result.Join("\n")))
diff --git a/code/modules/mob/mob_defines.dm b/code/modules/mob/mob_defines.dm
index 700b5d9a04d..9bda2f967e9 100644
--- a/code/modules/mob/mob_defines.dm
+++ b/code/modules/mob/mob_defines.dm
@@ -54,6 +54,7 @@
var/med_record = ""
var/sec_record = ""
var/gen_record = ""
+ var/exploit_record = ""
var/lying = 0
var/lying_prev = 0
var/lastpuke = 0
@@ -228,3 +229,5 @@
/// The datum receiving keyboard input. parent mob by default.
var/datum/input_focus = null
var/last_emote = null
+
+ var/ghost_orbiting = 0
diff --git a/code/modules/mob/mob_emote.dm b/code/modules/mob/mob_emote.dm
index b17532442a0..af545256726 100644
--- a/code/modules/mob/mob_emote.dm
+++ b/code/modules/mob/mob_emote.dm
@@ -68,13 +68,13 @@
*
* * intentional_use: Whether or not to check based on if the action was intentional.
*/
-/mob/proc/usable_emote_keys(intentional_use = TRUE)
+/mob/proc/usable_emote_keys(intentional_use)
var/list/all_keys = list()
for(var/key in GLOB.emote_list)
for(var/datum/emote/P in GLOB.emote_list[key])
if(P.key in all_keys)
continue
- if(P.can_run_emote(src, status_check = FALSE, intentional = null))
+ if(P.can_run_emote(src, status_check = FALSE, intentional = intentional_use))
all_keys += P.key
if(P.key_third_person)
all_keys += P.key_third_person
diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm
index cd582790d75..7c78e64e586 100644
--- a/code/modules/mob/mob_grab.dm
+++ b/code/modules/mob/mob_grab.dm
@@ -435,8 +435,8 @@
if(affecting.mind)
add_attack_logs(attacker, affecting, "Devoured")
-
- user.adjust_nutrition(2 * affecting.health)
+ if(!isvampire(user))
+ user.adjust_nutrition(2 * affecting.health)
for(var/datum/disease/virus/V in affecting.diseases)
if(V.spread_flags > NON_CONTAGIOUS)
@@ -457,10 +457,6 @@
return 1
var/mob/living/carbon/human/H = attacker
- var/datum/antagonist/vampire/vamp = H.mind?.has_antag_datum(/datum/antagonist/vampire)
- var/datum/antagonist/goon_vampire/g_vamp = H.mind?.has_antag_datum(/datum/antagonist/goon_vampire)
- if(ishuman(H) && (vamp || g_vamp) && istype(prey, /mob/living/simple_animal)) //vampires can't eat simple mobs despite race
- return FALSE
if(ishuman(H) && is_type_in_list(prey, H.dna.species.allowed_consumed_mobs)) //species eating of other mobs
return 1
diff --git a/code/modules/mob/mob_movement.dm b/code/modules/mob/mob_movement.dm
index 261dd033617..4cd4d3c6442 100644
--- a/code/modules/mob/mob_movement.dm
+++ b/code/modules/mob/mob_movement.dm
@@ -380,6 +380,7 @@
/client/verb/body_r_arm()
set name = "body-r-arm"
set hidden = 1
+
if(!check_has_body_select())
return
@@ -398,11 +399,13 @@
if(!check_has_body_select())
return
+
var/next_in_line
if(mob.zone_selected == BODY_ZONE_CHEST)
next_in_line = BODY_ZONE_WING
else
next_in_line = BODY_ZONE_CHEST
+
var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
selector.set_selected_zone(next_in_line)
@@ -444,9 +447,15 @@
if(!check_has_body_select())
return
+
+ var/next_in_line
+ if(mob.zone_selected == BODY_ZONE_PRECISE_GROIN)
+ next_in_line = BODY_ZONE_TAIL
+ else
+ next_in_line = BODY_ZONE_PRECISE_GROIN
var/obj/screen/zone_sel/selector = mob.hud_used.zone_select
- selector.set_selected_zone(BODY_ZONE_PRECISE_GROIN)
+ selector.set_selected_zone(next_in_line)
/client/verb/body_tail()
set name = "body-tail"
diff --git a/code/modules/paperwork/carbonpaper.dm b/code/modules/paperwork/carbonpaper.dm
index ce9be619fb6..30d9aadbf3e 100644
--- a/code/modules/paperwork/carbonpaper.dm
+++ b/code/modules/paperwork/carbonpaper.dm
@@ -6,7 +6,7 @@
var/iscopy = 0
-/obj/item/paper/carbon/update_icon()
+/obj/item/paper/carbon/update_icon_state()
if(iscopy)
if(info)
icon_state = "cpaper_words"
@@ -24,7 +24,6 @@
icon_state = "paper_stack"
-
/obj/item/paper/carbon/verb/removecopy()
set name = "Remove carbon-copy"
set category = "Object"
diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm
index d662897190e..262e27f2225 100644
--- a/code/modules/paperwork/clipboard.dm
+++ b/code/modules/paperwork/clipboard.dm
@@ -16,7 +16,18 @@
/obj/item/clipboard/New()
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/clipboard/AltClick(mob/user)
+ if(Adjacent(user) && !user.incapacitated())
+ if(is_pen(user.get_active_hand()))
+ penPlacement(user, user.get_active_hand(), TRUE)
+ else
+ removePen(user)
+ return
+ . = ..()
+
/obj/item/clipboard/verb/removePen(mob/user)
set category = "Object"
@@ -39,6 +50,7 @@
/obj/item/clipboard/examine(mob/user)
. = ..()
+ . += "Alt-Click to remove its pen."
if(in_range(user, src) && toppaper)
. += toppaper.examine(user)
@@ -60,7 +72,7 @@
containedpen.forceMove_turf()
user.put_in_hands(containedpen, ignore_anim = FALSE)
containedpen = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/clipboard/proc/showClipboard(mob/user) //Show them what's on the clipboard
var/dat = {"[src]"}
@@ -76,15 +88,23 @@
popup.set_content(dat)
popup.open()
-/obj/item/clipboard/update_icon()
- overlays.Cut()
+
+/obj/item/clipboard/update_overlays()
+ . = ..()
if(toppaper)
- overlays += toppaper.icon_state
- overlays += toppaper.overlays
+ . += toppaper.icon_state
+ . += toppaper.overlays
if(containedpen)
- overlays += "clipboard_pen"
- overlays += "clipboard_over"
- ..()
+ . += "clipboard_pen"
+ for(var/obj/O in src)
+ if(istype(O, /obj/item/photo))
+ var/image/img = image('icons/obj/bureaucracy.dmi')
+ var/obj/item/photo/Ph = O
+ img = Ph.tiny
+ . += img
+ break
+ . += "clipboard_over"
+
/obj/item/clipboard/attackby(obj/item/W, mob/user)
if(isPaperwork(W)) //If it's a photo, paper bundle, or piece of paper, place it on the clipboard.
@@ -93,7 +113,7 @@
playsound(loc, "pageturn", 50, 1)
if(isPaperwork(W) == PAPERWORK)
toppaper = W
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(is_pen(W))
if(!toppaper) //If there's no paper we can write on, just stick the pen into the clipboard
penPlacement(user, W, TRUE)
@@ -113,7 +133,7 @@
return
else if(istype(W, /obj/item/stamp) && toppaper) //We can stamp the topmost piece of paper
toppaper.attackby(W, user)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
return ..()
@@ -155,7 +175,7 @@
to_chat(usr, "You flick the pages so that [P] is on top.")
playsound(loc, "pageturn", 50, 1)
toppaper = P
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
showClipboard(usr)
#undef PAPERWORK
diff --git a/code/modules/paperwork/contract.dm b/code/modules/paperwork/contract.dm
index aac51f90340..d1d9a09f839 100644
--- a/code/modules/paperwork/contract.dm
+++ b/code/modules/paperwork/contract.dm
@@ -10,7 +10,7 @@
/obj/item/paper/contract/proc/update_text()
return
-/obj/item/paper/contract/update_icon()
+/obj/item/paper/contract/update_icon_state()
return
diff --git a/code/modules/paperwork/desk_bell.dm b/code/modules/paperwork/desk_bell.dm
index 69839e6a98d..67ea39a9248 100644
--- a/code/modules/paperwork/desk_bell.dm
+++ b/code/modules/paperwork/desk_bell.dm
@@ -29,13 +29,13 @@
return TRUE
-/obj/item/desk_bell/MouseDrop(atom/over)
+/obj/item/desk_bell/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(over != user || user.incapacitated() || !ishuman(user))
+ if(over_object != user || user.incapacitated() || !ishuman(user))
return FALSE
anchored = FALSE
diff --git a/code/modules/paperwork/filingcabinet.dm b/code/modules/paperwork/filingcabinet.dm
index fc00441de33..f80d3da514b 100644
--- a/code/modules/paperwork/filingcabinet.dm
+++ b/code/modules/paperwork/filingcabinet.dm
@@ -14,8 +14,9 @@
desc = "A large cabinet with drawers."
icon = 'icons/obj/bureaucracy.dmi'
icon_state = "filingcabinet"
- density = 1
+ density = TRUE
anchored = TRUE
+ var/opened = FALSE
/obj/structure/filingcabinet/chestdrawer
@@ -37,14 +38,20 @@
I.loc = src
+/obj/structure/filingcabinet/update_icon_state()
+ icon_state = "[initial(icon_state)][opened ? "-open" : ""]"
+
+
/obj/structure/filingcabinet/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/paper) || istype(P, /obj/item/folder) || istype(P, /obj/item/photo) || istype(P, /obj/item/paper_bundle) || istype(P, /obj/item/documents))
add_fingerprint(user)
to_chat(user, "You put [P] in [src].")
user.drop_transfer_item_to_loc(P, src)
- icon_state = "[initial(icon_state)]-open"
+ opened = TRUE
+ update_icon(UPDATE_ICON_STATE)
sleep(5)
- icon_state = initial(icon_state)
+ opened = FALSE
+ update_icon(UPDATE_ICON_STATE)
updateUsrDialog()
else if(user.a_intent != INTENT_HARM)
to_chat(user, "You can't put [P] in [src]!")
@@ -106,9 +113,11 @@
P.forceMove_turf()
usr.put_in_hands(P, ignore_anim = FALSE)
updateUsrDialog()
- icon_state = "[initial(icon_state)]-open"
+ opened = TRUE
+ update_icon(UPDATE_ICON_STATE)
sleep(5)
- icon_state = initial(icon_state)
+ opened = FALSE
+ update_icon(UPDATE_ICON_STATE)
/*
diff --git a/code/modules/paperwork/folders.dm b/code/modules/paperwork/folders.dm
index f3f2e646ce8..eeca23bdc72 100644
--- a/code/modules/paperwork/folders.dm
+++ b/code/modules/paperwork/folders.dm
@@ -29,17 +29,18 @@
desc = "A white folder."
icon_state = "folder_white"
-/obj/item/folder/update_icon()
- overlays.Cut()
+
+/obj/item/folder/update_overlays()
+ . = ..()
if(contents.len)
- overlays += "folder_paper"
- ..()
+ . += "folder_paper"
+
/obj/item/folder/attackby(obj/item/W as obj, mob/user as mob, params)
if(istype(W, /obj/item/paper) || istype(W, /obj/item/photo) || istype(W, /obj/item/paper_bundle) || istype(W, /obj/item/documents))
user.drop_transfer_item_to_loc(W, src)
to_chat(user, "You put the [W] into \the [src].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(istype(W, /obj/item/pen))
rename_interactive(user, W)
else
@@ -90,8 +91,8 @@
//Update everything
attack_self(usr)
- update_icon()
- return
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/folder/documents
name = "folder- 'TOP SECRET'"
@@ -100,7 +101,7 @@
/obj/item/folder/documents/New()
..()
new /obj/item/documents/nanotrasen(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/folder/syndicate
name = "folder- 'TOP SECRET'"
@@ -112,7 +113,7 @@
/obj/item/folder/syndicate/red/New()
..()
new /obj/item/documents/syndicate/red(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/folder/syndicate/blue
icon_state = "folder_sblue"
@@ -120,7 +121,7 @@
/obj/item/folder/syndicate/blue/New()
..()
new /obj/item/documents/syndicate/blue(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/folder/syndicate/yellow
icon_state = "folder_syellow"
@@ -128,11 +129,11 @@
/obj/item/folder/syndicate/yellow/full/New()
..()
new /obj/item/documents/syndicate/yellow(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/folder/syndicate/mining/New()
. = ..()
new /obj/item/documents/syndicate/mining(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
diff --git a/code/modules/paperwork/frames.dm b/code/modules/paperwork/frames.dm
index 6e3be6478c3..3c84e75cb11 100644
--- a/code/modules/paperwork/frames.dm
+++ b/code/modules/paperwork/frames.dm
@@ -25,12 +25,8 @@
qdel(A)
return ..()
-/obj/item/picture_frame/update_icon()
- overlays.Cut()
-
- if(displayed)
- overlays |= getFlatIcon(displayed)
+/obj/item/picture_frame/update_icon_state()
if(istype(displayed, /obj/item/photo))
icon_state = "[icon_base]-photo"
else if(istype(displayed, /obj/structure/sign/poster))
@@ -38,7 +34,15 @@
else
icon_state = "[icon_base]-paper"
- overlays |= icon_state
+
+/obj/item/picture_frame/update_overlays()
+ . = ..()
+
+ if(displayed)
+ . += getFlatIcon(displayed)
+
+ . += icon_state
+
/obj/item/picture_frame/proc/insert(obj/D)
if(istype(D, /obj/item/poster))
@@ -56,7 +60,7 @@
qdel(D)
/obj/item/picture_frame/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(displayed)
playsound(src, I.usesound, 100, 1)
user.visible_message("[user] unfastens \the [displayed] out of \the [src].", "You unfasten \the [displayed] out of \the [src].")
@@ -71,7 +75,7 @@
update_icon()
else
to_chat(user, "There is nothing to remove from \the [src].")
- else if(istype(I, /obj/item/crowbar))
+ else if(I.tool_behaviour == TOOL_CROWBAR)
playsound(src, I.usesound, 100, 1)
user.visible_message("[user] breaks down \the [src].", "You break down \the [src].")
for(var/A in contents)
@@ -199,18 +203,24 @@
QDEL_NULL(frame)
return ..()
-/obj/structure/sign/picture_frame/update_icon()
- overlays.Cut()
+
+/obj/structure/sign/picture_frame/update_icon_state()
if(frame)
icon = null
icon_state = null
- overlays |= getFlatIcon(frame)
else
icon = initial(icon)
icon_state = initial(icon_state)
+
+/obj/structure/sign/picture_frame/update_overlays()
+ . = ..()
+ if(frame)
+ . += getFlatIcon(frame)
+
+
/obj/structure/sign/picture_frame/attackby(obj/item/I, mob/user)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
playsound(src, I.usesound, 100, 1)
user.visible_message("[user] begins to unfasten \the [src] from the wall.", "You begin to unfasten \the [src] from the wall.")
if(do_after(user, 100 * I.toolspeed * gettoolspeedmod(user), target = src))
diff --git a/code/modules/paperwork/handlabeler.dm b/code/modules/paperwork/handlabeler.dm
index f4dca6a98f8..5a046aaf350 100644
--- a/code/modules/paperwork/handlabeler.dm
+++ b/code/modules/paperwork/handlabeler.dm
@@ -6,7 +6,7 @@
item_state = "flight"
var/label = null
var/labels_left = 30
- var/mode = 0
+ var/mode = FALSE
/obj/item/hand_labeler/afterattack(atom/A, mob/user, proximity)
if(!proximity)
@@ -33,9 +33,14 @@
playsound(A, 'sound/items/handling/component_pickup.ogg', 20, TRUE)
labels_left--
-/obj/item/hand_labeler/attack_self(mob/user as mob)
- mode = !mode
+
+/obj/item/hand_labeler/update_icon_state()
icon_state = "labeler[mode]"
+
+
+/obj/item/hand_labeler/attack_self(mob/user)
+ mode = !mode
+ update_icon(UPDATE_ICON_STATE)
if(mode)
to_chat(user, "You turn on \the [src].")
//Now let them chose the text.
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 3232d1a7889..2ea2bfc83f6 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -19,6 +19,7 @@
body_parts_covered = HEAD
resistance_flags = FLAMMABLE
max_integrity = 50
+ blocks_emissive = FALSE
attack_verb = list("bapped")
permeability_coefficient = 0.01
dog_fashion = /datum/dog_fashion/head
@@ -29,9 +30,10 @@
var/footer //The bottom stuff before the stamp but after the body
var/info_links //A different version of the paper which includes html links at fields and EOF
var/stamps //The (text for the) stamps on the paper.
- var/fields //Amount of user created fields
+ var/fields = 0 //Amount of user created fields
var/language = "Galactic Common" //The language of paper. For now using only in case of Thetta
var/list/stamped
+ var/list/stamp_overlays = list()
var/ico[0] //Icons and
var/offset_x[0] //offsets stored for later
var/offset_y[0] //usage by the photocopier
@@ -61,8 +63,7 @@
update_icon()
updateinfolinks()
-/obj/item/paper/update_icon()
- ..()
+/obj/item/paper/update_icon_state()
if(info)
icon_state = "paper_words"
return
@@ -70,6 +71,7 @@
/obj/item/paper/examine(mob/user)
. = ..()
+ . += "Alt-Click the [initial(name)] with a pen in hand to rename it."
if(user.is_literate())
if(in_range(user, src) || istype(user, /mob/dead/observer))
show_content(user)
@@ -78,12 +80,13 @@
else
. += "You don't know how to read."
-/obj/item/paper/proc/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
+
+/obj/item/paper/proc/show_content(mob/user, forceshow = FALSE, forcestars = FALSE, infolinks, view = TRUE)
var/datum/asset/assets = get_asset_datum(/datum/asset/simple/paper)
assets.send(user)
var/data
- var/stars = (!user?.say_understands(null, GLOB.all_languages[language]) && !forceshow) || forcestars
+ var/stars = (!user.say_understands(null, GLOB.all_languages[language]) && !forceshow) || forcestars
if(stars) //assuming all paper is written in common is better than hardcoded type checks
data = "[header][stars(info)][footer][stamps]"
else
@@ -105,84 +108,132 @@
popup.open()
return data
-/obj/item/paper/verb/rename()
- set name = "Rename paper"
- set category = "Object"
- set src in usr
- if((CLUMSY in usr.mutations) && prob(50))
- to_chat(usr, "You cut yourself on the paper.")
+/obj/item/paper/AltClick(mob/living/carbon/human/user)
+ if(!ishuman(user) || user.incapacitated() || !Adjacent(user))
+ return
+ if(is_pen(user.get_active_hand()))
+ rename(user)
return
- if(!usr.is_literate())
- to_chat(usr, "You don't know how to read.")
+ if(user.is_in_hands(src))
+ ProcFoldPlane(user, src)
return
- var/n_name = rename_interactive(usr)
+ return ..()
+
+
+/obj/item/paper/proc/rename(mob/user)
+ if((CLUMSY in user.mutations) && prob(50))
+ to_chat(user, "You cut yourself on the paper.")
+ return
+ if(!user.is_literate())
+ to_chat(user, "You don't know how to read.")
+ return
+ var/n_name = rename_interactive(user)
if(isnull(n_name))
return
if(n_name != "")
desc = "This is a paper titled '" + name + "'."
else
desc = initial(desc)
- add_fingerprint(usr)
- return
+ add_fingerprint(user)
+
/obj/item/paper/attack_self(mob/living/user as mob)
user.examinate(src)
- if(rigged && (SSholiday.holidays && SSholiday.holidays[APRIL_FOOLS]))
- if(spam_flag == 0)
- spam_flag = 1
- playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
- spawn(20)
- spam_flag = 0
- return
+ if(rigged && !spam_flag && (SSholiday.holidays && SSholiday.holidays[APRIL_FOOLS]))
+ spam_flag = TRUE
+ addtimer(VARSET_CALLBACK(src, spam_flag, FALSE), 3 SECONDS)
+ playsound(loc, 'sound/items/bikehorn.ogg', 50, 1)
+
-/obj/item/paper/attack_ai(var/mob/living/silicon/ai/user as mob)
+/obj/item/paper/attack_ai(mob/living/silicon/ai/user)
var/dist
- if(istype(user) && user.current) //is AI
+ if(isAI(user) && user.current) //is AI
dist = get_dist(src, user.current)
else //cyborg or AI not seeing through a camera
dist = get_dist(src, user)
if(dist < 2)
- show_content(user, forceshow = 1)
+ show_content(user, forceshow = TRUE)
else
- show_content(user, forcestars = 1)
- return
+ show_content(user, forcestars = TRUE)
+
+
+/obj/item/paper/attack(mob/living/carbon/human/target, mob/living/user, def_zone)
+ if(!ishuman(target))
+ return ..()
-/obj/item/paper/attack(mob/living/carbon/M as mob, mob/living/carbon/user as mob)
if(user.zone_selected == BODY_ZONE_PRECISE_EYES)
user.visible_message("[user] is trying to show the paper to you. ", \
- "You hold up a paper and try to show it to [M]. ")
+ "You hold up a paper and try to show it to [target]. ")
- if(do_mob(user, M, 0.7 SECONDS))
+ if(do_mob(user, target, 0.7 SECONDS))
user.visible_message("[user] shows the paper to you. ", \
- "You hold up a paper and show it to [M]. ")
- M.examinate(src)
+ "You hold up a paper and show it to [target]. ")
+ target.examinate(src)
else
- to_chat(user, span_warning("You fail to show the paper to [M]."))
+ to_chat(user, span_warning("You fail to show the paper to [target]."))
else if(user.zone_selected == BODY_ZONE_PRECISE_MOUTH)
- if(!istype(M, /mob)) return
-
- if(ishuman(M))
- var/mob/living/carbon/human/H = M
- if(H == user)
- to_chat(user, "You wipe off your face with [src].")
- H.lip_style = null
- H.lip_color = initial(H.lip_color)
- H.update_body()
- else
- user.visible_message("[user] begins to wipe [H]'s face clean with \the [src].", \
- "You begin to wipe off [H]'s face.")
- if(do_after(user, 10, target = H) && do_after(H, 10, 0)) //user needs to keep their active hand, H does not.
- user.visible_message("[user] wipes [H]'s face clean with \the [src].", \
- "You wipe off [H]'s face.")
- H.lip_style = null
- H.lip_color = initial(H.lip_color)
- H.update_body()
+ if(target == user)
+ to_chat(user, "You wipe off your face with [src].")
+ else
+ user.visible_message("[user] begins to wipe [target]'s face clean with \the [src].",
+ "You begin to wipe off [target]'s face.")
+ if(!do_after(user, 1 SECONDS, target = target) || !do_after(target, 1 SECONDS, FALSE)) // user needs to keep their active hand, target does not.
+ return
+ user.visible_message("[user] wipes [target]'s face clean with \the [src].",
+ "You wipe off [target]'s face.")
+
+ target.lip_style = null
+ target.lip_color = null
+ target.update_body()
+ else
+ return ..()
+
+
+/obj/item/paper/attack_animal(mob/living/simple_animal/pet/dog/doggo)
+ if(!isdog(doggo)) // Only dogs can eat homework.
+ return
+ doggo.changeNext_move(CLICK_CD_MELEE)
+ if(world.time < doggo.last_eaten + 30 SECONDS)
+ to_chat(doggo, "You are too full to try eating [src] now.")
+ return
+
+ doggo.visible_message("[doggo] starts chewing the corner of [src]!",
+ "You start chewing the corner of [src].",
+ "You hear a quiet gnawing, and the sound of paper rustling.")
+ playsound(src, 'sound/effects/pageturn2.ogg', 100, TRUE)
+ if(!do_after(doggo, 10 SECONDS, FALSE, src))
+ return
+
+ if(world.time < doggo.last_eaten + 30 SECONDS) // Check again to prevent eating multiple papers at once.
+ to_chat(doggo, "You are too full to try eating [src] now.")
+ return
+ doggo.last_eaten = world.time
+
+ // 90% chance of a crumpled paper with illegible text.
+ if(prob(90))
+ var/message_ending = "."
+ var/obj/item/paper/crumpled/crumped = new(loc)
+ crumped.name = name
+ if(info) // Something written on the paper.
+ crumped.info = "Whatever was once written here has been made completely illegible by a combination of chew marks and saliva."
+ message_ending = ", the drool making it an unreadable mess!"
+ crumped.update_icon()
+ qdel(src)
+
+ doggo.visible_message("[doggo] finishes eating [src][message_ending]",
+ "You finish eating [src][message_ending]")
+ doggo.emote("bark")
+
+ // 10% chance of the paper just being eaten entirely.
else
- ..()
+ doggo.visible_message("[doggo] swallows [src] whole!", "You swallow [src] whole. Tasty!")
+ playsound(doggo, 'sound/items/eatfood.ogg', 50, TRUE)
+ qdel(src)
+
-/obj/item/paper/proc/addtofield(var/id, var/text, var/links = 0)
+/obj/item/paper/proc/addtofield(id, text, links = 0)
if(id > MAX_PAPER_FIELDS)
return
@@ -192,11 +243,11 @@
while(locid <= MAX_PAPER_FIELDS)
var/istart = 0
if(links)
- istart = findtext(info_links, "", laststart)
+ istart = findtext_char(info_links, "", laststart)
else
- istart = findtext(info, "", laststart)
+ istart = findtext_char(info, "", laststart)
- if(istart==0)
+ if(!istart)
return // No field found with matching id
laststart = istart+1
@@ -204,59 +255,58 @@
if(locid == id)
var/iend = 1
if(links)
- iend = findtext(info_links, "", istart)
+ iend = findtext_char(info_links, "", istart)
else
- iend = findtext(info, "", istart)
+ iend = findtext_char(info, "", istart)
- //textindex = istart+26
textindex = iend
break
if(links)
- var/before = copytext(info_links, 1, textindex)
- var/after = copytext(info_links, textindex)
+ var/before = copytext_char(info_links, 1, textindex)
+ var/after = copytext_char(info_links, textindex)
info_links = before + text + after
else
- var/before = copytext(info, 1, textindex)
- var/after = copytext(info, textindex)
+ var/before = copytext_char(info, 1, textindex)
+ var/after = copytext_char(info, textindex)
info = before + text + after
updateinfolinks()
+
/obj/item/paper/proc/updateinfolinks()
info_links = info
- var/i = 0
- for(i=1,i<=fields,i++)
- var/write_1 = "write"
- var/write_2 = "\[A\]"
+ for(var/i in 1 to fields)
+ var/write_1 = "write"
+ var/write_2 = "\[a\]"
addtofield(i, "[write_1][write_2]", 1)
- info_links = info_links + "write"
+ info_links = info_links + "write" + "\[A\]"
/obj/item/paper/proc/clearpaper()
info = null
stamps = null
stamped = list()
- overlays.Cut()
+ stamp_overlays = list()
updateinfolinks()
update_icon()
-/obj/item/paper/proc/parsepencode(var/t, var/obj/item/pen/P, mob/user as mob)
+/obj/item/paper/proc/parsepencode(t, obj/item/pen/P, mob/user as mob)
t = pencode_to_html(html_encode(t), usr, P, TRUE, TRUE, TRUE, deffont, signfont, crayonfont)
return t
/obj/item/paper/proc/populatefields()
- //Count the fields
+ //Count the fields
var/laststart = 1
while(fields < MAX_PAPER_FIELDS)
- var/i = findtext(info, "", laststart)
- if(i==0)
+ var/i = findtext_char(info, "", laststart)
+ if(!i)
break
laststart = i+1
fields++
-/obj/item/paper/proc/openhelp(mob/user as mob)
+/obj/item/paper/proc/openhelp(mob/user)
user << browse({"Pen Help
Crayon&Pen commands
@@ -281,33 +331,29 @@
\[time\] : Inserts the current station time in HH:MM:SS.
"}, "window=paper_help")
-/obj/item/paper/proc/topic_href_write(var/id, var/input_element)
+
+/obj/item/paper/proc/topic_href_write(id, input_element)
var/obj/item/item_write = usr.get_active_hand() // Check to see if he still got that darn pen, also check if he's using a crayon or pen.
add_hiddenprint(usr) // No more forging nasty documents as someone else, you jerks
- if(!istype(item_write, /obj/item/pen))
- if(!istype(item_write, /obj/item/toy/crayon))
- return
-
- // if paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr
- if(src.loc != usr && !src.Adjacent(usr) && !((istype(src.loc, /obj/item/clipboard) || istype(src.loc, /obj/item/folder)) && (src.loc.loc == usr || src.loc.Adjacent(usr)) ) )
+ if(!is_pen(item_write) && !istype(item_write, /obj/item/toy/crayon))
return
+ if(loc != usr && !Adjacent(usr) && !((istype(loc, /obj/item/clipboard) || istype(loc, /obj/item/folder)) && (loc.loc == usr || loc.Adjacent(usr))))
+ return // If paper is not in usr, then it must be near them, or in a clipboard or folder, which must be in or near usr
input_element = parsepencode(input_element, item_write, usr) // Encode everything from pencode to html
- if(id!="end")
+ if(id != "end")
addtofield(text2num(id), input_element) // He wants to edit a field, let him.
else
info += input_element // Oh, he wants to edit to the end of the file, let him.
populatefields()
updateinfolinks()
-
- item_write.on_write(src,usr)
-
- show_content(usr, forceshow = 1, infolinks = 1)
-
+ item_write.on_write(src, usr)
+ show_content(usr, forceshow = TRUE, infolinks = TRUE)
update_icon()
+
/obj/item/paper/Topic(href, href_list)
..()
if(!usr || (usr.stat || usr.restrained()))
@@ -317,51 +363,66 @@
var/id = href_list["auto_write"]
var/const/sign_text = "\[Поставить подпись\]"
+ var/const/account_text = "\[Написать номер аккаунта\]"
+ var/const/pin_text = "\[Написать пин-код\]"
var/const/time_text = "\[Написать текущее время\]"
var/const/date_text = "\[Написать текущую дату\]"
- var/const/num_text = "\[Написать номер аккаунта\]"
- var/const/pin_text = "\[Написать пин-код\]"
var/const/station_text = "\[Написать название станции\]"
+ var/const/gender_text = "\[Указать пол\]"
+ var/const/species_text = "\[Указать расу\]"
+
+ var/list/menu_list = list() // text items in the menu
+
+ menu_list.Add(usr.real_name) // the real name of the character, even if it is hidden
- //пункты текста в меню
- var/list/menu_list = list()
- menu_list.Add(usr.real_name) //настоящее имя персонажа, даже если оно спрятано
-
- //если игрок маскируется или имя отличается, добавляется новый вариант ответа
- if (usr.real_name != usr.name || usr.name != "unknown")
- menu_list.Add("[usr.name]")
-
- menu_list.Add(usr.job, //текущая работа
- num_text, //номер аккаунта
- pin_text, //номер пин-кода
- sign_text, //подпись
- time_text, //время
- date_text, //дата
- station_text, //название станции
- usr.gender, //пол
- usr.dna.species //раса
+ if(usr.real_name != usr.name && lowertext(usr.name) != "unknown") // if the player is masked or the name is different a new answer option is added
+ menu_list.Add(usr.name)
+
+ if(usr.job)
+ menu_list.Add(usr.job) // job
+
+ menu_list.Add(sign_text) //signature
+
+ if(usr.mind?.initial_account?.account_number)
+ menu_list.Add(account_text) // account number
+
+ if(usr.mind?.initial_account?.remote_access_pin)
+ menu_list.Add(pin_text) // account pin-code
+
+ menu_list.Add(
+ time_text, // time
+ date_text, // date
+ station_text, // station name
+ gender_text, // gender
)
+ if(usr.dna?.species)
+ menu_list.Add(species_text) //current
+
var/input_element = input("Выберите текст который хотите добавить:", "Выбор пункта") as null|anything in menu_list
+ if(!input_element)
+ return
- //форматируем выбранные пункты меню в pencode и внутренние данные
- switch(input_element)
- if (sign_text)
+ switch(input_element) //format selected menu items in pencode and internal data
+ if(sign_text)
input_element = "\[sign\]"
- if (time_text)
+ if(time_text)
input_element = "\[time\]"
- if (date_text)
+ if(date_text)
input_element = "\[date\]"
- if (station_text)
+ if(station_text)
input_element = "\[station\]"
- if (num_text)
+ if(account_text)
input_element = usr.mind.initial_account.account_number
- if (pin_text)
+ if(pin_text)
input_element = usr.mind.initial_account.remote_access_pin
+ if(gender_text)
+ input_element = usr.gender
+ if(species_text)
+ input_element = usr.dna.species
topic_href_write(id, input_element)
-
if(href_list["write"] )
var/id = href_list["write"]
var/input_element = input("Enter what you want to write:", "Write", null, null) as message
@@ -370,14 +431,12 @@
/obj/item/paper/attackby(obj/item/P, mob/living/user, params)
- ..()
+ . = ..()
if(resistance_flags & ON_FIRE)
return
- var/clown = 0
- if(user.mind && (user.mind.assigned_role == "Clown"))
- clown = 1
+ var/clown = user.mind && (user.mind.assigned_role == "Clown")
if(istype(P, /obj/item/paper) || istype(P, /obj/item/photo))
if(istype(P, /obj/item/paper/carbon))
@@ -426,9 +485,9 @@
src.loc = B
P.loc = B
B.amount++
- B.update_icon()
+ B.update_appearance(UPDATE_ICON|UPDATE_DESC)
- else if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
+ else if(is_pen(P) || istype(P, /obj/item/toy/crayon))
if(user.is_literate())
var/obj/item/pen/multi/robopen/RP = P
if(istype(P, /obj/item/pen/multi/robopen) && RP.mode == 2)
@@ -452,6 +511,7 @@
stamp(P)
to_chat(user, "You stamp the paper with your rubber stamp.")
+ playsound(user, 'sound/items/handling/standard_stamp.ogg', 50, vary = TRUE)
if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
@@ -471,12 +531,14 @@
add_fingerprint(user)
+
/obj/item/paper/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
..()
if(!(resistance_flags & FIRE_PROOF))
info = "Heat-curled corners and sooty words offer little insight. Whatever was once written on this page has been rendered illegible through fire."
-/obj/item/paper/proc/stamp(var/obj/item/stamp/S)
+
+/obj/item/paper/proc/stamp(obj/item/stamp/S)
stamps += (!stamps || stamps == "" ? "" : "") + ""
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -501,9 +563,13 @@
if(!stamped)
stamped = new
stamped += S.type
- overlays += stampoverlay
+ stamp_overlays += stampoverlay
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/paper/update_overlays()
+ return stamp_overlays
- playsound(S, pick(S.stamp_sounds), 35, 1, -1)
/*
* Premade paper
@@ -550,8 +616,10 @@
name = "paper scrap"
icon_state = "scrap"
-/obj/item/paper/crumpled/update_icon()
- return
+
+/obj/item/paper/crumpled/update_icon_state()
+ if(info)
+ icon_state = "scrap_words"
/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"
@@ -567,9 +635,10 @@
info = "
"
-/obj/item/paper/fortune/update_icon()
- ..()
+
+/obj/item/paper/fortune/update_icon_state()
icon_state = initial(icon_state)
+
/*
* Premade paper
*/
@@ -659,10 +728,6 @@
name = "paper- 'Note'"
info = "The call has gone out! Our ancestral home has been rediscovered! Not a small patch of land, but a true clown nation, a true Clown Planet! We're on our way home at last!"
-/obj/item/paper/crumpled
- name = "paper scrap"
- icon_state = "scrap"
-
/obj/item/paper/syndicate
name = "paper"
header = "
"
@@ -749,25 +814,21 @@
info = "ᅠᅠАгенство внутренних дел по надзору за домашними животными находящимися на станции сообщает, приставленный к вам питомец \"Гав Гавыч\" почил. Он верно служил ремеслу дознавателей, сыщиков и детективов. Мы будем помнить о его вкладе и сохраним о нём память в анналах истории о домашних питомцах Нанотрейзен. "
footer = "
Штампы и данные:
Время принятия отчета: *Данный документ подлежит ксерокопированию, для сохранения в архиве уполномоченных лиц, и выдаче агенту. *Данный документ может содержать личную информацию. "
-/obj/item/paper/crumpled/update_icon()
- return
-
-/obj/item/paper/crumpled/bloody
- icon_state = "scrap_bloodied"
/obj/item/paper/evilfax
name = "Centcomm Reply"
info = ""
var/mytarget = null
var/myeffect = null
- var/used = 0
+ var/used = FALSE
var/countdown = 60
- var/activate_on_timeout = 0
+ var/activate_on_timeout = FALSE
var/faxmachineid = null
-/obj/item/paper/evilfax/show_content(var/mob/user, var/forceshow = 0, var/forcestars = 0, var/infolinks = 0, var/view = 1)
+
+/obj/item/paper/evilfax/show_content(mob/user, forceshow = FALSE, forcestars = FALSE, infolinks, view = TRUE)
if(user == mytarget)
- if(istype(user, /mob/living/carbon))
+ if(iscarbon(user))
var/mob/living/carbon/C = user
evilpaper_specialaction(C)
..()
@@ -799,81 +860,85 @@
if(!countdown)
if(mytarget)
if(activate_on_timeout)
- evilpaper_specialaction(mytarget)
+ addtimer(CALLBACK(src, PROC_REF(evilpaper_specialaction), mytarget), 3 SECONDS, TIMER_DELETE_ME)
else
message_admins("[mytarget] ignored an evil fax until it timed out.")
else
message_admins("Evil paper '[src]' timed out, after not being assigned a target.")
- used = 1
+ used = TRUE
evilpaper_selfdestruct()
else
countdown--
-/obj/item/paper/evilfax/proc/evilpaper_specialaction(var/mob/living/carbon/target)
- spawn(30)
- if(istype(target, /mob/living/carbon))
- var/obj/machinery/photocopier/faxmachine/fax = locateUID(faxmachineid)
- if(myeffect == "Borgification")
- to_chat(target,"You seem to comprehend the AI a little better. Why are your muscles so stiff?")
- var/datum/disease/virus/transformation/robot/D = new
- D.Contract(target)
- else if(myeffect == "Corgification")
- to_chat(target,"You hear distant howling as the world seems to grow bigger around you. Boy, that itch sure is getting worse!")
- var/datum/disease/virus/transformation/corgi/D = new
- D.Contract(target)
- else if(myeffect == "Death By Fire")
- to_chat(target,"You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?")
- var/turf/simulated/T = get_turf(target)
- new /obj/effect/hotspot(T)
- target.adjustFireLoss(150) // hard crit, the burning takes care of the rest.
- else if(myeffect == "Total Brain Death")
- to_chat(target,"You see a message appear in front of you in bright red letters: YHWH-3 ACTIVATED. TERMINATION IN 3 SECONDS")
- target.mutations.Add(NOCLONE)
- target.adjustBrainLoss(125)
- else if(myeffect == "Honk Tumor")
- if(!target.get_int_organ(/obj/item/organ/internal/honktumor))
- var/obj/item/organ/internal/organ = new /obj/item/organ/internal/honktumor
- to_chat(target,"Life seems funnier, somehow.")
- organ.insert(target)
- else if(myeffect == "Cluwne")
- if(istype(target, /mob/living/carbon/human))
- var/mob/living/carbon/human/H = target
- to_chat(H, "You feel surrounded by sadness. Sadness... and HONKS!")
- H.makeCluwne()
- else if(myeffect == "Demote")
- GLOB.event_announcement.Announce("[target.real_name] настоящим приказом был понижен до Гражданского. Немедленно обработайте этот запрос. Невыполнение этих распоряжений является основанием для расторжения контракта.","ВНИМАНИЕ: Приказ ЦК о понижении в должности.")
- for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
- if(R.fields["name"] == target.real_name)
- R.fields["criminal"] = SEC_RECORD_STATUS_DEMOTE
- R.fields["comments"] += "Central Command Demotion Order, given on [GLOB.current_date_string] [station_time_timestamp()] Process this demotion immediately. Failure to comply with these orders is grounds for termination."
- update_all_mob_security_hud()
- else if(myeffect == "Demote with Bot")
- GLOB.event_announcement.Announce("[target.real_name] настоящим приказом был понижен до Гражданского. Немедленно обработайте этот запрос. Невыполнение этих распоряжений является основанием для расторжения контракта.","ВНИМАНИЕ: Приказ ЦК о понижении в должности.")
- for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
- if(R.fields["name"] == target.real_name)
- R.fields["criminal"] = SEC_RECORD_STATUS_ARREST
- R.fields["comments"] += "Central Command Demotion Order, given on [GLOB.current_date_string] [station_time_timestamp()] Process this demotion immediately. Failure to comply with these orders is grounds for termination."
- update_all_mob_security_hud()
- if(fax)
- var/turf/T = get_turf(fax)
- new /obj/effect/portal(T)
- new /mob/living/simple_animal/bot/secbot(T)
- else if(myeffect == "Revoke Fax Access")
- GLOB.fax_blacklist += target.real_name
- if(fax)
- fax.authenticated = 0
- else if(myeffect == "Angry Fax Machine")
- if(fax)
- fax.become_mimic()
- else
- message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.")
- used = 1
- evilpaper_selfdestruct()
+
+/obj/item/paper/evilfax/proc/evilpaper_specialaction(mob/living/carbon/target)
+ if(!iscarbon(target))
+ return
+
+ var/obj/machinery/photocopier/faxmachine/fax = locateUID(faxmachineid)
+ if(myeffect == "Borgification")
+ to_chat(target,"You seem to comprehend the AI a little better. Why are your muscles so stiff?")
+ var/datum/disease/virus/transformation/robot/D = new
+ D.Contract(target)
+ else if(myeffect == "Corgification")
+ to_chat(target,"You hear distant howling as the world seems to grow bigger around you. Boy, that itch sure is getting worse!")
+ var/datum/disease/virus/transformation/corgi/D = new
+ D.Contract(target)
+ else if(myeffect == "Death By Fire")
+ to_chat(target,"You feel hotter than usual. Maybe you should lowe-wait, is that your hand melting?")
+ var/turf/simulated/T = get_turf(target)
+ new /obj/effect/hotspot(T)
+ target.adjustFireLoss(150) // hard crit, the burning takes care of the rest.
+ else if(myeffect == "Total Brain Death")
+ to_chat(target,"You see a message appear in front of you in bright red letters: YHWH-3 ACTIVATED. TERMINATION IN 3 SECONDS")
+ target.mutations.Add(NOCLONE)
+ target.adjustBrainLoss(125)
+ else if(myeffect == "Honk Tumor")
+ if(!target.get_int_organ(/obj/item/organ/internal/honktumor))
+ new /obj/item/organ/internal/honktumor(target)
+ to_chat(target,"Life seems funnier, somehow.")
+ else if(myeffect == "Cluwne")
+ if(ishuman(target))
+ var/mob/living/carbon/human/H = target
+ to_chat(H, "You feel surrounded by sadness. Sadness... and HONKS!")
+ H.makeCluwne()
+ else if(myeffect == "Demote")
+ GLOB.event_announcement.Announce("[target.real_name] настоящим приказом был понижен до Гражданского. Немедленно обработайте этот запрос. Невыполнение этих распоряжений является основанием для расторжения контракта.","ВНИМАНИЕ: Приказ ЦК о понижении в должности.")
+ for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
+ if(R.fields["name"] == target.real_name)
+ R.fields["criminal"] = SEC_RECORD_STATUS_DEMOTE
+ R.fields["comments"] += "Central Command Demotion Order, given on [GLOB.current_date_string] [station_time_timestamp()] Process this demotion immediately. Failure to comply with these orders is grounds for termination."
+ update_all_mob_security_hud()
+ else if(myeffect == "Demote with Bot")
+ GLOB.event_announcement.Announce("[target.real_name] настоящим приказом был понижен до Гражданского. Немедленно обработайте этот запрос. Невыполнение этих распоряжений является основанием для расторжения контракта.","ВНИМАНИЕ: Приказ ЦК о понижении в должности.")
+ for(var/datum/data/record/R in sortRecord(GLOB.data_core.security))
+ if(R.fields["name"] == target.real_name)
+ R.fields["criminal"] = SEC_RECORD_STATUS_ARREST
+ R.fields["comments"] += "Central Command Demotion Order, given on [GLOB.current_date_string] [station_time_timestamp()] Process this demotion immediately. Failure to comply with these orders is grounds for termination."
+ update_all_mob_security_hud()
+ if(fax)
+ var/turf/T = get_turf(fax)
+ new /obj/effect/portal(T)
+ new /mob/living/simple_animal/bot/secbot(T)
+ else if(myeffect == "Revoke Fax Access")
+ GLOB.fax_blacklist += target.real_name
+ if(fax)
+ fax.authenticated = FALSE
+ else if(myeffect == "Angry Fax Machine")
+ if(fax)
+ fax.become_mimic()
+ else
+ message_admins("Evil paper [src] was activated without a proper effect set! This is a bug.")
+
+ used = TRUE
+ evilpaper_selfdestruct()
+
/obj/item/paper/evilfax/proc/evilpaper_selfdestruct()
visible_message("[src] spontaneously catches fire, and burns up!")
qdel(src)
+
/obj/item/paper/pickup(user)
if(contact_poison && ishuman(user))
var/mob/living/carbon/human/H = user
@@ -1599,20 +1664,20 @@
могут быть использованы для строительства новых отсеков.\
Особенности станции
\
В отличие от большинства других научно-исследовательских станций Nanotrasen, \
- таких как "Кибериада", НСС "Керборос" имеет менее \
+ таких как "Кибериада", НСС "Керберос" имеет менее \
жёсткую систему контроля за личными вещами экипажа. В частности, в отсеках \
были построены дополнительные автолаты, в том числе публичные \
(в карго и РНД). Также, благодаря более высокому бюджету, были возведены \
новые отсеки, такие как ангар или склад в отсеке РнД.\
- Был расширен отдел вирусологии и возведены новые техничесские туннели для \
+ Был расширен отдел вирусологии и возведены новые технические туннели для \
новых проектов."
icon_state = "pamphlet"
-/obj/item/paper/deltainfo/update_icon()
+/obj/item/paper/deltainfo/update_icon_state()
return
/obj/item/paper/pamphletdeathsquad
icon_state = "pamphlet-ds"
-/obj/item/paper/pamphletdeathsquad/update_icon()
+/obj/item/paper/pamphletdeathsquad/update_icon_state()
return
diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm
index 1f9fe272072..c314d388910 100644
--- a/code/modules/paperwork/paper_bundle.dm
+++ b/code/modules/paperwork/paper_bundle.dm
@@ -14,7 +14,8 @@
attack_verb = list("bapped")
drop_sound = 'sound/items/handling/paper_drop.ogg'
pickup_sound = 'sound/items/handling/paper_pickup.ogg'
- var/amount = 0 //Amount of items clipped to the paper. Note: If you have 2 paper, this should be 1
+ var/amount = 0 //Amount of total items clipped to the paper. Note: If you have 2 paper, this should be 1
+ var/photos = 0 //Amount of photos clipped to the paper.
var/page = 1
var/screen = 0
@@ -50,6 +51,7 @@
H.update_inv_r_hand()
else if(istype(W, /obj/item/photo))
amount++
+ photos++
if(screen == 2)
screen = 1
to_chat(user, "You add [(W.name == "photo") ? "the photo" : W.name] to [(src.name == "paper bundle") ? "the paper bundle" : src.name].")
@@ -91,7 +93,7 @@
P.attackby(W, user, params)
- update_icon()
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
if(winget(usr, "PaperBundle[UID()]", "is-visible") == "true") // NOT MY FAULT IT IS A BUILT IN PROC PLEASE DO NOT HIT ME
attack_self(usr) //Update the browsed page.
add_fingerprint(usr)
@@ -171,11 +173,11 @@
+ "[P.scribble ? "
Written on the back: [P.scribble]" : ""]"\
+ "", "window=PaperBundle[UID()]")
-/obj/item/paper_bundle/attack_self(mob/user as mob)
- src.show_content(user)
+/obj/item/paper_bundle/attack_self(mob/user)
+ show_content(user)
add_fingerprint(user)
- update_icon()
- return
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
+
/obj/item/paper_bundle/Topic(href, href_list)
..()
@@ -216,7 +218,7 @@
page--
amount--
- update_icon()
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
else
to_chat(usr, "You need to hold it in your hands to change pages.")
if(istype(src.loc, /mob))
@@ -253,35 +255,53 @@
return
-/obj/item/paper_bundle/update_icon()
- ..()
- if(contents.len)
- var/obj/item/paper/P = src[1]
- icon_state = P.icon_state
- overlays = P.overlays
- underlays = 0
- var/i = 0
- var/photo
+/obj/item/paper_bundle/update_desc(updates = ALL)
+ . = ..()
+ if(amount == (photos - 1))
+ desc = "[photos] photos clipped together." // In case you clip 2 photos together and remove the paper
+ return
+
+ else if(((amount + 1) - photos) >= 2) // extra papers + original paper - photos
+ desc = "[(amount + 1) - photos] papers clipped to each other."
+
+ else
+ desc = "A single sheet of paper."
+ if(photos)
+ desc += "\nThere [photos == 1 ? "is a photo" : "are [photos] photos"] attached to it."
+
+
+/obj/item/paper_bundle/update_icon_state()
+ if(length(contents))
+ var/obj/item/paper/P = contents[1]
+ icon_state = P.icon_state // must have an icon_state to show up on clipboards
+
+
+/obj/item/paper_bundle/update_overlays()
+ . = ..()
+ underlays.Cut()
+ if(length(contents))
+ var/obj/item/paper/P = contents[1]
+ . += P.overlays
+
+ var/counter = 0
for(var/obj/O in src)
- var/image/img = image('icons/obj/bureaucracy.dmi')
+ var/image/sheet = image('icons/obj/bureaucracy.dmi')
if(istype(O, /obj/item/paper))
- img.icon_state = O.icon_state
- img.pixel_x -= min(1*i, 2)
- img.pixel_y -= min(1*i, 2)
- pixel_x = min(0.5*i, 1)
- pixel_y = min( 1*i, 2)
- underlays += img
- i++
+ if(length(underlays) == 3)
+ continue
+
+ sheet.icon_state = O.icon_state
+ sheet.pixel_x -= min(1 * counter, 2)
+ sheet.pixel_y -= min(1 * counter, 2)
+ pixel_x = min(0.5 * counter, 1)
+ pixel_y = min(1 * counter, 2)
+ underlays += sheet
+ counter++
+
else if(istype(O, /obj/item/photo))
- var/obj/item/photo/Ph = O
- img = Ph.tiny
- photo = 1
- overlays += img
- if(i>1)
- desc = "[i] papers clipped to each other."
- else
- desc = "A single sheet of paper."
- if(photo)
- desc += "\nThere is a photo attached to it."
- overlays += image('icons/obj/bureaucracy.dmi', "clip")
- return
+ var/obj/item/photo/picture = O
+ sheet = picture.tiny
+ . += sheet
+
+ . += "clip"
+
diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm
index 2f2072a8eb7..dcb8c658c85 100644
--- a/code/modules/paperwork/paperbin.dm
+++ b/code/modules/paperwork/paperbin.dm
@@ -11,11 +11,12 @@
var/amount = 30 //How much paper is in the bin.
var/list/papers = list() //List of papers put in the bin for reference.
var/letterhead_type
+ var/purple_bin = FALSE
/obj/item/paper_bin/fire_act(datum/gas_mixture/air, exposed_temperature, exposed_volume, global_overlay = TRUE)
if(amount)
amount = 0
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
..()
/obj/item/paper_bin/Destroy()
@@ -25,16 +26,16 @@
/obj/item/paper_bin/burn()
amount = 0
extinguish()
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
-/obj/item/paper_bin/MouseDrop(atom/over)
+/obj/item/paper_bin/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(over != user || user.incapacitated() || !ishuman(user))
+ if(over_object != user || user.incapacitated() || !ishuman(user))
return FALSE
if(user.put_in_hands(src, ignore_anim = FALSE))
@@ -45,7 +46,7 @@
return FALSE
-/obj/item/paper_bin/attack_hand(mob/user as mob)
+/obj/item/paper_bin/attack_hand(mob/user)
if(ishuman(user))
var/mob/living/carbon/human/H = user
var/obj/item/organ/external/temp = H.bodyparts_by_name[BODY_ZONE_PRECISE_R_HAND]
@@ -57,7 +58,7 @@
if(amount >= 1)
amount--
if(amount==0)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
var/obj/item/paper/P
if(papers.len > 0) //If there's any custom paper on the stack, use that instead of creating a new paper.
@@ -102,22 +103,24 @@
else
. += "There are no papers in the bin."
-/obj/item/paper_bin/update_icon()
+
+/obj/item/paper_bin/update_icon_state()
if(amount < 1)
icon_state = "paper_bin0"
else
- icon_state = "paper_bin1"
- ..()
+ icon_state = "paper_bin[purple_bin ? "2" : "1"]"
+
/obj/item/paper_bin/carbon
name = "carbonless paper bin"
icon_state = "paper_bin2"
+ purple_bin = TRUE
-/obj/item/paper_bin/carbon/attack_hand(mob/user as mob)
+/obj/item/paper_bin/carbon/attack_hand(mob/user)
if(amount >= 1)
amount--
if(amount==0)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
var/obj/item/paper/carbon/P
if(papers.len > 0) //If there's any custom paper on the stack, use that instead of creating a new paper.
diff --git a/code/modules/paperwork/paperplane.dm b/code/modules/paperwork/paperplane.dm
index 58c38eb63bc..32b7201a523 100644
--- a/code/modules/paperwork/paperplane.dm
+++ b/code/modules/paperwork/paperplane.dm
@@ -14,6 +14,7 @@
var/obj/item/paper/internal_paper
+
/obj/item/paperplane/New(loc, obj/item/paper/new_paper)
..()
pixel_y = rand(-8, 8)
@@ -25,12 +26,14 @@
new_paper.forceMove(src)
else
internal_paper = new /obj/item/paper(src)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/item/paperplane/Destroy()
QDEL_NULL(internal_paper)
return ..()
+
/obj/item/paperplane/suicide_act(mob/living/user)
user.Stun(20 SECONDS)
user.visible_message("[user] jams [name] in [user.p_their()] nose. It looks like [user.p_theyre()] trying to commit suicide!")
@@ -41,16 +44,17 @@
sleep(10)
return BRUTELOSS
-/obj/item/paperplane/update_icon()
- overlays.Cut()
+
+/obj/item/paperplane/update_overlays()
+ . = ..()
var/list/stamped = internal_paper.stamped
if(!stamped)
stamped = new
else if(stamped)
for(var/S in stamped)
var/obj/item/stamp = S
- var/image/stampoverlay = image('icons/obj/bureaucracy.dmi', "paperplane_[initial(stamp.icon_state)]")
- overlays += stampoverlay
+ . += "paperplane_[initial(stamp.icon_state)]"
+
/obj/item/paperplane/attack_self(mob/user) // Unfold the paper plane
to_chat(user, "You unfold [src].")
@@ -60,16 +64,17 @@
internal_paper = null
qdel(src)
+
/obj/item/paperplane/attackby(obj/item/P, mob/living/carbon/human/user, params)
..()
- if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
+ if(is_pen(P) || istype(P, /obj/item/toy/crayon))
to_chat(user, "You should unfold [src] before changing it.")
return
else if(istype(P, /obj/item/stamp)) //we don't randomize stamps on a paperplane
internal_paper.attackby(P, user) //spoofed attack to update internal paper.
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(is_hot(P))
if((CLUMSY in user.mutations) && prob(10))
@@ -88,6 +93,7 @@
add_fingerprint(user)
+
/obj/item/paperplane/throw_impact(atom/hit_atom, datum/thrownthing/throwingdatum)
if(..())
return
@@ -109,20 +115,15 @@
E.take_damage(8, 1)
H.emote("scream")
-/obj/item/paper/AltClick(mob/user, obj/item/I)
+
+/obj/item/paper/proc/ProcFoldPlane(mob/living/carbon/user, obj/item/paper)
if(ishuman(user))
- var/mob/living/carbon/human/H = user
- I = H.is_type_in_hands(/obj/item/paper)
- if(I)
- ProcFoldPlane(H, I)
-
-/obj/item/paper/proc/ProcFoldPlane(mob/living/carbon/user, obj/item/I)
- if(istype(user))
- if((!in_range(src, user)) || user.stat || user.restrained())
+ if(!Adjacent(user) || user.incapacitated())
return
to_chat(user, "You fold [src] into the shape of a plane!")
user.drop_item_ground(src)
- I = new /obj/item/paperplane(user, src)
- user.put_in_hands(I)
+ paper = new /obj/item/paperplane(user, src)
+ user.put_in_hands(paper, ignore_anim = FALSE)
else
to_chat(user, "You lack the dexterity to fold [src].")
+
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 6c6658a0607..6e2a6472851 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -67,26 +67,28 @@
/obj/item/pen/multi/Initialize(mapload)
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/pen/multi/proc/select_colour(mob/user as mob)
+/obj/item/pen/multi/proc/select_colour(mob/user)
var/newcolour = tgui_input_list(user, "Which colour would you like to use?", name, colour_choices, colour)
if(newcolour)
colour = newcolour
playsound(loc, 'sound/effects/pop.ogg', 50, 1)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/pen/multi/attack_self(mob/living/user as mob)
+/obj/item/pen/multi/attack_self(mob/living/user)
select_colour(user)
-/obj/item/pen/multi/update_icon()
- overlays.Cut()
- var/icon/o = new(icon, pen_color_iconstate)
- var/list/c = colour_choices[colour]
- o.SetIntensity(c[1], c[2], c[3])
+
+/obj/item/pen/multi/update_overlays()
+ . = ..()
+ var/icon/color_overlay = new(icon, pen_color_iconstate)
+ var/list/colors = colour_choices[colour]
+ color_overlay.SetIntensity(colors[1], colors[2], colors[3])
if(pen_color_shift)
- o.Shift(SOUTH, pen_color_shift)
- overlays += o
+ color_overlay.Shift(SOUTH, pen_color_shift)
+ . += color_overlay
+
/obj/item/pen/fancy
name = "fancy pen"
@@ -197,28 +199,24 @@
playsound(user, 'sound/weapons/saberon.ogg', 3, 1)
to_chat(user, "[src] is now active.")
set_light(brightness_on, 1)
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
+
+
+/obj/item/pen/edagger/update_icon_state()
+ icon_state = on ? "edagger" : initial(icon_state) //looks like a normal pen when off.
+ item_state = on ? "edagger" : initial(item_state)
-/obj/item/pen/edagger/update_icon()
- if(on)
- icon_state = "edagger"
- item_state = "edagger"
- else
- icon_state = initial(icon_state) //looks like a normal pen when off.
- item_state = initial(item_state)
/obj/item/pen/edagger/comms
icon_state = "ofcommpen"
item_state = "ofcommpen"
light_color = LIGHT_COLOR_BLUE
-/obj/item/pen/edagger/comms/update_icon()
- if(on)
- icon_state = "ofcommpen_active"
- item_state = "ofcommpen_active"
- else
- icon_state = initial(icon_state) //looks like a normal pen when off.
- item_state = initial(item_state)
+
+/obj/item/pen/edagger/comms/update_icon_state()
+ icon_state = on ? "ofcommpen_active" : initial(icon_state)
+ item_state = on ? "ofcommpen_active" : initial(item_state)
+
/obj/item/proc/on_write(obj/item/paper/P, mob/user)
return
diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm
index 4764c3ad36f..34fcaac2439 100644
--- a/code/modules/paperwork/photocopier.dm
+++ b/code/modules/paperwork/photocopier.dm
@@ -302,7 +302,7 @@
c.language = copy.language
c.offset_x = copy.offset_x
c.offset_y = copy.offset_y
- var/list/temp_overlays = copy.overlays //Iterates through stamps
+ var/list/temp_overlays = copy.stamp_overlays //Iterates through stamps
var/image/img //and puts a matching
for(var/j = 1, j <= temp_overlays.len, j++) //gray overlay onto the copy
if(copy.ico.len)
@@ -316,7 +316,7 @@
img = image('icons/obj/bureaucracy.dmi', "paper_stamp-dots")
img.pixel_x = copy.offset_x[j]
img.pixel_y = copy.offset_y[j]
- c.overlays += img
+ c.stamp_overlays += img
c.updateinfolinks()
toner--
if(toner == 0)
@@ -393,7 +393,7 @@
return p
//If need_toner is 0, the copies will still be lightened when low on toner, however it will not be prevented from printing. TODO: Implement print queues for fax machines and get rid of need_toner
-/obj/machinery/photocopier/proc/bundlecopy(var/obj/item/paper_bundle/bundle, var/need_toner=1)
+/obj/machinery/photocopier/proc/bundlecopy(obj/item/paper_bundle/bundle, need_toner = TRUE)
var/obj/item/paper_bundle/P = new /obj/item/paper_bundle (src, default_papers = FALSE)
for(var/obj/item/W in bundle)
if(toner <= 0 && need_toner)
@@ -412,8 +412,7 @@
return null
P.amount--
P.forceMove(get_turf(src))
- P.update_icon()
- P.icon_state = "paper_words"
+ P.update_appearance(UPDATE_ICON|UPDATE_DESC)
P.name = bundle.name
P.pixel_y = rand(-8, 8)
P.pixel_x = rand(-9, 9)
@@ -425,7 +424,7 @@
new /obj/effect/decal/cleanable/blood/oil(get_turf(src))
toner = 0
-/obj/machinery/photocopier/MouseDrop_T(mob/target, mob/living/user)
+/obj/machinery/photocopier/MouseDrop_T(mob/target, mob/living/user, params)
check_ass() //Just to make sure that you can re-drag somebody onto it after they moved off.
if(!istype(target) || target.buckled || get_dist(user, src) > 1 || get_dist(user, target) > 1 || user.stat || istype(user, /mob/living/silicon/ai) || target == ass)
return
@@ -442,6 +441,7 @@
copyitem.forceMove(get_turf(src))
visible_message("[copyitem] is shoved out of the way by [ass]!")
copyitem = null
+ return TRUE
/obj/machinery/photocopier/proc/check_ass() //I'm not sure wether I made this proc because it's good form or because of the name.
if(!ass)
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index e96f38ebc59..860c50d3119 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -37,10 +37,10 @@
var/photo_size = 3
var/log_text = "" //Used for sending to Discord and just logging
-/obj/item/photo/attack_self(mob/user as mob)
+/obj/item/photo/attack_self(mob/user)
user.examinate(src)
-/obj/item/photo/attackby(obj/item/P as obj, mob/user as mob, params)
+/obj/item/photo/attackby(obj/item/P, mob/user, params)
if(istype(P, /obj/item/pen) || istype(P, /obj/item/toy/crayon))
var/txt = sanitize(input(user, "What would you like to write on the back?", "Photo Writing", null) as text)
txt = copytext(txt, 1, 128)
@@ -81,7 +81,7 @@
else
. += "It is too far away."
-/obj/item/photo/proc/show(mob/user as mob)
+/obj/item/photo/proc/show(mob/user)
var/icon/img_shown = new/icon(img)
var/colormatrix = user.get_screen_colour()
// Apply colorblindness effects, if any.
@@ -127,26 +127,6 @@
pickup_sound = 'sound/items/handling/book_pickup.ogg'
-/obj/item/storage/photo_album/MouseDrop(atom/over)
- . = ..()
- if(!.)
- return FALSE
-
- var/mob/user = usr
- if(user.incapacitated() || !ishuman(user))
- return FALSE
-
- if(over == user)
- playsound(loc, "rustle", 50, TRUE, -5)
- user.put_in_hands(src, ignore_anim = FALSE)
- if(user.s_active)
- user.s_active.close(user)
- show_to(user)
- return TRUE
-
- return FALSE
-
-
/*********
* camera *
*********/
@@ -194,19 +174,19 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
size = nsize
to_chat(usr, "Camera will now take [size]x[size] photos.")
-/obj/item/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
+/obj/item/camera/attack(mob/living/carbon/human/M, mob/user)
return
-/obj/item/camera/attack_self(mob/user as mob)
+/obj/item/camera/attack_self(mob/user)
on = !on
- if(on)
- src.icon_state = icon_on
- else
- src.icon_state = icon_off
+ update_icon(UPDATE_ICON_STATE)
to_chat(user, "You switch the camera [on ? "on" : "off"].")
return
-/obj/item/camera/attackby(obj/item/I as obj, mob/user as mob, params)
+/obj/item/camera/update_icon_state()
+ icon_state = on ? icon_on : icon_off
+
+/obj/item/camera/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/camera_film))
if(pictures_left)
to_chat(user, "[src] still has some film in it!")
@@ -354,15 +334,19 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
pictures_left--
desc = "A polaroid camera. It has [pictures_left] photos left."
to_chat(user, "[pictures_left] photos left.")
- icon_state = icon_off
on = FALSE
+ update_icon(UPDATE_ICON_STATE)
if(istype(src,/obj/item/camera/spooky))
if(user.mind && user.mind.assigned_role == "Chaplain" && see_ghosts)
if(prob(24))
handle_haunt(user)
- spawn(64)
- icon_state = icon_on
- on = TRUE
+ addtimer(CALLBACK(src, PROC_REF(delayed_turn_on)), 6.4 SECONDS)
+
+
+/obj/item/camera/proc/delayed_turn_on()
+ on = TRUE
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/camera/proc/can_capture_turf(turf/T, mob/user)
var/viewer = user
@@ -467,18 +451,18 @@ GLOBAL_LIST_INIT(SpookyGhosts, list("ghost","shade","shade2","ghost-narsie","hor
pictures_left = 30
var/max_storage = 10
-/obj/item/camera/digital/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag)
+
+/obj/item/camera/digital/afterattack(atom/target, mob/user, flag)
if(!on || !pictures_left || ismob(target.loc)) return
captureimage(target, user, flag)
playsound(loc, pick('sound/items/polaroid1.ogg', 'sound/items/polaroid2.ogg'), 75, 1, -3)
- desc = "A digital camera. A small screen shows that there are currently [saved_pictures.len] pictures stored."
- icon_state = icon_off
- on = 0
- spawn(64)
- icon_state = icon_on
- on = 1
+ desc = "A digital camera. A small screen shows that there are currently [length(saved_pictures)] pictures stored."
+ on = FALSE
+ update_icon(UPDATE_ICON_STATE)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/obj/item/camera, delayed_turn_on)), 6.4 SECONDS)
+
/obj/item/camera/digital/captureimage(atom/target, mob/user, flag)
if(saved_pictures.len >= max_storage)
diff --git a/code/modules/pda/PDA.dm b/code/modules/pda/PDA.dm
index 096d4aa72c0..4bb5731c089 100755
--- a/code/modules/pda/PDA.dm
+++ b/code/modules/pda/PDA.dm
@@ -104,7 +104,7 @@ GLOBAL_LIST_EMPTY(PDAs)
return id ? id : ..()
-/obj/item/pda/MouseDrop(atom/over)
+/obj/item/pda/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
var/mob/user = usr
diff --git a/code/modules/pda/ai.dm b/code/modules/pda/ai.dm
index 9f34fe4b73f..ff76ff3d515 100644
--- a/code/modules/pda/ai.dm
+++ b/code/modules/pda/ai.dm
@@ -22,7 +22,7 @@
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
- to_chat(usr, "Cannot use messenger!")
+ to_chat(usr, span_warning("Cannot use messenger!"))
var/list/plist = M.available_pdas()
if(plist)
var/c = tgui_input_list(usr, "Please select a PDA", "Send message", sortList(plist))
@@ -40,13 +40,11 @@
return
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
- to_chat(usr, "Cannot use messenger!")
+ to_chat(usr, span_warning("Cannot use messenger!"))
var/HTML = {"AI PDA Message Log"}
for(var/index in M.tnote)
- if(index["sent"])
- HTML += addtext("→ To ", index["owner"],": ", index["message"], " ")
- else
- HTML += addtext("← From ", index["owner"],": ", index["message"], " ")
+ var/obj/item/pda/target_pda = locateUID(index["target"])
+ HTML += "[index["sent"] ? "→ To" : "← From"] [QDELETED(target_pda) ? "Error#1133: Unable to find UserName." : "[target_pda.owner] ([target_pda.ownjob])"]: [index["message"]] "
HTML +=""
usr << browse(HTML, "window=log;size=400x444;border=1;can_resize=1;can_close=1;can_minimize=0")
diff --git a/code/modules/pda/messenger.dm b/code/modules/pda/messenger.dm
index 73e3975f597..bb643bf4127 100644
--- a/code/modules/pda/messenger.dm
+++ b/code/modules/pda/messenger.dm
@@ -28,8 +28,8 @@
data["messages"] = tnote
for(var/c in tnote)
if(c["target"] == active_conversation)
- data["convo_name"] = sanitize(c["owner"])
- data["convo_job"] = sanitize(c["job"])
+ var/obj/item/pda/device = locateUID(c["target"])
+ data["convo_device"] = QDELETED(device) ? "Error#1133: Unable to find UserName." : "[device.owner] ([device.ownjob])"
break
else
var/list/convopdas = list()
@@ -171,8 +171,8 @@
useMS.send_pda_message("[P.owner]","[pda.owner]","[t]")
- tnote.Add(list(list("sent" = 1, "owner" = "[P.owner]", "job" = "[P.ownjob]", "message" = "[t]", "target" = "[P.UID()]")))
- PM.tnote.Add(list(list("sent" = 0, "owner" = "[pda.owner]", "job" = "[pda.ownjob]", "message" = "[t]", "target" = "[pda.UID()]")))
+ tnote.Add(list(list("sent" = 1, "message" = "[t]", "target" = "[P.UID()]")))
+ PM.tnote.Add(list(list("sent" = 0, "message" = "[t]", "target" = "[pda.UID()]")))
// Show it to ghosts
for(var/mob/M in GLOB.dead_mob_list)
diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm
index 9d5bd2e5f18..9fff1a15de4 100644
--- a/code/modules/power/apc.dm
+++ b/code/modules/power/apc.dm
@@ -1007,32 +1007,28 @@
var/obj/machinery/light = L
INVOKE_ASYNC(light, TYPE_PROC_REF(/obj/machinery/light, update), FALSE)
-/obj/machinery/power/apc/proc/can_use(var/mob/user, var/loud = 0) //used by attack_hand() and Topic()
+/obj/machinery/power/apc/proc/can_use(mob/user, loud = 0) //used by attack_hand() and Topic()
if(stat & BROKEN)
return FALSE
if(user.can_admin_interact())
return TRUE
autoflag = 5
- if(istype(user, /mob/living/silicon))
+ if(ispAI(user))
+ var/mob/living/silicon/pai/pAI = user
+ if(!pAI.syndipai || !pAI.ai_capability || pAI.capa_is_cooldown)
+ return FALSE
+ else if(issilicon(user))
var/mob/living/silicon/ai/AI = user
var/mob/living/silicon/robot/robot = user
- if( \
- aidisabled || \
- malfhack && istype(malfai) && \
- ( \
- (istype(AI) && (malfai!=AI && malfai != AI.parent)) || \
- (istype(robot) && (robot in malfai.connected_robots)) \
- ) \
- )
+ if(aidisabled || malfhack && istype(malfai) && ((istype(AI) && (malfai!=AI && malfai != AI.parent)) || (istype(robot) && !(robot in malfai.connected_robots))))
if(!loud)
to_chat(user, "\The [src] has AI control disabled!")
user << browse(null, "window=apc")
user.unset_machine()
return FALSE
- else
- if((!in_range(src, user) || !istype(loc, /turf)))
- return FALSE
+ else if(!in_range(src, user) || !isturf(loc))
+ return FALSE
var/mob/living/carbon/human/H = user
if(istype(H))
diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index d6a3c915ccd..8951d904eb6 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -99,7 +99,7 @@ By design, d1 is the smallest direction and d2 is the highest
//If underfloor, hide the cable
/obj/structure/cable/hide(i)
if(level == 1 && isturf(loc))
- invisibility = i ? INVISIBILITY_ABSTRACT : 0
+ invisibility = i ? INVISIBILITY_MAXIMUM : 0
update_icon(UPDATE_ICON_STATE)
@@ -602,8 +602,8 @@ GLOBAL_LIST_INIT(cable_coil_recipes, list (new/datum/stack_recipe/cable_restrain
current_organ = pick_n_take(childlist)
if(!current_organ.burn_dam || !current_organ.is_robotic())
continue
- else if(current_organ.parent && !parenthealed)
- current_organ = current_organ.parent
+ else if(target_organ.parent && !parenthealed)
+ current_organ = target_organ.parent
parenthealed = TRUE
if(!current_organ.burn_dam || !current_organ.is_robotic())
break
diff --git a/code/modules/power/cell.dm b/code/modules/power/cell.dm
index 43eb5828781..9d21a27c2a7 100644
--- a/code/modules/power/cell.dm
+++ b/code/modules/power/cell.dm
@@ -32,7 +32,7 @@
if(ratingdesc)
desc += " This one has a power rating of [DisplayPower(maxcharge)], and you should not swallow it."
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/Destroy()
STOP_PROCESSING(SSobj, src)
@@ -53,16 +53,18 @@
else
return PROCESS_KILL
-/obj/item/stock_parts/cell/update_icon()
- overlays.Cut()
+
+/obj/item/stock_parts/cell/update_overlays()
+ . = ..()
if(grown_battery)
- overlays += image('icons/obj/engines_and_power/power.dmi', "grown_wires")
+ . += image('icons/obj/engines_and_power/power.dmi', "grown_wires")
if(charge < 0.01)
return
else if(charge/maxcharge >=0.995)
- overlays += "cell-o2"
+ . += "cell-o2"
else
- overlays += "cell-o1"
+ . += "cell-o1"
+
/obj/item/stock_parts/cell/proc/percent() // return % charge of cell
return 100 * charge / maxcharge
@@ -183,7 +185,7 @@
/obj/item/stock_parts/cell/crap/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/upgraded
name = "upgraded power cell"
@@ -208,7 +210,7 @@
/obj/item/stock_parts/cell/secborg/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/pulse //265 pulse shots
name = "pulse rifle power cell"
@@ -249,7 +251,7 @@
/obj/item/stock_parts/cell/high/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/super
name = "super-capacity power cell"
@@ -263,7 +265,7 @@
/obj/item/stock_parts/cell/super/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/hyper
name = "hyper-capacity power cell"
@@ -277,7 +279,7 @@
/obj/item/stock_parts/cell/hyper/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/bluespace
name = "bluespace power cell"
@@ -292,7 +294,7 @@
/obj/item/stock_parts/cell/bluespace/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/infinite
name = "infinite-capacity power cell!"
@@ -304,7 +306,7 @@
chargerate = 30000
/obj/item/stock_parts/cell/infinite/use()
- return 1
+ return TRUE
/obj/item/stock_parts/cell/infinite/abductor
name = "void core"
@@ -315,9 +317,9 @@
rating = 12
ratingdesc = FALSE
-/obj/item/stock_parts/cell/infinite/abductor/update_icon()
- return
+/obj/item/stock_parts/cell/infinite/abductor/update_overlays()
+ return list()
/obj/item/stock_parts/cell/potato
name = "potato battery"
@@ -351,7 +353,7 @@
/obj/item/stock_parts/cell/emproof/empty/New()
..()
charge = 0
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/stock_parts/cell/emproof/emp_act(severity)
return
diff --git a/code/modules/power/gravitygenerator.dm b/code/modules/power/gravitygenerator.dm
index 86c2d1fba12..d150dd0a82d 100644
--- a/code/modules/power/gravitygenerator.dm
+++ b/code/modules/power/gravitygenerator.dm
@@ -181,7 +181,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
/obj/machinery/gravity_generator/main/attackby(obj/item/I as obj, mob/user as mob, params)
switch(broken_state)
if(GRAV_NEEDS_SCREWDRIVER)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
add_fingerprint(user)
to_chat(user, "You secure the screws of the framework.")
playsound(src.loc, I.usesound, 50, 1)
@@ -202,7 +202,7 @@ GLOBAL_LIST_EMPTY(gravity_generators) // We will keep track of this by adding ne
to_chat(user, "You need 10 sheets of plasteel.")
return
if(GRAV_NEEDS_WRENCH)
- if(istype(I, /obj/item/wrench))
+ if(I.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
to_chat(user, "You secure the plating to the framework.")
playsound(src.loc, I.usesound, 75, 1)
diff --git a/code/modules/power/lighting.dm b/code/modules/power/lighting.dm
index 30665b2802a..662481f43a5 100644
--- a/code/modules/power/lighting.dm
+++ b/code/modules/power/lighting.dm
@@ -469,7 +469,7 @@
// attempt to stick weapon into light socket
if(status == LIGHT_EMPTY)
- if(istype(W, /obj/item/screwdriver)) //If it's a screwdriver open it.
+ if(W.tool_behaviour == TOOL_SCREWDRIVER) //If it's a screwdriver open it.
playsound(loc, W.usesound, W.tool_volume, 1)
user.visible_message("[user] opens [src]'s casing.", \
"You open [src]'s casing.", "You hear a screwdriver.")
diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm
index 5561a31e8a3..9c8cbbe3eaa 100644
--- a/code/modules/power/port_gen.dm
+++ b/code/modules/power/port_gen.dm
@@ -287,7 +287,7 @@
SStgui.update_uis(src)
return
else if(!active)
- if(istype(O, /obj/item/wrench))
+ if(O.tool_behaviour == TOOL_WRENCH)
if(!anchored)
connect_to_network()
@@ -299,7 +299,7 @@
playsound(src.loc, O.usesound, 50, 1)
anchored = !anchored
- else if(istype(O, /obj/item/screwdriver))
+ else if(O.tool_behaviour == TOOL_SCREWDRIVER)
panel_open = !panel_open
playsound(src.loc, O.usesound, 50, 1)
if(panel_open)
@@ -309,7 +309,7 @@
else if(istype(O, /obj/item/storage/part_replacer) && panel_open)
exchange_parts(user, O)
return
- else if(istype(O, /obj/item/crowbar) && panel_open)
+ else if(O.tool_behaviour == TOOL_CROWBAR && panel_open)
default_deconstruction_crowbar(user, O)
add_fingerprint(user)
else
diff --git a/code/modules/power/power.dm b/code/modules/power/power.dm
index f2b1d6308ac..6d714358df6 100644
--- a/code/modules/power/power.dm
+++ b/code/modules/power/power.dm
@@ -239,7 +239,7 @@
var/index = 1
var/obj/P = null
- worklist+=O //start propagating from the passed object
+ worklist[O] = TRUE //start propagating from the passed object
while(index<=worklist.len) //until we've exhausted all power objects
P = worklist[index] //get the next power object found
@@ -249,17 +249,19 @@
var/obj/structure/cable/C = P
if(C.powernet != PN) //add it to the powernet, if it isn't already there
PN.add_cable(C)
- worklist |= C.get_connections() //get adjacents power objects, with or without a powernet
+ //worklist |= C.get_connections() //get adjacents power objects, with or without a powernet
+ for(var/i in C.get_connections())
+ worklist[i] = TRUE
else if(P.anchored && istype(P, /obj/machinery/power))
var/obj/machinery/power/M = P
- found_machines |= M //we wait until the powernet is fully propagates to connect the machines
+ found_machines[P] = M //we wait until the powernet is fully propagates to connect the machines
else
continue
//now that the powernet is set, connect found machines to it
- for(var/obj/machinery/power/PM in found_machines)
+ for(var/obj/machinery/power/PM as anything in found_machines)
if(!PM.connect_to_network()) //couldn't find a node on its turf...
PM.disconnect_from_network() //... so disconnect if already on a powernet
diff --git a/code/modules/power/singularity/collector.dm b/code/modules/power/singularity/collector.dm
index 1ded07a2a83..bda593ff322 100644
--- a/code/modules/power/singularity/collector.dm
+++ b/code/modules/power/singularity/collector.dm
@@ -54,7 +54,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
/obj/machinery/power/rad_collector/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/multitool))
+ if(W.tool_behaviour == TOOL_MULTITOOL)
add_fingerprint(user)
to_chat(user, "The [W.name] detects that [last_power]W were recently produced.")
return 1
@@ -68,13 +68,13 @@ GLOBAL_LIST_EMPTY(rad_collectors)
add_fingerprint(user)
user.drop_transfer_item_to_loc(W, src)
src.P = W
- update_icons()
- else if(istype(W, /obj/item/crowbar))
+ update_icon()
+ else if(W.tool_behaviour == TOOL_CROWBAR)
if(P && !src.locked)
add_fingerprint(user)
eject()
return 1
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
if(P)
to_chat(user, "Remove the plasma tank first.")
return 1
@@ -125,7 +125,7 @@ GLOBAL_LIST_EMPTY(rad_collectors)
if(active)
toggle_power()
else
- update_icons()
+ update_icon()
/obj/machinery/power/rad_collector/proc/receive_pulse(var/pulse_strength)
if(P && active)
@@ -134,26 +134,27 @@ GLOBAL_LIST_EMPTY(rad_collectors)
add_avail(power_produced)
last_power = power_produced
return
- return
-/obj/machinery/power/rad_collector/proc/update_icons()
- overlays.Cut()
+/obj/machinery/power/rad_collector/update_icon_state()
+ icon_state = "ca[active ? "_on" : ""]"
+
+
+/obj/machinery/power/rad_collector/update_overlays()
+ . = ..()
if(P)
- overlays += image('icons/obj/engines_and_power/singularity.dmi', "ptank")
+ . += "ptank"
if(stat & (NOPOWER|BROKEN))
return
if(active)
- overlays += image('icons/obj/engines_and_power/singularity.dmi', "on")
+ . += "on"
/obj/machinery/power/rad_collector/proc/toggle_power()
active = !active
if(active)
- icon_state = "ca_on"
flick("ca_active", src)
else
- icon_state = "ca"
flick("ca_deactive", src)
- update_icons()
- return
+ update_icon()
+
diff --git a/code/modules/power/singularity/field_generator.dm b/code/modules/power/singularity/field_generator.dm
index ad5aa584818..67851b52e98 100644
--- a/code/modules/power/singularity/field_generator.dm
+++ b/code/modules/power/singularity/field_generator.dm
@@ -83,7 +83,7 @@ field_generator power level display
add_fingerprint(user)
to_chat(user, "[src] needs to be off!")
return
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
switch(state)
if(FG_UNSECURED)
if(isinspace())
diff --git a/code/modules/power/singularity/generator.dm b/code/modules/power/singularity/generator.dm
index f2fbe3b450b..a01be8a11e8 100644
--- a/code/modules/power/singularity/generator.dm
+++ b/code/modules/power/singularity/generator.dm
@@ -22,7 +22,7 @@
if(src) qdel(src)
/obj/machinery/the_singularitygen/attackby(obj/item/W, mob/user, params)
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
anchored = !anchored
playsound(src.loc, W.usesound, 75, 1)
diff --git a/code/modules/power/singularity/narsie.dm b/code/modules/power/singularity/narsie.dm
index 92a64ad27bb..d22b389a675 100644
--- a/code/modules/power/singularity/narsie.dm
+++ b/code/modules/power/singularity/narsie.dm
@@ -15,6 +15,11 @@
/obj/singularity/narsie/admin_investigate_setup()
return
+
+/obj/singularity/narsie/update_icon_state()
+ return
+
+
/obj/singularity/narsie/large
name = "Nar'Sie"
icon = 'icons/obj/narsie.dmi'
diff --git a/code/modules/power/singularity/ratvar.dm b/code/modules/power/singularity/ratvar.dm
index df1e4335670..7f774d30c68 100644
--- a/code/modules/power/singularity/ratvar.dm
+++ b/code/modules/power/singularity/ratvar.dm
@@ -36,6 +36,11 @@
addtimer(CALLBACK(src, PROC_REF(call_shuttle)), 7 SECONDS)
+
+/obj/singularity/ratvar/update_icon_state()
+ return
+
+
/obj/singularity/ratvar/proc/call_shuttle()
SSshuttle.emergency.request(null, 0.3)
SSshuttle.emergency.canRecall = FALSE // Cannot recall
diff --git a/code/modules/power/singularity/singularity.dm b/code/modules/power/singularity/singularity.dm
index d6ad8990499..f91d7cbd124 100644
--- a/code/modules/power/singularity/singularity.dm
+++ b/code/modules/power/singularity/singularity.dm
@@ -147,6 +147,28 @@
dissipate_track++
+/obj/singularity/update_icon_state()
+ switch(current_size)
+ if(STAGE_ONE)
+ icon = 'icons/obj/engines_and_power/singularity.dmi'
+ icon_state = "singularity_s1"
+ if(STAGE_TWO)
+ icon = 'icons/effects/96x96.dmi'
+ icon_state = "singularity_s3"
+ if(STAGE_THREE)
+ icon = 'icons/effects/160x160.dmi'
+ icon_state = "singularity_s5"
+ if(STAGE_FOUR)
+ icon = 'icons/effects/224x224.dmi'
+ icon_state = "singularity_s7"
+ if(STAGE_FIVE)
+ icon = 'icons/effects/288x288.dmi'
+ icon_state = "singularity_s9"
+ if(STAGE_SIX)
+ icon = 'icons/effects/352x352.dmi'
+ icon_state = "singularity_s11"
+
+
/obj/singularity/proc/expand(force_size = 0)
var/temp_allowed_size = src.allowed_size
if(force_size)
@@ -156,8 +178,6 @@
switch(temp_allowed_size)
if(STAGE_ONE)
current_size = STAGE_ONE
- icon = 'icons/obj/engines_and_power/singularity.dmi'
- icon_state = "singularity_s1"
pixel_x = 0
pixel_y = 0
grav_pull = 4
@@ -168,8 +188,6 @@
if(STAGE_TWO)
if((check_turfs_in(1,1))&&(check_turfs_in(2,1))&&(check_turfs_in(4,1))&&(check_turfs_in(8,1)))
current_size = STAGE_TWO
- icon = 'icons/effects/96x96.dmi'
- icon_state = "singularity_s3"
pixel_x = -32
pixel_y = -32
grav_pull = 6
@@ -180,8 +198,6 @@
if(STAGE_THREE)
if((check_turfs_in(1,2))&&(check_turfs_in(2,2))&&(check_turfs_in(4,2))&&(check_turfs_in(8,2)))
current_size = STAGE_THREE
- icon = 'icons/effects/160x160.dmi'
- icon_state = "singularity_s5"
pixel_x = -64
pixel_y = -64
grav_pull = 8
@@ -192,8 +208,6 @@
if(STAGE_FOUR)
if((check_turfs_in(1,3))&&(check_turfs_in(2,3))&&(check_turfs_in(4,3))&&(check_turfs_in(8,3)))
current_size = STAGE_FOUR
- icon = 'icons/effects/224x224.dmi'
- icon_state = "singularity_s7"
pixel_x = -96
pixel_y = -96
grav_pull = 10
@@ -203,8 +217,6 @@
dissipate_strength = 10
if(STAGE_FIVE)//this one also lacks a check for gens because it eats everything
current_size = STAGE_FIVE
- icon = 'icons/effects/288x288.dmi'
- icon_state = "singularity_s9"
pixel_x = -128
pixel_y = -128
grav_pull = 10
@@ -212,13 +224,12 @@
dissipate = 0 //It cant go smaller due to e loss
if(STAGE_SIX) //This only happens if a stage 5 singulo consumes a supermatter shard.
current_size = STAGE_SIX
- icon = 'icons/effects/352x352.dmi'
- icon_state = "singularity_s11"
pixel_x = -160
pixel_y = -160
grav_pull = 15
consume_range = 5
dissipate = 0
+ update_icon(UPDATE_ICON_STATE)
if(current_size == allowed_size)
investigate_log("grew to size [current_size]", INVESTIGATE_ENGINE)
return 1
diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm
index da3f01f882d..0feab1b9291 100644
--- a/code/modules/power/smes.dm
+++ b/code/modules/power/smes.dm
@@ -202,7 +202,7 @@
return
//disassembling the terminal
- if(istype(I, /obj/item/wirecutters) && terminal && panel_open)
+ if(I.tool_behaviour == TOOL_WIRECUTTER && terminal && panel_open)
var/turf/T = get_turf(terminal)
if(T.intact) //is the floor plating removed ?
to_chat(user, "You must first expose the power terminal!")
diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm
index 392e81ed9d7..85d2caa1895 100644
--- a/code/modules/power/solar.dm
+++ b/code/modules/power/solar.dm
@@ -204,14 +204,14 @@
/obj/item/solar_assembly/attackby(var/obj/item/W, var/mob/user, params)
if(!anchored && isturf(loc))
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
anchored = 1
user.visible_message("[user] wrenches the solar assembly into place.", "You wrench the solar assembly into place.")
playsound(src.loc, W.usesound, 50, 1)
return 1
else
- if(istype(W, /obj/item/wrench))
+ if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
anchored = 0
user.visible_message("[user] unwrenches the solar assembly from its place.", "You unwrench the solar assembly from its place.")
@@ -242,7 +242,7 @@
qdel(W)
user.visible_message("[user] inserts the electronics into the solar assembly.", "You insert the electronics into the solar assembly.")
return 1
- else if(istype(W, /obj/item/crowbar))
+ else if(W.tool_behaviour == TOOL_CROWBAR)
add_fingerprint(user)
var/obj/item/tracker_electronics/electronics = new(src.loc)
electronics.add_fingerprint(user)
@@ -428,7 +428,7 @@
set_panels(cdir)
/obj/machinery/power/solar_control/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
playsound(src.loc, I.usesound, 50, 1)
if(do_after(user, 20 * I.toolspeed * gettoolspeedmod(user), target = src))
if(src.stat & BROKEN)
diff --git a/code/modules/power/terminal.dm b/code/modules/power/terminal.dm
index e2ee72809fb..7ea17a9141e 100644
--- a/code/modules/power/terminal.dm
+++ b/code/modules/power/terminal.dm
@@ -35,7 +35,7 @@
/obj/machinery/power/terminal/hide(i)
if(i)
- invisibility = INVISIBILITY_ABSTRACT
+ invisibility = INVISIBILITY_MAXIMUM
icon_state = "term-f"
else
invisibility = 0
@@ -78,7 +78,7 @@
/obj/machinery/power/terminal/attackby(obj/item/W, mob/living/user, params)
- if(istype(W, /obj/item/wirecutters))
+ if(W.tool_behaviour == TOOL_WIRECUTTER)
dismantle(user, W)
else
return ..()
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 62a9b83e93a..5d9d41d5653 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -30,20 +30,26 @@
/// How strong the flash is
var/muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
+
/obj/item/ammo_casing/New()
..()
if(projectile_type)
BB = new projectile_type(src)
- pixel_x = rand(-10.0, 10)
- pixel_y = rand(-10.0, 10)
+ pixel_x = rand(-10, 10)
+ pixel_y = rand(-10, 10)
dir = pick(GLOB.alldirs)
- update_icon()
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
-/obj/item/ammo_casing/update_icon()
- ..()
+
+/obj/item/ammo_casing/update_icon_state()
icon_state = "[initial(icon_state)][BB ? "-live" : ""]"
+
+
+/obj/item/ammo_casing/update_desc(updates = ALL)
+ . = ..()
desc = "[initial(desc)][BB ? "" : " This one is spent."]"
+
/obj/item/ammo_casing/proc/newshot(params) //For energy weapons, shotgun shells and wands (!).
if(!BB)
BB = new projectile_type(src, params)
@@ -69,13 +75,13 @@
else
continue
if(boolets > 0)
- box.update_icon()
+ box.update_appearance(UPDATE_ICON|UPDATE_DESC)
to_chat(user, span_notice("You collect [boolets] shell\s. [box] now contains [box.stored_ammo.len] shell\s."))
playsound(src, 'sound/weapons/gun_interactions/bulletinsert.ogg', 50, 1)
else
to_chat(user, span_warning("You fail to collect anything!"))
else
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(BB)
if(initial(BB.name) == "bullet")
var/tmp_label = ""
@@ -139,7 +145,7 @@
if(ammo_type)
for(var/i in 1 to max_ammo)
stored_ammo += new ammo_type(src)
- update_icon()
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
initial_mats = materials.Copy()
update_mat_value()
@@ -212,8 +218,8 @@
if(!silent)
to_chat(user, span_notice("You load [num_loaded] shell\s into \the [src]!"))
playsound(src, load_sound, 50, 1)
- A.update_icon()
- update_icon()
+ A.update_appearance(UPDATE_ICON|UPDATE_DESC)
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
return num_loaded
@@ -223,16 +229,22 @@
user.put_in_hands(A)
playsound(src, remove_sound, 50, 1)
to_chat(user, span_notice("You remove a round from \the [src]!"))
- update_icon()
+ update_appearance(UPDATE_ICON|UPDATE_DESC)
-/obj/item/ammo_box/update_icon()
+
+/obj/item/ammo_box/update_desc(updates = ALL)
+ . = ..()
+ desc = "[initial(desc)] There are [length(stored_ammo)] shell\s left!"
+
+
+/obj/item/ammo_box/update_icon_state()
var/icon_base = initial(icon_prefix) ? initial(icon_prefix) : initial(icon_state)
switch(multiple_sprites)
if(1)
- icon_state = "[icon_base]-[stored_ammo.len]"
+ icon_state = "[icon_base]-[length(stored_ammo)]"
if(2)
- icon_state = "[icon_base]-[stored_ammo.len ? "[max_ammo]" : "0"]"
- desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
+ icon_state = "[icon_base]-[length(stored_ammo) ? "[max_ammo]" : "0"]"
+
/obj/item/ammo_box/update_materials_coeff(new_coeff)
. = ..()
@@ -253,7 +265,7 @@
materials[material] += ammo.materials[material]
//Behavior for magazines
-/obj/item/ammo_box/magazine/proc/ammo_count()
+/obj/item/ammo_box/magazine/proc/ammo_count(countempties = TRUE)
return length(stored_ammo)
/obj/item/ammo_box/magazine/proc/empty_magazine()
diff --git a/code/modules/projectiles/ammunition/ammo_casings.dm b/code/modules/projectiles/ammunition/ammo_casings.dm
index d7615d14d94..0b6b5910ed7 100644
--- a/code/modules/projectiles/ammunition/ammo_casings.dm
+++ b/code/modules/projectiles/ammunition/ammo_casings.dm
@@ -1,6 +1,6 @@
/obj/item/ammo_casing/a357
desc = "A .357 bullet casing."
- materials = list(MAT_METAL = 4000)
+ materials = list(MAT_METAL = 3750)
caliber = ".357"
projectile_type = /obj/item/projectile/bullet
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_NORMAL
@@ -61,7 +61,7 @@
/obj/item/ammo_casing/c38/hp
desc = "A .38 Hollow-Point bullet casing"
icon_state = "rhp-casing"
- materials = list(MAT_METAL = 4000)
+ materials = list(MAT_METAL = 5000)
projectile_type = /obj/item/projectile/bullet/hp38
/obj/item/ammo_casing/c38/invisible
@@ -120,7 +120,7 @@
/obj/item/ammo_casing/c46x30mm
desc = "A 4.6x30mm bullet casing."
- materials = list(MAT_METAL = 1000)
+ materials = list(MAT_METAL = 500)
caliber = "4.6x30mm"
projectile_type = /obj/item/projectile/bullet/weakbullet3/foursix
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
@@ -128,7 +128,7 @@
/obj/item/ammo_casing/c9mmte
desc = "A 9mm TE bullet casing."
- materials = list(MAT_METAL = 800)
+ materials = list(MAT_METAL = 550)
caliber = "9mm TE"
projectile_type = /obj/item/projectile/bullet/weakbullet4/c9mmte
muzzle_flash_strength = MUZZLE_FLASH_STRENGTH_WEAK
@@ -483,11 +483,10 @@
var/modified = FALSE
harmful = FALSE
-/obj/item/ammo_casing/caseless/foam_dart/update_icon()
- ..()
+
+/obj/item/ammo_casing/caseless/foam_dart/update_icon_state()
if(modified)
icon_state = "foamdart_empty"
- desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
if(BB)
BB.icon_state = "foamdart_empty"
else
@@ -495,10 +494,16 @@
if(BB)
BB.icon_state = initial(BB.icon_state)
+
+/obj/item/ammo_casing/caseless/foam_dart/update_desc(updates)
+ . = ..()
+ desc = modified ? "Its nerf or nothing! ... Although, this one doesn't look too safe." : initial(desc)
+
+
/obj/item/ammo_casing/caseless/foam_dart/attackby(obj/item/A, mob/user, params)
..()
var/obj/item/projectile/bullet/reusable/foam_dart/FD = BB
- if(istype(A, /obj/item/screwdriver) && !modified)
+ if(A.tool_behaviour == TOOL_SCREWDRIVER && !modified)
modified = TRUE
FD.damage_type = BRUTE
update_icon()
@@ -537,11 +542,10 @@
caliber = "foam_force_sniper"
projectile_type = /obj/item/projectile/bullet/reusable/foam_dart/sniper
-/obj/item/ammo_casing/caseless/foam_dart/sniper/update_icon()
- ..()
+
+/obj/item/ammo_casing/caseless/foam_dart/sniper/update_icon_state()
if(modified)
icon_state = "foamdartsniper_empty"
- desc = "Its nerf or nothing! ... Although, this one doesn't look too safe."
if(BB)
BB.icon_state = "foamdartsniper_empty"
else
@@ -549,6 +553,12 @@
if(BB)
BB.icon_state = initial(BB.icon_state)
+
+/obj/item/ammo_casing/caseless/foam_dart/sniper/update_desc(updates)
+ . = ..()
+ desc = modified ? "Its nerf or nothing! ... Although, this one doesn't look too safe." : initial(desc)
+
+
/obj/item/ammo_casing/caseless/foam_dart/sniper/riot
name = "riot foam sniper dart"
desc = "For the bigger brother of the crowd control toy. Ages 18 and up."
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 9cb28aab69f..9941d83facb 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -9,9 +9,10 @@
ammo_type = /obj/item/ammo_casing/a357
max_ammo = 20
-/obj/item/ammo_box/a357/update_icon()
- icon_state = "[initial(icon_state)]-[round(stored_ammo.len / 3)]"
- desc = "[initial(desc)] There are [stored_ammo.len] shell\s left!"
+
+/obj/item/ammo_box/a357/update_icon_state()
+ icon_state = "[initial(icon_state)]-[round(length(stored_ammo) / 3)]"
+
/obj/item/ammo_box/n762
name = "ammo box (7.62x38mm)"
@@ -294,16 +295,17 @@
name = "Shotgun Speedloader"
icon_state = "shotgunloader"
-/obj/item/ammo_box/speedloader/shotgun/update_icon()
- overlays.Cut()
+/obj/item/ammo_box/speedloader/shotgun/update_overlays()
+ . = ..()
for(var/i = 1 to length(stored_ammo))
var/obj/item/ammo_casing/shotgun/ammo = stored_ammo[i]
var/icon/new_ammo_icon = icon('icons/obj/weapons/ammo.dmi', "[initial(ammo.icon_state)]_loader")
if(i < 7)
new_ammo_icon.Shift((i % 2) == 0 ? WEST : EAST, 3)
new_ammo_icon.Turn(FLOOR((i - 1) * 45, 90))
- overlays += new_ammo_icon
+ . += new_ammo_icon
+
/obj/item/ammo_box/speedloader/shotgun/slug
name = "Shotgun Speedloader (slug)"
diff --git a/code/modules/projectiles/ammunition/energy.dm b/code/modules/projectiles/ammunition/energy.dm
index 4e0f06c3c4b..6c538947edc 100644
--- a/code/modules/projectiles/ammunition/energy.dm
+++ b/code/modules/projectiles/ammunition/energy.dm
@@ -223,14 +223,9 @@
delay = 10
e_cost = 100
fire_sound = 'sound/weapons/pulse3.ogg'
- var/obj/item/gun/energy/wormhole_projector/gun = null
select_name = "blue"
harmful = FALSE
-/obj/item/ammo_casing/energy/wormhole/New(var/obj/item/gun/energy/wormhole_projector/wh)
- . = ..()
- gun = wh
-
/obj/item/ammo_casing/energy/wormhole/orange
projectile_type = /obj/item/projectile/beam/wormhole/orange
muzzle_flash_color = "#FF6600"
diff --git a/code/modules/projectiles/ammunition/magazines.dm b/code/modules/projectiles/ammunition/magazines.dm
index dccfa7f2eef..51b6bc2fe5a 100644
--- a/code/modules/projectiles/ammunition/magazines.dm
+++ b/code/modules/projectiles/ammunition/magazines.dm
@@ -14,7 +14,7 @@
max_ammo = 7
-/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = 1)
+/obj/item/ammo_box/magazine/internal/cylinder/ammo_count(countempties = TRUE)
var/boolets = 0
for(var/obj/item/ammo_casing/bullet in stored_ammo)
if(bullet && (bullet.BB || countempties))
@@ -108,7 +108,7 @@
max_ammo = 4
multiload = 0
-/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = 1)
+/obj/item/ammo_box/magazine/internal/shot/ammo_count(countempties = TRUE)
if(!countempties)
var/boolets = 0
for(var/obj/item/ammo_casing/bullet in stored_ammo)
@@ -243,8 +243,7 @@
desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets"
ammo_type = /obj/item/ammo_casing/c10mm/ap
-/obj/item/ammo_box/magazine/m10mm/update_icon()
- . = ..()
+/obj/item/ammo_box/magazine/m10mm/update_icon_state()
icon_state = "[initial(icon_state)]-[ammo_count() ? "15" : "0"]"
/obj/item/ammo_box/magazine/m45
@@ -263,13 +262,12 @@
multiple_sprites = 1
caliber = "9mm"
-/obj/item/ammo_box/magazine/enforcer/update_icon()
- ..()
- overlays.Cut()
- var/ammo = ammo_count()
- if(ammo && is_rubber())
- overlays += image('icons/obj/weapons/ammo.dmi', icon_state = "enforcer-r")
+/obj/item/ammo_box/magazine/enforcer/update_overlays()
+ . = ..()
+ if(ammo_count() && is_rubber())
+ . += image('icons/obj/weapons/ammo.dmi', icon_state = "enforcer-r")
+
/obj/item/ammo_box/magazine/enforcer/examine(mob/user)
. = ..()
@@ -295,8 +293,7 @@
max_ammo = 10
caliber = "40nr"
-/obj/item/ammo_box/magazine/sp8/update_icon()
- ..()
+/obj/item/ammo_box/magazine/sp8/update_icon_state()
icon_state = "sp8mag-[round(ammo_count(),2)]"
/obj/item/ammo_box/magazine/wt550m9
@@ -306,8 +303,7 @@
caliber = "4.6x30mm"
max_ammo = 20
-/obj/item/ammo_box/magazine/wt550m9/update_icon()
- ..()
+/obj/item/ammo_box/magazine/wt550m9/update_icon_state()
icon_state = "46x30mmt-[round(ammo_count(),4)]"
/obj/item/ammo_box/magazine/wt550m9/wtap
@@ -329,8 +325,7 @@
caliber = "9mm TE"
max_ammo = 20
-/obj/item/ammo_box/magazine/sp91rc/update_icon()
- ..()
+/obj/item/ammo_box/magazine/sp91rc/update_icon_state()
icon_state = "9mm-te-[round(ammo_count(),5)]"
/obj/item/ammo_box/magazine/uzim9mm
@@ -340,8 +335,7 @@
caliber = "9mm"
max_ammo = 32
-/obj/item/ammo_box/magazine/uzim9mm/update_icon()
- ..()
+/obj/item/ammo_box/magazine/uzim9mm/update_icon_state()
icon_state = "uzi9mm-[round(ammo_count(),4)]"
/obj/item/ammo_box/magazine/smgm9mm
@@ -363,8 +357,7 @@
name = "SMG Magazine (Incendiary 9mm)"
ammo_type = /obj/item/ammo_casing/c9mm/inc
-/obj/item/ammo_box/magazine/smgm9mm/update_icon()
- ..()
+/obj/item/ammo_box/magazine/smgm9mm/update_icon_state()
icon_state = "[initial(icon_state)]-[round(ammo_count()+1,4)]"
/obj/item/ammo_box/magazine/sfg9mm
@@ -374,8 +367,7 @@
caliber = "9mm"
max_ammo = 30
-/obj/item/ammo_box/magazine/sfg9mm/update_icon()
- ..()
+/obj/item/ammo_box/magazine/sfg9mm/update_icon_state()
icon_state = "[initial(icon_state)]-[round(ammo_count(), 30)]"
/obj/item/ammo_box/magazine/pistolm9mm
@@ -385,8 +377,7 @@
caliber = "9mm"
max_ammo = 15
-/obj/item/ammo_box/magazine/pistolm9mm/update_icon()
- ..()
+/obj/item/ammo_box/magazine/pistolm9mm/update_icon_state()
icon_state = "9x19p-[ammo_count() ? "15" : "0"]"
/obj/item/ammo_box/magazine/smgm45
@@ -397,8 +388,7 @@
caliber = ".45"
max_ammo = 20
-/obj/item/ammo_box/magazine/smgm45/update_icon()
- ..()
+/obj/item/ammo_box/magazine/smgm45/update_icon_state()
icon_state = "[initial(icon_state)]-[round(ammo_count(),2)]"
/obj/item/ammo_box/magazine/tommygunm45
@@ -537,8 +527,7 @@
icon_state = "smg9mm-20"
max_ammo = 20
-/obj/item/ammo_box/magazine/toy/smg/update_icon()
- ..()
+/obj/item/ammo_box/magazine/toy/smg/update_icon_state()
icon_state = "smg9mm-[round(ammo_count()+1,4)]"
/obj/item/ammo_box/magazine/toy/smg/riot
@@ -553,8 +542,7 @@
/obj/item/ammo_box/magazine/toy/pistol/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-/obj/item/ammo_box/magazine/toy/pistol/update_icon()
- ..()
+/obj/item/ammo_box/magazine/toy/pistol/update_icon_state()
icon_state = "9x19p-[ammo_count() ? "15" : "0"]"
/obj/item/ammo_box/magazine/toy/enforcer
@@ -564,21 +552,21 @@
multiple_sprites = 1
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
-/obj/item/ammo_box/magazine/toy/enforcer/update_icon()
- ..()
- overlays.Cut()
+/obj/item/ammo_box/magazine/toy/enforcer/update_overlays()
+ . = ..()
var/ammo = ammo_count()
if(ammo && is_riot())
overlays += image('icons/obj/weapons/ammo.dmi', icon_state = "enforcer-rd")
else if(ammo)
overlays += image('icons/obj/weapons/ammo.dmi', icon_state = "enforcer-bd")
+
/obj/item/ammo_box/magazine/toy/enforcer/proc/is_riot()//if the topmost bullet is a riot dart
var/ammo = ammo_count()
if(!ammo)
return FALSE
- if(istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/riot))
+ if(istype(contents[length(contents)], /obj/item/ammo_casing/caseless/foam_dart/riot))
return TRUE
return FALSE
@@ -587,8 +575,7 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
max_ammo = 20
-/obj/item/ammo_box/magazine/toy/smgm45/update_icon()
- ..()
+/obj/item/ammo_box/magazine/toy/smgm45/update_icon_state()
icon_state = "c20r45-[round(ammo_count(),2)]"
/obj/item/ammo_box/magazine/toy/m762
@@ -596,8 +583,7 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
max_ammo = 50
-/obj/item/ammo_box/magazine/toy/m762/update_icon()
- ..()
+/obj/item/ammo_box/magazine/toy/m762/update_icon_state()
icon_state = "a762-[round(ammo_count(),10)]"
/obj/item/ammo_box/magazine/toy/m762/riot
@@ -612,9 +598,8 @@
caliber = "laser"
max_ammo = 20
-/obj/item/ammo_box/magazine/laser/update_icon()
- ..()
- icon_state = "[initial(icon_state)]-[CEILING(ammo_count(0)/20, 1)*20]"
+/obj/item/ammo_box/magazine/laser/update_icon_state()
+ icon_state = "[initial(icon_state)]-[CEILING(ammo_count(FALSE)/20, 1)*20]"
/obj/item/ammo_box/magazine/lr30mag
name = "small encased laser projector magazine"
@@ -625,20 +610,10 @@
caliber = "laser"
max_ammo = 12
-/obj/item/ammo_box/magazine/lr30mag/update_icon()
- ..()
+/obj/item/ammo_box/magazine/lr30mag/update_icon_state()
icon_state = "lmag-[round(ammo_count(),3)]"
-/obj/item/ammo_box/magazine/toy/smgm45
- name = "donksoft SMG magazine"
- ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
- max_ammo = 20
-
-/obj/item/ammo_box/magazine/toy/smgm45/update_icon()
- ..()
- icon_state = "c20r45-[round(ammo_count(),2)]"
-
/obj/item/ammo_box/magazine/toy/smgm45/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
index 47221f2c3ce..b8ac290507c 100644
--- a/code/modules/projectiles/gun.dm
+++ b/code/modules/projectiles/gun.dm
@@ -43,15 +43,20 @@
var/randomspread = 1
var/barrel_dir = EAST // barel direction need for a rotate gun with telekinesis for shot to target (default: matched with tile direction)
- var/unique_rename = TRUE //allows renaming with a pen
- var/unique_reskin = FALSE //allows reskinning
- var/current_skin = null //the skin choice if we had a reskin
- var/list/options = list()
+ /// Allows renaming with a pen
+ var/unique_rename = TRUE
+ /// Allows reskinning
+ var/unique_reskin = FALSE
+ /// The skin choice if we had a reskin
+ var/current_skin
+ /// Lazy list of gun visual skins. Filled on Initialize() in proc/update_gun_skins()
+ var/list/skin_options
lefthand_file = 'icons/mob/inhands/guns_lefthand.dmi'
righthand_file = 'icons/mob/inhands/guns_righthand.dmi'
var/obj/item/flashlight/gun_light = null
+ var/gun_light_overlay
var/can_flashlight = 0
var/can_bayonet = FALSE //if a bayonet can be added or removed if it already has one.
@@ -82,19 +87,24 @@
var/malf_high_bound = 80
var/malf_counter // random number between malf_low_bound and malf_high_bound
+
/obj/item/gun/Initialize()
. = ..()
appearance_flags |= KEEP_TOGETHER
if(gun_light)
verbs += /obj/item/gun/proc/toggle_gunlight
build_zooming()
- if(rusted_weapon == TRUE)
+ if(rusted_weapon)
malf_counter = rand(malf_low_bound, malf_high_bound)
+ update_gun_skins()
+
/obj/item/gun/Destroy()
+ QDEL_NULL(gun_light)
QDEL_NULL(bayonet)
return ..()
+
/obj/item/gun/handle_atom_del(atom/A)
if(A == bayonet)
clear_bayonet()
@@ -113,6 +123,24 @@
else if(can_bayonet)
. += "It has a bayonet lug on it."
+
+/obj/item/gun/proc/update_gun_skins()
+ return
+
+
+/**
+ * Adds skin in associative lazy list: skin_options[skin_name] = skin_icon_state
+ *
+ * Arguments:
+ * * skin_name - what skin name user will see.
+ * * skin_icon_state - which icon_state will be used for the gun.
+ */
+/obj/item/gun/proc/add_skin(skin_name, skin_icon_state)
+ if(!unique_reskin)
+ return
+ LAZYSET(skin_options, skin_name, skin_icon_state)
+
+
/obj/item/gun/proc/process_chamber()
return 0
@@ -357,11 +385,10 @@
if(S.on)
set_light(0)
gun_light = S
- update_icon()
- update_gun_light(user)
var/datum/action/A = new /datum/action/item_action/toggle_gunlight(src)
if(loc == user)
A.Grant(user)
+ update_gun_light()
if(unique_rename)
if(istype(I, /obj/item/pen))
@@ -376,6 +403,7 @@
return
to_chat(user, "You attach [K] to [src]'s bayonet lug.")
bayonet = K
+ update_icon()
var/state = "bayonet" //Generic state.
if(bayonet.icon_state in icon_states('icons/obj/weapons/bayonets.dmi')) //Snowflake state?
state = bayonet.icon_state
@@ -383,7 +411,7 @@
knife_overlay = mutable_appearance(bayonet_icons, state)
knife_overlay.pixel_x = knife_x_offset
knife_overlay.pixel_y = knife_y_offset
- overlays += knife_overlay
+ update_icon(UPDATE_OVERLAYS)
else
return ..()
@@ -395,14 +423,13 @@
for(var/obj/item/flashlight/seclite/S in src)
to_chat(user, "You unscrew the seclite from [src].")
gun_light = null
- S.loc = get_turf(user)
- update_gun_light(user)
+ update_gun_light()
+ S.forceMove_turf()
S.update_brightness(user)
- update_icon()
for(var/datum/action/item_action/toggle_gunlight/TGL in actions)
qdel(TGL)
else if(bayonet && can_bayonet) //if it has a bayonet, and the bayonet can be removed
- bayonet.forceMove(get_turf(user))
+ bayonet.forceMove_turf()
clear_bayonet()
/obj/item/gun/proc/toggle_gunlight()
@@ -420,9 +447,10 @@
to_chat(user, "You toggle the gun light [gun_light.on ? "on":"off"].")
playsound(user, 'sound/weapons/empty.ogg', 100, 1)
- update_gun_light(user)
+ update_gun_light()
-/obj/item/gun/proc/update_gun_light(mob/user = null)
+
+/obj/item/gun/proc/update_gun_light()
if(gun_light)
if(gun_light.on)
set_light(gun_light.brightness_on)
@@ -432,22 +460,23 @@
else
set_light(0)
- for(var/X in actions)
- var/datum/action/A = X
- A.UpdateButtonIcon()
+ update_icon(UPDATE_OVERLAYS)
+ update_equipped_item()
+
/obj/item/gun/proc/clear_bayonet()
if(!bayonet)
return
bayonet = null
if(knife_overlay)
- overlays -= knife_overlay
knife_overlay = null
+ update_icon(UPDATE_OVERLAYS)
return TRUE
/obj/item/gun/extinguish_light(force = FALSE)
if(gun_light?.on)
- toggle_gunlight()
+ gun_light.on = FALSE
+ update_gun_light()
visible_message(span_danger("[src]'s light fades and turns off."))
@@ -457,22 +486,37 @@
if(azoom)
azoom.Remove(user)
+
/obj/item/gun/AltClick(mob/user)
+ if(!unique_reskin || current_skin || loc != user)
+ return ..()
if(user.incapacitated())
- to_chat(user, "You can't do that right now!")
- return
- if(unique_reskin && loc == user)
- reskin_gun(user)
+ to_chat(user, span_warning("You can't do that right now!"))
+ return ..()
+ reskin_gun(user)
-/obj/item/gun/proc/reskin_gun(mob/M)
- var/choice = input(M,"Select your skin.","Reskin Gun") in options
- if(src && choice && !M.incapacitated() && in_range(M,src))
- if(options[choice] == null)
- return
- current_skin = options[choice]
- to_chat(M, "Your gun is now skinned as [choice]. Say hello to your new friend.")
+/obj/item/gun/proc/reskin_gun(mob/user)
+ if(!LAZYLEN(skin_options))
+ stack_trace("[src] has unique_reskin set to TRUE but skin_options list is empty.")
+ return
+ var/list/skins = list()
+ for(var/skin in skin_options)
+ skins[skin] = image(icon = icon, icon_state = skin_options[skin])
+ var/choice = show_radial_menu(user, src, skins, radius = 40, custom_check = CALLBACK(src, PROC_REF(reskin_radial_check), user), require_near = TRUE)
+
+ if(choice && reskin_radial_check(user) && !current_skin)
+ current_skin = skin_options[choice]
+ to_chat(user, "Your gun is now skinned as [choice]. Say hello to your new friend.")
update_icon()
+ update_equipped_item()
+
+
+/obj/item/gun/proc/reskin_radial_check(mob/living/carbon/human/user)
+ if(!ishuman(user) || QDELETED(src) || !user.is_in_hands(src) || user.incapacitated())
+ return FALSE
+ return TRUE
+
/obj/item/gun/proc/handle_suicide(mob/living/carbon/human/user, mob/living/carbon/human/target, params)
if(!ishuman(user) || !ishuman(target))
diff --git a/code/modules/projectiles/guns/alien.dm b/code/modules/projectiles/guns/alien.dm
index 746649fe722..bcabb2de7f7 100644
--- a/code/modules/projectiles/guns/alien.dm
+++ b/code/modules/projectiles/guns/alien.dm
@@ -54,9 +54,14 @@
restricted_species = list(/datum/species/vox/armalis)
sprite_sheets_inhand = list("Vox Armalis" = 'icons/mob/clothing/species/armalis/held.dmi') //Big guns big birds.
-/obj/item/gun/energy/noisecannon/update_icon()
+
+/obj/item/gun/energy/noisecannon/update_icon_state()
return
+
+/obj/item/gun/energy/noisecannon/update_overlays()
+ return list()
+
//Casing
/obj/item/ammo_casing/energy/sonic
projectile_type = /obj/item/projectile/energy/sonic
diff --git a/code/modules/projectiles/guns/dartgun.dm b/code/modules/projectiles/guns/dartgun.dm
index ad69e1445a6..f68c07b1f2f 100644
--- a/code/modules/projectiles/guns/dartgun.dm
+++ b/code/modules/projectiles/guns/dartgun.dm
@@ -10,14 +10,15 @@
origin_tech = "materials=2"
var/darts = 5
-/obj/item/dart_cartridge/update_icon()
+
+/obj/item/dart_cartridge/update_icon_state()
if(!darts)
icon_state = "darts-0"
else if(darts > 5)
icon_state = "darts-5"
else
icon_state = "darts-[darts]"
- return 1
+
/obj/item/gun/dartgun
name = "dart gun"
@@ -32,10 +33,11 @@
var/containers_type = /obj/item/reagent_containers/glass/beaker
var/list/starting_chems = null
-/obj/item/gun/dartgun/update_icon()
+
+/obj/item/gun/dartgun/update_icon_state()
if(!cartridge)
icon_state = "dartgun-e"
- return 1
+ return
if(!cartridge.darts)
icon_state = "dartgun-0"
@@ -43,10 +45,11 @@
icon_state = "dartgun-5"
else
icon_state = "dartgun-[cartridge.darts]"
- return 1
-/obj/item/gun/dartgun/New()
- ..()
+
+/obj/item/gun/dartgun/Initialize()
+ . = ..()
+
if(starting_chems)
for(var/chem in starting_chems)
var/obj/B = new containers_type(src)
@@ -55,6 +58,7 @@
cartridge = new /obj/item/dart_cartridge(src)
update_icon()
+
/obj/item/gun/dartgun/examine(mob/user)
. = ..()
if(get_dist(user, src) <= 2)
@@ -150,7 +154,7 @@
to_chat(user, "There are no reagents available!")
return
cartridge.darts--
- src.update_icon()
+ update_icon()
S.reagents.trans_to(D, S.reagents.total_volume)
qdel(S)
D.icon_state = "syringeproj"
@@ -293,6 +297,6 @@
anchored = 1
density = 0
-/obj/effect/syringe_gun_dummy/New()
+/obj/effect/syringe_gun_dummy/Initialize(mapload)
. = ..()
create_reagents(15)
diff --git a/code/modules/projectiles/guns/energy.dm b/code/modules/projectiles/guns/energy.dm
index f01f049d325..f46c5b7b558 100644
--- a/code/modules/projectiles/guns/energy.dm
+++ b/code/modules/projectiles/guns/energy.dm
@@ -4,6 +4,7 @@
desc = "A basic energy-based gun."
icon = 'icons/obj/weapons/energy.dmi'
fire_sound_text = "laser blast"
+ gun_light_overlay = "flight"
ammo_x_offset = 2
var/obj/item/stock_parts/cell/cell //What type of power cell this uses
@@ -17,6 +18,12 @@
var/charge_sections = 4
var/charge_tick = 0
var/charge_delay = 4
+ /// Used when updating icon and overlays
+ var/new_icon_state
+ /// If the item uses a shared set of overlays instead of being based on icon_state
+ var/overlay_set
+ /// Used when updating icon and overlays to determine the energy pips
+ var/ratio
var/can_add_sibyl_system = TRUE //if a sibyl system's mod can be added or removed if it already has one
var/obj/item/sibyl_system_mod/sibyl_mod = null
@@ -174,11 +181,13 @@
/obj/item/gun/energy/proc/on_recharge()
newshot()
+
/obj/item/gun/energy/attack_self(mob/living/user)
- if(ammo_type.len > 1)
+ if(length(ammo_type))
select_fire(user)
update_icon()
+
/obj/item/gun/energy/can_shoot(mob/living/user)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
var/check_charge = cell.charge >= shot.e_cost
@@ -229,43 +238,54 @@
chambered = null
newshot()
update_icon()
- if(istype(user,/mob/living/carbon/human)) //This has to be here or else if you toggle modes by clicking the gun in hand
- var/mob/living/carbon/human/H = user //Otherwise the mob icon doesn't update, blame shitty human update_icons() code
- H.update_inv_l_hand()
- H.update_inv_r_hand()
- return
-
-/obj/item/gun/energy/update_icon()
- overlays.Cut()
- var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
+
+
+/obj/item/gun/energy/update_icon(updates = ALL)
+ ..()
+ update_equipped_item()
+
+
+/obj/item/gun/energy/update_icon_state()
+ icon_state = initial(icon_state)
+ ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
- var/iconState = "[icon_state]_charge"
- var/itemState = null
+ new_icon_state = "[icon_state]_charge"
+ var/new_item_state = null
if(!initial(item_state))
- itemState = icon_state
+ new_item_state = icon_state
if(modifystate)
- overlays += "[icon_state]_[shot.select_name]"
- iconState += "_[shot.select_name]"
- if(itemState)
- itemState += "[shot.select_name]"
+ new_icon_state += "_[shot.select_name]"
+ if(new_item_state)
+ new_item_state += "[shot.select_name]"
+ if(new_item_state)
+ new_item_state += "[ratio]"
+ item_state = new_item_state
+ if(current_skin)
+ icon_state = current_skin
+
+
+/obj/item/gun/energy/update_overlays()
+ . = ..()
+ var/overlay_name = overlay_set ? overlay_set : icon_state
+ var/obj/item/ammo_casing/energy/shot = ammo_type[select]
+ if(modifystate)
+ . += "[overlay_name]_[shot.select_name]"
if(cell.charge < shot.e_cost)
- overlays += "[icon_state]_empty"
+ . += "[overlay_name]_empty"
else
if(!shaded_charge)
for(var/i = ratio, i >= 1, i--)
- overlays += image(icon = icon, icon_state = iconState, pixel_x = ammo_x_offset * (i -1))
+ . += image(icon = icon, icon_state = new_icon_state, pixel_x = ammo_x_offset * (i - 1))
else
- overlays += image(icon = icon, icon_state = "[icon_state]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
- if(gun_light && can_flashlight)
- var/iconF = "flight"
+ . += image(icon = icon, icon_state = "[overlay_name]_[modifystate ? "[shot.select_name]_" : ""]charge[ratio]")
+ if(gun_light && gun_light_overlay)
+ var/iconF = gun_light_overlay
if(gun_light.on)
- iconF = "flight_on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
- if(bayonet && can_bayonet)
- overlays += knife_overlay
- if(itemState)
- itemState += "[ratio]"
- item_state = itemState
+ iconF = "[gun_light_overlay]_on"
+ . += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
+ if(bayonet && knife_overlay)
+ . += knife_overlay
+
/obj/item/gun/energy/ui_action_click()
toggle_gunlight()
diff --git a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
index 1245b0d6cf2..eb9a41b30ff 100644
--- a/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
+++ b/code/modules/projectiles/guns/energy/kinetic_accelerator.dm
@@ -151,18 +151,11 @@
update_icon()
overheat = FALSE
-/obj/item/gun/energy/kinetic_accelerator/update_icon()
- cut_overlays()
+
+/obj/item/gun/energy/kinetic_accelerator/update_overlays()
+ . = ..()
if(empty_state && !can_shoot())
- add_overlay(empty_state)
-
- if(gun_light && can_flashlight)
- var/iconF = "flight"
- if(gun_light.on)
- iconF = "flight_on"
- add_overlay(image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset))
- if(bayonet && can_bayonet)
- add_overlay(knife_overlay)
+ . += empty_state
/obj/item/gun/energy/kinetic_accelerator/experimental
diff --git a/code/modules/projectiles/guns/energy/laser.dm b/code/modules/projectiles/guns/energy/laser.dm
index 8a585f2d992..8d2d8d9c3ff 100644
--- a/code/modules/projectiles/guns/energy/laser.dm
+++ b/code/modules/projectiles/guns/energy/laser.dm
@@ -1,8 +1,8 @@
/obj/item/gun/energy/laser
name = "laser gun"
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
- icon_state = "laser"
- item_state = "laser"
+ icon_state = "lasergun"
+ item_state = null
w_class = WEIGHT_CLASS_NORMAL
materials = list(MAT_METAL=2000)
origin_tech = "combat=4;magnets=2"
@@ -13,6 +13,8 @@
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
desc = "A modified version of the basic laser gun, this one fires less concentrated energy bolts designed for target practice."
+ icon_state = "laser"
+ item_state = "laser"
origin_tech = "combat=2;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/laser/practice)
clumsy_check = 0
@@ -21,6 +23,7 @@
/obj/item/gun/energy/laser/retro
name ="retro laser gun"
icon_state = "retro"
+ item_state = "laser"
desc = "An older model of the basic lasergun, no longer used by Nanotrasen's private security or military forces. Nevertheless, it is still quite deadly and easy to maintain, making it a favorite amongst pirates and other outlaws."
ammo_x_offset = 3
@@ -36,19 +39,12 @@
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
unique_reskin = TRUE
-/obj/item/gun/energy/laser/captain/New()
- ..()
- options["The Original"] = "caplaser"
- options["Restored"] = "caplaser_new"
- options["Alternative"] = "caplaser_newer"
- options["Cancel"] = null
-/obj/item/gun/energy/laser/captain/update_icon()
- ..()
- if(current_skin)
- icon_state = "[current_skin]"
- else
- icon_state = "[initial(icon_state)]"
+/obj/item/gun/energy/laser/captain/update_gun_skins()
+ add_skin("The Original", "caplaser")
+ add_skin("Restored", "caplaser_new")
+ add_skin("Alternative", "caplaser_newer")
+
/obj/item/gun/energy/laser/captain/scattershot
name = "scatter shot laser rifle"
@@ -141,11 +137,13 @@
ammo_type = list(/obj/item/ammo_casing/energy/immolator/strong, /obj/item/ammo_casing/energy/immolator/scatter)
origin_tech = "combat=5;magnets=5;powerstorage=4"
-/obj/item/gun/energy/immolator/multi/update_icon()
- ..()
+
+/obj/item/gun/energy/immolator/multi/update_overlays()
+ . = ..()
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
var/append = shot.select_name
- overlays += image(icon = icon, icon_state = "multilensimmolator-[append]")
+ . += image(icon, icon_state = "multilensimmolator-[append]")
+
/obj/item/gun/energy/immolator/multi/cyborg
name = "cyborg immolator cannon"
@@ -155,6 +153,8 @@
////////Laser Tag////////////////////
/obj/item/gun/energy/laser/tag
+ icon_state = "bluetag"
+ item_state = "laser"
name = "laser tag gun"
desc = "Standard issue weapon of the Imperial Guard"
origin_tech = "combat=2;magnets=2"
diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm
index 668e85d6911..7398ebb26c4 100644
--- a/code/modules/projectiles/guns/energy/nuclear.dm
+++ b/code/modules/projectiles/guns/energy/nuclear.dm
@@ -26,9 +26,12 @@
desc = "A small, pistol-sized energy gun with a built-in flashlight. It has two settings: disable and kill."
icon_state = "mini"
w_class = WEIGHT_CLASS_SMALL
+ gun_light_overlay = "mini-light"
+ flight_x_offset = 0
+ flight_y_offset = 0
ammo_x_offset = 2
charge_sections = 3
- can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
+ can_flashlight = FALSE
actions_types = list(/datum/action/item_action/toggle_gunlight)
/obj/item/gun/energy/gun/mini/Initialize(mapload, ...)
@@ -37,10 +40,6 @@
cell.maxcharge = 600
cell.charge = 600
-/obj/item/gun/energy/gun/mini/update_icon()
- ..()
- if(gun_light && gun_light.on)
- overlays += "mini-light"
/obj/item/gun/energy/gun/hos
name = "\improper X-01 MultiPhase Energy Gun"
@@ -64,8 +63,8 @@
/obj/item/gun/energy/gun/blueshield/can_shoot()
. = ..()
- if (. && !isertmindshielded(usr))
- to_chat(usr, "ЕРТ имплант «Защита разума» не обнаружен!")
+ if(. && !isertmindshielded(usr))
+ to_chat(usr, span_warning("ЕРТ имплант «Защита разума» не обнаружен!"))
return FALSE
return .
@@ -83,8 +82,8 @@
/obj/item/gun/energy/gun/pdw9/ert/can_shoot()
. = ..()
- if (. && !isertmindshielded(usr))
- to_chat(usr, "ЕРТ имплант «Защита разума» не обнаружен!")
+ if(. && !isertmindshielded(usr))
+ to_chat(usr, span_warning("ЕРТ имплант «Защита разума» не обнаружен!"))
return FALSE
return .
diff --git a/code/modules/projectiles/guns/energy/special.dm b/code/modules/projectiles/guns/energy/special.dm
index c04c8c3d1bc..5197f796942 100644
--- a/code/modules/projectiles/guns/energy/special.dm
+++ b/code/modules/projectiles/guns/energy/special.dm
@@ -186,8 +186,8 @@
else
return ..()
-/obj/item/gun/energy/plasmacutter/update_icon()
- return
+/obj/item/gun/energy/plasmacutter/update_overlays()
+ return list()
/obj/item/gun/energy/plasmacutter/adv
name = "advanced plasma cutter"
@@ -285,8 +285,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/c3dbullet)
can_charge = FALSE
-/obj/item/gun/energy/printer/update_icon()
- return
+/obj/item/gun/energy/printer/update_overlays()
+ return list()
/obj/item/gun/energy/printer/emp_act()
return
@@ -700,9 +700,7 @@
/obj/item/gun/energy/dominator/update_icon(updates = ALL)
is_equipped = ismob(loc)
- update_icon_state()
- update_overlays()
- update_equipped_item()
+ ..()
/obj/item/gun/energy/dominator/update_icon_state()
@@ -714,7 +712,7 @@
icon_state = "[base_icon_state][sibyl_mod.auth_id ? "_unlock" : "_lock" ]"
return
- var/ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
+ ratio = CEILING((cell.charge / cell.maxcharge) * charge_sections, 1)
var/obj/item/ammo_casing/energy/shot = ammo_type[select]
var/shot_name = shot.alt_select_name
var/new_item_state = base_icon_state
@@ -730,9 +728,9 @@
/obj/item/gun/energy/dominator/update_overlays()
. = list()
if(gun_light && can_flashlight)
- var/iconF = "flight"
+ var/iconF = gun_light_overlay
if(gun_light.on)
- iconF = "[iconF]_on"
+ iconF = "[gun_light_overlay]_on"
. += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
diff --git a/code/modules/projectiles/guns/magic.dm b/code/modules/projectiles/guns/magic.dm
index 87cdec16388..360579aa054 100644
--- a/code/modules/projectiles/guns/magic.dm
+++ b/code/modules/projectiles/guns/magic.dm
@@ -51,8 +51,8 @@
charges--//... drain a charge
return
-/obj/item/gun/magic/New()
- ..()
+/obj/item/gun/magic/Initialize()
+ . = ..()
charges = max_charges
chambered = new ammo_type(src)
if(can_charge)
@@ -73,7 +73,7 @@
charges++
return 1
-/obj/item/gun/magic/update_icon()
+/obj/item/gun/magic/update_icon_state()
return
/obj/item/gun/magic/shoot_with_empty_chamber(mob/living/user as mob|obj)
diff --git a/code/modules/projectiles/guns/magic/wand.dm b/code/modules/projectiles/guns/magic/wand.dm
index a95db09a36c..f31e2ee2cb7 100644
--- a/code/modules/projectiles/guns/magic/wand.dm
+++ b/code/modules/projectiles/guns/magic/wand.dm
@@ -1,4 +1,4 @@
-/obj/item/gun/magic/wand/
+/obj/item/gun/magic/wand
name = "wand of nothing"
belt_icon = "wand of nothing"
desc = "It's not just a stick, it's a MAGIC stick!"
@@ -10,19 +10,21 @@
max_charges = 100 //100, 50, 50, 34 (max charge distribution by 25%ths)
var/variable_charges = 1
-/obj/item/gun/magic/wand/New()
+/obj/item/gun/magic/wand/Initialize()
if(prob(75) && variable_charges) //25% chance of listed max charges, 50% chance of 1/2 max charges, 25% chance of 1/3 max charges
if(prob(33))
max_charges = CEILING(max_charges / 3, 1)
else
max_charges = CEILING(max_charges / 2, 1)
- ..()
+ . = ..()
+
/obj/item/gun/magic/wand/examine(mob/user)
. = ..()
. += "Has [charges] charge\s remaining."
-/obj/item/gun/magic/wand/update_icon()
+
+/obj/item/gun/magic/wand/update_icon_state()
icon_state = "[initial(icon_state)][charges ? "" : "-drained"]"
diff --git a/code/modules/projectiles/guns/medbeam.dm b/code/modules/projectiles/guns/medbeam.dm
index 137a2bf65d1..d0ea81f4306 100644
--- a/code/modules/projectiles/guns/medbeam.dm
+++ b/code/modules/projectiles/guns/medbeam.dm
@@ -15,8 +15,8 @@
weapon_weight = WEAPON_MEDIUM
-/obj/item/gun/medbeam/New()
- ..()
+/obj/item/gun/medbeam/Initialize()
+ . = ..()
START_PROCESSING(SSobj, src)
/obj/item/gun/medbeam/Destroy()
diff --git a/code/modules/projectiles/guns/misc/blastcannon.dm b/code/modules/projectiles/guns/misc/blastcannon.dm
index ad9e4edcbb9..9f9bef2b698 100644
--- a/code/modules/projectiles/guns/misc/blastcannon.dm
+++ b/code/modules/projectiles/guns/misc/blastcannon.dm
@@ -23,19 +23,33 @@
user.put_in_hands(bomb)
user.visible_message("[user] detaches [bomb] from [src].")
bomb = null
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
return ..()
-/obj/item/gun/blastcannon/update_icon()
+
+/obj/item/gun/blastcannon/update_name(updates = ALL)
+ . = ..()
if(bomb)
- icon_state = icon_state_loaded
name = "blast cannon"
- desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave."
else
- icon_state = initial(icon_state)
name = initial(name)
+
+
+/obj/item/gun/blastcannon/update_desc(updates = ALL)
+ . = ..()
+ if(bomb)
+ desc = "A makeshift device used to concentrate a bomb's blast energy to a narrow wave."
+ else
desc = initial(desc)
+
+/obj/item/gun/blastcannon/update_icon_state()
+ if(bomb)
+ icon_state = icon_state_loaded
+ else
+ icon_state = initial(icon_state)
+
+
/obj/item/gun/blastcannon/attackby(obj/O, mob/user)
if(istype(O, /obj/item/transfer_valve))
var/obj/item/transfer_valve/T = O
@@ -47,7 +61,7 @@
return FALSE
user.visible_message("[user] attaches [T] to [src]!")
bomb = T
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
return TRUE
return ..()
@@ -71,7 +85,7 @@
return ..()
var/power = calculate_bomb()
QDEL_NULL(bomb)
- update_icon()
+ update_appearance(UPDATE_NAME|UPDATE_DESC|UPDATE_ICON_STATE)
var/heavy = power * 0.2
var/medium = power * 0.5
var/light = power
diff --git a/code/modules/projectiles/guns/projectile.dm b/code/modules/projectiles/guns/projectile.dm
index 8cb7c95df60..4fd4c64fa93 100644
--- a/code/modules/projectiles/guns/projectile.dm
+++ b/code/modules/projectiles/guns/projectile.dm
@@ -10,24 +10,50 @@
var/obj/item/ammo_box/magazine/magazine
var/can_tactical = FALSE //check to see if the gun can tactically reload
-/obj/item/gun/projectile/New()
- ..()
+
+/obj/item/gun/projectile/Initialize(mapload)
+ . = ..()
if(!magazine)
magazine = new mag_type(src)
chamber_round()
+ update_weight()
update_icon()
- return
-/obj/item/gun/projectile/update_icon()
- ..()
+
+/obj/item/gun/projectile/update_name(updates = ALL)
+ . = ..()
+ if(sawn_state)
+ name = "sawn-off [name]"
+ else
+ name = initial(name)
+
+
+/obj/item/gun/projectile/update_desc(updates = ALL)
+ . = ..()
+ if(sawn_state)
+ desc = sawn_desc
+ else
+ desc = initial(desc)
+
+
+/obj/item/gun/projectile/update_icon_state()
if(current_skin)
- icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""]"
+ icon_state = "[current_skin][suppressed ? "-suppressed" : ""][sawn_state ? "_sawn" : ""]"
else
icon_state = "[initial(icon_state)][suppressed ? "-suppressed" : ""][sawn_state ? "-sawn" : ""][bolt_open ? "-open" : ""]"
- if(bayonet && can_bayonet)
- overlays += knife_overlay
-/obj/item/gun/projectile/process_chamber(eject_casing = 1, empty_chamber = 1)
+
+/obj/item/gun/projectile/update_overlays()
+ . = ..()
+ if(bayonet && knife_overlay)
+ . += knife_overlay
+
+
+/obj/item/gun/proc/update_weight()
+ return
+
+
+/obj/item/gun/projectile/process_chamber(eject_casing = TRUE, empty_chamber = TRUE)
var/obj/item/ammo_casing/AC = chambered //Find chambered round
if(isnull(AC) || !istype(AC))
chamber_round()
@@ -35,7 +61,7 @@
if(eject_casing)
AC.loc = get_turf(src) //Eject casing onto ground.
AC.SpinAnimation(10, 1) //next gen special effects
- playsound(src, chambered.casing_drop_sound, 100, 1)
+ playsound(src, chambered.casing_drop_sound, 100, TRUE)
if(empty_chamber)
chambered = null
chamber_round()
@@ -50,24 +76,26 @@
return
/obj/item/gun/projectile/can_shoot()
- if(!magazine || !magazine.ammo_count(0))
- return 0
- return 1
+ if(!magazine || !magazine.ammo_count(FALSE))
+ return FALSE
+ return TRUE
/obj/item/gun/projectile/proc/can_reload()
return !magazine
-/obj/item/gun/projectile/proc/reload(obj/item/ammo_box/magazine/AM, mob/user as mob)
- user.drop_item_ground(AM)
- magazine = AM
- magazine.loc = src
- playsound(src, magin_sound, 50, 1)
- chamber_round()
- AM.update_icon()
- update_icon()
- return
-/obj/item/gun/projectile/attackby(var/obj/item/A as obj, mob/user as mob, params)
+/obj/item/gun/projectile/proc/reload(obj/item/ammo_box/magazine/AM, mob/user)
+ user.drop_item_ground(AM)
+ magazine = AM
+ magazine.loc = src
+ playsound(src, magin_sound, 50, 1)
+ chamber_round()
+ update_weight()
+ AM.update_icon()
+ update_icon()
+
+
+/obj/item/gun/projectile/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
if(istype(AM, mag_type))
@@ -129,13 +157,14 @@
return
..()
-/obj/item/gun/projectile/attack_self(mob/living/user as mob)
+/obj/item/gun/projectile/attack_self(mob/living/user)
var/obj/item/ammo_casing/AC = chambered //Find chambered round
if(magazine)
magazine.loc = get_turf(loc)
user.put_in_hands(magazine)
magazine.update_icon()
magazine = null
+ update_weight()
to_chat(user, "You pull the magazine out of \the [src]!")
playsound(src, magout_sound, 50, 1)
else if(chambered)
@@ -153,12 +182,12 @@
. = ..()
. += "Has [get_ammo()] round\s remaining."
-/obj/item/gun/projectile/proc/get_ammo(countchambered = 1)
+/obj/item/gun/projectile/proc/get_ammo(countchambered = TRUE, countempties = TRUE)
var/boolets = 0 //mature var names for mature people
if(chambered && countchambered)
boolets++
if(magazine)
- boolets += magazine.ammo_count()
+ boolets += magazine.ammo_count(countempties)
return boolets
/obj/item/gun/projectile/suicide_act(mob/user)
@@ -192,19 +221,17 @@
user.visible_message("\The [src] goes off!", "\The [src] goes off in your face!")
return
- if(do_after(user, 30, target = src))
+ if(do_after(user, 3 SECONDS, target = src))
if(sawn_state == SAWN_OFF)
return
user.visible_message("[user] shortens \the [src]!", "You shorten \the [src].")
- name = "sawn-off [name]"
- desc = sawn_desc
w_class = WEIGHT_CLASS_NORMAL
item_state = "gun"//phil235 is it different with different skin?
slot_flags &= ~SLOT_BACK //you can't sling it on your back
slot_flags |= SLOT_BELT //but you can wear it on your belt (poorly concealed under a trenchcoat, ideally)
sawn_state = SAWN_OFF
- update_icon()
- return 1
+ update_appearance()
+ return TRUE
// Sawing guns related proc
/obj/item/gun/projectile/proc/blow_up(mob/user)
diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm
index 033a687f040..f76495b0d15 100644
--- a/code/modules/projectiles/guns/projectile/automatic.dm
+++ b/code/modules/projectiles/guns/projectile/automatic.dm
@@ -9,22 +9,30 @@
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
-/obj/item/gun/projectile/automatic/update_icon()
- ..()
- overlays.Cut()
+
+/obj/item/gun/projectile/automatic/update_icon_state()
+ icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+
+/obj/item/gun/projectile/automatic/update_overlays()
+ . = ..()
if(!select)
- overlays += "[initial(icon_state)]semi"
+ . += "[initial(icon_state)]semi"
if(select == 1)
- overlays += "[initial(icon_state)]burst"
- icon_state = "[initial(icon_state)][magazine ? "-[magazine.max_ammo]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- if(bayonet && can_bayonet)
- overlays += knife_overlay
+ . += "[initial(icon_state)]burst"
+
+ if(gun_light && gun_light_overlay)
+ var/iconF = gun_light_overlay
+ if(gun_light.on)
+ iconF = "[gun_light_overlay]_on"
+ . += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
-/obj/item/gun/projectile/automatic/attackby(var/obj/item/A as obj, mob/user as mob, params)
+
+/obj/item/gun/projectile/automatic/attackby(obj/item/A, mob/user, params)
. = ..()
if(.)
if(alarmed) // Did the empty clip alarm go off already?
- alarmed = 0 // Reset the alarm once a magazine is loaded
+ alarmed = FALSE // Reset the alarm once a magazine is loaded
return
if(istype(A, /obj/item/ammo_box/magazine))
var/obj/item/ammo_box/magazine/AM = A
@@ -101,17 +109,20 @@
knife_x_offset = 26
knife_y_offset = 12
-/obj/item/gun/projectile/automatic/c20r/New()
- ..()
+
+/obj/item/gun/projectile/automatic/c20r/Initialize()
+ . = ..()
update_icon()
-/obj/item/gun/projectile/automatic/c20r/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+
+/obj/item/gun/projectile/automatic/c20r/afterattack(atom/target, mob/living/user, flag)
..()
empty_alarm()
-/obj/item/gun/projectile/automatic/c20r/update_icon()
- ..()
- icon_state = "c20r[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/gun/projectile/automatic/c20r/update_icon_state()
+ icon_state = "c20r[magazine ? "-[CEILING(get_ammo(FALSE)/4, 1)*4]" : ""][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
+
//WT550//
/obj/item/gun/projectile/automatic/wt550
@@ -130,22 +141,19 @@
can_bayonet = TRUE
knife_x_offset = 25
knife_y_offset = 12
+ gun_light_overlay = "wt-light"
-/obj/item/gun/projectile/automatic/wt550/update_icon()
- ..()
- icon_state = "wt550[magazine ? "-[CEILING(get_ammo(0)/4, 1)*4]" : ""]"
- if(gun_light)
- var/iconF = "wt-light"
- if(gun_light.on)
- iconF = "wt-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
+/obj/item/gun/projectile/automatic/wt550/update_icon_state()
+ icon_state = "wt550[magazine ? "-[CEILING(get_ammo(FALSE)/4, 1)*4]" : ""]"
-/obj/item/gun/projectile/automatic/wt550/ui_action_click(var/owner, var/action_type)
- if(..()) return TRUE
- if (action_type == /datum/action/item_action/toggle_gunlight)
- toggle_gunlight()
- return TRUE
+
+/obj/item/gun/projectile/automatic/wt550/ui_action_click(owner, action_type)
+ if(..())
+ return TRUE
+ if(action_type == /datum/action/item_action/toggle_gunlight)
+ toggle_gunlight()
+ return TRUE
//"SP-91-RC//
/obj/item/gun/projectile/automatic/sp91rc
@@ -158,31 +166,25 @@
magin_sound = 'sound/weapons/gun_interactions/batrifle_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/batrifle_magout.ogg'
fire_delay = 2
- can_suppress = 0
- can_flashlight = 1
+ can_suppress = FALSE
+ can_flashlight = TRUE
burst_size = 3
can_bayonet = FALSE
+ gun_light_overlay = "SP-91-RC-light"
-/obj/item/gun/projectile/automatic/sp91rc/update_icon()
- ..()
- icon_state = "SP-91-RC[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
- item_state = "SP-91-RC[magazine ? "-[get_ammo(0) ? "20" : "0"]" : ""]"
- if(gun_light)
- var/iconF = "SP-91-RC-light"
- if(gun_light.on)
- iconF = "SP-91-RC-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
+/obj/item/gun/projectile/automatic/sp91rc/update_icon_state()
+ icon_state = "SP-91-RC[magazine ? "-[CEILING(get_ammo(FALSE)/5, 1)*5]" : ""]"
+ item_state = "SP-91-RC[magazine ? "-[get_ammo(FALSE) ? "20" : "0"]" : ""]"
-/obj/item/gun/projectile/automatic/sp91rc/attackby(var/obj/item/A, mob/user, params)
- . = .. ()
- update_equipped_item()
-/obj/item/gun/projectile/automatic/sp91rc/ui_action_click(var/owner, var/action_type)
- if(..()) return TRUE
- if (action_type == /datum/action/item_action/toggle_gunlight)
- toggle_gunlight()
- return TRUE
+/obj/item/gun/projectile/automatic/sp91rc/ui_action_click(owner, action_type)
+ if(..())
+ return TRUE
+ if(action_type == /datum/action/item_action/toggle_gunlight)
+ toggle_gunlight()
+ return TRUE
+
//Type-U3 Uzi//
/obj/item/gun/projectile/automatic/mini_uzi
@@ -210,19 +212,21 @@
burst_size = 3
fire_delay = 2
-/obj/item/gun/projectile/automatic/m90/New()
- ..()
+
+/obj/item/gun/projectile/automatic/m90/Initialize(mapload)
+ . = ..()
underbarrel = new /obj/item/gun/projectile/revolver/grenadelauncher(src)
update_icon()
-/obj/item/gun/projectile/automatic/m90/afterattack(var/atom/target, var/mob/living/user, flag, params)
+
+/obj/item/gun/projectile/automatic/m90/afterattack(atom/target, mob/living/user, flag, params)
if(select == 0)
underbarrel.afterattack(target, user, flag, params)
else
..()
return
-/obj/item/gun/projectile/automatic/m90/attackby(var/obj/item/A, mob/user, params)
+/obj/item/gun/projectile/automatic/m90/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_casing))
if(istype(A, underbarrel.magazine.ammo_type))
underbarrel.attack_self()
@@ -230,21 +234,25 @@
else
return ..()
-/obj/item/gun/projectile/automatic/m90/update_icon()
- ..()
- overlays.Cut()
- switch(select)
- if(1)
- overlays += "[initial(icon_state)]burst"
- if(0)
- overlays += "[initial(icon_state)]gren"
+
+/obj/item/gun/projectile/automatic/m90/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"][suppressed ? "-suppressed" : ""]"
if(magazine)
- overlays += image(icon = icon, icon_state = "m90-[CEILING(get_ammo(0)/6, 1)*6]")
- item_state = "m90-[CEILING(get_ammo(0)/7.5, 1)]"
+ item_state = "m90-[CEILING(get_ammo(FALSE)/7.5, 1)]"
else
item_state = "m90-0"
- return
+
+
+/obj/item/gun/projectile/automatic/m90/update_overlays()
+ . = ..()
+ if(magazine)
+ . += image(icon = icon, icon_state = "m90-[CEILING(get_ammo(FALSE)/6, 1)*6]")
+ switch(select)
+ if(0)
+ . += "[initial(icon_state)]gren"
+ if(1)
+ . += "[initial(icon_state)]burst"
+
/obj/item/gun/projectile/automatic/m90/burst_select()
var/mob/living/carbon/human/user = usr
@@ -326,14 +334,19 @@
fire_delay = 0
actions_types = null
-/obj/item/gun/projectile/automatic/shotgun/bulldog/New()
- ..()
- update_icon()
-/obj/item/gun/projectile/automatic/shotgun/bulldog/proc/update_magazine()
+/obj/item/gun/projectile/automatic/shotgun/bulldog/update_icon_state()
+ icon_state = "bulldog[chambered ? "" : "-e"]"
+
+
+/obj/item/gun/projectile/automatic/shotgun/bulldog/update_overlays()
+ . = ..()
+ if(magazine)
+ . += "[magazine.icon_state]"
+
+
+/obj/item/gun/projectile/automatic/shotgun/bulldog/update_weight()
if(magazine)
- overlays.Cut()
- overlays += "[magazine.icon_state]"
if(istype(magazine, /obj/item/ammo_box/magazine/m12g/XtrLrg))
w_class = WEIGHT_CLASS_BULKY
else
@@ -341,21 +354,17 @@
else
w_class = WEIGHT_CLASS_NORMAL
-/obj/item/gun/projectile/automatic/shotgun/bulldog/update_icon()
- overlays.Cut()
- update_magazine()
- icon_state = "bulldog[chambered ? "" : "-e"]"
-/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(var/obj/item/A as obj, mob/user as mob, params)
- if(istype(A, /obj/item/ammo_box/magazine/m12g/XtrLrg))
- if(istype(loc, /obj/item/storage)) // To prevent inventory exploits
- var/obj/item/storage/Strg = loc
- if(Strg.max_w_class < WEIGHT_CLASS_BULKY)
- to_chat(user, "You can't reload [src], with a XL mag, while it's in a normal bag.")
- return
+/obj/item/gun/projectile/automatic/shotgun/bulldog/attackby(obj/item/I, mob/user, params)
+ if(istype(I, /obj/item/ammo_box/magazine/m12g/XtrLrg) && isstorage(loc)) // To prevent inventory exploits
+ var/obj/item/storage/storage = loc
+ if(storage.max_w_class < WEIGHT_CLASS_BULKY)
+ to_chat(user, span_warning("You can't reload [src], with a XL mag, while it's in a normal bag."))
+ return
return ..()
-/obj/item/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target as mob|obj|turf|area, mob/living/user as mob|obj, flag)
+
+/obj/item/gun/projectile/automatic/shotgun/bulldog/afterattack(atom/target, mob/living/user, flag)
..()
empty_alarm()
@@ -397,10 +406,11 @@
burst_size = 2
can_suppress = 0
-/obj/item/gun/projectile/automatic/cats/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/cats/update_icon_state()
icon_state = "tla_cats[magazine ? "" : "-e"]"
+
/obj/item/gun/projectile/automatic/cats/examine(mob/user)
. = ..()
if(Adjacent(user))
@@ -424,9 +434,8 @@
can_suppress = 0
burst_size = 2
-/obj/item/gun/projectile/automatic/lasercarbine/update_icon()
- ..()
- icon_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(0)/5, 1)*5]" : ""]"
+/obj/item/gun/projectile/automatic/lasercarbine/update_icon_state()
+ icon_state = "lasercarbine[magazine ? "-[CEILING(get_ammo(FALSE)/5, 1)*5]" : ""]"
/obj/item/gun/projectile/automatic/lr30
name = "\improper LR-30 Laser Rifle"
@@ -443,9 +452,8 @@
burst_size = 1
actions_types = null
-/obj/item/gun/projectile/automatic/lr30/update_icon()
- ..()
- icon_state = "lr30[magazine ? "-[CEILING(get_ammo(0)/3, 1)*3]" : ""]"
+/obj/item/gun/projectile/automatic/lr30/update_icon_state()
+ icon_state = "lr30[magazine ? "-[CEILING(get_ammo(FALSE)/3, 1)*3]" : ""]"
//Semi-Machine Gun SFG
@@ -457,21 +465,19 @@
mag_type = /obj/item/ammo_box/magazine/sfg9mm
burst_size = 3
can_flashlight = TRUE
+ gun_light_overlay = "sfg-light"
-/obj/item/gun/projectile/automatic/sfg/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/sfg/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- if(gun_light)
- var/iconF = "sfg-light"
- if(gun_light.on)
- iconF = "sfg-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = flight_x_offset, pixel_y = flight_y_offset)
-/obj/item/gun/projectile/automatic/sfg/ui_action_click(var/owner, var/action_type)
- if(..()) return TRUE
- if (action_type == /datum/action/item_action/toggle_gunlight)
- toggle_gunlight()
- return TRUE
+
+/obj/item/gun/projectile/automatic/sfg/ui_action_click(owner, action_type)
+ if(..())
+ return TRUE
+ if(action_type == /datum/action/item_action/toggle_gunlight)
+ toggle_gunlight()
+ return TRUE
//Aussec Armory M-52
diff --git a/code/modules/projectiles/guns/projectile/bombarda.dm b/code/modules/projectiles/guns/projectile/bombarda.dm
index bf2d01cf5e2..61f4fadb796 100644
--- a/code/modules/projectiles/guns/projectile/bombarda.dm
+++ b/code/modules/projectiles/guns/projectile/bombarda.dm
@@ -24,12 +24,10 @@
A.update_icon()
update_icon()
-/obj/item/gun/projectile/bombarda/update_icon()
- . = ..()
- if(!chambered)
- icon_state = "bombarda_open"
- else
- icon_state = "bombarda"
+
+/obj/item/gun/projectile/bombarda/update_icon_state()
+ icon_state = "bombarda[chambered ? "" : "_open"]"
+
/obj/item/gun/projectile/bombarda/process_chamber(eject_casing, empty_chamber)
var/obj/item/ammo_casing/AC = chambered
@@ -82,11 +80,11 @@
remove_sound = 'sound/weapons/bombarda/open.ogg'
load_sound = 'sound/weapons/bombarda/load.ogg'
-/obj/item/ammo_box/magazine/internal/bombarda/New()
- ..()
+/obj/item/ammo_box/magazine/internal/bombarda/Initialize(mapload)
+ . = ..()
QDEL_LIST(stored_ammo) //not supposed to have initial ammo.
-/obj/item/ammo_box/magazine/internal/bombarda/ammo_count(countempties = 1)
+/obj/item/ammo_box/magazine/internal/bombarda/ammo_count(countempties = TRUE)
if(!countempties)
var/boolets = 0
for(var/obj/item/ammo_casing/bullet in stored_ammo)
diff --git a/code/modules/projectiles/guns/projectile/bow.dm b/code/modules/projectiles/guns/projectile/bow.dm
index ed8a6a70dbd..a4418fbcf5d 100644
--- a/code/modules/projectiles/guns/projectile/bow.dm
+++ b/code/modules/projectiles/guns/projectile/bow.dm
@@ -10,7 +10,7 @@
weapon_weight = WEAPON_HEAVY
trigger_guard = TRIGGER_GUARD_NONE
var/draw_sound = 'sound/weapons/draw_bow.ogg'
- var/ready_to_fire = 0
+ var/ready_to_fire = FALSE
var/slowdown_when_ready = 2
/obj/item/gun/projectile/bow/ashen //better than wooden
@@ -23,20 +23,25 @@
force = 10
slowdown_when_ready = 1
-/obj/item/gun/projectile/bow/update_icon()
+
+/obj/item/gun/projectile/bow/update_icon_state()
if(magazine.ammo_count() && !ready_to_fire)
icon_state = "[initial(icon_state)]_loaded"
else if(ready_to_fire)
icon_state = "[initial(icon_state)]_firing"
- slowdown = slowdown_when_ready
else
icon_state = initial(icon_state)
- slowdown = initial(slowdown)
+
+
+/obj/item/gun/projectile/bow/proc/update_slowdown()
+ slowdown = ready_to_fire ? slowdown_when_ready : initial(slowdown)
+
/obj/item/gun/projectile/bow/dropped(mob/user, silent = FALSE)
if(magazine && magazine.ammo_count())
magazine.empty_magazine()
ready_to_fire = FALSE
+ update_slowdown()
update_icon()
. = ..()
@@ -45,10 +50,10 @@
if(!ready_to_fire && magazine.ammo_count())
ready_to_fire = TRUE
playsound(user, draw_sound, 100, 1)
- update_icon()
else
ready_to_fire = FALSE
- update_icon()
+ update_slowdown()
+ update_icon()
/obj/item/gun/projectile/bow/attackby(obj/item/A, mob/user, params)
var/num_loaded = magazine.attackby(A, user, params, 1)
@@ -68,6 +73,7 @@
/obj/item/gun/projectile/bow/process_chamber(eject_casing = 0, empty_chamber = 1)
. = ..()
ready_to_fire = FALSE
+ update_slowdown()
update_icon()
// ammo
@@ -134,8 +140,8 @@
new /obj/item/ammo_casing/caseless/arrow(src)
update_icon()
-/obj/item/storage/backpack/quiver/update_icon()
- if(length(contents) > 0)
+/obj/item/storage/backpack/quiver/update_icon_state()
+ if(length(contents))
icon_state = "quiver_[clamp(length(contents),1,5)]"
else
icon_state = initial(icon_state)
diff --git a/code/modules/projectiles/guns/projectile/launchers.dm b/code/modules/projectiles/guns/projectile/launchers.dm
index 1b06c3e7538..c6d9f199ad2 100644
--- a/code/modules/projectiles/guns/projectile/launchers.dm
+++ b/code/modules/projectiles/guns/projectile/launchers.dm
@@ -46,10 +46,10 @@
/obj/item/gun/projectile/automatic/gyropistol/process_chamber(eject_casing = 0, empty_chamber = 1)
..()
-/obj/item/gun/projectile/automatic/gyropistol/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/gyropistol/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "loaded" : ""]"
- return
+
/obj/item/gun/projectile/automatic/speargun
name = "kinetic speargun"
@@ -67,7 +67,7 @@
select = 0
actions_types = null
-/obj/item/gun/projectile/automatic/speargun/update_icon()
+/obj/item/gun/projectile/automatic/speargun/update_icon_state()
return
/obj/item/gun/projectile/automatic/speargun/attack_self()
@@ -136,10 +136,16 @@
update_icon()
return
-/obj/item/gun/projectile/revolver/rocketlauncher/update_icon()
- cut_overlays()
+
+/obj/item/gun/projectile/revolver/rocketlauncher/update_icon_state()
+ return
+
+
+/obj/item/gun/projectile/revolver/rocketlauncher/update_overlays()
+ . = ..()
if(!chambered)
- add_overlay("[icon_state]_empty")
+ . += "[icon_state]_empty"
+
/obj/item/gun/projectile/revolver/rocketlauncher/suicide_act(mob/user)
user.visible_message("[user] aims [src] at the ground! It looks like [user.p_theyre()] performing a sick rocket jump!")
diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm
index bc831a96392..c60f2c20de9 100644
--- a/code/modules/projectiles/guns/projectile/pistol.dm
+++ b/code/modules/projectiles/guns/projectile/pistol.dm
@@ -10,15 +10,15 @@
fire_sound = 'sound/weapons/gunshots/1stechkin.ogg'
magin_sound = 'sound/weapons/gun_interactions/pistol_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/pistol_magout.ogg'
- can_suppress = 1
+ can_suppress = TRUE
burst_size = 1
fire_delay = 0
actions_types = null
-/obj/item/gun/projectile/automatic/pistol/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/pistol/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- return
+
//M1911//
/obj/item/gun/projectile/automatic/pistol/m1911
@@ -28,7 +28,7 @@
w_class = WEIGHT_CLASS_NORMAL
mag_type = /obj/item/ammo_box/magazine/m45
fire_sound = 'sound/weapons/gunshots/1colt.ogg'
- can_suppress = 0
+ can_suppress = FALSE
//Enforcer//
/obj/item/gun/projectile/automatic/pistol/enforcer
@@ -41,42 +41,42 @@
can_suppress = TRUE
unique_reskin = TRUE
can_flashlight = TRUE
+ gun_light_overlay = "enforcer-light"
+
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/update_gun_skins()
+ add_skin("Grey slide", "enforcer_grey")
+ add_skin("Red slide", "enforcer_red")
+ add_skin("Green slide", "enforcer_green")
+ add_skin("Tan slide", "enforcer_tan")
+ add_skin("Black slide", "enforcer_black")
+ add_skin("Green Handle", "enforcer_greengrip")
+ add_skin("Tan Handle", "enforcer_tangrip")
+ add_skin("Red Handle", "enforcer_redgrip")
-/obj/item/gun/projectile/automatic/pistol/enforcer/New()
- ..()
- options["Grey slide"] = "enforcer_grey"
- options["Red slide"] = "enforcer_red"
- options["Green slide"] = "enforcer_green"
- options["Tan slide"] = "enforcer_tan"
- options["Black slide"] = "enforcer_black"
- options["Green Handle"] = "enforcer_greengrip"
- options["Tan Handle"] = "enforcer_tangrip"
- options["Red Handle"] = "enforcer_redgrip"
- options["Cancel"] = null
-
-/obj/item/gun/projectile/automatic/pistol/enforcer/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/update_icon_state()
if(current_skin)
icon_state = "[current_skin][chambered ? "" : "-e"]"
else
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- overlays.Cut()
+
+
+/obj/item/gun/projectile/automatic/pistol/enforcer/update_overlays()
+ . = ..()
if(suppressed)
- overlays += image(icon = icon, icon_state = "enforcer_supp", pixel_x = 4)
- if(gun_light)
- var/iconF = "Enforcer_light"
- if(gun_light.on)
- iconF = "Enforcer_light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
+ . += image(icon = icon, icon_state = "enforcer_supp", pixel_x = 4)
+
/obj/item/gun/projectile/automatic/pistol/enforcer/ui_action_click()
toggle_gunlight()
/obj/item/gun/projectile/automatic/pistol/enforcer/lethal
-/obj/item/gun/projectile/automatic/pistol/enforcer/lethal/New()
+/obj/item/gun/projectile/automatic/pistol/enforcer/lethal/Initialize(mapload)
magazine = new/obj/item/ammo_box/magazine/enforcer/lethal
- ..()
+ . = ..()
+
//СБшный инфорсер//
/obj/item/gun/projectile/automatic/pistol/enforcer/security
@@ -97,92 +97,59 @@
can_suppress = TRUE
unique_reskin = TRUE
can_flashlight = TRUE
+ gun_light_overlay = "sp8-light"
-/obj/item/gun/projectile/automatic/pistol/sp8/New()
- ..()
- options["Black"] = "sp8_black"
- options["Red"] = "sp8_red"
- options["Green"] = "sp8_green"
- options["Olive"] = "sp8_olive"
- options["Yellow"] = "sp8_yellow"
- options["White"] = "sp8_white"
- options["Cancel"] = null
-
-/obj/item/gun/projectile/automatic/pistol/sp8/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/pistol/sp8/update_gun_skins()
+ add_skin("Black", "sp8_black")
+ add_skin("Red", "sp8_red")
+ add_skin("Green", "sp8_green")
+ add_skin("Olive", "sp8_olive")
+ add_skin("Yellow", "sp8_yellow")
+ add_skin("White", "sp8_white")
+
+
+/obj/item/gun/projectile/automatic/pistol/sp8/update_icon_state()
if(current_skin)
icon_state = "[current_skin][chambered ? "" : "-e"]"
else
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- overlays.Cut()
+
+
+/obj/item/gun/projectile/automatic/pistol/sp8/update_overlays()
+ . = ..()
if(suppressed)
- overlays += image(icon = icon, icon_state = "sp8_supp")
- if(gun_light)
- var/iconF = "sp8-light"
- if(gun_light.on)
- iconF = "sp8-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
+ . += image(icon = icon, icon_state = "sp8_supp")
+
/obj/item/gun/projectile/automatic/pistol/sp8/ui_action_click()
toggle_gunlight()
-/obj/item/gun/projectile/automatic/pistol/sp8t
+
+/obj/item/gun/projectile/automatic/pistol/sp8/sp8t
name = "SP-8-T"
- can_suppress = FALSE
icon_state = "sp8t_dust"
desc = "Новейшая разработка для сил защиты активов."
- force = 10
- mag_type = /obj/item/ammo_box/magazine/sp8
fire_sound = 'sound/weapons/gunshots/sp8t.ogg'
+ can_suppress = FALSE
unique_reskin = TRUE
can_flashlight = TRUE
-/obj/item/gun/projectile/automatic/pistol/sp8t/New()
- ..()
- options["Dust"] = "sp8t_dust"
- options["Sea"] = "sp8t_sea"
- options["Cancel"] = null
-/obj/item/gun/projectile/automatic/pistol/sp8t/update_icon()
- ..()
- if(current_skin)
- icon_state = "[current_skin][chambered ? "" : "-e"]"
- else
- icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
- overlays.Cut()
- if(suppressed)
- overlays += image(icon = icon, icon_state = "sp8_supp")
- if(gun_light)
- var/iconF = "sp8-light"
- if(gun_light.on)
- iconF = "sp8-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
-
-/obj/item/gun/projectile/automatic/pistol/sp8t/ui_action_click()
- toggle_gunlight()
+/obj/item/gun/projectile/automatic/pistol/sp8/sp8t/update_gun_skins()
+ add_skin("Dust", "sp8t_dust")
+ add_skin("Sea", "sp8t_sea")
+
-/obj/item/gun/projectile/automatic/pistol/sp8ar
+/obj/item/gun/projectile/automatic/pistol/sp8/sp8ar
name = "SP-8-AR"
desc = "Пистолет сил защиты активов оснащённый ДТК."
- can_suppress = FALSE
icon_state = "sp8ar"
- unique_reskin = FALSE
- force = 10
- mag_type = /obj/item/ammo_box/magazine/sp8
fire_sound = 'sound/weapons/gunshots/sp8ar.ogg'
+ can_suppress = FALSE
+ unique_reskin = FALSE
can_flashlight = TRUE
-/obj/item/gun/projectile/automatic/pistol/sp8ar/update_icon()
- ..()
- if(gun_light)
- var/iconF = "sp8-light"
- if(gun_light.on)
- iconF = "sp8-light-on"
- overlays += image(icon = icon, icon_state = iconF, pixel_x = 0)
-
-/obj/item/gun/projectile/automatic/pistol/sp8ar/ui_action_click()
- toggle_gunlight()
-
//Desert Eagle//
/obj/item/gun/projectile/automatic/pistol/deagle
@@ -195,12 +162,13 @@
fire_sound = 'sound/weapons/gunshots/1deagle.ogg'
magin_sound = 'sound/weapons/gun_interactions/hpistol_magin.ogg'
magout_sound = 'sound/weapons/gun_interactions/hpistol_magout.ogg'
- can_suppress = 0
+ can_suppress = FALSE
+
-/obj/item/gun/projectile/automatic/pistol/deagle/update_icon()
- ..()
+/obj/item/gun/projectile/automatic/pistol/deagle/update_icon_state()
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
+
/obj/item/gun/projectile/automatic/pistol/deagle/gold
desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
icon_state = "deagleg"
@@ -219,7 +187,7 @@
w_class = WEIGHT_CLASS_NORMAL
origin_tech = "combat=3;materials=2;syndicate=3"
mag_type = /obj/item/ammo_box/magazine/pistolm9mm
- can_suppress = 1
+ can_suppress = TRUE
burst_size = 3
fire_delay = 2
actions_types = list(/datum/action/item_action/toggle_firemode)
diff --git a/code/modules/projectiles/guns/projectile/revolver.dm b/code/modules/projectiles/guns/projectile/revolver.dm
index 5b6adb143e6..39df8798abe 100644
--- a/code/modules/projectiles/guns/projectile/revolver.dm
+++ b/code/modules/projectiles/guns/projectile/revolver.dm
@@ -6,8 +6,8 @@
origin_tech = "combat=3;materials=2"
fire_sound = 'sound/weapons/gunshots/1rev.ogg'
-/obj/item/gun/projectile/revolver/New()
- ..()
+/obj/item/gun/projectile/revolver/Initialize(mapload)
+ . = ..()
if(!istype(magazine, /obj/item/ammo_box/magazine/internal/cylinder))
verbs -= /obj/item/gun/projectile/revolver/verb/spin
@@ -40,7 +40,7 @@
/obj/item/gun/projectile/revolver/attack_self(mob/living/user)
var/num_unloaded = 0
chambered = null
- while(get_ammo() > 0)
+ while(get_ammo(FALSE) > 0)
var/obj/item/ammo_casing/CB
CB = magazine.get_round(0)
if(CB)
@@ -73,20 +73,14 @@
else
verbs -= /obj/item/gun/projectile/revolver/verb/spin
+
/obj/item/gun/projectile/revolver/can_shoot()
- return get_ammo(0,0)
+ return get_ammo(FALSE, FALSE)
-/obj/item/gun/projectile/revolver/get_ammo(countchambered = 0, countempties = 1)
- var/boolets = 0 //mature var names for mature people
- if(chambered && countchambered)
- boolets++
- if(magazine)
- boolets += magazine.ammo_count(countempties)
- return boolets
/obj/item/gun/projectile/revolver/examine(mob/user)
. = ..()
- . += span_notice("[get_ammo(0,0)] of those are live rounds")
+ . += span_notice("[get_ammo(FALSE, FALSE)] of those are live rounds")
/obj/item/gun/projectile/revolver/detective
desc = "A cheap Martian knock-off of a classic law enforcement firearm. Uses .38-special rounds."
@@ -97,16 +91,15 @@
unique_rename = TRUE
unique_reskin = TRUE
-/obj/item/gun/projectile/revolver/detective/New()
- ..()
- options["The Original"] = "detective"
- options["Leopard Spots"] = "detective_leopard"
- options["Black Panther"] = "detective_panther"
- options["White Gold "] = "detective_gold"
- options["The Peacemaker"] = "detective_peacemaker"
- options["Gold Wood"] = "detective_gold_alt"
- options["Silver"] = "detective_silver"
- options["Cancel"] = null
+
+/obj/item/gun/projectile/revolver/detective/update_gun_skins()
+ add_skin("The Original", "detective")
+ add_skin("Leopard Spots", "detective_leopard")
+ add_skin("Black Panther", "detective_panther")
+ add_skin("White Gold", "detective_gold")
+ add_skin("Gold Wood", "detective_gold_alt")
+ add_skin("The Peacemaker", "detective_peacemaker")
+ add_skin("Silver", "detective_silver")
/obj/item/gun/projectile/revolver/fingergun //Summoned by the Finger Gun spell, from advanced mimery traitor item
@@ -132,8 +125,8 @@
mag_type = /obj/item/ammo_box/magazine/internal/cylinder/rev38/invisible/fake
-/obj/item/gun/projectile/revolver/fingergun/New(loc, new_parent_spell)
- ..()
+/obj/item/gun/projectile/revolver/fingergun/Initialize(loc, new_parent_spell)
+ . = ..()
parent_spell = new_parent_spell
verbs -= /obj/item/gun/projectile/revolver/verb/spin
@@ -213,15 +206,15 @@
var/spun = FALSE
-/obj/item/gun/projectile/revolver/russian/New()
- ..()
+/obj/item/gun/projectile/revolver/russian/Initialize(mapload)
+ . = ..()
Spin()
update_icon()
/obj/item/gun/projectile/revolver/russian/proc/Spin()
chambered = null
var/random = rand(1, magazine.max_ammo)
- if(random <= get_ammo(0,0))
+ if(random <= get_ammo(FALSE, FALSE))
chamber_round()
spun = TRUE
@@ -348,15 +341,15 @@
unique_rename = TRUE
unique_reskin = TRUE
-/obj/item/gun/projectile/revolver/doublebarrel/New()
- ..()
- options["Default"] = "dshotgun"
- options["Dark Red Finish"] = "dshotgun-d"
- options["Ash"] = "dshotgun-f"
- options["Faded Grey"] = "dshotgun-g"
- options["Maple"] = "dshotgun-l"
- options["Rosewood"] = "dshotgun-p"
- options["Cancel"] = null
+
+/obj/item/gun/projectile/revolver/doublebarrel/update_gun_skins()
+ add_skin("Default", "dshotgun")
+ add_skin("Dark Red Finish", "dshotgun-d")
+ add_skin("Ash", "dshotgun-f")
+ add_skin("Faded Grey", "dshotgun-g")
+ add_skin("Maple", "dshotgun-l")
+ add_skin("Rosewood", "dshotgun-p")
+
/obj/item/gun/projectile/revolver/doublebarrel/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/ammo_box/speedloader) || istype(A, /obj/item/ammo_casing))
@@ -376,7 +369,7 @@
/obj/item/gun/projectile/revolver/doublebarrel/attack_self(mob/living/user)
var/num_unloaded = 0
- while(get_ammo() > 0)
+ while(get_ammo(FALSE) > 0)
var/obj/item/ammo_casing/CB
CB = magazine.get_round(0)
chambered = null
@@ -421,10 +414,10 @@
else
return ..()
-/obj/item/gun/projectile/revolver/doublebarrel/improvised/update_icon()
- ..()
- if(slung && (sawn_state == SAWN_INTACT))
- icon_state = "ishotgunsling"
+
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/update_icon_state()
+ icon_state = "ishotgun[slung ? "sling" : sawn_state == SAWN_OFF ? "-sawn" : ""]"
+
/obj/item/gun/projectile/revolver/doublebarrel/improvised/sawoff(mob/user)
. = ..()
@@ -459,9 +452,12 @@
/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/is_crutch()
return TRUE
-/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon()
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_icon_state()
return
+/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/update_overlays()
+ return list()
+
/obj/item/gun/projectile/revolver/doublebarrel/improvised/cane/attackby(obj/item/A, mob/user, params)
if(istype(A, /obj/item/stack/cable_coil))
return
diff --git a/code/modules/projectiles/guns/projectile/saw.dm b/code/modules/projectiles/guns/projectile/saw.dm
index 2debf7f8de9..44e0370556e 100644
--- a/code/modules/projectiles/guns/projectile/saw.dm
+++ b/code/modules/projectiles/guns/projectile/saw.dm
@@ -22,10 +22,12 @@
playsound(src, cover_open ? 'sound/weapons/gun_interactions/sawopen.ogg' : 'sound/weapons/gun_interactions/sawclose.ogg', 50, 1)
update_icon()
-/obj/item/gun/projectile/automatic/l6_saw/update_icon()
- icon_state = "l6[cover_open ? "open" : "closed"][magazine ? CEILING(get_ammo(0)/12.5, 1)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
+
+/obj/item/gun/projectile/automatic/l6_saw/update_icon_state()
+ icon_state = "l6[cover_open ? "open" : "closed"][magazine ? CEILING(get_ammo(FALSE)/12.5, 1)*25 : "-empty"][suppressed ? "-suppressed" : ""]"
item_state = "l6[cover_open ? "openmag" : "closedmag"]"
+
/obj/item/gun/projectile/automatic/l6_saw/afterattack(atom/target as mob|obj|turf, mob/living/user as mob|obj, flag, params) //what I tried to do here is just add a check to see if the cover is open or not and add an icon_state change because I can't figure out how c-20rs do it with overlays
if(cover_open)
to_chat(user, "[src]'s cover is open! Close it before firing!")
@@ -131,8 +133,7 @@
origin_tech = "combat=4"
ammo_type = /obj/item/ammo_casing/mm556x45/incen
-/obj/item/ammo_box/magazine/mm556x45/update_icon()
- ..()
+/obj/item/ammo_box/magazine/mm556x45/update_icon_state()
icon_state = "a762-[round(ammo_count(),10)]"
//casings//
diff --git a/code/modules/projectiles/guns/projectile/shotgun.dm b/code/modules/projectiles/guns/projectile/shotgun.dm
index 854a65a6ec0..9c696c06677 100644
--- a/code/modules/projectiles/guns/projectile/shotgun.dm
+++ b/code/modules/projectiles/guns/projectile/shotgun.dm
@@ -27,7 +27,7 @@
/obj/item/gun/projectile/shotgun/process_chamber()
- return ..(0, 0)
+ return ..(FALSE, FALSE)
/obj/item/gun/projectile/shotgun/chamber_round()
return
@@ -115,7 +115,7 @@
user.visible_message("The [src] goes click!", "The [src] you are holding goes click.")
if(magazine.ammo_count()) //Spill the mag onto the floor
user.visible_message("[user.name] opens [src] up and the shells go goes flying around!", "You open [src] up and the shells go goes flying everywhere!!")
- while(get_ammo(0) > 0)
+ while(get_ammo(FALSE) > 0)
var/obj/item/ammo_casing/CB
CB = magazine.get_round(0)
if(CB)
@@ -183,8 +183,7 @@
magazine.max_ammo = 6
update_icon()
-/obj/item/gun/projectile/shotgun/riot/update_icon() //Can't use the old proc as it makes it go to riotshotgun-short_sawn
- ..()
+/obj/item/gun/projectile/shotgun/riot/update_icon_state() //Can't use the old proc as it makes it go to riotshotgun-short_sawn
if(current_skin)
icon_state = "[current_skin]"
else
@@ -193,8 +192,8 @@
/obj/item/gun/projectile/shotgun/riot/short
mag_type = /obj/item/ammo_box/magazine/internal/shot/riot/short
-/obj/item/gun/projectile/shotgun/riot/short/New()
- ..()
+/obj/item/gun/projectile/shotgun/riot/short/Initialize(mapload)
+ . = ..()
post_sawoff()
/obj/item/gun/projectile/shotgun/riot/buckshot //comes pre-loaded with buckshot rather than rubber
@@ -225,10 +224,14 @@
else
pump_unload(M)
bolt_open = !bolt_open
- icon_state = "moistnugget_open"
- update_icon() //I.E. fix the desc
+ update_icon(UPDATE_ICON_STATE)
return 1
+
+/obj/item/gun/projectile/shotgun/boltaction/update_icon_state()
+ icon_state = "[initial(icon_state)][bolt_open ? "-open" : ""]"
+
+
/obj/item/gun/projectile/shotgun/blow_up(mob/user)
. = 0
if(chambered && chambered.BB)
@@ -252,8 +255,8 @@
mag_type = /obj/item/ammo_box/magazine/internal/boltaction/enchanted
can_bayonet = FALSE
-/obj/item/gun/projectile/shotgun/boltaction/enchanted/New()
- ..()
+/obj/item/gun/projectile/shotgun/boltaction/enchanted/Initialize(mapload)
+ . = ..()
bolt_open = 1
pump()
@@ -328,8 +331,8 @@
var/obj/item/ammo_box/magazine/internal/shot/alternate_magazine
fire_sound = 'sound/weapons/gunshots/1shotgun_auto.ogg'
-/obj/item/gun/projectile/shotgun/automatic/dual_tube/New()
- ..()
+/obj/item/gun/projectile/shotgun/automatic/dual_tube/Initialize(mapload)
+ . = ..()
if(!alternate_magazine)
alternate_magazine = new mag_type(src)
diff --git a/code/modules/projectiles/guns/projectile/sniper.dm b/code/modules/projectiles/guns/projectile/sniper.dm
index 10c7f420836..77975abedd1 100644
--- a/code/modules/projectiles/guns/projectile/sniper.dm
+++ b/code/modules/projectiles/guns/projectile/sniper.dm
@@ -12,8 +12,8 @@
fire_delay = 40
burst_size = 1
origin_tech = "combat=7"
- can_unsuppress = 1
- can_suppress = 1
+ can_unsuppress = TRUE
+ can_suppress = TRUE
w_class = WEIGHT_CLASS_NORMAL
zoomable = TRUE
zoom_amt = 7 //Long range, enough to see in front of you, but no tiles behind you.
@@ -36,14 +36,10 @@
QDEL_NULL(magazine)
magazine = new /obj/item/ammo_box/magazine/sniper_rounds/compact/penetrator(src)
-/obj/item/gun/projectile/automatic/sniper_rifle/update_icon()
- if(magazine)
- icon_state = "sniper-mag"
- else
- icon_state = "sniper"
- ..()
- icon_state = "[initial(icon_state)][magazine ? "" : "-e"][suppressed ? "-suppressed" : ""]"
- return
+
+/obj/item/gun/projectile/automatic/sniper_rifle/update_icon_state()
+ icon_state = "[initial(icon_state)][magazine ? "-mag" : ""][suppressed ? "-suppressed" : ""]"
+
/obj/item/gun/projectile/automatic/sniper_rifle/compact //holds very little ammo, lacks zooming, and bullets are primarily damage dealers, but the gun lacks the downsides of the full size rifle
name = "compact sniper rifle"
@@ -57,11 +53,6 @@
can_suppress = FALSE
zoomable = FALSE
-/obj/item/gun/projectile/automatic/sniper_rifle/compact/update_icon()
- if(magazine)
- icon_state = "snipercompact-mag"
- else
- icon_state = "snipercompact"
//Normal Boolets
/obj/item/ammo_box/magazine/sniper_rounds
@@ -72,7 +63,7 @@
max_ammo = 5
caliber = ".50"
-/obj/item/ammo_box/magazine/sniper_rounds/update_icon()
+/obj/item/ammo_box/magazine/sniper_rounds/update_icon_state()
if(ammo_count())
icon_state = "[initial(icon_state)]-ammo"
else
@@ -121,7 +112,7 @@
/obj/item/projectile/bullet/sniper/soporific
armour_penetration = 0
- nodamage = 1
+ nodamage = TRUE
dismemberment = 0
weaken = 0
breakthings = FALSE
@@ -272,13 +263,16 @@
max_ammo = 6
caliber = "foam_force_sniper"
-/obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon()
- overlays.Cut()
+/obj/item/ammo_box/magazine/toy/sniper_rounds/update_icon_state()
+ return
+
+
+/obj/item/ammo_box/magazine/toy/sniper_rounds/update_overlays()
+ . = ..()
var/ammo = ammo_count()
- if(ammo && istype(contents[contents.len], /obj/item/ammo_casing/caseless/foam_dart/sniper/riot))
- overlays += image('icons/obj/weapons/ammo.dmi', icon_state = ".50mag-r")
+ if(ammo && istype(contents[length(contents)], /obj/item/ammo_casing/caseless/foam_dart/sniper/riot))
+ . += ".50mag-r"
else if(ammo)
- overlays += image('icons/obj/weapons/ammo.dmi', icon_state = ".50mag-f")
- else
- icon_state = "[initial(icon_state)]"
+ . += ".50mag-f"
+
diff --git a/code/modules/projectiles/guns/projectile/toy.dm b/code/modules/projectiles/guns/projectile/toy.dm
index 85de8d94e7e..92f29176be5 100644
--- a/code/modules/projectiles/guns/projectile/toy.dm
+++ b/code/modules/projectiles/guns/projectile/toy.dm
@@ -9,14 +9,12 @@
force = 0
throwforce = 0
burst_size = 3
- can_suppress = 0
- clumsy_check = 0
- needs_permit = 0
+ can_suppress = FALSE
+ clumsy_check = FALSE
+ needs_permit = FALSE
pickup_sound = 'sound/items/handling/generic_pickup1.ogg'
drop_sound = 'sound/items/handling/generic_drop3.ogg'
-/obj/item/gun/projectile/automatic/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
- ..()
/obj/item/gun/projectile/automatic/toy/pistol
name = "foam force pistol"
@@ -26,23 +24,26 @@
can_holster = TRUE
mag_type = /obj/item/ammo_box/magazine/toy/pistol
fire_sound = 'sound/weapons/gunshots/gunshot.ogg'
- can_suppress = 0
+ can_suppress = FALSE
burst_size = 1
fire_delay = 0
actions_types = null
-/obj/item/gun/projectile/automatic/toy/pistol/update_icon()
- ..()
+
+/obj/item/gun/projectile/automatic/toy/pistol/update_icon_state()
icon_state = "[initial(icon_state)][chambered ? "" : "-e"]"
+
/obj/item/gun/projectile/automatic/toy/pistol/riot
name = "foam force riot pistol"
desc = "RIOT! Ages 8 and up."
mag_type = /obj/item/ammo_box/magazine/toy/pistol/riot
-/obj/item/gun/projectile/automatic/toy/pistol/riot/New()
+
+/obj/item/gun/projectile/automatic/toy/pistol/riot/Initialize(mapload)
magazine = new /obj/item/ammo_box/magazine/toy/pistol/riot(src)
- ..()
+ . = ..()
+
/obj/item/gun/projectile/automatic/toy/pistol/enforcer
name = "foam enforcer"
@@ -50,15 +51,8 @@
icon_state = "enforcer"
mag_type = /obj/item/ammo_box/magazine/toy/enforcer
can_flashlight = TRUE
+ gun_light_overlay = "enforcer-light"
-/obj/item/gun/projectile/automatic/toy/pistol/enforcer/update_icon()
- ..()
- overlays.Cut()
- if(gun_light)
- var/iconF = "Enforcer_light"
- if(gun_light.on)
- iconF = "Enforcer_light-on"
- overlays += image(icon = 'icons/obj/weapons/projectile.dmi', icon_state = iconF, pixel_x = 0)
/obj/item/gun/projectile/automatic/toy/pistol/enforcer/ui_action_click()
toggle_gunlight()
@@ -72,8 +66,8 @@
throwforce = 0
origin_tech = null
mag_type = /obj/item/ammo_box/magazine/internal/shot/toy
- clumsy_check = 0
- needs_permit = 0
+ clumsy_check = FALSE
+ needs_permit = FALSE
pickup_sound = 'sound/items/handling/generic_pickup1.ogg'
drop_sound = 'sound/items/handling/generic_drop3.ogg'
@@ -97,8 +91,8 @@
desc = "A bullpup two-round burst toy SMG, designated 'C-20r'. Ages 8 and up."
icon = 'icons/obj/weapons/toy.dmi'
fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
- can_suppress = 0
- needs_permit = 0
+ can_suppress = FALSE
+ needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/smgm45
pickup_sound = 'sound/items/handling/generic_pickup1.ogg'
drop_sound = 'sound/items/handling/generic_drop3.ogg'
@@ -106,16 +100,13 @@
/obj/item/gun/projectile/automatic/c20r/toy/riot
mag_type = /obj/item/ammo_box/magazine/toy/smgm45/riot
-/obj/item/gun/projectile/automatic/c20r/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
- ..()
-
/obj/item/gun/projectile/automatic/l6_saw/toy
name = "donksoft LMG"
desc = "A heavily modified toy light machine gun, designated 'L6 SAW'. Ages 8 and up."
icon = 'icons/obj/weapons/toy.dmi'
fire_sound = 'sound/weapons/gunshots/gunshot_smg.ogg'
- can_suppress = 0
- needs_permit = 0
+ can_suppress = FALSE
+ needs_permit = FALSE
mag_type = /obj/item/ammo_box/magazine/toy/m762
pickup_sound = 'sound/items/handling/generic_pickup1.ogg'
drop_sound = 'sound/items/handling/generic_drop3.ogg'
@@ -123,9 +114,6 @@
/obj/item/gun/projectile/automatic/l6_saw/toy/riot
mag_type = /obj/item/ammo_box/magazine/toy/m762/riot
-/obj/item/gun/projectile/automatic/l6_saw/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
- ..()
-
/obj/item/gun/projectile/shotgun/toy/tommygun
name = "tommy gun"
desc = "Looks almost like the real thing! Great for practicing Drive-bys. Ages 8 and up."
@@ -148,11 +136,3 @@
pickup_sound = 'sound/items/handling/generic_pickup1.ogg'
drop_sound = 'sound/items/handling/generic_drop3.ogg'
-/obj/item/gun/projectile/automatic/sniper_rifle/toy/update_icon()
- if(magazine)
- icon_state = "sniper-mag"
- else
- icon_state = "sniper"
-
-/obj/item/gun/projectile/automatic/sniper_rifle/toy/process_chamber(eject_casing = 0, empty_chamber = 1)
- ..()
diff --git a/code/modules/projectiles/guns/rocket.dm b/code/modules/projectiles/guns/rocket.dm
index f8418e7c214..44f9041e19a 100644
--- a/code/modules/projectiles/guns/rocket.dm
+++ b/code/modules/projectiles/guns/rocket.dm
@@ -24,9 +24,12 @@
rockets = null
return ..()
-/obj/item/gun/rocketlauncher/update_icon()
+/obj/item/gun/throw/update_icon_state()
return
+/obj/item/gun/throw/update_overlays()
+ return list()
+
/obj/item/gun/rocketlauncher/attackby(obj/item/I, mob/user, params)
if(istype(I, /obj/item/ammo_casing/rocket))
if(rockets.len < max_rockets)
diff --git a/code/modules/projectiles/guns/syringe_gun.dm b/code/modules/projectiles/guns/syringe_gun.dm
index 3c43ce33287..f5d849dcffb 100644
--- a/code/modules/projectiles/guns/syringe_gun.dm
+++ b/code/modules/projectiles/guns/syringe_gun.dm
@@ -14,8 +14,8 @@
var/list/syringes = list()
var/max_syringes = 1
-/obj/item/gun/syringe/New()
- ..()
+/obj/item/gun/syringe/Initialize()
+ . = ..()
chambered = new /obj/item/ammo_casing/syringegun(src)
/obj/item/gun/syringe/process_chamber()
diff --git a/code/modules/projectiles/guns/throw.dm b/code/modules/projectiles/guns/throw.dm
index a778aed783b..8c68ed809fe 100644
--- a/code/modules/projectiles/guns/throw.dm
+++ b/code/modules/projectiles/guns/throw.dm
@@ -41,8 +41,6 @@
loaded_projectiles = null
return ..()
-/obj/item/gun/throw/update_icon()
- return
/obj/item/gun/throw/attackby(obj/item/I, mob/user, params)
if(istype(I, valid_projectile_type) && !(I.flags & NODROP))
diff --git a/code/modules/projectiles/guns/throw/crossbow.dm b/code/modules/projectiles/guns/throw/crossbow.dm
index 9f6867539ca..fe728437491 100644
--- a/code/modules/projectiles/guns/throw/crossbow.dm
+++ b/code/modules/projectiles/guns/throw/crossbow.dm
@@ -32,7 +32,8 @@
if(cell && severity)
emp_act(severity)
-/obj/item/gun/throw/crossbow/update_icon()
+
+/obj/item/gun/throw/crossbow/update_icon_state()
if(!tension)
if(!to_launch)
icon_state = "[initial(icon_state)]"
@@ -40,16 +41,18 @@
icon_state = "[initial(icon_state)]-nocked"
else
icon_state = "[initial(icon_state)]-drawn"
- overlays.Cut()
- var/bolt_type = "bolt"
- if(to_launch)
- if(tension)
- bolt_type += "_tighten"
- else
- bolt_type += "_untighten"
- var/obj/item/arrow/bolt = to_launch
- bolt_type += "_[bolt.overlay_prefix]"
- overlays += image('icons/obj/weapons/crossbow_rod.dmi', bolt_type)
+
+
+/obj/item/gun/throw/crossbow/update_overlays()
+ . = ..()
+
+ if(!to_launch)
+ return
+
+ var/bolt_type = "bolt[tension ? "_tighten" : "_untighten"]"
+ var/obj/item/arrow/bolt = to_launch
+ bolt_type += "_[bolt.overlay_prefix]"
+ . += image('icons/obj/weapons/crossbow_rod.dmi', bolt_type)
/obj/item/gun/throw/crossbow/examine(mob/user)
@@ -251,7 +254,7 @@
/obj/item/arrow/rod/fire/attackby(obj/item/I, mob/user, params)
. = ..()
- if(istype(I, /obj/item/lighter) || istype(I, /obj/item/weldingtool))
+ if(istype(I, /obj/item/lighter) || I.tool_behaviour == TOOL_WELDER)
fire_up()
/obj/item/arrow/rod/fire/proc/fire_up(mob/user)
diff --git a/code/modules/projectiles/guns/throw/pielauncher.dm b/code/modules/projectiles/guns/throw/pielauncher.dm
index 69dcc166aae..48c745c6b46 100644
--- a/code/modules/projectiles/guns/throw/pielauncher.dm
+++ b/code/modules/projectiles/guns/throw/pielauncher.dm
@@ -14,8 +14,8 @@
projectile_range = 30
-/obj/item/gun/throw/piecannon/New()
- ..()
+/obj/item/gun/throw/piecannon/Initialize()
+ . = ..()
for(var/i in 1 to max_capacity)
var/obj/item/reagent_containers/food/snacks/pie/P = new /obj/item/reagent_containers/food/snacks/pie(src)
loaded_projectiles += P
@@ -24,13 +24,15 @@
/obj/item/gun/throw/piecannon/notify_ammo_count()
return "[src] has [get_ammocount()] of [max_capacity] pies left."
-/obj/item/gun/throw/piecannon/update_icon()
+
+/obj/item/gun/throw/piecannon/update_icon_state()
if(to_launch)
icon_state = "piecannon1"
else
icon_state = "piecannon0"
item_state = icon_state
+
/obj/item/gun/throw/piecannon/process_chamber()
..()
update_icon()
diff --git a/code/modules/projectiles/projectile/bullets.dm b/code/modules/projectiles/projectile/bullets.dm
index 9065de76d57..71494bbc190 100644
--- a/code/modules/projectiles/projectile/bullets.dm
+++ b/code/modules/projectiles/projectile/bullets.dm
@@ -356,13 +356,13 @@
damage_type = TOX
weaken = 1 SECONDS
-/obj/item/projectile/bullet/neurotoxin/on_hit(var/atom/target, var/blocked = 0)
+/obj/item/projectile/bullet/neurotoxin/prehit(atom/target)
if(isalien(target))
weaken = 0
nodamage = 1
if(isobj(target) || issilicon(target) || ismachineperson(target))
damage_type = BURN
- . = ..() // Execute the rest of the code.
+ . = ..()
/obj/item/projectile/bullet/cap
name = "cap"
diff --git a/code/modules/projectiles/projectile/magic.dm b/code/modules/projectiles/projectile/magic.dm
index 7b8b17b1be9..baafcaeceee 100644
--- a/code/modules/projectiles/projectile/magic.dm
+++ b/code/modules/projectiles/projectile/magic.dm
@@ -210,7 +210,7 @@
Robot.mmi = new /obj/item/mmi/robotic_brain(new_mob)
Robot.mmi.brainmob.timeofhostdeath = M.timeofdeath
Robot.mmi.brainmob.stat = CONSCIOUS
- Robot.mmi.become_occupied("boris")
+ Robot.mmi.update_appearance(UPDATE_ICON_STATE|UPDATE_NAME)
Robot.lawupdate = FALSE
Robot.disconnect_from_ai()
Robot.clear_inherent_laws()
@@ -342,32 +342,34 @@
icon_state = "red_1"
damage_type = BURN
-/obj/item/projectile/magic/animate/Bump(var/atom/change)
- ..()
- if(istype(change, /obj/item) || istype(change, /obj/structure) && !is_type_in_list(change, GLOB.protected_objects))
- if(istype(change, /obj/structure/closet/statue))
- for(var/mob/living/carbon/human/H in change.contents)
- var/mob/living/simple_animal/hostile/statue/S = new /mob/living/simple_animal/hostile/statue(change.loc, firer)
- S.name = "statue of [H.name]"
- S.faction = list("\ref[firer]")
- S.icon = change.icon
- if(H.mind)
- H.mind.transfer_to(S)
- to_chat(S, "You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!")
- to_chat(S, "Do not harm [firer.name], your creator.")
- H = change
- H.loc = S
- qdel(src)
+
+/obj/item/projectile/magic/animate/on_hit(atom/target, blocked = 0, hit_zone)
+ . = ..()
+
+ if(isitem(target) || (isstructure(target) && !is_type_in_list(target, GLOB.protected_objects)))
+ if(istype(target, /obj/structure/closet/statue))
+ for(var/mob/living/carbon/human/prisoner in target)
+ var/mob/living/simple_animal/hostile/statue/statue = new(target.loc, firer)
+ statue.name = "statue of [prisoner.real_name]"
+ statue.faction = list("\ref[firer]")
+ statue.icon = target.icon
+ if(prisoner.mind)
+ prisoner.mind.transfer_to(statue)
+ to_chat(statue, span_warning("You are an animated statue. You cannot move when monitored, but are nearly invincible and deadly when unobserved!"))
+ to_chat(statue, span_userdanger("Do not harm [firer.real_name], your creator."))
+ prisoner.forceMove(statue)
+ qdel(target)
else
- var/obj/O = change
- if(istype(O, /obj/item/gun))
- new /mob/living/simple_animal/hostile/mimic/copy/ranged(O.loc, O, firer)
+ if(istype(target, /obj/item/gun))
+ new /mob/living/simple_animal/hostile/mimic/copy/ranged(target.loc, target, firer)
else
- new /mob/living/simple_animal/hostile/mimic/copy(O.loc, O, firer)
- else if(istype(change, /mob/living/simple_animal/hostile/mimic/copy))
+ new /mob/living/simple_animal/hostile/mimic/copy(target.loc, target, firer)
+
+ else if(istype(target, /mob/living/simple_animal/hostile/mimic/copy))
// Change our allegiance!
- var/mob/living/simple_animal/hostile/mimic/copy/C = change
- C.ChangeOwner(firer)
+ var/mob/living/simple_animal/hostile/mimic/copy/mimic = target
+ mimic.ChangeOwner(firer)
+
/obj/item/projectile/magic/spellblade
name = "blade energy"
diff --git a/code/modules/reagents/chemistry/holder.dm b/code/modules/reagents/chemistry/holder.dm
index ac6c16325e5..aa632834112 100644
--- a/code/modules/reagents/chemistry/holder.dm
+++ b/code/modules/reagents/chemistry/holder.dm
@@ -813,34 +813,19 @@
trans_data["diseases"] = temp
return trans_data
-/datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL)
+/datum/reagents/proc/generate_taste_message(minimum_percent = TASTE_SENSITIVITY_NORMAL, mob/living/user)
var/list/out = list()
var/list/reagent_tastes = list() //in the form reagent_tastes["descriptor"] = strength
//mobs should get this message when either they cannot taste, the tastes are all too weak for them to detect, or the tastes somehow don't have any strength
var/no_taste_text = "something indescribable"
if(minimum_percent > 100)
return no_taste_text
- for(var/A in reagent_list)
- var/datum/reagent/R = A
+ for(var/datum/reagent/R in reagent_list)
if(!R.taste_mult)
continue
- //nutriment carries a list of tastes that originates from the snack food that the nutriment came from
- if(istype(R, /datum/reagent/consumable/nutriment))
- var/list/nutriment_taste_data = R.data
- for(var/nutriment_taste in nutriment_taste_data)
- var/ratio = nutriment_taste_data[nutriment_taste]
- var/amount = ratio * R.taste_mult * R.volume
- if(nutriment_taste in reagent_tastes)
- reagent_tastes[nutriment_taste] += amount
- else
- reagent_tastes[nutriment_taste] = amount
- else
- var/taste_desc = R.taste_description
- var/taste_amount = R.volume * R.taste_mult
- if(taste_desc in reagent_tastes)
- reagent_tastes[taste_desc] += taste_amount
- else
- reagent_tastes[taste_desc] = taste_amount
+ var/list/taste_amount = R.taste_amplification(user)
+ for(var/taste_desc in taste_amount)
+ reagent_tastes[taste_desc] += taste_amount[taste_desc]
//deal with percentages
//TODO: may want to sort these from strong to weak
var/total_taste = counterlist_sum(reagent_tastes)
diff --git a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
index 177c0708765..17e6225bb8f 100644
--- a/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_dispenser.dm
@@ -1,3 +1,7 @@
+#define UPDATE_TYPE_HACK 1
+#define UPDATE_TYPE_COMPONENTS 2
+
+
/obj/machinery/chem_dispenser
name = "chem dispenser"
density = TRUE
@@ -15,8 +19,9 @@
var/recharge_amount = 100
var/recharge_counter = 0
var/hackedcheck = FALSE
+ var/componentscheck = FALSE
var/obj/item/reagent_containers/beaker = null
- var/image/icon_beaker = null //cached overlay
+ var/mutable_appearance/icon_beaker //cached overlay
var/list/dispensable_reagents = list("hydrogen", "lithium", "carbon", "nitrogen", "oxygen", "fluorine",
"sodium", "aluminum", "silicon", "phosphorus", "sulfur", "chlorine", "potassium", "iron",
"copper", "mercury", "plasma", "radium", "water", "ethanol", "sugar", "iodine", "bromine", "silver", "chromium")
@@ -39,8 +44,8 @@
component_parts += new /obj/item/stock_parts/manipulator(null)
component_parts += new /obj/item/stack/sheet/glass(null)
component_parts += new cell_type(null)
- RefreshParts()
dispensable_reagents = sortAssoc(dispensable_reagents)
+ RefreshParts()
/obj/machinery/chem_dispenser/upgraded/New()
..()
@@ -110,8 +115,8 @@
recharge_amount *= C.rating
for(var/obj/item/stock_parts/manipulator/M in component_parts)
if(M.rating > 3)
- dispensable_reagents |= upgrade_reagents
- dispensable_reagents = sortAssoc(dispensable_reagents)
+ componentscheck = TRUE
+ update_reagents(UPDATE_TYPE_COMPONENTS)
powerefficiency = round(newpowereff, 0.01)
/obj/machinery/chem_dispenser/Destroy()
@@ -138,12 +143,6 @@
return
recharge_counter++
-/obj/machinery/chem_dispenser/power_change()
- if(powered())
- stat &= ~NOPOWER
- else
- spawn(rand(0, 15))
- stat |= NOPOWER
/obj/machinery/chem_dispenser/ex_act(severity)
if(severity < 3)
@@ -155,7 +154,8 @@
..()
if(A == beaker)
beaker = null
- overlays.Cut()
+ update_icon(UPDATE_OVERLAYS)
+
/obj/machinery/chem_dispenser/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, datum/tgui/master_ui = null, datum/ui_state/state = GLOB.default_state)
// update the ui if it exists, returns null if no ui is passed/found
@@ -220,11 +220,7 @@
atom_say("Недостаточно энергии для завершения операции!")
return
R.add_reagent(params["reagent"], actual)
- overlays.Cut()
- if(!icon_beaker)
- icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position.
- icon_beaker.pixel_x = rand(-10, 5)
- overlays += icon_beaker
+ update_icon(UPDATE_OVERLAYS)
if("remove")
var/amount = text2num(params["amount"])
if(!beaker || !amount)
@@ -244,7 +240,7 @@
if(Adjacent(usr) && !issilicon(usr))
usr.put_in_hands(beaker, ignore_anim = FALSE)
beaker = null
- overlays.Cut()
+ update_icon(UPDATE_OVERLAYS)
else
return FALSE
@@ -270,13 +266,10 @@
to_chat(user, "[I] is stuck to you!")
return
add_fingerprint(user)
- beaker = I
+ beaker = I
to_chat(user, "You set [I] on the machine.")
SStgui.update_uis(src) // update all UIs attached to src
- if(!icon_beaker)
- icon_beaker = mutable_appearance('icons/obj/chemical.dmi', "disp_beaker") //randomize beaker overlay position.
- icon_beaker.pixel_x = rand(-10, 5)
- overlays += icon_beaker
+ update_icon(UPDATE_OVERLAYS)
return
return ..()
@@ -296,20 +289,30 @@
return ..()
+/obj/machinery/chem_dispenser/proc/update_reagents(update_type)
+ switch(update_type)
+ if(UPDATE_TYPE_HACK)
+ if(hackedcheck)
+ dispensable_reagents += hacked_reagents
+ else
+ dispensable_reagents -= hacked_reagents
+ if(UPDATE_TYPE_COMPONENTS)
+ dispensable_reagents |= upgrade_reagents
+
+ dispensable_reagents = sortAssoc(dispensable_reagents)
+
+
/obj/machinery/chem_dispenser/multitool_act(mob/user, obj/item/I)
. = TRUE
if(!I.use_tool(src, user, 0, volume = I.tool_volume))
return
- if(!hackedcheck)
- to_chat(user, hack_message)
- dispensable_reagents += hacked_reagents
- hackedcheck = TRUE
- else
- to_chat(user, unhack_message)
- dispensable_reagents -= hacked_reagents
- hackedcheck = FALSE
+
+ hackedcheck = !hackedcheck
+ to_chat(user, hackedcheck ? hack_message : unhack_message)
+ update_reagents(UPDATE_TYPE_HACK)
SStgui.update_uis(src)
+
/obj/machinery/chem_dispenser/screwdriver_act(mob/user, obj/item/I)
if(default_deconstruction_screwdriver(user, "[initial(icon_state)]-o", "[initial(icon_state)]", I))
return TRUE
@@ -343,6 +346,22 @@
add_fingerprint(user)
ui_interact(user)
+
+/obj/machinery/chem_dispenser/update_overlays()
+ . = ..()
+
+ if(!beaker)
+ return
+
+ if(!icon_beaker)
+ icon_beaker = mutable_appearance(icon, "disp_beaker")
+ else
+ cut_overlay(icon_beaker) // trash overlays system. will be fixed as soon as TG style overlays are implemented
+
+ icon_beaker.pixel_x = rand(-10, 5) // randomize beaker overlay position
+ . += icon_beaker
+
+
/obj/machinery/chem_dispenser/soda
icon_state = "soda_dispenser"
name = "soda fountain"
@@ -353,6 +372,7 @@
"watermelonjuice", "carrotjuice", "potato", "berryjuice")
upgrade_reagents = list("bananahonk", "milkshake", "cafe_latte", "cafe_mocha", "triple_citrus", "icecoffe","icetea")
hacked_reagents = list("thirteenloko")
+ var/list/hackedupgrade_reagents = list("zaza")
hack_message = "You change the mode from 'McNano' to 'Pizza King'."
unhack_message = "You change the mode from 'Pizza King' to 'McNano'."
is_drink = TRUE
@@ -381,6 +401,19 @@
component_parts += new cell_type(null)
RefreshParts()
+
+/obj/machinery/chem_dispenser/soda/update_reagents(update_type)
+ if(update_type == UPDATE_TYPE_HACK && componentscheck)
+ if(hackedcheck)
+ dispensable_reagents += hackedupgrade_reagents
+ else
+ dispensable_reagents -= hackedupgrade_reagents
+
+ else if(update_type == UPDATE_TYPE_COMPONENTS && hackedcheck)
+ dispensable_reagents += hackedupgrade_reagents
+ ..()
+
+
/obj/machinery/chem_dispenser/beer
icon_state = "booze_dispenser"
name = "booze dispenser"
@@ -388,7 +421,7 @@
desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
dispensable_reagents = list("ice", "cream", "cider", "beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequila", "vermouth", "cognac", "ale", "mead", "synthanol", "jagermeister", "bluecuracao", "sambuka", "schnaps", "sheridan")
upgrade_reagents = list("iced_beer", "irishcream", "manhattan", "antihol", "synthignon", "bravebull")
- hacked_reagents = list("goldschlager", "patron", "absinthe", "ethanol", "nothing", "sake", "bitter", "champagne", "aperol", "alcohol_free_beer")
+ hacked_reagents = list("goldschlager", "patron", "absinthe", "ethanol", "nothing", "sake", "bitter", "champagne", "aperol", "noalco_beer")
hack_message = "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes."
unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes."
is_drink = TRUE
@@ -472,7 +505,7 @@
cell = new(src)
dispensable_reagents = sortList(dispensable_reagents)
current_reagent = pick(dispensable_reagents)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
START_PROCESSING(SSobj, src)
/obj/item/handheld_chem_dispenser/Destroy()
@@ -496,7 +529,7 @@
cell.charge -= actual / efficiency
if(actual)
to_chat(user, "You dispense [amount] units of [current_reagent] into the [target].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if("remove")
if(!target.reagents.remove_reagent(current_reagent, amount))
to_chat(user, "You remove [amount] units of [current_reagent] from the [target].")
@@ -552,7 +585,7 @@
if("dispense")
if(params["reagent"] in dispensable_reagents)
current_reagent = params["reagent"]
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if("mode")
switch(params["mode"])
if("remove")
@@ -561,15 +594,15 @@
mode = "dispense"
if("isolate")
mode = "isolate"
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
return FALSE
add_fingerprint(usr)
-/obj/item/handheld_chem_dispenser/update_icon()
- cut_overlays()
+/obj/item/handheld_chem_dispenser/update_overlays()
+ . = ..()
if(cell && cell.charge)
var/image/power_light = image('icons/obj/chemical.dmi', src, "light_low")
var/percent = round((cell.charge / cell.maxcharge) * 100)
@@ -580,17 +613,17 @@
power_light.icon_state = "light_mid"
if(67 to INFINITY)
power_light.icon_state = "light_full"
- add_overlay(power_light)
+ . += power_light
var/image/mode_light = image('icons/obj/chemical.dmi', src, "light_remove")
mode_light.icon_state = "light_[mode]"
- add_overlay(mode_light)
+ . += mode_light
var/image/chamber_contents = image('icons/obj/chemical.dmi', src, "reagent_filling")
var/datum/reagent/R = GLOB.chemical_reagents_list[current_reagent]
chamber_contents.icon += R.color
- add_overlay(chamber_contents)
- ..()
+ . += chamber_contents
+
/obj/item/handheld_chem_dispenser/process() //Every [recharge_time] seconds, recharge some reagents for the cyborg
if(isrobot(loc) && cell.charge < cell.maxcharge)
@@ -600,7 +633,7 @@
R.cell.charge -= actual
cell.charge += actual
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return TRUE
/obj/item/handheld_chem_dispenser/attackby(obj/item/W, mob/user, params)
@@ -616,7 +649,7 @@
return
cell = W
to_chat(user, "You install a cell in [src].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/handheld_chem_dispenser/screwdriver_act(mob/user, obj/item/I)
if(!isrobot(loc) && cell)
@@ -624,7 +657,7 @@
cell.loc = get_turf(src)
cell = null
to_chat(user, "You remove the cell from the [src].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
return
..()
@@ -636,7 +669,7 @@
dispensable_reagents = list("ice", "cream", "cider", "beer", "kahlua", "whiskey", "wine", "vodka", "gin", "rum", "tequila",
"vermouth", "cognac", "ale", "mead", "synthanol", "jagermeister", "bluecuracao", "sambuka", "schnaps", "sheridan", "iced_beer",
"irishcream", "manhattan", "antihol", "synthignon", "bravebull", "goldschlager", "patron", "absinthe", "ethanol", "nothing",
- "sake", "bitter", "champagne", "aperol", "alcohol_free_beer")
+ "sake", "bitter", "champagne", "aperol", "noalco_beer")
/obj/item/handheld_chem_dispenser/soda
name = "handheld soda fountain"
@@ -663,3 +696,6 @@
"ammonia",
"ash",
"diethylamine")
+
+#undef UPDATE_TYPE_HACK
+#undef UPDATE_TYPE_COMPONENTS
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 502eca34007..c63bbea8df8 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -44,22 +44,22 @@
if(auto_eject)
eject_beaker()
+
+/obj/machinery/chem_heater/update_icon_state()
+ icon_state = "mixer[beaker ? "1" : "0"]b"
+
+
+
/obj/machinery/chem_heater/proc/eject_beaker(mob/user)
if(beaker)
beaker.forceMove(get_turf(src))
if(user && Adjacent(user) && !issilicon(user))
user.put_in_hands(beaker, ignore_anim = FALSE)
beaker = null
- icon_state = "mixer0b"
on = FALSE
+ update_icon(UPDATE_ICON_STATE)
SStgui.update_uis(src)
-/obj/machinery/chem_heater/power_change()
- if(powered())
- stat &= ~NOPOWER
- else
- spawn(rand(0, 15))
- stat |= NOPOWER
/obj/machinery/chem_heater/attackby(obj/item/I, mob/user)
if(isrobot(user))
@@ -74,7 +74,7 @@
add_fingerprint(user)
beaker = I
to_chat(user, "You add the beaker to the machine!")
- icon_state = "mixer1b"
+ update_icon(UPDATE_ICON_STATE)
SStgui.update_uis(src)
return
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index add481a3d68..20f3c0a70ba 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -68,22 +68,23 @@
else if(A == loaded_pill_bottle)
loaded_pill_bottle = null
-/obj/machinery/chem_master/update_icon()
- overlays.Cut()
+
+/obj/machinery/chem_master/update_icon_state()
icon_state = "mixer[beaker ? "1" : "0"][powered() ? "" : "_nopower"]"
+
+
+/obj/machinery/chem_master/update_overlays()
+ . = ..()
if(powered())
- overlays += "waitlight"
+ . += "waitlight"
/obj/machinery/chem_master/blob_act(obj/structure/blob/B)
if(prob(50))
qdel(src)
-/obj/machinery/chem_master/power_change()
- if(powered())
- stat &= ~NOPOWER
- else
- spawn(rand(0, 15))
- stat |= NOPOWER
+/obj/machinery/chem_master/power_change(forced = FALSE)
+ if(!..())
+ return
update_icon()
/obj/machinery/chem_master/attackby(obj/item/I, mob/user, params)
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 26013cb1f57..74f33c5b4cd 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -339,7 +339,7 @@
updateUsrDialog()
icon_state = "mixer1"
- else if(istype(I, /obj/item/screwdriver))
+ else if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(beaker)
add_fingerprint(user)
beaker.forceMove(get_turf(src))
diff --git a/code/modules/reagents/chemistry/reagents.dm b/code/modules/reagents/chemistry/reagents.dm
index 30d56d3de88..d60fd19d753 100644
--- a/code/modules/reagents/chemistry/reagents.dm
+++ b/code/modules/reagents/chemistry/reagents.dm
@@ -292,3 +292,10 @@
if(M.healthdoll)
M.healthdoll.cached_healthdoll_overlays.Cut()
M.updatehealth("fakedeath reagent end")
+
+
+/datum/reagent/proc/taste_amplification(mob/living/user)
+ . = list()
+ var/taste_desc = taste_description
+ var/taste_amount = volume * taste_mult
+ .[taste_desc] = taste_amount
diff --git a/code/modules/reagents/chemistry/reagents/admin.dm b/code/modules/reagents/chemistry/reagents/admin.dm
index 531abd930ff..95724270775 100644
--- a/code/modules/reagents/chemistry/reagents/admin.dm
+++ b/code/modules/reagents/chemistry/reagents/admin.dm
@@ -40,13 +40,14 @@
M.SetParalysis(0)
M.SetSilence(0)
M.SetHallucinate(0)
+ M.SetDeaf(0)
REMOVE_TRAITS_NOT_IN(M, list(ROUNDSTART_TRAIT))
M.SetDizzy(0)
M.SetDrowsy(0)
M.SetStuttering(0)
M.SetSlur(0)
M.SetConfused(0)
- M.SetSleeping(0, FALSE)
+ M.SetSleeping(0)
M.SetJitter(0)
for(var/thing in M.diseases)
var/datum/disease/D = thing
diff --git a/code/modules/reagents/chemistry/reagents/drink_cold.dm b/code/modules/reagents/chemistry/reagents/drink_cold.dm
index 09502b52b8b..965277784ea 100644
--- a/code/modules/reagents/chemistry/reagents/drink_cold.dm
+++ b/code/modules/reagents/chemistry/reagents/drink_cold.dm
@@ -177,3 +177,44 @@
/datum/reagent/consumable/drink/cold/rewriter/on_mob_life(mob/living/M)
M.Jitter(10 SECONDS)
return ..()
+
+
+/datum/reagent/consumable/drink/cold/zaza
+ name = "Zaza"
+ description = "The sharp delicious smell of cherries emanates from the drink."
+ id = "zaza"
+ color = "#b10023" // rgb:177, 0, 35
+ drink_icon = "zaza"
+ drink_name = "Zaza"
+ drink_desc = "A glass filled with cherry drink, for a great Zaza Friday."
+ taste_description = "delicious shugary water taste"
+ var/alternate_taste_description = "something messing flavor of this juice... just sugary water taste"
+ var/healamount = 0.5
+
+
+/datum/reagent/consumable/drink/cold/zaza/on_mob_life(mob/living/user)
+ var/update_flags = STATUS_UPDATE_NONE
+ if(ishuman(user) && prob(40))
+ update_flags |= user.adjustBruteLoss(-healamount, FALSE)
+ update_flags |= user.adjustFireLoss(-healamount, FALSE)
+ return ..() | update_flags
+
+
+/datum/reagent/consumable/drink/cold/zaza/taste_amplification(mob/living/user)
+ . = list()
+ var/taste_desc = ismindshielded(user) ? alternate_taste_description : taste_description
+ var/taste_amount = volume * taste_mult
+ .[taste_desc] = taste_amount
+
+
+/datum/reagent/consumable/drink/cold/zaza/fizzy
+ description = "The sharp delicious smell of cherries emanates from the sparkling drink."
+ color = "#f30028" // rgb:243, 0, 40
+ id = "zazafizzy"
+ drink_icon = "zaza_fizzy"
+ drink_desc = "A glass filled with cherry drink, for a great Zaza Friday. Now with bubbles!"
+ taste_description = "delicious fizzy water taste"
+ alternate_taste_description = "something messing flavor of this drink... just fizzy water taste"
+ healamount = 0.25
+
+
diff --git a/code/modules/reagents/chemistry/reagents/drinks.dm b/code/modules/reagents/chemistry/reagents/drinks.dm
index 38fdc391dcd..edb8fe5b8e7 100644
--- a/code/modules/reagents/chemistry/reagents/drinks.dm
+++ b/code/modules/reagents/chemistry/reagents/drinks.dm
@@ -536,7 +536,7 @@
/datum/reagent/consumable/drink/non_alcoholic_beer
name = "Non-alcoholic beer"
- id = "alcohol_free_beer"
+ id = "noalco_beer"
description = "The most meaningless thing."
drink_icon = "alcohol_free_beer"
drink_name = "Non-alcoholic beer"
diff --git a/code/modules/reagents/chemistry/reagents/drugs.dm b/code/modules/reagents/chemistry/reagents/drugs.dm
index eed5157a877..a0376503b55 100644
--- a/code/modules/reagents/chemistry/reagents/drugs.dm
+++ b/code/modules/reagents/chemistry/reagents/drugs.dm
@@ -708,6 +708,7 @@
M.emote("laugh")
return list(effect, update_flags)
+
/datum/reagent/rotatium //Rotatium. Fucks up your rotation and is hilarious
name = "Rotatium"
id = "rotatium"
@@ -717,23 +718,26 @@
metabolization_rate = 0.6 * REAGENTS_METABOLISM
taste_description = "spinning"
+
/datum/reagent/rotatium/on_mob_life(mob/living/carbon/M)
if(M.hud_used)
if(current_cycle >= 20 && current_cycle % 20 == 0)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
var/rotation = min(round(current_cycle / 20), 89) // By this point the player is probably puking and quitting anyway
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING, loop = -1)
animate(transform = matrix(-rotation, MATRIX_ROTATE), time = 5, easing = QUAD_EASING)
return ..()
+
/datum/reagent/rotatium/on_mob_delete(mob/living/M)
- if(M && M.hud_used)
- var/list/screens = list(M.hud_used.plane_masters["[FLOOR_PLANE]"], M.hud_used.plane_masters["[GAME_PLANE]"], M.hud_used.plane_masters["[LIGHTING_PLANE]"])
- for(var/whole_screen in screens)
- animate(whole_screen, transform = matrix(), time = 5, easing = QUAD_EASING)
+ if(M?.hud_used)
+ var/atom/movable/plane_master_controller/pm_controller = M.hud_used.plane_master_controllers[PLANE_MASTERS_GAME]
+ for(var/key in pm_controller.controlled_planes)
+ animate(pm_controller.controlled_planes[key], transform = matrix(), time = 5, easing = QUAD_EASING)
..()
+
//////////////////////////////
// laughter //
//////////////////////////////
diff --git a/code/modules/reagents/chemistry/reagents/food.dm b/code/modules/reagents/chemistry/reagents/food.dm
index be474044f91..b4eef2c4be7 100644
--- a/code/modules/reagents/chemistry/reagents/food.dm
+++ b/code/modules/reagents/chemistry/reagents/food.dm
@@ -55,6 +55,16 @@
counterlist_normalise(taste_amounts)
data = taste_amounts
+
+/datum/reagent/consumable/nutriment/taste_amplification(mob/living/user)
+ . = list()
+ var/list/nutriment_taste_data = data
+ for(var/nutriment_taste in nutriment_taste_data)
+ var/ratio = nutriment_taste_data[nutriment_taste]
+ var/amount = ratio * taste_mult * volume
+ .[nutriment_taste] = amount
+
+
/datum/reagent/consumable/nutriment/protein // Meat-based protein, digestable by carnivores and omnivores, worthless to herbivores
name = "Protein"
id = "protein"
diff --git a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
index 59fc5d732cf..2e148189797 100644
--- a/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
+++ b/code/modules/reagents/chemistry/reagents/pyrotechnic.dm
@@ -209,9 +209,8 @@
if(!S.reagents)
S.create_reagents(volume)
S.reagents.add_reagent("thermite", volume)
- S.thermite = TRUE
- S.overlays.Cut()
- S.overlays += image('icons/effects/effects.dmi', icon_state = "thermite")
+ S.melting_olay = mutable_appearance('icons/effects/effects.dmi', icon_state = "thermite")
+ S.add_overlay(S.melting_olay)
if(S.active_hotspot)
S.reagents.temperature_reagents(S.active_hotspot.temperature, 10, 300)
diff --git a/code/modules/reagents/chemistry/reagents/toxins.dm b/code/modules/reagents/chemistry/reagents/toxins.dm
index a65eb53ddd3..2cfa3145972 100644
--- a/code/modules/reagents/chemistry/reagents/toxins.dm
+++ b/code/modules/reagents/chemistry/reagents/toxins.dm
@@ -1356,3 +1356,26 @@
if(prob(25))
M.fakevomit(1)
return ..() | update_flags
+
+/datum/reagent/metalic_dust
+ name = "Metalic dust"
+ id = "metalicdust"
+ description = "Metal dust with large pieces of various metals and technical liquids."
+ reagent_state = SOLID
+ color = "#353434"
+ process_flags = ORGANIC | SYNTHETIC
+ metabolization_rate = 5
+ taste_description = span_warning("METAL DUST OH GOD")
+
+/datum/reagent/metalic_dust/on_mob_life(mob/living/M)
+ M.emote("scream")
+ to_chat(M, span_warning("OH SHIT!!!!"))
+ M.AdjustWeakened(2 SECONDS)
+ M.EyeBlurry(1 SECONDS)
+ M.adjustBruteLoss(rand(5, 10))
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ for(var/obj/item/organ/internal/organ in C.get_organs_zone(BODY_ZONE_PRECISE_GROIN))
+ organ.receive_damage(rand(5, 10))
+
+ return ..()
diff --git a/code/modules/reagents/chemistry/recipes/drinks.dm b/code/modules/reagents/chemistry/recipes/drinks.dm
index 53149815ad4..b1729146753 100644
--- a/code/modules/reagents/chemistry/recipes/drinks.dm
+++ b/code/modules/reagents/chemistry/recipes/drinks.dm
@@ -1475,3 +1475,12 @@
required_reagents = list("trinary" = 1, "codelibre" = 1, "rewriter" = 1, "irishempbomb" = 1, "synthanol" = 1 )
result_amount = 5
mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
+
+
+/datum/chemical_reaction/zaza_fizzy
+ name = "Fizzy Zaza"
+ id = "zazafizzy"
+ result = "zazafizzy"
+ required_reagents = list("zaza" = 1, "sodawater" = 1)
+ result_amount = 2
+ mix_sound = 'sound/goonstation/misc/drinkfizz.ogg'
diff --git a/code/modules/reagents/chemistry/recipes/food.dm b/code/modules/reagents/chemistry/recipes/food.dm
index f559864486e..b30e08272c8 100644
--- a/code/modules/reagents/chemistry/recipes/food.dm
+++ b/code/modules/reagents/chemistry/recipes/food.dm
@@ -56,6 +56,7 @@
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/sliceable/cheesewheel(location)
+/*
/datum/chemical_reaction/syntiflesh
name = "Syntiflesh"
id = "syntiflesh"
@@ -67,6 +68,7 @@
var/location = get_turf(holder.my_atom)
for(var/i = 1, i <= created_volume, i++)
new /obj/item/reagent_containers/food/snacks/meat/syntiflesh(location)
+*/
/datum/chemical_reaction/hot_ramen
name = "Hot Ramen"
diff --git a/code/modules/reagents/reagent_containers/applicator.dm b/code/modules/reagents/reagent_containers/applicator.dm
index 4e5e6a2671c..dba8e549abc 100644
--- a/code/modules/reagents/reagent_containers/applicator.dm
+++ b/code/modules/reagents/reagent_containers/applicator.dm
@@ -44,16 +44,15 @@
visible_message("[src] identifies and removes a harmful substance.")
update_icon()
-/obj/item/reagent_containers/applicator/update_icon()
- if(applying)
- icon_state = "mender-active"
- else
- icon_state = "mender"
- cut_overlays()
+
+/obj/item/reagent_containers/applicator/update_icon_state()
+ icon_state = "mender[applying ? "-active" : ""]"
+
+
+/obj/item/reagent_containers/applicator/update_overlays()
+ . = ..()
if(reagents.total_volume)
- var/mutable_appearance/filling = mutable_appearance('icons/goonstation/objects/objects.dmi', "mender-fluid")
- filling.color = mix_color_from_reagents(reagents.reagent_list)
- add_overlay(filling)
+ . += mutable_appearance('icons/goonstation/objects/objects.dmi', "mender-fluid", color = mix_color_from_reagents(reagents.reagent_list))
var/reag_pct = round((reagents.total_volume / volume) * 100)
var/mutable_appearance/applicator_bar = mutable_appearance('icons/goonstation/objects/objects.dmi', "app_e")
switch(reag_pct)
@@ -63,7 +62,8 @@
applicator_bar.icon_state = "app_he"
if(0)
applicator_bar.icon_state = "app_e"
- add_overlay(applicator_bar)
+ . += applicator_bar
+
/obj/item/reagent_containers/applicator/attack(mob/living/M, mob/user)
if(!reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/bottle.dm b/code/modules/reagents/reagent_containers/bottle.dm
index 5dc907fbd58..1daf2b9acac 100644
--- a/code/modules/reagents/reagent_containers/bottle.dm
+++ b/code/modules/reagents/reagent_containers/bottle.dm
@@ -13,12 +13,12 @@
volume = 30
/obj/item/reagent_containers/glass/bottle/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/glass/bottle/update_icon()
- overlays.Cut()
- underlays.Cut()
+/obj/item/reagent_containers/glass/bottle/update_overlays()
+ . = ..()
+ underlays.Cut()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -39,8 +39,8 @@
underlays += filling
if(!is_open_container())
- var/image/lid = image(icon, src, "lid_bottle")
- overlays += lid
+ . += "lid_[icon_state]"
+
/obj/item/reagent_containers/glass/bottle/decompile_act(obj/item/matter_decompiler/C, mob/user)
if(!reagents.total_volume)
diff --git a/code/modules/reagents/reagent_containers/dropper.dm b/code/modules/reagents/reagent_containers/dropper.dm
index 1c9162c7280..59b3d19cfdc 100644
--- a/code/modules/reagents/reagent_containers/dropper.dm
+++ b/code/modules/reagents/reagent_containers/dropper.dm
@@ -12,11 +12,14 @@
volume = 5
pass_open_check = TRUE
+
+/obj/item/reagent_containers/dropper/update_icon_state()
+ icon_state = "[initial(icon_state)][reagents.total_volume ? "1" : ""]"
+
+
/obj/item/reagent_containers/dropper/on_reagent_change()
- if(!reagents.total_volume)
- icon_state = "[initial(icon_state)]"
- else
- icon_state = "[initial(icon_state)]1"
+ update_icon(UPDATE_ICON_STATE)
+
/obj/item/reagent_containers/dropper/attack(mob/living/M, mob/living/user, def_zone)
return
diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm
index c2dd438a304..dd2db154c12 100644
--- a/code/modules/reagents/reagent_containers/glass_containers.dm
+++ b/code/modules/reagents/reagent_containers/glass_containers.dm
@@ -14,6 +14,7 @@
container_type = OPENCONTAINER
has_lid = TRUE
resistance_flags = ACID_PROOF
+ blocks_emissive = FALSE
var/label_text = ""
/obj/item/reagent_containers/glass/New()
@@ -25,6 +26,8 @@
if(get_dist(user, src) <= 2 && !is_open_container())
. += "Airtight lid seals it completely."
+ . += "[src] can hold up to [reagents.maximum_volume] units."
+
/obj/item/reagent_containers/glass/attack(mob/M, mob/user, def_zone)
if(!is_open_container())
return ..()
@@ -115,21 +118,28 @@
/obj/item/reagent_containers/glass/beaker
name = "beaker"
- desc = "A beaker. Can hold up to 50 units."
+ desc = "A simple glass beaker, nothing special."
icon = 'icons/obj/chemical.dmi'
icon_state = "beaker"
item_state = "beaker"
belt_icon = "beaker"
materials = list(MAT_GLASS=500)
var/obj/item/assembly_holder/assembly = null
- var/can_assembly = 1
+ var/can_assembly = TRUE
+
+
+/obj/item/reagent_containers/glass/beaker/examine(mob/user)
+ . = ..()
+ if(assembly)
+ . += "There is an [assembly] attached to it, use a screwdriver to remove it."
+
/obj/item/reagent_containers/glass/beaker/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/glass/beaker/update_icon()
- overlays.Cut()
+/obj/item/reagent_containers/glass/beaker/update_overlays()
+ . = ..()
if(reagents.total_volume)
var/image/filling = image('icons/obj/reagentfillings.dmi', src, "[icon_state]10")
@@ -151,14 +161,16 @@
filling.icon_state = "[icon_state]100"
filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+ . += filling
if(!is_open_container())
- var/image/lid = image(icon, src, "lid_[initial(icon_state)]")
- overlays += lid
+ . += "lid_[initial(icon_state)]"
+ if(blocks_emissive == FALSE)
+ . += emissive_blocker(icon, "lid_[initial(icon_state)]")
+
if(assembly)
- overlays += "assembly"
- ..()
+ . += "assembly"
+
/obj/item/reagent_containers/glass/beaker/verb/remove_assembly()
set name = "Remove Assembly"
@@ -172,26 +184,29 @@
usr.put_in_hands(assembly, ignore_anim = FALSE)
assembly = null
qdel(GetComponent(/datum/component/proximity_monitor))
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else
to_chat(usr, "There is no assembly to remove.")
+
/obj/item/reagent_containers/glass/beaker/proc/heat_beaker()
if(reagents)
reagents.temperature_reagents(4000)
+
/obj/item/reagent_containers/glass/beaker/attackby(obj/item/W, mob/user, params)
if(istype(W, /obj/item/assembly_holder) && can_assembly)
if(assembly)
to_chat(usr, "[src] already has an assembly.")
return ..()
- assembly = W
- user.drop_transfer_item_to_loc(W, src)
- if(assembly.has_prox_sensors())
- AddComponent(/datum/component/proximity_monitor)
- overlays += "assembly"
- else
- ..()
+ if(user.drop_transfer_item_to_loc(W, src))
+ if(assembly.has_prox_sensors())
+ AddComponent(/datum/component/proximity_monitor)
+ assembly = W
+ update_icon(UPDATE_OVERLAYS)
+ return ..()
+ return ..()
+
/obj/item/reagent_containers/glass/beaker/HasProximity(atom/movable/AM)
if(assembly)
@@ -215,7 +230,7 @@
/obj/item/reagent_containers/glass/beaker/large
name = "large beaker"
- desc = "A large beaker. Can hold up to 100 units."
+ desc = "A large glass beaker with twice the capacity of a normal beaker."
icon_state = "beakerlarge"
belt_icon = "large_beaker"
materials = list(MAT_GLASS=2500)
@@ -226,7 +241,7 @@
/obj/item/reagent_containers/glass/beaker/vial
name = "vial"
- desc = "A small glass vial. Can hold up to 25 units."
+ desc = "A small glass vial, often used by virologists of the 25th century."
icon_state = "vial"
belt_icon = "vial"
materials = list(MAT_GLASS=250)
@@ -238,7 +253,7 @@
/obj/item/reagent_containers/glass/beaker/drugs
name = "baggie"
- desc = "A baggie. Can hold up to 10 units."
+ desc = "A small plastic baggie, often used by pharmaceutical \"entrepreneurs\"."
icon_state = "baggie"
amount_per_transfer_from_this = 2
possible_transfer_amounts = null
@@ -248,24 +263,25 @@
/obj/item/reagent_containers/glass/beaker/thermite
name = "Thermite load"
- desc = "A baggie. Can hold up to 20 units."
+ desc = "A baggie loaded with combustible chemicals."
icon_state = "baggie"
- amount_per_transfer_from_this = 20
+ amount_per_transfer_from_this = 25
possible_transfer_amounts = null
- volume = 20
+ volume = 25
container_type = OPENCONTAINER
can_assembly = 0
- list_reagents = list("thermite" = 20)
+ list_reagents = list("thermite" = 25)
/obj/item/reagent_containers/glass/beaker/noreact
name = "cryostasis beaker"
- desc = "A cryostasis beaker that allows for chemical storage without reactions. Can hold up to 50 units."
+ desc = "A cryostasis beaker that allows for chemical storage without reactions."
icon_state = "beakernoreact"
materials = list(MAT_METAL=3000)
volume = 50
amount_per_transfer_from_this = 10
origin_tech = "materials=2;engineering=3;plasmatech=3"
container_type = OPENCONTAINER
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
/obj/item/reagent_containers/glass/beaker/noreact/New()
..()
@@ -273,13 +289,14 @@
/obj/item/reagent_containers/glass/beaker/bluespace
name = "bluespace beaker"
- desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete. Can hold up to 300 units."
+ desc = "A bluespace beaker, powered by experimental bluespace technology and Element Cuban combined with the Compound Pete."
icon_state = "beakerbluespace"
materials = list(MAT_GLASS=3000)
volume = 300
amount_per_transfer_from_this = 10
possible_transfer_amounts = list(5,10,15,25,30,50,100,300)
container_type = OPENCONTAINER
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
origin_tech = "bluespace=5;materials=4;plasmatech=4"
/obj/item/reagent_containers/glass/beaker/cryoxadone
@@ -311,14 +328,17 @@
armor = list("melee" = 10, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 50) //Weak melee protection, because you can wear it on your head
slot_flags = SLOT_HEAD
resistance_flags = NONE
+ blocks_emissive = EMISSIVE_BLOCK_GENERIC
container_type = OPENCONTAINER
var/paintable = TRUE
+
/obj/item/reagent_containers/glass/bucket/Initialize(mapload)
. = ..()
if(!color && paintable)
color = "#0085E5"
- update_icon() //in case bucket's color has been changed in editor or by some deriving buckets
+ update_icon(UPDATE_OVERLAYS) //in case bucket's color has been changed in editor or by some deriving buckets
+
/obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params)
. = ..()
@@ -326,18 +346,18 @@
var/obj/item/toy/crayon/spraycan/can = D
if(!can.capped && Adjacent(can, 1))
color = can.colour
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
-/obj/item/reagent_containers/glass/bucket/update_icon()
+
+/obj/item/reagent_containers/glass/bucket/update_overlays()
. = ..()
- overlays.Cut()
if(color)
var/mutable_appearance/bucket_mask = mutable_appearance(icon='icons/obj/janitor.dmi', icon_state = "bucket_mask")
- overlays += bucket_mask
+ . += bucket_mask
+
+ var/mutable_appearance/bucket_hand = mutable_appearance(icon='icons/obj/janitor.dmi', icon_state = "bucket_hand", appearance_flags = RESET_COLOR)
+ . += bucket_hand
- var/mutable_appearance/bucket_hand = mutable_appearance(icon='icons/obj/janitor.dmi', icon_state = "bucket_hand")
- bucket_hand.appearance_flags |= RESET_COLOR
- overlays += bucket_hand
/obj/item/reagent_containers/glass/bucket/wooden
name = "wooden bucket"
@@ -348,9 +368,10 @@
resistance_flags = FLAMMABLE
paintable = FALSE
-/obj/item/reagent_containers/glass/bucket/wooden/update_icon()
- . = ..()
- overlays.Cut()
+
+/obj/item/reagent_containers/glass/bucket/wooden/update_overlays()
+ return
+
/obj/item/reagent_containers/glass/bucket/equipped(mob/user, slot, initial)
. = ..()
@@ -360,6 +381,7 @@
reagents.reaction(user, REAGENT_TOUCH)
reagents.clear_reagents()
+
/obj/item/reagent_containers/glass/bucket/attackby(obj/D, mob/user, params)
if(istype(D, /obj/item/mop))
var/obj/item/mop/m = D
diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm
index 26c93c6ce4b..d1c5ca60344 100644
--- a/code/modules/reagents/reagent_containers/hypospray.dm
+++ b/code/modules/reagents/reagent_containers/hypospray.dm
@@ -114,6 +114,9 @@
list_reagents = list("omnizine" = 30)
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
+/obj/item/reagent_containers/hypospray/CMO/empty
+ list_reagents = null
+
/obj/item/reagent_containers/hypospray/combat
name = "combat stimulant injector"
desc = "A modified air-needle autoinjector, used by support operatives to quickly heal injuries in combat."
@@ -266,13 +269,14 @@
return
..()
spent = TRUE
- update_icon()
+ update_icon(UPDATE_ICON_STATE)
return TRUE
-/obj/item/reagent_containers/hypospray/autoinjector/update_icon()
- if(spent)
- if(icon_state != "[icon_state]0")
- icon_state = "[icon_state]0"
+
+/obj/item/reagent_containers/hypospray/autoinjector/update_icon_state()
+ var/real_state = replacetext(icon_state, "0", "") // we need to do this since customization is available
+ icon_state = "[real_state][spent ? "0" : ""]"
+
/obj/item/reagent_containers/hypospray/autoinjector/examine()
. = ..()
diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm
index 798fb060ac1..62c181cc27f 100644
--- a/code/modules/reagents/reagent_containers/iv_bag.dm
+++ b/code/modules/reagents/reagent_containers/iv_bag.dm
@@ -25,24 +25,24 @@
return ..()
/obj/item/reagent_containers/iv_bag/on_reagent_change()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/pickup(mob/user)
. = ..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/dropped(mob/user, silent = FALSE)
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack_self(mob/user)
..()
mode = !mode
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack_hand()
..()
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/proc/begin_processing(mob/target)
injection_target = target
@@ -74,13 +74,13 @@
var/fraction = min(amount_per_transfer_from_this/reagents.total_volume, 1) //The amount of reagents we'll transfer to the person
reagents.reaction(injection_target, REAGENT_INGEST, fraction) //React the amount we're transfering.
reagents.trans_to(injection_target, amount_per_transfer_from_this)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else // Drawing
if(reagents.total_volume < reagents.maximum_volume)
injection_target.transfer_blood_to(src, amount_per_transfer_from_this)
for(var/datum/reagent/x in injection_target.reagents.reagent_list) // Pull small amounts of reagents from the person while drawing blood
injection_target.reagents.trans_to(src, amount_per_transfer_from_this/10)
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/reagent_containers/iv_bag/attack(mob/living/M, mob/living/user, def_zone)
return
@@ -139,24 +139,24 @@
return
-/obj/item/reagent_containers/iv_bag/update_icon()
- overlays.Cut()
-
+/obj/item/reagent_containers/iv_bag/update_overlays()
+ . = ..()
if(reagents.total_volume)
var/percent = round((reagents.total_volume / volume) * 10) // We round the 1's place off of our percent for easy image processing.
var/image/filling = image('icons/goonstation/objects/iv.dmi', src, "[icon_state][percent]")
filling.icon += mix_color_from_reagents(reagents.reagent_list)
- overlays += filling
+ . += filling
if(ismob(loc))
switch(mode)
if(IV_DRAW)
- overlays += "draw"
+ . += "draw"
if(IV_INJECT)
- overlays += "inject"
+ . += "inject"
+
/obj/item/reagent_containers/iv_bag/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/pen) || istype(I, /obj/item/flashlight/pen))
+ if(is_pen(I) || istype(I, /obj/item/flashlight/pen))
rename_interactive(user, I)
// PRE-FILLED IV BAGS BELOW
@@ -177,6 +177,7 @@
if(blood_type != null && blood_species != null)
name = "[initial(name)] - [blood_type] - [blood_species]"
reagents.add_reagent("blood", 200, list("donor"=null,"diseases"=null,"blood_DNA"=null,"blood_type"=blood_type,"blood_species"=blood_species,"resistances"=null,"trace_chem"=null))
+ update_icon(UPDATE_OVERLAYS)
. = ..()
@@ -250,6 +251,8 @@
/obj/item/reagent_containers/iv_bag/bloodsynthetic/oxygenis/Initialize(mapload)
if(blood_type != null && blood_species != null)
reagents.add_reagent("sbloodoxy", 200, list("donor"=null,"diseases"=null,"blood_DNA"=null,"blood_type"=blood_type,"blood_species"=blood_species,"resistances"=null,"trace_chem"=null))
+ update_icon(UPDATE_OVERLAYS)
+
. = ..()
/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis
@@ -259,6 +262,7 @@
/obj/item/reagent_containers/iv_bag/bloodsynthetic/nitrogenis/Initialize(mapload)
if(blood_type != null && blood_species != null)
reagents.add_reagent("sbloodvox", 200, list("donor"=null,"diseases"=null,"blood_DNA"=null,"blood_type"=blood_type,"blood_species"=blood_species,"resistances"=null,"trace_chem"=null))
+ update_icon(UPDATE_OVERLAYS)
. = ..()
/obj/item/reagent_containers/iv_bag/slime
diff --git a/code/modules/reagents/reagent_containers/spray.dm b/code/modules/reagents/reagent_containers/spray.dm
index edbe5cf42de..731929f2548 100644
--- a/code/modules/reagents/reagent_containers/spray.dm
+++ b/code/modules/reagents/reagent_containers/spray.dm
@@ -205,7 +205,7 @@
-/obj/item/reagent_containers/spray/chemsprayer/attack_self(var/mob/user)
+/obj/item/reagent_containers/spray/chemsprayer/attack_self(mob/user)
amount_per_transfer_from_this = (amount_per_transfer_from_this == 10 ? 5 : 10)
to_chat(user, "You adjust the output switch. You'll now use [amount_per_transfer_from_this] units per spray.")
diff --git a/code/modules/reagents/reagent_containers/syringes.dm b/code/modules/reagents/reagent_containers/syringes.dm
index acaf54f158e..0481068d9c0 100644
--- a/code/modules/reagents/reagent_containers/syringes.dm
+++ b/code/modules/reagents/reagent_containers/syringes.dm
@@ -148,29 +148,35 @@
mode = SYRINGE_DRAW
update_icon()
-/obj/item/reagent_containers/syringe/update_icon()
- cut_overlays()
+
+/obj/item/reagent_containers/syringe/update_icon_state()
var/rounded_vol
- if(reagents && reagents.total_volume)
+ if(reagents?.total_volume)
rounded_vol = clamp(round((reagents.total_volume / volume * 15), 5), 1, 15)
- var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]")
- filling_overlay.icon += mix_color_from_reagents(reagents.reagent_list)
- add_overlay(filling_overlay)
else
rounded_vol = 0
icon_state = "[rounded_vol]"
item_state = "syringe_[rounded_vol]"
+
+
+/obj/item/reagent_containers/syringe/update_overlays()
+ . = ..()
+ var/rounded_vol
+ if(reagents && reagents.total_volume)
+ rounded_vol = clamp(round((reagents.total_volume / volume * 15), 5), 1, 15)
+ var/image/filling_overlay = mutable_appearance('icons/obj/reagentfillings.dmi', "syringe[rounded_vol]")
+ filling_overlay.icon += mix_color_from_reagents(reagents.reagent_list)
+ . += filling_overlay
if(ismob(loc))
- var/mob/M = loc
var/injoverlay
switch(mode)
if(SYRINGE_DRAW)
injoverlay = "draw"
if(SYRINGE_INJECT)
injoverlay = "inject"
- add_overlay(injoverlay)
- M.update_inv_l_hand()
- M.update_inv_r_hand()
+ . += injoverlay
+ update_equipped_item()
+
/obj/item/reagent_containers/syringe/antiviral
name = "Syringe (spaceacillin)"
diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm
index a5d2ebcdc65..93f1bae3e2d 100644
--- a/code/modules/recycling/conveyor2.dm
+++ b/code/modules/recycling/conveyor2.dm
@@ -41,8 +41,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
update_move_direction()
for(var/I in GLOB.conveyor_switches)
var/obj/machinery/conveyor_switch/S = I
- if(id == S.id)
- S.conveyors += src
+ S.link_conveyers(src)
/obj/machinery/conveyor/Destroy()
GLOB.conveyor_belts -= src
@@ -96,8 +95,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
add_fingerprint(user)
user.Move_Pulled(src)
-/obj/machinery/conveyor/update_icon()
- ..()
+/obj/machinery/conveyor/update_icon_state()
if(IS_OPERATING)
icon_state = "conveyor_started_[clockwise ? "cw" : "ccw"]"
if(reversed)
@@ -170,10 +168,13 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
dir = turn(dir, -45)
clockwise = FALSE
-/obj/machinery/conveyor/power_change()
- ..()
+
+/obj/machinery/conveyor/power_change(forced = FALSE)
+ if(!..())
+ return
update_icon()
+
/obj/machinery/conveyor/process()
if(!IS_OPERATING)
return
@@ -213,7 +214,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
return
var/move_time = 0
- if (slow_factor>1) // yes, 1 is special
+ if(slow_factor>1) // yes, 1 is special
move_time=CEILING(slow_factor, 2) // yes.
AM.Move(get_step(loc, forwards), forwards, move_time)
@@ -265,6 +266,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
var/reversed = TRUE // If we're in neutral, would we go forwards or backwards next?
var/slow_factor = 1 // How slow the belts should go. Gets copied into connected belts slow_factor.
+
/obj/machinery/conveyor_switch/New(newloc, new_id)
..(newloc)
GLOB.conveyor_switches += src
@@ -272,27 +274,42 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
id = new_id
for(var/I in GLOB.conveyor_belts)
var/obj/machinery/conveyor/C = I
- if(C.id == id)
- conveyors += C
+ link_conveyers(C)
+
+
+/obj/machinery/conveyor_switch/proc/link_conveyers(obj/machinery/conveyor/C)
+ if(C.id != id)
+ return
+ conveyors += C
+ RegisterSignal(C, COMSIG_PARENT_QDELETING, PROC_REF(unlink_conveyer)) // so it GCs properly
+
+
+/obj/machinery/conveyor_switch/proc/unlink_conveyer(obj/machinery/conveyor/C)
+ conveyors -= C
+
/obj/machinery/conveyor_switch/Destroy()
GLOB.conveyor_switches -= src
return ..()
-// update the icon depending on the position
-/obj/machinery/conveyor_switch/update_icon()
- overlays.Cut()
+// update the icon depending on the position
+/obj/machinery/conveyor_switch/update_icon_state()
if(!position)
icon_state = "switch-off"
else if(position == DIRECTION_REVERSED)
icon_state = "switch-rev"
- if(!(stat & NOPOWER))
- overlays += "redlight"
else if(position == DIRECTION_FORWARDS)
icon_state = "switch-fwd"
- if(!(stat & NOPOWER))
- overlays += "greenlight"
+
+
+/obj/machinery/conveyor_switch/update_overlays()
+ . = ..()
+ if(position == DIRECTION_REVERSED && !(stat & NOPOWER))
+ . += "redlight"
+ if(position == DIRECTION_FORWARDS && !(stat & NOPOWER))
+ . += "greenlight"
+
/obj/machinery/conveyor_switch/oneway
one_way = TRUE
@@ -394,8 +411,9 @@ GLOBAL_LIST_INIT(conveyor_switches, list())
return TRUE
-/obj/machinery/conveyor_switch/power_change()
- ..()
+/obj/machinery/conveyor_switch/power_change(forced = FALSE)
+ if(!..())
+ return
update_icon()
// CONVEYOR CONSTRUCTION STARTS HERE
diff --git a/code/modules/recycling/disposal-construction.dm b/code/modules/recycling/disposal-construction.dm
index 1b3bad78222..9cfe8fa49f2 100644
--- a/code/modules/recycling/disposal-construction.dm
+++ b/code/modules/recycling/disposal-construction.dm
@@ -69,11 +69,16 @@
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
-/obj/structure/disposalconstruct/hide(var/intact)
- invisibility = (intact && level==1) ? INVISIBILITY_ABSTRACT: 0 // hide if floor is intact
+/obj/structure/disposalconstruct/hide(intact)
+ invisibility = (intact && level == 1) ? INVISIBILITY_MAXIMUM : 0 // hide if floor is intact
update()
+/obj/structure/disposalconstruct/examine(mob/user)
+ . = ..()
+ . += "Alt-Click to rotate it, Alt-Shift-Click to flip it."
+
+
// flip and rotate verbs
/obj/structure/disposalconstruct/verb/rotate()
set category = "Object"
diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm
index 5c4ce23c920..8a0597259aa 100644
--- a/code/modules/recycling/disposal.dm
+++ b/code/modules/recycling/disposal.dm
@@ -888,8 +888,8 @@
// hide called by levelupdate if turf intact status changes
// change visibility status and force update of icon
-/obj/structure/disposalpipe/hide(var/intact)
- invisibility = intact ? INVISIBILITY_ABSTRACT: 0 // hide if floor is intact
+/obj/structure/disposalpipe/hide(intact)
+ invisibility = intact ? INVISIBILITY_MAXIMUM : 0 // hide if floor is intact
update_icon()
// update actual icon_state depending on visibility
@@ -932,6 +932,7 @@
for(var/atom/movable/AM in H)
AM.forceMove(T)
AM.pipe_eject(direction)
+ SEND_SIGNAL(AM, COMSIG_MOVABLE_EXIT_DISPOSALS)
spawn(1)
if(AM)
AM.throw_at(target, 100, 1)
@@ -947,6 +948,7 @@
AM.forceMove(T)
AM.pipe_eject(0)
+ SEND_SIGNAL(AM, COMSIG_MOVABLE_EXIT_DISPOSALS)
spawn(1)
if(AM)
AM.throw_at(target, 5, 1)
diff --git a/code/modules/research/circuitprinter.dm b/code/modules/research/circuitprinter.dm
index a3bc26e3e2f..f75ec7d3502 100644
--- a/code/modules/research/circuitprinter.dm
+++ b/code/modules/research/circuitprinter.dm
@@ -8,8 +8,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
name = "Circuit Imprinter"
desc = "Manufactures circuit boards for the construction of machines."
icon_state = "circuit_imprinter"
- icon_open = "circuit_imprinter_t"
- icon_closed = "circuit_imprinter"
+ base_icon_state = "circuit_imprinter"
container_type = OPENCONTAINER
categories = list(
@@ -38,8 +37,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
RefreshParts()
if(is_taipan(z))
icon_state = "syndie_circuit_imprinter"
- icon_open = "syndie_circuit_imprinter_t"
- icon_closed = "syndie_circuit_imprinter"
+ base_icon_state = "syndie_circuit_imprinter"
reagents.my_atom = src
/obj/machinery/r_n_d/circuit_imprinter/upgraded/New()
@@ -53,8 +51,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
RefreshParts()
if(is_taipan(z))
icon_state = "syndie_circuit_imprinter"
- icon_open = "syndie_circuit_imprinter_t"
- icon_closed = "syndie_circuit_imprinter"
+ base_icon_state = "syndie_circuit_imprinter"
reagents.my_atom = src
/obj/machinery/r_n_d/circuit_imprinter/RefreshParts()
@@ -73,7 +70,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
T = clamp(T, 1, 4)
efficiency_coeff = 1 / (2 ** (T - 1))
-/obj/machinery/r_n_d/circuit_imprinter/check_mat(datum/design/being_built, var/M)
+/obj/machinery/r_n_d/circuit_imprinter/check_mat(datum/design/being_built, M)
var/list/all_materials = being_built.reagents_list + being_built.materials
var/A = materials.amount(M)
@@ -82,12 +79,12 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return round(A / max(1, (all_materials[M] * efficiency_coeff)))
-/obj/machinery/r_n_d/circuit_imprinter/attackby(var/obj/item/O as obj, var/mob/user as mob, params)
+/obj/machinery/r_n_d/circuit_imprinter/attackby(obj/item/O, mob/user, params)
if(shocked)
add_fingerprint(user)
if(shock(user,50))
return TRUE
- if(default_deconstruction_screwdriver(user, icon_open, icon_closed, O))
+ if(default_deconstruction_screwdriver(user, "[base_icon_state]_t", base_icon_state, O))
add_fingerprint(user)
if(linked_console)
linked_console.linked_imprinter = null
@@ -98,7 +95,7 @@ using metal and glass, it uses glass and reagents (usually sulfuric acis).
return
if(panel_open)
- if(istype(O, /obj/item/crowbar))
+ if(O.tool_behaviour == TOOL_CROWBAR)
for(var/obj/I in component_parts)
if(istype(I, /obj/item/reagent_containers/glass/beaker))
reagents.trans_to(I, reagents.total_volume)
diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm
index bf8ae888b1d..930ce67eaf9 100644
--- a/code/modules/research/designs/autolathe_designs.dm
+++ b/code/modules/research/designs/autolathe_designs.dm
@@ -532,7 +532,7 @@
name = "Speed Loader (.38 Hollow-Point)"
id = "c38hp"
build_type = AUTOLATHE
- materials = list(MAT_METAL = 30000)
+ materials = list(MAT_METAL = 30500)
build_path = /obj/item/ammo_box/speedloader/c38/hp
category = list("hacked", "Security")
@@ -901,7 +901,7 @@
name = "Ammo Box (.357)"
id = "a357"
build_type = AUTOLATHE
- materials = list(MAT_METAL = 75000)
+ materials = list(MAT_METAL = 75500)
build_path = /obj/item/ammo_box/a357
category = list("hacked", "Security")
diff --git a/code/modules/research/designs/biogenerator_designs.dm b/code/modules/research/designs/biogenerator_designs.dm
index f03d2c09ddb..3e1bdf8f173 100644
--- a/code/modules/research/designs/biogenerator_designs.dm
+++ b/code/modules/research/designs/biogenerator_designs.dm
@@ -55,7 +55,7 @@
name = "Monkey cube"
id = "mcube"
build_type = BIOGENERATOR
- materials = list(MAT_BIOMASS = 250)
+ materials = list(MAT_BIOMASS = 500)
build_path = /obj/item/reagent_containers/food/snacks/monkeycube
category = list("initial", "Food")
diff --git a/code/modules/research/designs/mechfabricator_designs.dm b/code/modules/research/designs/mechfabricator_designs.dm
index 85d8782586e..12d07bc4a29 100644
--- a/code/modules/research/designs/mechfabricator_designs.dm
+++ b/code/modules/research/designs/mechfabricator_designs.dm
@@ -1868,6 +1868,16 @@
construction_time = 10 SECONDS
category = list("Exosuit Paintkits")
+/datum/design/paint_ripley_nt
+ name = "Ripley, Firefighter \"NT Special\""
+ id = "p_ripleynt"
+ build_type = MECHFAB
+ req_tech = list("combat" = 5, "engineering" = 5, "materials" = 5, "programming" = 5)
+ build_path = /obj/item/paintkit/ripley_nt
+ materials = list(MAT_METAL=20000, MAT_PLASMA=2000, MAT_GLASS= 2000)
+ construction_time = 10 SECONDS
+ category = list("Exosuit Paintkits")
+
/datum/design/paint_clarke_orangey
name = "Clarke \"Orangey\""
id = "p_orangey"
@@ -1998,6 +2008,16 @@
construction_time = 30 SECONDS
category = list("Exosuit Paintkits")
+/datum/design/paint_durand_nt
+ name = "Durand \"NT Special\""
+ id = "p_durandnt"
+ build_type = MECHFAB
+ req_tech = list("combat" = 6, "engineering" = 6, "materials" = 6, "programming" = 6)
+ build_path = /obj/item/paintkit/durand_nt
+ materials = list(MAT_METAL=40000, MAT_DIAMOND=4000, MAT_URANIUM= 4000)
+ construction_time = 30 SECONDS
+ category = list("Exosuit Paintkits")
+
/datum/design/paint_durand_soviet
name = "Durand \"Dollhouse\""
id = "p_soviet"
@@ -2057,3 +2077,13 @@
materials = list(MAT_METAL=50000, MAT_DIAMOND=4000, MAT_BLUESPACE=4000)
construction_time = 40 SECONDS
category = list("Exosuit Paintkits")
+
+/datum/design/paint_phazon_nt
+ name = "Phazon \"NT Special\""
+ id = "p_phazonnt"
+ build_type = MECHFAB
+ req_tech = list("bluespace" = 7, "engineering" = 7, "materials" = 7, "toxins" = 6)
+ build_path = /obj/item/paintkit/phazon_nt
+ materials = list(MAT_METAL=50000, MAT_DIAMOND=4000, MAT_BLUESPACE=4000)
+ construction_time = 40 SECONDS
+ category = list("Exosuit Paintkits")
diff --git a/code/modules/research/designs/weapon_designs.dm b/code/modules/research/designs/weapon_designs.dm
index a63f0e1f375..9af31f879fa 100644
--- a/code/modules/research/designs/weapon_designs.dm
+++ b/code/modules/research/designs/weapon_designs.dm
@@ -139,7 +139,7 @@
id = "mag_oldsmg"
req_tech = list("combat" = 1, "materials" = 1)
build_type = PROTOLATHE | AUTOLATHE
- materials = list(MAT_METAL = 11000)
+ materials = list(MAT_METAL = 12000)
build_path = /obj/item/ammo_box/magazine/wt550m9
category = list("Weapons", "hacked", "Security")
diff --git a/code/modules/research/experimentor.dm b/code/modules/research/experimentor.dm
index ab51b4b564c..ec83697314c 100644
--- a/code/modules/research/experimentor.dm
+++ b/code/modules/research/experimentor.dm
@@ -126,7 +126,7 @@
if(exchange_parts(user, O))
return
- if(panel_open && istype(O, /obj/item/crowbar))
+ if(panel_open && O.tool_behaviour == TOOL_CROWBAR)
default_deconstruction_crowbar(user, O)
return
diff --git a/code/modules/research/protolathe.dm b/code/modules/research/protolathe.dm
index c07f91c72ce..c4feb19dd11 100644
--- a/code/modules/research/protolathe.dm
+++ b/code/modules/research/protolathe.dm
@@ -102,7 +102,7 @@ Note: Must be placed west/left of and R&D console to function.
return
if(panel_open)
- if(istype(O, /obj/item/crowbar))
+ if(O.tool_behaviour == TOOL_CROWBAR)
for(var/obj/I in component_parts)
if(istype(I, /obj/item/reagent_containers/glass/beaker))
reagents.trans_to(I, reagents.total_volume)
diff --git a/code/modules/research/server.dm b/code/modules/research/server.dm
index 6a789ffa579..bd13c544029 100644
--- a/code/modules/research/server.dm
+++ b/code/modules/research/server.dm
@@ -152,7 +152,7 @@
add_fingerprint(user)
shock(user,50)
- if(istype(O, /obj/item/screwdriver))
+ if(O.tool_behaviour == TOOL_SCREWDRIVER)
add_fingerprint(user)
default_deconstruction_screwdriver(user, icon_open, icon_closed, O)
return 1
@@ -161,7 +161,7 @@
return 1
if(panel_open)
- if(istype(O, /obj/item/crowbar))
+ if(O.tool_behaviour == TOOL_CROWBAR)
griefProtection()
default_deconstruction_crowbar(user, O)
return 1
diff --git a/code/modules/research/xenobiology/xenobiology.dm b/code/modules/research/xenobiology/xenobiology.dm
index 6f30df3b131..b5288e9b610 100644
--- a/code/modules/research/xenobiology/xenobiology.dm
+++ b/code/modules/research/xenobiology/xenobiology.dm
@@ -514,19 +514,19 @@
qdel(src)
-/obj/item/slimepotion/speed/MouseDrop(atom/over)
+/obj/item/slimepotion/speed/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(istype(over, /obj/screen))
+ if(istype(over_object, /obj/screen))
return FALSE
- if(over == user || loc != user || user.incapacitated() || !ishuman(user))
+ if(over_object == user || loc != user || user.incapacitated() || !ishuman(user))
return FALSE
- afterattack(over, user, TRUE, drop = TRUE)
+ afterattack(over_object, user, TRUE, drop = TRUE)
return TRUE
@@ -581,20 +581,19 @@
qdel(src)
-/obj/item/slimepotion/clothing/MouseDrop(atom/over)
+/obj/item/slimepotion/clothing/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
if(!.)
return FALSE
var/mob/user = usr
- if(istype(over, /obj/screen))
+ if(istype(over_object, /obj/screen))
return FALSE
- if(over == user || loc != user || user.incapacitated() || !ishuman(user))
+ if(over_object == user || loc != user || user.incapacitated() || !ishuman(user))
return FALSE
- afterattack(over, user, TRUE)
- return TRUE
+ afterattack(over_object, user, TRUE)
/obj/item/slimepotion/clothing/fireproof
diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm
index 33d2550f6fd..b0a9979cf68 100644
--- a/code/modules/response_team/ert_outfits.dm
+++ b/code/modules/response_team/ert_outfits.dm
@@ -35,7 +35,7 @@
rt_assignment = "Emergency Response Team Leader"
rt_job = "Emergency Response Team Leader"
rt_mob_job = "ERT Commander"
- special_message = "За обычных условий вы подчиняетесь старшим по рангу офицерам Защиты Активов. \n Впрочем, на время проведения операции вы подчиняетесь Офицеру Специальных Операций. \n Исключениями являются случаи, когда его приказания прямо противоречат интересам Отдела Защиты Активов или приказаниям членов ОЗА в более высоком звании, чем вы. \n Вы имеете абсолютную власть в рамках вашего отряда, и практически абсолютную в рамках зоны проведения операции. Пресекайте прямое неподчинение, но не забывайте прислушиваться к мнению специалистов."
+ special_message = "В обычных условий вы подчиняетесь старшим по рангу офицерам Защиты Активов. \n Впрочем, на время проведения операции вы подчиняетесь Офицеру Специальных Операций. \n Исключениями являются случаи, когда его приказания прямо противоречат интересам Отдела Защиты Активов или приказаниям членов ОЗА в более высоком звании, чем вы. \n Вы имеете абсолютную власть в рамках вашего отряда, и практически абсолютную в рамках зоны проведения операции. Пресекайте прямое неподчинение, но не забывайте прислушиваться к мнению специалистов."
exp_type = EXP_TYPE_COMMAND
uniform = /obj/item/clothing/under/rank/centcom_officer/sensor
@@ -66,7 +66,7 @@
"Max" = "Мастер-сержант")
backpack_contents = list(
/obj/item/restraints/handcuffs = 1,
- /obj/item/storage/lockbox/mindshield = 1,
+ /obj/item/storage/lockbox/mindshield/ert = 1,
/obj/item/flashlight/seclite = 1
)
@@ -79,7 +79,7 @@
glasses = /obj/item/clothing/glasses/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer/swat
suit_store = /obj/item/gun/energy/gun/pdw9/ert
- belt = /obj/item/gun/projectile/automatic/pistol/sp8t
+ belt = /obj/item/gun/projectile/automatic/pistol/sp8/sp8t
hours_dif = 250
ranks = list("Min" = "Мастер-сержант",
@@ -90,7 +90,7 @@
/obj/item/camera_bug/ert = 1,
/obj/item/door_remote/omni = 1,
/obj/item/restraints/handcuffs = 1,
- /obj/item/storage/lockbox/mindshield = 1
+ /obj/item/storage/lockbox/mindshield/ert = 1
)
cybernetic_implants = list(
@@ -112,7 +112,7 @@
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
suit_store = /obj/item/gun/energy/gun/pdw9/ert
- belt = /obj/item/gun/projectile/automatic/pistol/sp8t
+ belt = /obj/item/gun/projectile/automatic/pistol/sp8/sp8t
hours_dif = 300
ranks = list("Min" = "Лейтенант",
@@ -121,12 +121,13 @@
backpack_contents = list(
/obj/item/ammo_box/magazine/sp8 = 4,
/obj/item/restraints/handcuffs = 1,
- /obj/item/storage/lockbox/mindshield = 1,
+ /obj/item/storage/lockbox/mindshield/ert = 1,
/obj/item/camera_bug/ert = 1,
/obj/item/door_remote/omni = 1,
)
cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/thermals/empproof,
/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
/obj/item/organ/internal/cyberimp/eyes/hud/security,
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
@@ -146,7 +147,7 @@
rt_mob_job = "ERT Security"
uniform = /obj/item/clothing/under/rank/security/sensor
back = /obj/item/storage/backpack/ert/security
- belt = /obj/item/storage/belt/security/response_team
+ belt = /obj/item/storage/belt/security/sec
pda = /obj/item/pda/heads/ert/security
id = /obj/item/card/id/ert/security
exp_type = EXP_TYPE_SECURITY
@@ -184,7 +185,7 @@
"Max" = "Специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 3,
/obj/item/storage/box/handcuffs = 1,
/obj/item/grenade/flashbang = 2,
@@ -209,7 +210,7 @@
shoes = /obj/item/clothing/shoes/magboots/advance
gloves = /obj/item/clothing/gloves/combat
suit = /obj/item/clothing/suit/space/hardsuit/ert/gamma/security
- belt = /obj/item/storage/belt/security/response_team_gamma
+ belt = /obj/item/storage/belt/military/assault/gammaert/full
suit_store = /obj/item/gun/energy/immolator/multi/sibyl
glasses = /obj/item/clothing/glasses/night
mask = /obj/item/clothing/mask/gas/sechailer/swat
@@ -222,7 +223,7 @@
"Max" = "Старший специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 3,
/obj/item/storage/box/handcuffs = 1,
/obj/item/storage/box/flashbangs = 1,
@@ -232,6 +233,7 @@
)
cybernetic_implants = list(
+ /obj/item/organ/internal/cyberimp/eyes/thermals/empproof,
/obj/item/organ/internal/cyberimp/chest/nutriment_old/plus,
/obj/item/organ/internal/cyberimp/eyes/hud/security,
/obj/item/organ/internal/cyberimp/brain/anti_stun/hardened,
@@ -300,7 +302,7 @@
"Max" = "Специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
/obj/item/rcd/preloaded = 1,
/obj/item/rcd_ammo = 3,
@@ -336,7 +338,7 @@
"Max" = "Старший специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
/obj/item/rcd/combat = 1,
/obj/item/rcd_ammo/large = 3,
@@ -418,7 +420,7 @@
"Max" = "Специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
/obj/item/storage/firstaid/ertm = 1,
/obj/item/storage/box/autoinjectors = 1,
@@ -460,7 +462,7 @@
"Max" = "Старший специалист")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
/obj/item/storage/firstaid/ertm = 1,
/obj/item/bodyanalyzer/advanced = 1,
@@ -495,14 +497,15 @@
l_ear = /obj/item/radio/headset/ert/alt
glasses = /obj/item/clothing/glasses/hud/security/sunglasses
mask = /obj/item/clothing/mask/gas/sechailer/swat
- belt = /obj/item/storage/belt/security/response_team
+ belt = /obj/item/storage/belt/security/sec
id = /obj/item/card/id/centcom
pda = /obj/item/pda/centcom
special_message = "Вы подчиняетесь непосредственно назначенному корпорацией командиру. \n Хоть вы и можете возражать ему, прямое подчинение крайне нежелательно. Исключениями являются случаи, когда ваш командир открыто действует против интересов НТ, или случаи, когда это требуется согласно приказаниям членов вашего Ордена с высшим саном. \n В случае его отсутствия или недееспособности, вам стоит прислушиваться к мнению члена отряда с самым высоким званием."
backpack_contents = list(
/obj/item/storage/box/zipties = 1,
- /obj/item/flashlight/seclite = 1
+ /obj/item/flashlight/seclite = 1,
+ /obj/item/reagent_containers/food/drinks/bottle/holywater = 1
)
/datum/outfit/job/centcom/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
@@ -538,8 +541,9 @@
"Max" = "Инквизитор")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
+ /obj/item/reagent_containers/food/drinks/bottle/holywater = 1
)
@@ -569,8 +573,9 @@
"Max" = "Инквизитор")
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
+ /obj/item/reagent_containers/food/drinks/bottle/holywater = 1
)
cybernetic_implants = list(
@@ -633,7 +638,7 @@
mask = /obj/item/clothing/mask/gas/sechailer
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
)
@@ -656,7 +661,7 @@
r_pocket = /obj/item/scythe/tele
backpack_contents = list(
- /obj/item/gun/projectile/automatic/pistol/sp8t = 1,
+ /obj/item/gun/projectile/automatic/pistol/sp8/sp8t = 1,
/obj/item/ammo_box/magazine/sp8 = 2,
/obj/item/grenade/chem_grenade/antiweed = 2,
/obj/item/storage/box/lights/mixed = 1,
diff --git a/code/modules/ruins/lavalandruin_code/fountain_hall.dm b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
index 4f4dfa5c10b..484e0d2c3fd 100644
--- a/code/modules/ruins/lavalandruin_code/fountain_hall.dm
+++ b/code/modules/ruins/lavalandruin_code/fountain_hall.dm
@@ -41,9 +41,10 @@
to_chat(user, "The water feels warm and soothing as you touch it. The fountain immediately dries up shortly afterwards.")
user.reagents.add_reagent("godblood", 20)
update_icon()
- addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), time_between_uses)
+ addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon), UPDATE_ICON_STATE), time_between_uses)
-/obj/structure/healingfountain/update_icon()
+
+/obj/structure/healingfountain/update_icon_state()
if(last_process + time_between_uses > world.time)
icon_state = "fountain"
else
diff --git a/code/modules/ruins/lavalandruin_code/necropolis_lavalend.dm b/code/modules/ruins/lavalandruin_code/necropolis_lavalend.dm
index 40a28b31568..3b4c0de09ba 100644
--- a/code/modules/ruins/lavalandruin_code/necropolis_lavalend.dm
+++ b/code/modules/ruins/lavalandruin_code/necropolis_lavalend.dm
@@ -68,7 +68,7 @@
/obj/machinery/door/poddoor/impassable/necropolisdoor
name = "necropolis door"
- desc = "Древние двери которые откроются только только избранным"
+ desc = "Древние двери которые откроются только избранным."
icon = 'icons/obj/lavaland/necrdoor.dmi'
icon_state = "necr"
diff --git a/code/modules/ruins/syndicate_space_base.dm b/code/modules/ruins/syndicate_space_base.dm
index 1da15dd1097..a1455f56d7e 100644
--- a/code/modules/ruins/syndicate_space_base.dm
+++ b/code/modules/ruins/syndicate_space_base.dm
@@ -1,8 +1,8 @@
/obj/item/paper/syndicate/code_words
name = "Code Words"
-/obj/item/paper/syndicate/code_words/New()
- ..()
+/obj/item/paper/syndicate/code_words/Initialize(mapload)
+ . = ..()
var/phrases = jointext(GLOB.syndicate_code_phrase, ", ")
var/responses = jointext(GLOB.syndicate_code_response, ", ")
@@ -11,7 +11,8 @@
info += "Кодовые ответы: [responses] \n"
info += "Используйте слова при общении с потенциальными агентами. В тоже время будьте осторожны, ибо кто угодно может оказаться потенциальным врагом."
info_links = info
- overlays += "paper_words"
+ update_icon()
+
// Space Base Spawners. Исспользуется переделанная копия спавнеров лавалендовских.
/obj/effect/mob_spawn/human/space_base_syndicate
@@ -22,9 +23,9 @@
id_job = "Syndicate Scientist"
icon = 'icons/obj/machines/cryogenic2.dmi'
icon_state = "cryo_s"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Эксперементируйте со смертельными химикатами, растениями, генами и вирусами. Наслаждайтесь спокойной жизнью зная, что ваша работа так или иначе насолит НТ в будущем!"
- flavour_text = "Вы агент синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования на сколько можете и постарайтесь не высовываться. \
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Экспериментируйте со смертельными химикатами, растениями, генами и вирусами. Наслаждайтесь спокойной жизнью, зная, что ваша работа так или иначе насолит НТ в будущем!"
+ flavour_text = "Вы — агент Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько можете и постарайтесь не высовываться. \
Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate
assignedrole = TAIPAN_SCIENTIST
@@ -108,9 +109,9 @@
name = "Syndicate Medic sleeper"
mob_name = "Syndicate Medic"
id_job = "Syndicate Medic"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Проводите медицинские опыты сомнительного содержания. Вылечивайте своих коллег, которые опять поссорились с генералом Синди, или оживляйте неудачных космических путников, для допросов или боргизации. Даже Синдикату нужны врачи!"
- flavour_text = "Вы агент синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования на сколько можете и постарайтесь не высовываться. \
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Проводите медицинские опыты сомнительного содержания. Вылечивайте своих коллег, которые опять поссорились с генералом Синди, или оживляйте неудачливых космических путников, для допросов или киборгизации. Даже Синдикату нужны врачи!"
+ flavour_text = "Вы — агент Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько можете и постарайтесь не высовываться. \
Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate/medic
assignedrole = TAIPAN_MEDIC
@@ -142,9 +143,9 @@
name = "Syndicate Botanist sleeper"
mob_name = "Syndicate Botanist"
id_job = "Syndicate Botanist"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Выращивайте сомнительные растения. Помогите повару накормить экипаж, а учёным создать опаснейшие растения! Наслаждайтесь силой природы в руках Синдиката!"
- flavour_text = "Вы агент синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования на сколько можете и постарайтесь не высовываться. \
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Выращивайте сомнительные растения. Помогите повару накормить экипаж, а учёным — создать опаснейшие растения! Наслаждайтесь силой природы в руках Синдиката!"
+ flavour_text = "Вы — агент Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько можете и постарайтесь не высовываться. \
Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate/botanist
assignedrole = TAIPAN_BOTANIST
@@ -169,9 +170,9 @@
name = "Syndicate Cargo Technician sleeper"
mob_name = "Syndicate Cargo Technician"
id_job = "Syndicate Cargo Technician"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Даже синдикату нужны рабочие руки, приносите людям их посылки, заказывайте и продавайте, наслаждайтесь простой работой среди всех этих учёных. Здесь всё равно платят в разы лучше!"
- flavour_text = "Вы Грузчик синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Работайте с грузами, заказывайте всё что может потребоваться станции или вам и зарабатывайте реальные деньги, а не виртуальные очки!"
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Даже Синдикату нужны рабочие руки, приносите людям их посылки, заказывайте и продавайте, наслаждайтесь простой работой среди всех этих учёных. Здесь всё равно платят в разы лучше!"
+ flavour_text = "Вы — грузчик Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Работайте с грузами, заказывайте всё, что может потребоваться станции или вам и зарабатывайте реальные деньги, а не виртуальные очки!"
outfit = /datum/outfit/space_base_syndicate/cargotech
assignedrole = TAIPAN_CARGO
min_hours = 10
@@ -190,9 +191,9 @@
name = "Syndicate Chef Sleeper"
mob_name = "Syndicate Chef"
id_job = "Syndicate Chef"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Даже синдикату нужны рабочие руки! У вас в распоряжении свой бар, кухня и ботаника. Накормите этих голодных учёных или помогите им создать последнее блюдо для ваших врагов. Здесь всё равно платят в разы лучше!"
- flavour_text = "Вы Повар синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Готовьте еду и напитки экипажу и постарайтесь не высовываться!"
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Даже Синдикату нужны рабочие руки! У вас в распоряжении свой бар, кухня и ботаника. Накормите этих голодных учёных или помогите им создать последнее блюдо для ваших врагов. Здесь всё равно платят в разы лучше!"
+ flavour_text = "Вы — повар Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Готовьте еду и напитки экипажу и постарайтесь не высовываться!"
outfit = /datum/outfit/space_base_syndicate/chef
assignedrole = TAIPAN_CHEF
min_hours = 10
@@ -217,9 +218,9 @@
name = "Syndicate Atmos Engineer Sleeper"
mob_name = "Syndicate Atmos Engineer"
id_job = "Syndicate Atmos Engineer"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Там где есть космическая станция, есть и двигатели с трубами которым нужно своё техобслуживание. Обеспечьте станцию энергией, чините повреждения после неудачных опытов учёных и отдыхайте в баре пока снова что-нибудь не взорвут. "
- flavour_text = "Вы Инженер атмосферник синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Запустите двигатель, убедитесь, что на станцию подаётся достаточно электричества и воздуха, а так же чините отделы которые неприменно сломают."
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Там, где есть космическая станция, есть и двигатели с трубами, которым нужно своё техобслуживание. Обеспечьте станцию энергией, чините повреждения после неудачных опытов учёных и отдыхайте в баре, пока снова что-нибудь не взорвут. "
+ flavour_text = "Вы — инженер-атмосферник Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Запустите двигатель, убедитесь, что на станцию подаётся достаточно электричества и воздуха, а также чините отделы, которые непременно сломают."
outfit = /datum/outfit/space_base_syndicate/engineer
assignedrole = TAIPAN_ENGINEER
min_hours = 10
@@ -238,9 +239,9 @@
name = "Syndicate Comms Officer sleeper"
mob_name = "Syndicate Comms Officer"
id_job = "Syndicate Comms Officer"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Проверяйте камеры и коммуникации, руководите станцией в случае ЧП, старайтесь помогать любым агентам синдиката на станции при этом сохраняя свою базу секретом от НТ. Вы являетесь единственным агентом с доступом в хранилище и оружейную."
- flavour_text = "Вы Офицер синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Наблюдайте за станцией НТ, руководите вверенной вам базой и постарайтесь не высовываться. \
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Проверяйте камеры и коммуникации, руководите станцией в случае ЧП, старайтесь помогать любым агентам Синдиката на станции, при этом сохраняя свою базу в секрете от НТ. Вы являетесь единственным агентом с доступом в хранилище и оружейную."
+ flavour_text = "Вы — офицер Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Наблюдайте за станцией НТ, руководите вверенной вам базой и постарайтесь не высовываться. \
Синдикат ясно дал вам понять, что не стоит подводить их доверие. Не разочаруйте их!"
outfit = /datum/outfit/space_base_syndicate/comms
assignedrole = TAIPAN_COMMS
@@ -265,9 +266,9 @@
name = "Syndicate Research Director sleeper"
mob_name = "Syndicate Research Director"
id_job = "Syndicate Research Director"
- important_info = "Не мешайте другим оперативникам синдиката (Таким как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и её сохранность является для вас высшим приоритетом!"
- description = "Следите за тем чтобы учёные занимались исследованиями и не подорвали всю станцию, предоставьте синдикату результаты своих исследований через карго и помните, смерть Нанотрейзен!"
- flavour_text = "Вы Директор Исследований синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания Нанотрэйзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования на сколько можете и постарайтесь не высовываться. \
+ important_info = "Не мешайте другим оперативникам Синдиката (таким, как предатели или ядерные оперативники). Вы можете работать вместе или против не связанных с Синдикатом антагонистов в индивидуальном порядке. Не покидайте свою базу без разрешения администрации! Ваша база, её секретность и сохранность является для вас высшим приоритетом!"
+ description = "Следите за тем, чтобы учёные занимались исследованиями и не подорвали всю станцию, предоставьте Синдикату результаты своих исследований через карго и помните: смерть НаноТрейзен!"
+ flavour_text = "Вы Директор Исследований Синдиката, работающий на сверхсекретной научно-наблюдательной станции Тайпан, занимающейся созданием биооружия и взаимодействием с чёрным рынком. К несчастью, ваш самый главный враг, компания НаноТрейзен, имеет собственную массивную научную базу в вашем секторе. Продолжайте свои исследования насколько сможете и постарайтесь не высовываться. \
Вам дали ясно понять, что синдикат заставит вас очень сильно пожалеть если вы разочаруете их!"
outfit = /datum/outfit/space_base_syndicate/rd
assignedrole = TAIPAN_RD
diff --git a/code/modules/shuttle/assault_pod.dm b/code/modules/shuttle/assault_pod.dm
index 9505ac475e2..6fbe302523c 100644
--- a/code/modules/shuttle/assault_pod.dm
+++ b/code/modules/shuttle/assault_pod.dm
@@ -10,7 +10,7 @@
return ..()
-/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1)
+/obj/docking_port/mobile/assault_pod/dock(obj/docking_port/stationary/S1, force, transit)
..()
if(!istype(S1, /obj/docking_port/stationary/transit))
playsound(get_turf(src.loc), 'sound/effects/explosion1.ogg',50,1)
diff --git a/code/modules/shuttle/shuttle.dm b/code/modules/shuttle/shuttle.dm
index c68305f07e2..8ba53824fc9 100644
--- a/code/modules/shuttle/shuttle.dm
+++ b/code/modules/shuttle/shuttle.dm
@@ -364,16 +364,16 @@
mode = SHUTTLE_RECALL
/obj/docking_port/mobile/proc/enterTransit()
+ . = FALSE
previous = null
-// if(!destination)
-// return
var/obj/docking_port/stationary/S0 = get_docked()
var/obj/docking_port/stationary/S1 = findTransitDock()
if(S1)
- if(dock(S1, , TRUE))
+ if(dock(S1, transit = TRUE))
WARNING("shuttle \"[id]\" could not enter transit space. Docked at [S0 ? S0.id : "null"]. Transit dock [S1 ? S1.id : "null"].")
else
previous = S0
+ return TRUE
else
WARNING("shuttle \"[id]\" could not enter transit space. S0=[S0 ? S0.id : "null"] S1=[S1 ? S1.id : "null"]")
@@ -441,7 +441,7 @@
//this is the main proc. It instantly moves our mobile port to stationary port S1
//it handles all the generic behaviour, such as sanity checks, closing doors on the shuttle, stunning mobs, etc
-/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force=FALSE, transit=FALSE)
+/obj/docking_port/mobile/proc/dock(obj/docking_port/stationary/S1, force = FALSE, transit = FALSE)
// Crashing this ship with NO SURVIVORS
if(S1.get_docked() == src)
remove_ripples()
@@ -665,10 +665,10 @@
setTimer(20) //can't dock for some reason, try again in 2 seconds
return
if(SHUTTLE_IGNITING)
- mode = SHUTTLE_CALL
- setTimer(callTime)
- enterTransit()
- return
+ if(enterTransit())
+ mode = SHUTTLE_CALL
+ setTimer(callTime)
+ return
mode = SHUTTLE_IDLE
timer = 0
destination = null
diff --git a/code/modules/shuttle/supply.dm b/code/modules/shuttle/supply.dm
index 2a38ae3a320..6db49911b9d 100644
--- a/code/modules/shuttle/supply.dm
+++ b/code/modules/shuttle/supply.dm
@@ -16,6 +16,41 @@
height = 7
roundstart_move = "supply_away"
+/obj/docking_port/mobile/supply/proc/forbidden_atoms_check(atom/A)
+ var/static/list/cargo_blacklist = list(
+ /obj/structure/blob,
+ /obj/structure/spider/spiderling,
+ /obj/item/disk/nuclear,
+ /obj/machinery/nuclearbomb,
+ /obj/item/radio/beacon,
+ /obj/machinery/the_singularitygen,
+ /obj/singularity,
+ /obj/machinery/teleport/station,
+ /obj/machinery/teleport/hub,
+ /obj/machinery/telepad,
+ /obj/machinery/telepad_cargo,
+ /obj/machinery/clonepod,
+ /obj/effect/hierophant,
+ /obj/item/warp_cube,
+ /obj/machinery/quantumpad,
+ /obj/structure/extraction_point,
+ /obj/item/paicard
+ )
+ if(A)
+ if(isliving(A))
+ if(!istype(A.loc, /obj/item/mobcapsule))
+ return TRUE
+ var/mob/living/living = A
+ if(living.client) //You cannot get out of the capsule and you will be destroyed. Saving clients
+ return TRUE
+ if(is_type_in_list(A, cargo_blacklist))
+ return TRUE
+ for(var/thing in A)
+ if(.(thing))
+ return TRUE
+
+ return FALSE
+
/obj/docking_port/mobile/supply/register()
if(!..())
return 0
@@ -32,7 +67,7 @@
return 2
return ..()
-/obj/docking_port/mobile/supply/dock()
+/obj/docking_port/mobile/supply/dock(obj/docking_port/stationary/S1, force, transit)
. = ..()
if(.) return .
@@ -180,7 +215,7 @@
objective.unit_completed(cost)
msg += "[tech.name] - new data. "
- qdel(MA)
+ qdel(MA, force = TRUE)
SSshuttle.sold_atoms += "."
@@ -200,35 +235,6 @@
SSshuttle.centcom_message += "[msg]"
-/proc/forbidden_atoms_check(atom/A)
- var/list/blacklist = list(
- /mob/living,
- /obj/structure/blob,
- /obj/structure/spider/spiderling,
- /obj/item/disk/nuclear,
- /obj/machinery/nuclearbomb,
- /obj/item/radio/beacon,
- /obj/machinery/the_singularitygen,
- /obj/singularity,
- /obj/machinery/teleport/station,
- /obj/machinery/teleport/hub,
- /obj/machinery/telepad,
- /obj/machinery/telepad_cargo,
- /obj/machinery/clonepod,
- /obj/effect/hierophant,
- /obj/item/warp_cube,
- /obj/machinery/quantumpad,
- /obj/structure/extraction_point
- )
- if(A)
- if(is_type_in_list(A, blacklist))
- return 1
- for(var/thing in A)
- if(.(thing))
- return 1
-
- return 0
-
/********************
SUPPLY ORDER
********************/
@@ -335,12 +341,12 @@
if(istype(Crate, /obj/structure/closet/crate))
var/obj/structure/closet/crate/CR = Crate
CR.manifest = slip
- CR.update_icon()
+ CR.update_icon(UPDATE_OVERLAYS)
CR.announce_beacons = object.announce_beacons.Copy()
if(istype(Crate, /obj/structure/largecrate))
var/obj/structure/largecrate/LC = Crate
LC.manifest = slip
- LC.update_icon()
+ LC.update_icon(UPDATE_OVERLAYS)
return Crate
@@ -409,10 +415,11 @@
if(SO)
if(!SO.comment)
SO.comment = "No comment."
- var/pack_techs
- for(var/tech_id in SO.object.required_tech)
- pack_techs += "[CallTechName(tech_id)]: [SO.object.required_tech[tech_id]]; "
- requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment, "command1" = list("confirmorder" = SO.ordernum), "command2" = list("rreq" = SO.ordernum), "pack_techs" = pack_techs)))
+ var/list/pack_techs = list()
+ if(length(SO.object.required_tech))
+ for(var/tech_id in SO.object.required_tech)
+ pack_techs += "[CallTechName(tech_id)]: [SO.object.required_tech[tech_id]]; "
+ requests_list.Add(list(list("ordernum" = SO.ordernum, "supply_type" = SO.object.name, "orderedby" = SO.orderedby, "comment" = SO.comment, "command1" = list("confirmorder" = SO.ordernum), "command2" = list("rreq" = SO.ordernum), "pack_techs" = pack_techs.Join(""))))
data["requests"] = requests_list
var/list/orders_list = list()
@@ -426,6 +433,7 @@
data["canapprove"] = (SSshuttle.supply.getDockedId() == "supply_away") && !(SSshuttle.supply.mode != SHUTTLE_IDLE) && !is_public
data["points"] = round(SSshuttle.points)
+ data["credits"] = SSshuttle.cargo_money_account.money
data["moving"] = SSshuttle.supply.mode != SHUTTLE_IDLE
data["at_station"] = SSshuttle.supply.getDockedId() == "supply_home"
@@ -442,7 +450,7 @@
var/datum/supply_packs/pack = SSshuttle.supply_packs[set_name]
var/has_sale = pack.cost < initial(pack.cost)
if((pack.hidden && hacked) || (pack.contraband && can_order_contraband) || (pack.special && pack.special_enabled) || (!pack.contraband && !pack.hidden && !pack.special))
- packs_list.Add(list(list("name" = pack.name, "cost" = pack.cost, "ref" = "[pack.UID()]", "contents" = pack.ui_manifest, "cat" = pack.group, "has_sale" = has_sale)))
+ packs_list.Add(list(list("name" = pack.name, "cost" = pack.cost, "creditsCost" = pack.credits_cost, "ref" = "[pack.UID()]", "contents" = pack.ui_manifest, "cat" = pack.group, "has_sale" = has_sale)))
data["supply_packs"] = packs_list
@@ -561,6 +569,8 @@
else if(P.can_approve(usr))
SSshuttle.requestlist.Cut(i,i+1)
SSshuttle.points -= P.cost
+ if(P.credits_cost)
+ SSshuttle.cargo_money_account.money -= P.credits_cost
SSshuttle.shoppinglist += O
P.times_ordered += 1
investigate_log("[key_name_log(usr)] has authorized an order for [P.name]. Remaining points: [SSshuttle.points].", INVESTIGATE_CARGO)
diff --git a/code/modules/spacepods/lock_buster.dm b/code/modules/spacepods/lock_buster.dm
index 8a83315ce3d..57ff9030524 100644
--- a/code/modules/spacepods/lock_buster.dm
+++ b/code/modules/spacepods/lock_buster.dm
@@ -3,12 +3,15 @@
desc = "Destroys a podlock in mere seconds once applied. Waranty void if used."
icon = 'icons/obj/device.dmi'
icon_state = "lock_buster_off"
- var/on = 0
+ var/on = FALSE
-/obj/item/lock_buster/attack_self(mob/user as mob)
+
+/obj/item/lock_buster/update_icon_state()
+ icon_state = "lock_buster_[on ? "on" : "off"]"
+
+
+/obj/item/lock_buster/attack_self(mob/user = usr)
on = !on
- if(on)
- icon_state = "lock_buster_on"
- else
- icon_state = "lock_buster_off"
- to_chat(usr, "You turn the [src] [on ? "on" : "off"].")
+ update_icon(UPDATE_ICON_STATE)
+ to_chat(user, span_notice("You turn the [src] [on ? "on" : "off"]."))
+
diff --git a/code/modules/spacepods/parts.dm b/code/modules/spacepods/parts.dm
index ec1d8665023..6d5553aafe7 100644
--- a/code/modules/spacepods/parts.dm
+++ b/code/modules/spacepods/parts.dm
@@ -74,7 +74,7 @@
pod.loc = F.loc
qdel(F)
playsound(get_turf(src), O.usesound, 50, 1)
- if(istype(O, /obj/item/wrench))
+ if(O.tool_behaviour == TOOL_WRENCH)
to_chat(user, "You [!anchored ? "secure \the [src] in place." : "remove the securing bolts."]")
anchored = !anchored
density = anchored
diff --git a/code/modules/spacepods/spacepod.dm b/code/modules/spacepods/spacepod.dm
index cd1eaef4c68..ce20a992167 100644
--- a/code/modules/spacepods/spacepod.dm
+++ b/code/modules/spacepods/spacepod.dm
@@ -726,7 +726,7 @@
playsound(src, 'sound/machines/windowdoor.ogg', 50, 1)
return 1
-/obj/spacepod/MouseDrop_T(atom/A, mob/user)
+/obj/spacepod/MouseDrop_T(atom/A, mob/user, params)
if(user == pilot || (user in passengers))
return
diff --git a/code/modules/station_goals/brs/brs_reward.dm b/code/modules/station_goals/brs/brs_reward.dm
index 819a5118965..e5e4a010c62 100644
--- a/code/modules/station_goals/brs/brs_reward.dm
+++ b/code/modules/station_goals/brs/brs_reward.dm
@@ -4,7 +4,7 @@
origin_tech = "bluespace=9;magnets=8"
icon_state = "docs_part"
-/obj/item/paper/researchnotes_brs/update_icon()
+/obj/item/paper/researchnotes_brs/update_icon_state()
return
/obj/structure/toilet/bluespace
@@ -14,13 +14,18 @@
var/teleport_sound = 'sound/magic/lightning_chargeup.ogg'
var/teleport_sound_cooldown = FALSE
-/obj/structure/toilet/bluespace/update_icon()
+
+/obj/structure/toilet/bluespace/update_icon_state()
. = ..()
icon_state = "bluespace_toilet[open][cistern]"
- overlays.Cut()
+
+
+/obj/structure/toilet/bluespace/update_overlays()
+ . = ..()
if(open)
overlays += image(icon, "bluespace_toilet_singularity")
+
/obj/structure/toilet/bluespace/attack_hand(mob/living/user)
. = ..()
if(open)
@@ -47,8 +52,8 @@
/obj/structure/toilet/bluespace/nt
icon_state = "bluespace_toilet00-NT"
-/obj/structure/toilet/bluespace/nt/update_icon()
- . = ..()
+/obj/structure/toilet/bluespace/nt/update_icon_state()
+ ..()
icon_state = "bluespace_toilet[open][cistern]-NT"
/obj/effect/spawner/lootdrop/bluespace_rift
diff --git a/code/modules/station_goals/bsa.dm b/code/modules/station_goals/bsa.dm
index 95f96c26a58..ca5e56d8928 100644
--- a/code/modules/station_goals/bsa.dm
+++ b/code/modules/station_goals/bsa.dm
@@ -44,7 +44,7 @@
var/obj/item/multitool/M = W
M.buffer = src
to_chat(user, "You store linkage information in [W]'s buffer.")
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
default_unfasten_wrench(user, W, 10)
return TRUE
@@ -62,7 +62,7 @@
var/obj/item/multitool/M = W
M.buffer = src
to_chat(user, "You store linkage information in [W]'s buffer.")
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
default_unfasten_wrench(user, W, 10)
return TRUE
@@ -89,7 +89,7 @@
front = M.buffer
M.buffer = null
to_chat(user, "You link [src] with [front].")
- else if(istype(W, /obj/item/wrench))
+ else if(W.tool_behaviour == TOOL_WRENCH)
add_fingerprint(user)
default_unfasten_wrench(user, W, 10)
return TRUE
diff --git a/code/modules/station_goals/dna_vault.dm b/code/modules/station_goals/dna_vault.dm
index da3020e486b..db0bf822685 100644
--- a/code/modules/station_goals/dna_vault.dm
+++ b/code/modules/station_goals/dna_vault.dm
@@ -192,19 +192,16 @@ GLOBAL_LIST_INIT(non_simple_animals, typecacheof(list(/mob/living/carbon/human/l
..()
-/obj/machinery/dna_vault/update_icon()
- ..()
+/obj/machinery/dna_vault/update_icon_state()
if(stat & NOPOWER)
icon_state = "vaultoff"
return
icon_state = "vault"
-/obj/machinery/dna_vault/power_change()
- if(powered(power_channel))
- stat &= ~NOPOWER
- else
- stat |= NOPOWER
- update_icon()
+/obj/machinery/dna_vault/power_change(forced = FALSE)
+ if(!..())
+ return
+ update_icon(UPDATE_ICON_STATE)
/obj/machinery/dna_vault/Destroy()
diff --git a/code/modules/station_goals/shield.dm b/code/modules/station_goals/shield.dm
index 35d0aca8532..e5bacfad02c 100644
--- a/code/modules/station_goals/shield.dm
+++ b/code/modules/station_goals/shield.dm
@@ -143,7 +143,7 @@
icon_state = active ? "sat_active" : "sat_inactive"
/obj/machinery/satellite/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/multitool))
+ if(I.tool_behaviour == TOOL_MULTITOOL)
add_fingerprint(user)
to_chat(user, "// NTSAT-[id] // Режим : [active ? "ОСНОВНОЙ" : "ОЖИДАНИЕ"] //[emagged ? "ОТЛАДКА //" : ""]")
else
diff --git a/code/modules/surgery/organs/augments_eyes.dm b/code/modules/surgery/organs/augments_eyes.dm
index bc507c66e79..1b1d65f5a98 100644
--- a/code/modules/surgery/organs/augments_eyes.dm
+++ b/code/modules/surgery/organs/augments_eyes.dm
@@ -78,25 +78,28 @@
origin_tech = "materials=5;programming=4;biotech=4;magnets=4"
aug_message = "You see prey everywhere you look..."
+/obj/item/organ/internal/cyberimp/eyes/thermals/empproof/emp_act(severity)
+ return
+
// HUD implants
/obj/item/organ/internal/cyberimp/eyes/hud
name = "HUD implant"
desc = "These cybernetic eyes will display a HUD over everything you see. Maybe."
slot = INTERNAL_ORGAN_EYE_HUD_DEVICE
- var/HUD_type = 0
+ var/HUDType = 0
/// A list of extension kinds added to the examine text. Things like medical or security records.
- var/list/examine_extensions = null
+ var/examine_extensions = 0
/obj/item/organ/internal/cyberimp/eyes/hud/insert(mob/living/carbon/M, special = ORGAN_MANIPULATION_DEFAULT)
. = ..()
- if(HUD_type)
- var/datum/atom_hud/H = GLOB.huds[HUD_type]
+ if(HUDType)
+ var/datum/atom_hud/H = GLOB.huds[HUDType]
H.add_hud_to(M)
/obj/item/organ/internal/cyberimp/eyes/hud/remove(mob/living/carbon/M, special = ORGAN_MANIPULATION_DEFAULT)
. = ..()
- if(HUD_type)
- var/datum/atom_hud/H = GLOB.huds[HUD_type]
+ if(HUDType)
+ var/datum/atom_hud/H = GLOB.huds[HUDType]
H.remove_hud_from(M)
/obj/item/organ/internal/cyberimp/eyes/hud/medical
@@ -106,8 +109,8 @@
implant_color = "#00FFFF"
origin_tech = "materials=4;programming=4;biotech=4"
aug_message = "You suddenly see health bars floating above people's heads..."
- HUD_type = DATA_HUD_MEDICAL_ADVANCED
- examine_extensions = list(EXAMINE_HUD_MEDICAL)
+ HUDType = DATA_HUD_MEDICAL_ADVANCED
+ examine_extensions = EXAMINE_HUD_MEDICAL
/obj/item/organ/internal/cyberimp/eyes/hud/diagnostic
name = "Diagnostic HUD implant"
@@ -116,7 +119,7 @@
implant_color = "#ff9000"
origin_tech = "materials=4;engineering=4;biotech=4"
aug_message = "You see the diagnostic information of the synthetics around you..."
- HUD_type = DATA_HUD_DIAGNOSTIC
+ HUDType = DATA_HUD_DIAGNOSTIC
/obj/item/organ/internal/cyberimp/eyes/hud/security
name = "Security HUD implant"
@@ -125,8 +128,8 @@
implant_color = "#CC0000"
origin_tech = "materials=4;programming=4;biotech=3;combat=3"
aug_message = "Job indicator icons pop up in your vision. That is not a certified surgeon..."
- HUD_type = DATA_HUD_SECURITY_ADVANCED
- examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE)
+ HUDType = DATA_HUD_SECURITY_ADVANCED
+ examine_extensions = EXAMINE_HUD_SECURITY_READ | EXAMINE_HUD_SECURITY_WRITE
// Welding shield implant
/obj/item/organ/internal/cyberimp/eyes/shield
diff --git a/code/modules/surgery/organs/autoimplanter.dm b/code/modules/surgery/organs/autoimplanter.dm
index 4a8df60e841..35fef61759c 100644
--- a/code/modules/surgery/organs/autoimplanter.dm
+++ b/code/modules/surgery/organs/autoimplanter.dm
@@ -31,7 +31,7 @@
I.forceMove(src)
storedorgan = I
to_chat(user, "You insert the [I] into [src].")
- else if(istype(I, /obj/item/screwdriver))
+ else if(I.tool_behaviour == TOOL_SCREWDRIVER)
if(!storedorgan)
to_chat(user, "There's no implant in [src] for you to remove.")
else
@@ -51,7 +51,7 @@
qdel(src)
/obj/item/autoimplanter/oneuse/attackby(obj/item/I, mob/user, params)
- if(istype(I, /obj/item/screwdriver))
+ if(I.tool_behaviour == TOOL_SCREWDRIVER)
storedorgan.forceMove(get_turf(user))
storedorgan = null
to_chat(user, "You remove the [storedorgan] from [src].")
diff --git a/code/modules/surgery/organs/heart.dm b/code/modules/surgery/organs/heart.dm
index 9399e1d36ad..005ac0c47cf 100644
--- a/code/modules/surgery/organs/heart.dm
+++ b/code/modules/surgery/organs/heart.dm
@@ -8,7 +8,7 @@
dead_icon = "heart-off"
var/icon_base = "heart"
-/obj/item/organ/internal/heart/update_icon()
+/obj/item/organ/internal/heart/update_icon_state()
if(beating)
icon_state = "[icon_base]-on"
else
diff --git a/code/modules/surgery/organs/organ_icon.dm b/code/modules/surgery/organs/organ_icon.dm
index 3820587dfb1..407616ce36e 100644
--- a/code/modules/surgery/organs/organ_icon.dm
+++ b/code/modules/surgery/organs/organ_icon.dm
@@ -131,14 +131,15 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
add_overlay(head_accessory_s)
if(f_style)
- var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[f_style]
- if(facial_hair_style && ((facial_hair_style.species_allowed && (dna.species.name in facial_hair_style.species_allowed)) || (dna.species.bodyflags & ALL_RPARTS)))
- var/icon/facial_s = new /icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
- if(istype(dna.species, /datum/species/slime)) // I am el worstos
- facial_s.Blend("[owner.skin_colour]A0", ICON_AND) //A0 = 160 alpha.
- else if(facial_hair_style.do_colouration)
- facial_s.Blend(facial_colour, ICON_ADD)
- add_overlay(facial_s)
+ if(!ismachineperson(owner) || (ismachineperson(owner) && ((owner.head && (owner.head.flags & BLOCKFACIALHAIR)) || (owner.wear_mask && (owner.wear_mask.flags & BLOCKFACIALHAIR)))))
+ var/datum/sprite_accessory/facial_hair_style = GLOB.facial_hair_styles_list[f_style]
+ if(facial_hair_style && ((facial_hair_style.species_allowed && (dna.species.name in facial_hair_style.species_allowed)) || (dna.species.bodyflags & ALL_RPARTS)))
+ var/icon/facial_s = new /icon("icon" = facial_hair_style.icon, "icon_state" = "[facial_hair_style.icon_state]_s")
+ if(istype(dna.species, /datum/species/slime)) // I am el worstos
+ facial_s.Blend("[owner.skin_colour]A0", ICON_AND) //A0 = 160 alpha.
+ else if(facial_hair_style.do_colouration)
+ facial_s.Blend(facial_colour, ICON_ADD)
+ add_overlay(facial_s)
if(h_style)
if(!ismachineperson(owner) || (ismachineperson(owner) && ((owner.head && (owner.head.flags & BLOCKHEADHAIR)) || (owner.wear_mask && (owner.wear_mask.flags & BLOCKHEADHAIR)))))
@@ -189,7 +190,7 @@ GLOBAL_LIST_EMPTY(limb_icon_cache)
// new damage icon system
// adjusted to set damage_state to brute/burn code only (without r_name0 as before)
-/obj/item/organ/external/update_icon()
+/obj/item/organ/external/update_icon_state()
var/n_is = damage_state_text()
if(n_is != damage_state)
damage_state = n_is
diff --git a/code/modules/surgery/organs/subtypes/diona.dm b/code/modules/surgery/organs/subtypes/diona.dm
index e56e1805f4b..f7f79630138 100644
--- a/code/modules/surgery/organs/subtypes/diona.dm
+++ b/code/modules/surgery/organs/subtypes/diona.dm
@@ -148,7 +148,7 @@
icon_state = "nymph"
parent_organ_zone = BODY_ZONE_PRECISE_GROIN
-/obj/item/organ/internal/heart/diona/update_icon()
+/obj/item/organ/internal/heart/diona/update_icon_state()
return
/obj/item/organ/internal/eyes/diona
diff --git a/code/modules/surgery/organs/subtypes/slime.dm b/code/modules/surgery/organs/subtypes/slime.dm
index 19eccc1bdb9..04f86b4afd2 100644
--- a/code/modules/surgery/organs/subtypes/slime.dm
+++ b/code/modules/surgery/organs/subtypes/slime.dm
@@ -6,7 +6,7 @@
desc = "This is a slime's osmotic pressure regulator, it appears to be some kind of biological pump that uses osmotic pressure to regulate water flow. It seems to work similar to a heart."
dead_icon = null
-/obj/item/organ/internal/heart/slime/update_icon()
+/obj/item/organ/internal/heart/slime/update_icon_state()
return
/obj/item/organ/internal/lungs/slime
diff --git a/code/modules/surgery/organs/subtypes/xenos.dm b/code/modules/surgery/organs/subtypes/xenos.dm
index e1311ed00da..c3eb12b9ff4 100644
--- a/code/modules/surgery/organs/subtypes/xenos.dm
+++ b/code/modules/surgery/organs/subtypes/xenos.dm
@@ -196,7 +196,7 @@
/obj/item/organ/internal/xenos/neurotoxin
- name = "xeno neurotoxin gland"
+ name = "large xeno neurotoxin gland"
icon_state = "neurotox"
parent_organ_zone = BODY_ZONE_HEAD
slot = INTERNAL_ORGAN_NEUROTOXIN_GLAND
@@ -204,6 +204,7 @@
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin)
/obj/item/organ/internal/xenos/neurotoxin/sentinel
+ name = "medium xeno neurotoxin gland"
alien_powers = list(/obj/effect/proc_holder/spell/alien_spell/neurotoxin/sentinel)
/obj/item/organ/internal/xenos/resinspinner
diff --git a/code/modules/telesci/gps.dm b/code/modules/telesci/gps.dm
index cf1530b24fb..fe74a36e94a 100644
--- a/code/modules/telesci/gps.dm
+++ b/code/modules/telesci/gps.dm
@@ -35,23 +35,23 @@ GLOBAL_LIST_EMPTY(GPS_list)
GLOB.poi_list.Add(src)
if(name == initial(name))
name = "global positioning system ([gpstag])"
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/gps/Destroy()
GLOB.GPS_list.Remove(src)
GLOB.poi_list.Remove(src)
return ..()
-/obj/item/gps/update_icon()
- cut_overlays()
+/obj/item/gps/update_overlays()
+ . = ..()
if(emped)
- add_overlay("emp")
+ . += "emp"
else if(tracking)
- add_overlay("working")
+ . += "working"
/obj/item/gps/emp_act(severity)
emped = TRUE
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
addtimer(CALLBACK(src, PROC_REF(reboot)), EMP_DISABLE_TIME)
/obj/item/gps/AltClick(mob/living/user)
@@ -67,7 +67,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
return
tracking = !tracking
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
if(tracking)
to_chat(user, "[src] is now tracking, and visible to other GPS devices.")
else
@@ -120,7 +120,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
ui_interact(user)
-/obj/item/gps/MouseDrop(atom/over)
+/obj/item/gps/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
. = ..()
var/mob/user = usr
@@ -163,7 +163,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
*/
/obj/item/gps/proc/reboot()
emped = FALSE
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/gps/science
icon_state = "gps-s"
@@ -179,6 +179,12 @@ GLOBAL_LIST_EMPTY(GPS_list)
desc = "A positioning system helpful for rescuing trapped or injured miners, keeping one on you at all times while mining might just save your life."
tracking = FALSE
+/obj/item/gps/security
+ icon_state = "gps-r"
+ gpstag = "SEC0"
+ desc = "A positioning system helpful for monitoring prisoners that are implanted with a tracking implant."
+ local = TRUE
+
/obj/item/gps/cyborg
icon_state = "gps-b"
gpstag = "BORG0"
@@ -201,7 +207,7 @@ GLOBAL_LIST_EMPTY(GPS_list)
local = TRUE
gpstag = "Eerie Signal"
desc = "Report to a coder immediately."
- invisibility = INVISIBILITY_MAXIMUM
+ invisibility = INVISIBILITY_ABSTRACT
/obj/item/gps/internal/mining
icon_state = "gps-m"
diff --git a/code/modules/vehicle/ambulance.dm b/code/modules/vehicle/ambulance.dm
index fd4a5904fd1..d1a86817085 100644
--- a/code/modules/vehicle/ambulance.dm
+++ b/code/modules/vehicle/ambulance.dm
@@ -112,13 +112,15 @@
. = ..()
. += "Drag [src]'s sprite over the ambulance to (de)attach it."
-/obj/structure/bed/amb_trolley/MouseDrop(obj/over_object as obj)
- ..()
- if(istype(over_object, /obj/vehicle/ambulance))
- var/obj/vehicle/ambulance/amb = over_object
- if(amb.bed)
- amb.bed = null
- to_chat(usr, "You unhook the bed to the ambulance.")
- else
- amb.bed = src
- to_chat(usr, "You hook the bed to the ambulance.")
+/obj/structure/bed/amb_trolley/MouseDrop(atom/over_object, src_location, over_location, src_control, over_control, params)
+ . = ..()
+ if(!. || !istype(over_object, /obj/vehicle/ambulance))
+ return FALSE
+
+ var/obj/vehicle/ambulance/amb = over_object
+ if(amb.bed)
+ amb.bed = null
+ to_chat(usr, "You unhook the bed to the ambulance.")
+ else
+ amb.bed = src
+ to_chat(usr, "You hook the bed to the ambulance.")
diff --git a/code/modules/vehicle/janicart.dm b/code/modules/vehicle/janicart.dm
index b0b28c7f4d7..3e61fc16851 100644
--- a/code/modules/vehicle/janicart.dm
+++ b/code/modules/vehicle/janicart.dm
@@ -55,7 +55,7 @@
I.forceMove(src)
to_chat(user, "")
trash_bag = I
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(istype(I, /obj/item/janiupgrade))
if(floorbuffer)
to_chat(user, "[src] already has an upgrade installed! Use a screwdriver to remove it.")
@@ -63,18 +63,20 @@
floorbuffer = TRUE
qdel(I)
to_chat(user,"You upgrade [src] with [I].")
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
else if(trash_bag && (!is_key(I) || is_key(inserted_key))) // don't put a key in the trash when we need it
trash_bag.attackby(I, user)
else
return ..()
-/obj/vehicle/janicart/update_icon()
- cut_overlays()
+
+/obj/vehicle/janicart/update_overlays()
+ . = ..()
if(trash_bag)
- add_overlay("cart_garbage")
+ . += "cart_garbage"
if(floorbuffer)
- add_overlay("cart_buffer")
+ . += "cart_buffer"
+
/obj/vehicle/janicart/attack_hand(mob/user)
if(..())
@@ -83,7 +85,7 @@
trash_bag.forceMove_turf()
user.put_in_hands(trash_bag, ignore_anim = FALSE)
trash_bag = null
- update_icon()
+ update_icon(UPDATE_OVERLAYS)
/obj/item/key/janitor
desc = "A keyring with a small steel key, and a pink fob reading \"Pussy Wagon\"."
diff --git a/code/modules/vehicle/vehicle.dm b/code/modules/vehicle/vehicle.dm
index c035cd89244..7ce0f7371d1 100644
--- a/code/modules/vehicle/vehicle.dm
+++ b/code/modules/vehicle/vehicle.dm
@@ -113,10 +113,6 @@
buckled_mob.pixel_y = generic_pixel_y
-/obj/vehicle/update_icon()
- return
-
-
/obj/item/key
name = "key"
desc = "A small grey key."
diff --git a/config/example/dbconfig.txt b/config/example/dbconfig.txt
index e64d877ec4a..0315c714374 100644
--- a/config/example/dbconfig.txt
+++ b/config/example/dbconfig.txt
@@ -9,7 +9,7 @@
## This value must be set to the version of the paradise schema in use.
## If this value does not match, the SQL database will not be loaded and an error will be generated.
## Roundstart will be delayed.
-DB_VERSION 31
+DB_VERSION 32
## Server the MySQL database can be found at.
# Examples: localhost, 200.135.5.43, www.mysqldb.com, etc.
diff --git a/goon/browserassets/css/browserOutput-dark.css b/goon/browserassets/css/browserOutput-dark.css
index 6f5272afe53..1fc0d8ec93e 100644
--- a/goon/browserassets/css/browserOutput-dark.css
+++ b/goon/browserassets/css/browserOutput-dark.css
@@ -21,6 +21,7 @@ body {
scrollbar-face-color:#1A1A1A;
scrollbar-track-color:#171717;
scrollbar-highlight-color:#171717;
+ scrollbar-arrow-color: #a4bad6;
}
h1, h2, h3, h4, h5, h6 {color: #06f; font-family: Georgia, Verdana, sans-serif;}
@@ -266,7 +267,7 @@ em {font-style: normal;font-weight: bold;}
.ooc {font-weight: bold;}
.looc {color: #6699CC;}
.adminobserverooc {color: #0099cc;font-weight: bold;}
-.adminooc {color: #b82e00;font-weight: bold;}
+.adminooc {color: #a0320e;font-weight: bold;}
.adminobserver {color: #996600;font-weight: bold;}
.admin {color: #386aff;font-weight: bold;}
.adminsay {color: #9611D4;font-weight: bold;}
@@ -292,7 +293,7 @@ em {font-style: normal;font-weight: bold;}
.event_gamma {color: #d46549;}
.dsquadradio {color: #998599;}
.resteamradio {color: #18BC46;}
-.airadio {color: #ff5ed7;}
+.airadio {color: #de4fbb;}
.centradio {color: #2681a5;}
.secradio {color: #CF0000;}
/* .engradio {color: #FEAC20;} */
@@ -300,7 +301,7 @@ em {font-style: normal;font-weight: bold;}
.sciradio {color: #c68cfa;}
.supradio {color: #9F8545;}
.srvradio {color: #bbd164;}
-.proradio {color: #b84f92;}
+/* .proradio {color: #b84f92;} */
.admin_channel {color: #fcba03;}
.all_admin_ping {color: #12A5F4; font-weight: bold; font-size: 120%; text-align: center;}
.mentor_channel {color: #775BFF;font-weight: bold;}
@@ -314,8 +315,8 @@ h1.alert, h2.alert {color: #a4bad6;}
.emote {font-style: italic;}
.selecteddna {color: #a4bad6; background-color: #001B1B}
-.attack {color: #ff0000;}
-.moderate {color: #CC0000;}
+.attack {color: #be2020;}
+.moderate {color: #a91b1b;}
.disarm {color: #990000;}
.passive {color: #660000;}
@@ -328,26 +329,35 @@ h1.alert, h2.alert {color: #a4bad6;}
.info {color: #9ab0ff;}
.notice {color: #6685f5;}
.boldnotice {color: #6685f5;font-weight: bold;}
-.suicide {color: #ff5050;font-style: italic;}
+.suicide {color: #d33838;font-style: italic;}
.green {color: #03bb39;}
.pr_announce {color: #c51e1e;font-weight: bold;}
.boldannounce {color: #c51e1e;font-weight: bold;}
.greenannounce {color: #059223;font-weight: bold;}
-.alien {color: #543354;}
-.noticealien {color: #00c000;}
-.alertalien {color: #00c000; font-weight: bold;}
-.terrorspider {color: #822382;}
+.alien {color: #923492;}
+.noticealien {color: #00a000;}
+.alertalien {color: #00a000; font-weight: bold;}
+.terrorspider {color: #7d0284;}
.dantalion {color: #1a7d5b;}
.sinister {color: #800080;font-weight: bold;font-style: italic;} /* /vg/ */
-.blob {color: #006221;font-weight: bold;font-style: italic;}
-.confirm {color: #00af3b;}
+.blob {color: #006221;font-weight: bold;font-style: italic;}
+.blobteslium_paste {color: #512e89;font-weight: bold;font-style: italic;}
+.blobradioactive_gel {color: #2476f0;font-weight: bold;font-style: italic;}
+.blobb_sorium {color: #808000;font-weight: bold;font-style: italic;}
+.blobcryogenic_liquid {color: #8BA6E9;font-weight: bold;font-style: italic;}
+.blobkinetic {color: #FFA500;font-weight: bold;font-style: italic;}
+.bloblexorin_jelly {color: #00FFC5;font-weight: bold;font-style: italic;}
+.blobenvenomed_filaments {color: #9ACD32;font-weight: bold;font-style: italic;}
+.blobboiling_oil {color: #B68D00;font-weight: bold;font-style: italic;}
+.blobripping_tendrils {color: #7F0000;font-weight: bold;font-style: italic;}
+.confirm {color: #00af3b;}
.rose {color: #ff5050;}
.sans {font-family: 'Comic Sans MS', cursive, sans-serif;}
.wingdings {font-family: Wingdings, Webdings;}
.robot {font-family: 'PxPlus IBM MDA'; font-size: 1.15em;}
-.ancient {color: #008B8B;font-style: italic;}
+.ancient {color: #008B8B;font-style: italic;}
.newscaster {color: #CC0000;}
.mod {color: #735638;font-weight: bold;}
.modooc {color: #184880;font-weight: bold;}
diff --git a/goon/browserassets/css/browserOutput.css b/goon/browserassets/css/browserOutput.css
index 0a4be213cdc..897423cb6cb 100644
--- a/goon/browserassets/css/browserOutput.css
+++ b/goon/browserassets/css/browserOutput.css
@@ -334,7 +334,16 @@ h1.alert, h2.alert {color: #000000;}
.sinister {color: #800080; font-weight: bold; font-style: italic;} /* /vg/ */
-.blob {color: #006221; font-weight: bold; font-style: italic;}
+.blob {color: #006221;font-weight: bold;font-style: italic;}
+.blobteslium_paste {color: #412968;font-weight: bold;font-style: italic;}
+.blobradioactive_gel {color: #2476f0;font-weight: bold;font-style: italic;}
+.blobb_sorium {color: #808000;font-weight: bold;font-style: italic;}
+.blobcryogenic_liquid {color: #8BA6E9;font-weight: bold;font-style: italic;}
+.blobkinetic {color: #FFA500;font-weight: bold;font-style: italic;}
+.bloblexorin_jelly {color: #00FFC5;font-weight: bold;font-style: italic;}
+.blobenvenomed_filaments {color: #9ACD32;font-weight: bold;font-style: italic;}
+.blobboiling_oil {color: #B68D00;font-weight: bold;font-style: italic;}
+.blobripping_tendrils {color: #7F0000;font-weight: bold;font-style: italic;}
.confirm {color: #00af3b;}
.rose {color: #ff5050;}
.sans {font-family: 'Comic Sans MS', cursive, sans-serif;}
diff --git a/html/browser/bootstrap.min.css b/html/browser/bootstrap.min.css
new file mode 100644
index 00000000000..840cf2b504f
--- /dev/null
+++ b/html/browser/bootstrap.min.css
@@ -0,0 +1,2131 @@
+/*!
+ * Bootstrap v4.6.2 (https://getbootstrap.com/)
+ * Copyright 2011-2022 The Bootstrap Authors
+ * Copyright 2011-2022 Twitter, Inc.
+ * Licensed under MIT (https://github.com/twbs/bootstrap/blob/main/LICENSE)
+ */:root{--blue:#007bff;--indigo:#6610f2;--purple:#6f42c1;--pink:#e83e8c;--red:#dc3545;--orange:#fd7e14;--yellow:#ffc107;--green:#28a745;--teal:#20c997;--cyan:#17a2b8;--white:#fff;--gray:#6c757d;--gray-dark:#343a40;--primary:#007bff;--secondary:#6c757d;--success:#28a745;--info:#17a2b8;--warning:#ffc107;--danger:#dc3545;--light:#f8f9fa;--dark:#343a40;--breakpoint-xs:0;--breakpoint-sm:576px;--breakpoint-md:768px;--breakpoint-lg:992px;--breakpoint-xl:1200px}
+*,::after,::before{box-sizing:border-box}
+html{line-height:1.15;-webkit-text-size-adjust:100%;-webkit-tap-highlight-color:transparent}
+article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}
+[tabindex="-1"]:focus:not(:focus-visible){outline:0!important}
+hr{box-sizing:content-box;height:0;overflow:visible}
+h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}
+p{margin-top:0;margin-bottom:1rem}
+abbr[data-original-title],abbr[title]{text-decoration:underline;-webkit-text-decoration:underline dotted;text-decoration:underline dotted;cursor:help;border-bottom:0;-webkit-text-decoration-skip-ink:none;text-decoration-skip-ink:none}
+address{margin-bottom:1rem;font-style:normal;line-height:inherit}
+dl,ol,ul{margin-top:0;margin-bottom:1rem}
+ol ol,ol ul,ul ol,ul ul{margin-bottom:0}
+dt{font-weight:700}
+dd{margin-bottom:.5rem;margin-left:0}
+blockquote{margin:0 0 1rem}
+b,strong{font-weight:bolder}
+small{font-size:80%}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline}
+sub{bottom:-.25em}
+sup{top:-.5em}
+a{color:#007bff;text-decoration:none;background-color:transparent}
+a:hover{color:#0056b3;text-decoration:underline}
+a:not([href]):not([class]){color:inherit;text-decoration:none}
+a:not([href]):not([class]):hover{color:inherit;text-decoration:none}
+code,kbd,pre,samp{font-size:1em}
+pre{margin-top:0;margin-bottom:1rem;overflow:auto;-ms-overflow-style:scrollbar}
+figure{margin:0 0 1rem}
+img{vertical-align:middle;border-style:none}
+svg{overflow:hidden;vertical-align:middle}
+table{border-collapse:collapse}
+caption{padding-top:.75rem;padding-bottom:.75rem;color:#6c757d;text-align:left;caption-side:bottom}
+th{text-align:inherit;text-align:-webkit-match-parent}
+label{display:inline-block;margin-bottom:.5rem}
+button{border-radius:0}
+button:focus:not(:focus-visible){outline:0}
+button,input,optgroup,select,textarea{margin:0;font-family:inherit;font-size:inherit;line-height:inherit}
+button,input{overflow:visible}
+button,select{text-transform:none}
+[role=button]{cursor:pointer}
+select{word-wrap:normal}
+[type=button],[type=reset],[type=submit],button{-webkit-appearance:button}
+[type=button]:not(:disabled),[type=reset]:not(:disabled),[type=submit]:not(:disabled),button:not(:disabled){cursor:pointer}
+[type=button]::-moz-focus-inner,[type=reset]::-moz-focus-inner,[type=submit]::-moz-focus-inner,button::-moz-focus-inner{padding:0;border-style:none}
+input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}
+textarea{overflow:auto;resize:vertical}
+fieldset{min-width:0;padding:0;margin:0;border:0}
+legend{display:block;width:100%;max-width:100%;padding:0;margin-bottom:.5rem;font-size:1.5em;line-height:inherit;color:inherit;white-space:normal}
+progress{vertical-align:baseline}
+[type=number]::-webkit-inner-spin-button,[type=number]::-webkit-outer-spin-button{height:auto}
+[type=search]{outline-offset:-2px;-webkit-appearance:none}
+[type=search]::-webkit-search-decoration{-webkit-appearance:none}
+::-webkit-file-upload-button{font:inherit;-webkit-appearance:button}
+output{display:inline-block}
+summary{display:list-item;cursor:pointer}
+template{display:none}
+[hidden]{display:none!important}
+.h1,.h2,.h3,.h4,.h5,.h6,h1,h2,h3,h4,h5,h6{margin-bottom:.5rem;font-weight:500;line-height:1.2}
+.h1,h1{font-size:2.5em}
+.h2,h2{font-size:2em}
+.h3,h3{font-size:1.75em}
+.h4,h4{font-size:1.5em}
+.h5,h5{font-size:1.25em}
+.h6,h6{font-size:1em}
+.lead{font-size:1.25em;font-weight:300}
+.display-1{font-size:6em;font-weight:300;line-height:1.2}
+.display-2{font-size:5.5em;font-weight:300;line-height:1.2}
+.display-3{font-size:4.5em;font-weight:300;line-height:1.2}
+.display-4{font-size:3.5em;font-weight:300;line-height:1.2}
+hr{margin-top:1rem;margin-bottom:1rem;border:0;border-top:1px solid rgba(0,0,0,.1)}
+.small,small{font-size:.875em;font-weight:400}
+.mark,mark{padding:.2em;background-color:#fcf8e3}
+.list-unstyled{padding-left:0;list-style:none}
+.list-inline{padding-left:0;list-style:none}
+.list-inline-item{display:inline-block}
+.list-inline-item:not(:last-child){margin-right:.5rem}
+.initialism{font-size:90%;text-transform:uppercase}
+.blockquote{margin-bottom:1rem;font-size:1.25em}
+.blockquote-footer{display:block;font-size:.875em;color:#6c757d}
+.blockquote-footer::before{content:"\2014\00A0"}
+.img-fluid{max-width:100%;height:auto}
+.img-thumbnail{padding:.25rem;background-color:#fff;border:1px solid #dee2e6;border-radius:.25rem;max-width:100%;height:auto}
+.figure{display:inline-block}
+.figure-img{margin-bottom:.5rem;line-height:1}
+.figure-caption{font-size:90%;color:#6c757d}
+code{font-size:87.5%;color:#e83e8c;word-wrap:break-word}
+a>code{color:inherit}
+kbd{padding:.2rem .4rem;font-size:87.5%;color:#fff;background-color:#212529;border-radius:.2rem}
+kbd kbd{padding:0;font-size:100%;font-weight:700}
+pre{display:block;font-size:87.5%;color:#212529}
+pre code{font-size:inherit;color:inherit;word-break:normal}
+.pre-scrollable{max-height:340px;overflow-y:scroll}
+.container,.container-fluid,.container-lg,.container-md,.container-sm,.container-xl{width:100%;padding-right:15px;padding-left:15px;margin-right:auto;margin-left:auto}
+@media (min-width:576px){.container,.container-sm{max-width:540px}
+}
+@media (min-width:768px){.container,.container-md,.container-sm{max-width:720px}
+}
+@media (min-width:992px){.container,.container-lg,.container-md,.container-sm{max-width:960px}
+}
+@media (min-width:1200px){.container,.container-lg,.container-md,.container-sm,.container-xl{max-width:1140px}
+}
+.row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-15px;margin-left:-15px}
+.no-gutters{margin-right:0;margin-left:0}
+.no-gutters>.col,.no-gutters>[class*=col-]{padding-right:0;padding-left:0}
+.col,.col-1,.col-10,.col-11,.col-12,.col-2,.col-3,.col-4,.col-5,.col-6,.col-7,.col-8,.col-9,.col-auto,.col-lg,.col-lg-1,.col-lg-10,.col-lg-11,.col-lg-12,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-auto,.col-md,.col-md-1,.col-md-10,.col-md-11,.col-md-12,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-auto,.col-sm,.col-sm-1,.col-sm-10,.col-sm-11,.col-sm-12,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-auto,.col-xl,.col-xl-1,.col-xl-10,.col-xl-11,.col-xl-12,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-auto{position:relative;width:100%;padding-right:15px;padding-left:15px}
+.col{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}
+.row-cols-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.row-cols-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.row-cols-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.row-cols-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.row-cols-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}
+.row-cols-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}
+.col-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}
+.col-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.col-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.col-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}
+.col-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.col-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}
+.col-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}
+.col-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}
+.col-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}
+.col-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}
+.col-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.order-first{-ms-flex-order:-1;order:-1}
+.order-last{-ms-flex-order:13;order:13}
+.order-0{-ms-flex-order:0;order:0}
+.order-1{-ms-flex-order:1;order:1}
+.order-2{-ms-flex-order:2;order:2}
+.order-3{-ms-flex-order:3;order:3}
+.order-4{-ms-flex-order:4;order:4}
+.order-5{-ms-flex-order:5;order:5}
+.order-6{-ms-flex-order:6;order:6}
+.order-7{-ms-flex-order:7;order:7}
+.order-8{-ms-flex-order:8;order:8}
+.order-9{-ms-flex-order:9;order:9}
+.order-10{-ms-flex-order:10;order:10}
+.order-11{-ms-flex-order:11;order:11}
+.order-12{-ms-flex-order:12;order:12}
+.offset-1{margin-left:8.333333%}
+.offset-2{margin-left:16.666667%}
+.offset-3{margin-left:25%}
+.offset-4{margin-left:33.333333%}
+.offset-5{margin-left:41.666667%}
+.offset-6{margin-left:50%}
+.offset-7{margin-left:58.333333%}
+.offset-8{margin-left:66.666667%}
+.offset-9{margin-left:75%}
+.offset-10{margin-left:83.333333%}
+.offset-11{margin-left:91.666667%}
+@media (min-width:576px){.col-sm{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}
+.row-cols-sm-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.row-cols-sm-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.row-cols-sm-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.row-cols-sm-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.row-cols-sm-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}
+.row-cols-sm-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-sm-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}
+.col-sm-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}
+.col-sm-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-sm-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.col-sm-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.col-sm-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}
+.col-sm-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.col-sm-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}
+.col-sm-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}
+.col-sm-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}
+.col-sm-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}
+.col-sm-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}
+.col-sm-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.order-sm-first{-ms-flex-order:-1;order:-1}
+.order-sm-last{-ms-flex-order:13;order:13}
+.order-sm-0{-ms-flex-order:0;order:0}
+.order-sm-1{-ms-flex-order:1;order:1}
+.order-sm-2{-ms-flex-order:2;order:2}
+.order-sm-3{-ms-flex-order:3;order:3}
+.order-sm-4{-ms-flex-order:4;order:4}
+.order-sm-5{-ms-flex-order:5;order:5}
+.order-sm-6{-ms-flex-order:6;order:6}
+.order-sm-7{-ms-flex-order:7;order:7}
+.order-sm-8{-ms-flex-order:8;order:8}
+.order-sm-9{-ms-flex-order:9;order:9}
+.order-sm-10{-ms-flex-order:10;order:10}
+.order-sm-11{-ms-flex-order:11;order:11}
+.order-sm-12{-ms-flex-order:12;order:12}
+.offset-sm-0{margin-left:0}
+.offset-sm-1{margin-left:8.333333%}
+.offset-sm-2{margin-left:16.666667%}
+.offset-sm-3{margin-left:25%}
+.offset-sm-4{margin-left:33.333333%}
+.offset-sm-5{margin-left:41.666667%}
+.offset-sm-6{margin-left:50%}
+.offset-sm-7{margin-left:58.333333%}
+.offset-sm-8{margin-left:66.666667%}
+.offset-sm-9{margin-left:75%}
+.offset-sm-10{margin-left:83.333333%}
+.offset-sm-11{margin-left:91.666667%}
+}
+@media (min-width:768px){.col-md{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}
+.row-cols-md-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.row-cols-md-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.row-cols-md-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.row-cols-md-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.row-cols-md-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}
+.row-cols-md-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-md-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}
+.col-md-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}
+.col-md-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-md-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.col-md-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.col-md-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}
+.col-md-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.col-md-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}
+.col-md-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}
+.col-md-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}
+.col-md-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}
+.col-md-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}
+.col-md-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.order-md-first{-ms-flex-order:-1;order:-1}
+.order-md-last{-ms-flex-order:13;order:13}
+.order-md-0{-ms-flex-order:0;order:0}
+.order-md-1{-ms-flex-order:1;order:1}
+.order-md-2{-ms-flex-order:2;order:2}
+.order-md-3{-ms-flex-order:3;order:3}
+.order-md-4{-ms-flex-order:4;order:4}
+.order-md-5{-ms-flex-order:5;order:5}
+.order-md-6{-ms-flex-order:6;order:6}
+.order-md-7{-ms-flex-order:7;order:7}
+.order-md-8{-ms-flex-order:8;order:8}
+.order-md-9{-ms-flex-order:9;order:9}
+.order-md-10{-ms-flex-order:10;order:10}
+.order-md-11{-ms-flex-order:11;order:11}
+.order-md-12{-ms-flex-order:12;order:12}
+.offset-md-0{margin-left:0}
+.offset-md-1{margin-left:8.333333%}
+.offset-md-2{margin-left:16.666667%}
+.offset-md-3{margin-left:25%}
+.offset-md-4{margin-left:33.333333%}
+.offset-md-5{margin-left:41.666667%}
+.offset-md-6{margin-left:50%}
+.offset-md-7{margin-left:58.333333%}
+.offset-md-8{margin-left:66.666667%}
+.offset-md-9{margin-left:75%}
+.offset-md-10{margin-left:83.333333%}
+.offset-md-11{margin-left:91.666667%}
+}
+@media (min-width:992px){.col-lg{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}
+.row-cols-lg-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.row-cols-lg-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.row-cols-lg-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.row-cols-lg-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.row-cols-lg-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}
+.row-cols-lg-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-lg-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}
+.col-lg-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}
+.col-lg-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-lg-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.col-lg-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.col-lg-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}
+.col-lg-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.col-lg-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}
+.col-lg-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}
+.col-lg-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}
+.col-lg-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}
+.col-lg-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}
+.col-lg-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.order-lg-first{-ms-flex-order:-1;order:-1}
+.order-lg-last{-ms-flex-order:13;order:13}
+.order-lg-0{-ms-flex-order:0;order:0}
+.order-lg-1{-ms-flex-order:1;order:1}
+.order-lg-2{-ms-flex-order:2;order:2}
+.order-lg-3{-ms-flex-order:3;order:3}
+.order-lg-4{-ms-flex-order:4;order:4}
+.order-lg-5{-ms-flex-order:5;order:5}
+.order-lg-6{-ms-flex-order:6;order:6}
+.order-lg-7{-ms-flex-order:7;order:7}
+.order-lg-8{-ms-flex-order:8;order:8}
+.order-lg-9{-ms-flex-order:9;order:9}
+.order-lg-10{-ms-flex-order:10;order:10}
+.order-lg-11{-ms-flex-order:11;order:11}
+.order-lg-12{-ms-flex-order:12;order:12}
+.offset-lg-0{margin-left:0}
+.offset-lg-1{margin-left:8.333333%}
+.offset-lg-2{margin-left:16.666667%}
+.offset-lg-3{margin-left:25%}
+.offset-lg-4{margin-left:33.333333%}
+.offset-lg-5{margin-left:41.666667%}
+.offset-lg-6{margin-left:50%}
+.offset-lg-7{margin-left:58.333333%}
+.offset-lg-8{margin-left:66.666667%}
+.offset-lg-9{margin-left:75%}
+.offset-lg-10{margin-left:83.333333%}
+.offset-lg-11{margin-left:91.666667%}
+}
+@media (min-width:1200px){.col-xl{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;max-width:100%}
+.row-cols-xl-1>*{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.row-cols-xl-2>*{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.row-cols-xl-3>*{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.row-cols-xl-4>*{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.row-cols-xl-5>*{-ms-flex:0 0 20%;flex:0 0 20%;max-width:20%}
+.row-cols-xl-6>*{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-xl-auto{-ms-flex:0 0 auto;flex:0 0 auto;width:auto;max-width:100%}
+.col-xl-1{-ms-flex:0 0 8.333333%;flex:0 0 8.333333%;max-width:8.333333%}
+.col-xl-2{-ms-flex:0 0 16.666667%;flex:0 0 16.666667%;max-width:16.666667%}
+.col-xl-3{-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}
+.col-xl-4{-ms-flex:0 0 33.333333%;flex:0 0 33.333333%;max-width:33.333333%}
+.col-xl-5{-ms-flex:0 0 41.666667%;flex:0 0 41.666667%;max-width:41.666667%}
+.col-xl-6{-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}
+.col-xl-7{-ms-flex:0 0 58.333333%;flex:0 0 58.333333%;max-width:58.333333%}
+.col-xl-8{-ms-flex:0 0 66.666667%;flex:0 0 66.666667%;max-width:66.666667%}
+.col-xl-9{-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}
+.col-xl-10{-ms-flex:0 0 83.333333%;flex:0 0 83.333333%;max-width:83.333333%}
+.col-xl-11{-ms-flex:0 0 91.666667%;flex:0 0 91.666667%;max-width:91.666667%}
+.col-xl-12{-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}
+.order-xl-first{-ms-flex-order:-1;order:-1}
+.order-xl-last{-ms-flex-order:13;order:13}
+.order-xl-0{-ms-flex-order:0;order:0}
+.order-xl-1{-ms-flex-order:1;order:1}
+.order-xl-2{-ms-flex-order:2;order:2}
+.order-xl-3{-ms-flex-order:3;order:3}
+.order-xl-4{-ms-flex-order:4;order:4}
+.order-xl-5{-ms-flex-order:5;order:5}
+.order-xl-6{-ms-flex-order:6;order:6}
+.order-xl-7{-ms-flex-order:7;order:7}
+.order-xl-8{-ms-flex-order:8;order:8}
+.order-xl-9{-ms-flex-order:9;order:9}
+.order-xl-10{-ms-flex-order:10;order:10}
+.order-xl-11{-ms-flex-order:11;order:11}
+.order-xl-12{-ms-flex-order:12;order:12}
+.offset-xl-0{margin-left:0}
+.offset-xl-1{margin-left:8.333333%}
+.offset-xl-2{margin-left:16.666667%}
+.offset-xl-3{margin-left:25%}
+.offset-xl-4{margin-left:33.333333%}
+.offset-xl-5{margin-left:41.666667%}
+.offset-xl-6{margin-left:50%}
+.offset-xl-7{margin-left:58.333333%}
+.offset-xl-8{margin-left:66.666667%}
+.offset-xl-9{margin-left:75%}
+.offset-xl-10{margin-left:83.333333%}
+.offset-xl-11{margin-left:91.666667%}
+}
+.table{width:100%;margin-bottom:1rem;color:#212529}
+.table td,.table th{padding:.75rem;vertical-align:top;border-top:1px solid #dee2e6}
+.table thead th{vertical-align:bottom;border-bottom:2px solid #dee2e6}
+.table tbody+tbody{border-top:2px solid #dee2e6}
+.table-sm td,.table-sm th{padding:.3rem}
+.table-bordered{border:1px solid #dee2e6}
+.table-bordered td,.table-bordered th{border:1px solid #dee2e6}
+.table-bordered thead td,.table-bordered thead th{border-bottom-width:2px}
+.table-borderless tbody+tbody,.table-borderless td,.table-borderless th,.table-borderless thead th{border:0}
+.table-striped tbody tr:nth-of-type(odd){background-color:rgba(0,0,0,.05)}
+.table-hover tbody tr:hover{color:#212529;background-color:rgba(0,0,0,.075)}
+.table-primary,.table-primary>td,.table-primary>th{background-color:#b8daff}
+.table-primary tbody+tbody,.table-primary td,.table-primary th,.table-primary thead th{border-color:#7abaff}
+.table-hover .table-primary:hover{background-color:#9fcdff}
+.table-hover .table-primary:hover>td,.table-hover .table-primary:hover>th{background-color:#9fcdff}
+.table-secondary,.table-secondary>td,.table-secondary>th{background-color:#d6d8db}
+.table-secondary tbody+tbody,.table-secondary td,.table-secondary th,.table-secondary thead th{border-color:#b3b7bb}
+.table-hover .table-secondary:hover{background-color:#c8cbcf}
+.table-hover .table-secondary:hover>td,.table-hover .table-secondary:hover>th{background-color:#c8cbcf}
+.table-success,.table-success>td,.table-success>th{background-color:#c3e6cb}
+.table-success tbody+tbody,.table-success td,.table-success th,.table-success thead th{border-color:#8fd19e}
+.table-hover .table-success:hover{background-color:#b1dfbb}
+.table-hover .table-success:hover>td,.table-hover .table-success:hover>th{background-color:#b1dfbb}
+.table-info,.table-info>td,.table-info>th{background-color:#bee5eb}
+.table-info tbody+tbody,.table-info td,.table-info th,.table-info thead th{border-color:#86cfda}
+.table-hover .table-info:hover{background-color:#abdde5}
+.table-hover .table-info:hover>td,.table-hover .table-info:hover>th{background-color:#abdde5}
+.table-warning,.table-warning>td,.table-warning>th{background-color:#ffeeba}
+.table-warning tbody+tbody,.table-warning td,.table-warning th,.table-warning thead th{border-color:#ffdf7e}
+.table-hover .table-warning:hover{background-color:#ffe8a1}
+.table-hover .table-warning:hover>td,.table-hover .table-warning:hover>th{background-color:#ffe8a1}
+.table-danger,.table-danger>td,.table-danger>th{background-color:#f5c6cb}
+.table-danger tbody+tbody,.table-danger td,.table-danger th,.table-danger thead th{border-color:#ed969e}
+.table-hover .table-danger:hover{background-color:#f1b0b7}
+.table-hover .table-danger:hover>td,.table-hover .table-danger:hover>th{background-color:#f1b0b7}
+.table-light,.table-light>td,.table-light>th{background-color:#fdfdfe}
+.table-light tbody+tbody,.table-light td,.table-light th,.table-light thead th{border-color:#fbfcfc}
+.table-hover .table-light:hover{background-color:#ececf6}
+.table-hover .table-light:hover>td,.table-hover .table-light:hover>th{background-color:#ececf6}
+.table-dark,.table-dark>td,.table-dark>th{background-color:#c6c8ca}
+.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#95999c}
+.table-hover .table-dark:hover{background-color:#b9bbbe}
+.table-hover .table-dark:hover>td,.table-hover .table-dark:hover>th{background-color:#b9bbbe}
+.table-active,.table-active>td,.table-active>th{background-color:rgba(0,0,0,.075)}
+.table-hover .table-active:hover{background-color:rgba(0,0,0,.075)}
+.table-hover .table-active:hover>td,.table-hover .table-active:hover>th{background-color:rgba(0,0,0,.075)}
+.table .thead-dark th{color:#fff;background-color:#343a40;border-color:#454d55}
+.table .thead-light th{color:#495057;background-color:#e9ecef;border-color:#dee2e6}
+.table-dark{color:#fff;background-color:#343a40}
+.table-dark td,.table-dark th,.table-dark thead th{border-color:#454d55}
+.table-dark.table-bordered{border:0}
+.table-dark.table-striped tbody tr:nth-of-type(odd){background-color:rgba(255,255,255,.05)}
+.table-dark.table-hover tbody tr:hover{color:#fff;background-color:rgba(255,255,255,.075)}
+@media (max-width:575.98px){.table-responsive-sm{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
+.table-responsive-sm>.table-bordered{border:0}
+}
+@media (max-width:767.98px){.table-responsive-md{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
+.table-responsive-md>.table-bordered{border:0}
+}
+@media (max-width:991.98px){.table-responsive-lg{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
+.table-responsive-lg>.table-bordered{border:0}
+}
+@media (max-width:1199.98px){.table-responsive-xl{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
+.table-responsive-xl>.table-bordered{border:0}
+}
+.table-responsive{display:block;width:100%;overflow-x:auto;-webkit-overflow-scrolling:touch}
+.table-responsive>.table-bordered{border:0}
+.form-control{display:block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;font-size:1em;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;background-clip:padding-box;border:1px solid #ced4da;border-radius:.25rem;transition:border-color .15s ease-in-out,box-shadow .15s ease-in-out}
+@media (prefers-reduced-motion:reduce){.form-control{transition:none}
+}
+.form-control::-ms-expand{background-color:transparent;border:0}
+.form-control:focus{color:#495057;background-color:#fff;border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.form-control::-webkit-input-placeholder{color:#6c757d;opacity:1}
+.form-control::-moz-placeholder{color:#6c757d;opacity:1}
+.form-control:-ms-input-placeholder{color:#6c757d;opacity:1}
+.form-control::-ms-input-placeholder{color:#6c757d;opacity:1}
+.form-control::placeholder{color:#6c757d;opacity:1}
+.form-control:disabled,.form-control[readonly]{background-color:#e9ecef;opacity:1}
+input[type=date].form-control,input[type=datetime-local].form-control,input[type=month].form-control,input[type=time].form-control{-webkit-appearance:none;-moz-appearance:none;appearance:none}
+select.form-control:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}
+select.form-control:focus::-ms-value{color:#495057;background-color:#fff}
+.form-control-file,.form-control-range{display:block;width:100%}
+.col-form-label{padding-top:calc(.375rem + 1px);padding-bottom:calc(.375rem + 1px);margin-bottom:0;font-size:inherit;line-height:1.5}
+.col-form-label-lg{padding-top:calc(.5rem + 1px);padding-bottom:calc(.5rem + 1px);font-size:1.25em;line-height:1.5}
+.col-form-label-sm{padding-top:calc(.25rem + 1px);padding-bottom:calc(.25rem + 1px);font-size:.875em;line-height:1.5}
+.form-control-plaintext{display:block;width:100%;padding:.375rem 0;margin-bottom:0;font-size:1em;line-height:1.5;color:#212529;background-color:transparent;border:solid transparent;border-width:1px 0}
+.form-control-plaintext.form-control-lg,.form-control-plaintext.form-control-sm{padding-right:0;padding-left:0}
+.form-control-sm{height:calc(1.5em + .5rem + 2px);padding:.25rem .5rem;font-size:.875em;line-height:1.5;border-radius:.2rem}
+.form-control-lg{height:calc(1.5em + 1rem + 2px);padding:.5rem 1rem;font-size:1.25em;line-height:1.5;border-radius:.3rem}
+select.form-control[multiple],select.form-control[size]{height:auto}
+textarea.form-control{height:auto}
+.form-group{margin-bottom:1rem}
+.form-text{display:block;margin-top:.25rem}
+.form-row{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-right:-5px;margin-left:-5px}
+.form-row>.col,.form-row>[class*=col-]{padding-right:5px;padding-left:5px}
+.form-check{position:relative;display:block;padding-left:1.25rem}
+.form-check-input{position:absolute;margin-top:.3rem;margin-left:-1.25rem}
+.form-check-input:disabled~.form-check-label,.form-check-input[disabled]~.form-check-label{color:#6c757d}
+.form-check-label{margin-bottom:0}
+.form-check-inline{display:-ms-inline-flexbox;display:inline-flex;-ms-flex-align:center;align-items:center;padding-left:0;margin-right:.75rem}
+.form-check-inline .form-check-input{position:static;margin-top:0;margin-right:.3125rem;margin-left:0}
+.valid-feedback{display:none;width:100%;margin-top:.25rem;font-size:.875em;color:#28a745}
+.valid-tooltip{position:absolute;top:100%;left:0;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875em;line-height:1.5;color:#fff;background-color:rgba(40,167,69,.9);border-radius:.25rem}
+.form-row>.col>.valid-tooltip,.form-row>[class*=col-]>.valid-tooltip{left:5px}
+.is-valid~.valid-feedback,.is-valid~.valid-tooltip,.was-validated :valid~.valid-feedback,.was-validated :valid~.valid-tooltip{display:block}
+.form-control.is-valid,.was-validated .form-control:valid{border-color:#28a745;padding-right:calc(1.5em + .75rem)!important;background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}
+.form-control.is-valid:focus,.was-validated .form-control:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}
+.was-validated select.form-control:valid,select.form-control.is-valid{padding-right:3rem!important;background-position:right 1.5rem center}
+.was-validated textarea.form-control:valid,textarea.form-control.is-valid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}
+.custom-select.is-valid,.was-validated .custom-select:valid{border-color:#28a745;padding-right:calc(.75em + 2.3125rem)!important;background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right .75rem center/8px 10px no-repeat,#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%2328a745' d='M2.3 6.73L.6 4.53c-.4-1.04.46-1.4 1.1-.8l1.1 1.4 3.4-3.8c.6-.63 1.6-.27 1.2.7l-4 4.6c-.43.5-.8.4-1.1.1z'/%3e%3c/svg%3e") center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem) no-repeat}
+.custom-select.is-valid:focus,.was-validated .custom-select:valid:focus{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}
+.form-check-input.is-valid~.form-check-label,.was-validated .form-check-input:valid~.form-check-label{color:#28a745}
+.form-check-input.is-valid~.valid-feedback,.form-check-input.is-valid~.valid-tooltip,.was-validated .form-check-input:valid~.valid-feedback,.was-validated .form-check-input:valid~.valid-tooltip{display:block}
+.custom-control-input.is-valid~.custom-control-label,.was-validated .custom-control-input:valid~.custom-control-label{color:#28a745}
+.custom-control-input.is-valid~.custom-control-label::before,.was-validated .custom-control-input:valid~.custom-control-label::before{border-color:#28a745}
+.custom-control-input.is-valid:checked~.custom-control-label::before,.was-validated .custom-control-input:valid:checked~.custom-control-label::before{border-color:#34ce57;background-color:#34ce57}
+.custom-control-input.is-valid:focus~.custom-control-label::before,.was-validated .custom-control-input:valid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}
+.custom-control-input.is-valid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:valid:focus:not(:checked)~.custom-control-label::before{border-color:#28a745}
+.custom-file-input.is-valid~.custom-file-label,.was-validated .custom-file-input:valid~.custom-file-label{border-color:#28a745}
+.custom-file-input.is-valid:focus~.custom-file-label,.was-validated .custom-file-input:valid:focus~.custom-file-label{border-color:#28a745;box-shadow:0 0 0 .2rem rgba(40,167,69,.25)}
+.invalid-feedback{display:none;width:100%;margin-top:.25rem;font-size:.875em;color:#dc3545}
+.invalid-tooltip{position:absolute;top:100%;left:0;z-index:5;display:none;max-width:100%;padding:.25rem .5rem;margin-top:.1rem;font-size:.875em;line-height:1.5;color:#fff;background-color:rgba(220,53,69,.9);border-radius:.25rem}
+.form-row>.col>.invalid-tooltip,.form-row>[class*=col-]>.invalid-tooltip{left:5px}
+.is-invalid~.invalid-feedback,.is-invalid~.invalid-tooltip,.was-validated :invalid~.invalid-feedback,.was-validated :invalid~.invalid-tooltip{display:block}
+.form-control.is-invalid,.was-validated .form-control:invalid{border-color:#dc3545;padding-right:calc(1.5em + .75rem)!important;background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e");background-repeat:no-repeat;background-position:right calc(.375em + .1875rem) center;background-size:calc(.75em + .375rem) calc(.75em + .375rem)}
+.form-control.is-invalid:focus,.was-validated .form-control:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}
+.was-validated select.form-control:invalid,select.form-control.is-invalid{padding-right:3rem!important;background-position:right 1.5rem center}
+.was-validated textarea.form-control:invalid,textarea.form-control.is-invalid{padding-right:calc(1.5em + .75rem);background-position:top calc(.375em + .1875rem) right calc(.375em + .1875rem)}
+.custom-select.is-invalid,.was-validated .custom-select:invalid{border-color:#dc3545;padding-right:calc(.75em + 2.3125rem)!important;background:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right .75rem center/8px 10px no-repeat,#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' fill='none' stroke='%23dc3545' viewBox='0 0 12 12'%3e%3ccircle cx='6' cy='6' r='4.5'/%3e%3cpath stroke-linejoin='round' d='M5.8 3.6h.4L6 6.5z'/%3e%3ccircle cx='6' cy='8.2' r='.6' fill='%23dc3545' stroke='none'/%3e%3c/svg%3e") center right 1.75rem/calc(.75em + .375rem) calc(.75em + .375rem) no-repeat}
+.custom-select.is-invalid:focus,.was-validated .custom-select:invalid:focus{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}
+.form-check-input.is-invalid~.form-check-label,.was-validated .form-check-input:invalid~.form-check-label{color:#dc3545}
+.form-check-input.is-invalid~.invalid-feedback,.form-check-input.is-invalid~.invalid-tooltip,.was-validated .form-check-input:invalid~.invalid-feedback,.was-validated .form-check-input:invalid~.invalid-tooltip{display:block}
+.custom-control-input.is-invalid~.custom-control-label,.was-validated .custom-control-input:invalid~.custom-control-label{color:#dc3545}
+.custom-control-input.is-invalid~.custom-control-label::before,.was-validated .custom-control-input:invalid~.custom-control-label::before{border-color:#dc3545}
+.custom-control-input.is-invalid:checked~.custom-control-label::before,.was-validated .custom-control-input:invalid:checked~.custom-control-label::before{border-color:#e4606d;background-color:#e4606d}
+.custom-control-input.is-invalid:focus~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}
+.custom-control-input.is-invalid:focus:not(:checked)~.custom-control-label::before,.was-validated .custom-control-input:invalid:focus:not(:checked)~.custom-control-label::before{border-color:#dc3545}
+.custom-file-input.is-invalid~.custom-file-label,.was-validated .custom-file-input:invalid~.custom-file-label{border-color:#dc3545}
+.custom-file-input.is-invalid:focus~.custom-file-label,.was-validated .custom-file-input:invalid:focus~.custom-file-label{border-color:#dc3545;box-shadow:0 0 0 .2rem rgba(220,53,69,.25)}
+.form-inline{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center}
+.form-inline .form-check{width:100%}
+@media (min-width:576px){.form-inline label{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;margin-bottom:0}
+.form-inline .form-group{display:-ms-flexbox;display:flex;-ms-flex:0 0 auto;flex:0 0 auto;-ms-flex-flow:row wrap;flex-flow:row wrap;-ms-flex-align:center;align-items:center;margin-bottom:0}
+.form-inline .form-control{display:inline-block;width:auto;vertical-align:middle}
+.form-inline .form-control-plaintext{display:inline-block}
+.form-inline .custom-select,.form-inline .input-group{width:auto}
+.form-inline .form-check{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:auto;padding-left:0}
+.form-inline .form-check-input{position:relative;-ms-flex-negative:0;flex-shrink:0;margin-top:0;margin-right:.25rem;margin-left:0}
+.form-inline .custom-control{-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center}
+.form-inline .custom-control-label{margin-bottom:0}
+}
+.btn{display:inline-block;font-weight:400;color:#212529;text-align:center;vertical-align:middle;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:transparent;border:1px solid transparent;padding:.375rem .75rem;font-size:1em;line-height:1.5;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}
+@media (prefers-reduced-motion:reduce){.btn{transition:none}
+}
+.btn:hover{color:#212529;text-decoration:none}
+.btn.focus,.btn:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.btn.disabled,.btn:disabled{opacity:.65}
+.btn:not(:disabled):not(.disabled){cursor:pointer}
+a.btn.disabled,fieldset:disabled a.btn{pointer-events:none}
+.btn-primary{color:#fff;background-color:#007bff;border-color:#007bff}
+.btn-primary:hover{color:#fff;background-color:#0069d9;border-color:#0062cc}
+.btn-primary.focus,.btn-primary:focus{color:#fff;background-color:#0069d9;border-color:#0062cc;box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}
+.btn-primary.disabled,.btn-primary:disabled{color:#fff;background-color:#007bff;border-color:#007bff}
+.btn-primary:not(:disabled):not(.disabled).active,.btn-primary:not(:disabled):not(.disabled):active,.show>.btn-primary.dropdown-toggle{color:#fff;background-color:#0062cc;border-color:#005cbf}
+.btn-primary:not(:disabled):not(.disabled).active:focus,.btn-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(38,143,255,.5)}
+.btn-secondary{color:#fff;background-color:#6c757d;border-color:#6c757d}
+.btn-secondary:hover{color:#fff;background-color:#5a6268;border-color:#545b62}
+.btn-secondary.focus,.btn-secondary:focus{color:#fff;background-color:#5a6268;border-color:#545b62;box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}
+.btn-secondary.disabled,.btn-secondary:disabled{color:#fff;background-color:#6c757d;border-color:#6c757d}
+.btn-secondary:not(:disabled):not(.disabled).active,.btn-secondary:not(:disabled):not(.disabled):active,.show>.btn-secondary.dropdown-toggle{color:#fff;background-color:#545b62;border-color:#4e555b}
+.btn-secondary:not(:disabled):not(.disabled).active:focus,.btn-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(130,138,145,.5)}
+.btn-success{color:#fff;background-color:#28a745;border-color:#28a745}
+.btn-success:hover{color:#fff;background-color:#218838;border-color:#1e7e34}
+.btn-success.focus,.btn-success:focus{color:#fff;background-color:#218838;border-color:#1e7e34;box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}
+.btn-success.disabled,.btn-success:disabled{color:#fff;background-color:#28a745;border-color:#28a745}
+.btn-success:not(:disabled):not(.disabled).active,.btn-success:not(:disabled):not(.disabled):active,.show>.btn-success.dropdown-toggle{color:#fff;background-color:#1e7e34;border-color:#1c7430}
+.btn-success:not(:disabled):not(.disabled).active:focus,.btn-success:not(:disabled):not(.disabled):active:focus,.show>.btn-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(72,180,97,.5)}
+.btn-info{color:#fff;background-color:#17a2b8;border-color:#17a2b8}
+.btn-info:hover{color:#fff;background-color:#138496;border-color:#117a8b}
+.btn-info.focus,.btn-info:focus{color:#fff;background-color:#138496;border-color:#117a8b;box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}
+.btn-info.disabled,.btn-info:disabled{color:#fff;background-color:#17a2b8;border-color:#17a2b8}
+.btn-info:not(:disabled):not(.disabled).active,.btn-info:not(:disabled):not(.disabled):active,.show>.btn-info.dropdown-toggle{color:#fff;background-color:#117a8b;border-color:#10707f}
+.btn-info:not(:disabled):not(.disabled).active:focus,.btn-info:not(:disabled):not(.disabled):active:focus,.show>.btn-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(58,176,195,.5)}
+.btn-warning{color:#212529;background-color:#ffc107;border-color:#ffc107}
+.btn-warning:hover{color:#212529;background-color:#e0a800;border-color:#d39e00}
+.btn-warning.focus,.btn-warning:focus{color:#212529;background-color:#e0a800;border-color:#d39e00;box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}
+.btn-warning.disabled,.btn-warning:disabled{color:#212529;background-color:#ffc107;border-color:#ffc107}
+.btn-warning:not(:disabled):not(.disabled).active,.btn-warning:not(:disabled):not(.disabled):active,.show>.btn-warning.dropdown-toggle{color:#212529;background-color:#d39e00;border-color:#c69500}
+.btn-warning:not(:disabled):not(.disabled).active:focus,.btn-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(222,170,12,.5)}
+.btn-danger{color:#fff;background-color:#dc3545;border-color:#dc3545}
+.btn-danger:hover{color:#fff;background-color:#c82333;border-color:#bd2130}
+.btn-danger.focus,.btn-danger:focus{color:#fff;background-color:#c82333;border-color:#bd2130;box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}
+.btn-danger.disabled,.btn-danger:disabled{color:#fff;background-color:#dc3545;border-color:#dc3545}
+.btn-danger:not(:disabled):not(.disabled).active,.btn-danger:not(:disabled):not(.disabled):active,.show>.btn-danger.dropdown-toggle{color:#fff;background-color:#bd2130;border-color:#b21f2d}
+.btn-danger:not(:disabled):not(.disabled).active:focus,.btn-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(225,83,97,.5)}
+.btn-light{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}
+.btn-light:hover{color:#212529;background-color:#e2e6ea;border-color:#dae0e5}
+.btn-light.focus,.btn-light:focus{color:#212529;background-color:#e2e6ea;border-color:#dae0e5;box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}
+.btn-light.disabled,.btn-light:disabled{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}
+.btn-light:not(:disabled):not(.disabled).active,.btn-light:not(:disabled):not(.disabled):active,.show>.btn-light.dropdown-toggle{color:#212529;background-color:#dae0e5;border-color:#d3d9df}
+.btn-light:not(:disabled):not(.disabled).active:focus,.btn-light:not(:disabled):not(.disabled):active:focus,.show>.btn-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(216,217,219,.5)}
+.btn-dark{color:#fff;background-color:#343a40;border-color:#343a40}
+.btn-dark:hover{color:#fff;background-color:#23272b;border-color:#1d2124}
+.btn-dark.focus,.btn-dark:focus{color:#fff;background-color:#23272b;border-color:#1d2124;box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}
+.btn-dark.disabled,.btn-dark:disabled{color:#fff;background-color:#343a40;border-color:#343a40}
+.btn-dark:not(:disabled):not(.disabled).active,.btn-dark:not(:disabled):not(.disabled):active,.show>.btn-dark.dropdown-toggle{color:#fff;background-color:#1d2124;border-color:#171a1d}
+.btn-dark:not(:disabled):not(.disabled).active:focus,.btn-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(82,88,93,.5)}
+.btn-outline-primary{color:#007bff;border-color:#007bff}
+.btn-outline-primary:hover{color:#fff;background-color:#007bff;border-color:#007bff}
+.btn-outline-primary.focus,.btn-outline-primary:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}
+.btn-outline-primary.disabled,.btn-outline-primary:disabled{color:#007bff;background-color:transparent}
+.btn-outline-primary:not(:disabled):not(.disabled).active,.btn-outline-primary:not(:disabled):not(.disabled):active,.show>.btn-outline-primary.dropdown-toggle{color:#fff;background-color:#007bff;border-color:#007bff}
+.btn-outline-primary:not(:disabled):not(.disabled).active:focus,.btn-outline-primary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-primary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}
+.btn-outline-secondary{color:#6c757d;border-color:#6c757d}
+.btn-outline-secondary:hover{color:#fff;background-color:#6c757d;border-color:#6c757d}
+.btn-outline-secondary.focus,.btn-outline-secondary:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}
+.btn-outline-secondary.disabled,.btn-outline-secondary:disabled{color:#6c757d;background-color:transparent}
+.btn-outline-secondary:not(:disabled):not(.disabled).active,.btn-outline-secondary:not(:disabled):not(.disabled):active,.show>.btn-outline-secondary.dropdown-toggle{color:#fff;background-color:#6c757d;border-color:#6c757d}
+.btn-outline-secondary:not(:disabled):not(.disabled).active:focus,.btn-outline-secondary:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-secondary.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}
+.btn-outline-success{color:#28a745;border-color:#28a745}
+.btn-outline-success:hover{color:#fff;background-color:#28a745;border-color:#28a745}
+.btn-outline-success.focus,.btn-outline-success:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}
+.btn-outline-success.disabled,.btn-outline-success:disabled{color:#28a745;background-color:transparent}
+.btn-outline-success:not(:disabled):not(.disabled).active,.btn-outline-success:not(:disabled):not(.disabled):active,.show>.btn-outline-success.dropdown-toggle{color:#fff;background-color:#28a745;border-color:#28a745}
+.btn-outline-success:not(:disabled):not(.disabled).active:focus,.btn-outline-success:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-success.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}
+.btn-outline-info{color:#17a2b8;border-color:#17a2b8}
+.btn-outline-info:hover{color:#fff;background-color:#17a2b8;border-color:#17a2b8}
+.btn-outline-info.focus,.btn-outline-info:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}
+.btn-outline-info.disabled,.btn-outline-info:disabled{color:#17a2b8;background-color:transparent}
+.btn-outline-info:not(:disabled):not(.disabled).active,.btn-outline-info:not(:disabled):not(.disabled):active,.show>.btn-outline-info.dropdown-toggle{color:#fff;background-color:#17a2b8;border-color:#17a2b8}
+.btn-outline-info:not(:disabled):not(.disabled).active:focus,.btn-outline-info:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-info.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}
+.btn-outline-warning{color:#ffc107;border-color:#ffc107}
+.btn-outline-warning:hover{color:#212529;background-color:#ffc107;border-color:#ffc107}
+.btn-outline-warning.focus,.btn-outline-warning:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}
+.btn-outline-warning.disabled,.btn-outline-warning:disabled{color:#ffc107;background-color:transparent}
+.btn-outline-warning:not(:disabled):not(.disabled).active,.btn-outline-warning:not(:disabled):not(.disabled):active,.show>.btn-outline-warning.dropdown-toggle{color:#212529;background-color:#ffc107;border-color:#ffc107}
+.btn-outline-warning:not(:disabled):not(.disabled).active:focus,.btn-outline-warning:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-warning.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}
+.btn-outline-danger{color:#dc3545;border-color:#dc3545}
+.btn-outline-danger:hover{color:#fff;background-color:#dc3545;border-color:#dc3545}
+.btn-outline-danger.focus,.btn-outline-danger:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}
+.btn-outline-danger.disabled,.btn-outline-danger:disabled{color:#dc3545;background-color:transparent}
+.btn-outline-danger:not(:disabled):not(.disabled).active,.btn-outline-danger:not(:disabled):not(.disabled):active,.show>.btn-outline-danger.dropdown-toggle{color:#fff;background-color:#dc3545;border-color:#dc3545}
+.btn-outline-danger:not(:disabled):not(.disabled).active:focus,.btn-outline-danger:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-danger.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}
+.btn-outline-light{color:#f8f9fa;border-color:#f8f9fa}
+.btn-outline-light:hover{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}
+.btn-outline-light.focus,.btn-outline-light:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}
+.btn-outline-light.disabled,.btn-outline-light:disabled{color:#f8f9fa;background-color:transparent}
+.btn-outline-light:not(:disabled):not(.disabled).active,.btn-outline-light:not(:disabled):not(.disabled):active,.show>.btn-outline-light.dropdown-toggle{color:#212529;background-color:#f8f9fa;border-color:#f8f9fa}
+.btn-outline-light:not(:disabled):not(.disabled).active:focus,.btn-outline-light:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-light.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}
+.btn-outline-dark{color:#343a40;border-color:#343a40}
+.btn-outline-dark:hover{color:#fff;background-color:#343a40;border-color:#343a40}
+.btn-outline-dark.focus,.btn-outline-dark:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}
+.btn-outline-dark.disabled,.btn-outline-dark:disabled{color:#343a40;background-color:transparent}
+.btn-outline-dark:not(:disabled):not(.disabled).active,.btn-outline-dark:not(:disabled):not(.disabled):active,.show>.btn-outline-dark.dropdown-toggle{color:#fff;background-color:#343a40;border-color:#343a40}
+.btn-outline-dark:not(:disabled):not(.disabled).active:focus,.btn-outline-dark:not(:disabled):not(.disabled):active:focus,.show>.btn-outline-dark.dropdown-toggle:focus{box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}
+.btn-link{font-weight:400;color:#007bff;text-decoration:none}
+.btn-link:hover{color:#0056b3;text-decoration:underline}
+.btn-link.focus,.btn-link:focus{text-decoration:underline}
+.btn-link.disabled,.btn-link:disabled{color:#6c757d;pointer-events:none}
+.btn-group-lg>.btn,.btn-lg{padding:.5rem 1rem;font-size:1.25em;line-height:1.5;border-radius:.3rem}
+.btn-group-sm>.btn,.btn-sm{padding:.25rem .5rem;font-size:.875em;line-height:1.5;border-radius:.2rem}
+.btn-block{display:block;width:100%}
+.btn-block+.btn-block{margin-top:.5rem}
+input[type=button].btn-block,input[type=reset].btn-block,input[type=submit].btn-block{width:100%}
+.fade{transition:opacity .15s linear}
+@media (prefers-reduced-motion:reduce){.fade{transition:none}
+}
+.fade:not(.show){opacity:0}
+.collapse:not(.show){display:none}
+.collapsing{position:relative;height:0;overflow:hidden;transition:height .35s ease}
+@media (prefers-reduced-motion:reduce){.collapsing{transition:none}
+}
+.collapsing.width{width:0;height:auto;transition:width .35s ease}
+@media (prefers-reduced-motion:reduce){.collapsing.width{transition:none}
+}
+.dropdown,.dropleft,.dropright,.dropup{position:relative}
+.dropdown-toggle{white-space:nowrap}
+.dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid;border-right:.3em solid transparent;border-bottom:0;border-left:.3em solid transparent}
+.dropdown-toggle:empty::after{margin-left:0}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;display:none;float:left;min-width:10rem;padding:.5rem 0;margin:.125rem 0 0;font-size:1em;color:#212529;text-align:left;list-style:none;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.15);border-radius:.25rem}
+.dropdown-menu-left{right:auto;left:0}
+.dropdown-menu-right{right:0;left:auto}
+@media (min-width:576px){.dropdown-menu-sm-left{right:auto;left:0}
+.dropdown-menu-sm-right{right:0;left:auto}
+}
+@media (min-width:768px){.dropdown-menu-md-left{right:auto;left:0}
+.dropdown-menu-md-right{right:0;left:auto}
+}
+@media (min-width:992px){.dropdown-menu-lg-left{right:auto;left:0}
+.dropdown-menu-lg-right{right:0;left:auto}
+}
+@media (min-width:1200px){.dropdown-menu-xl-left{right:auto;left:0}
+.dropdown-menu-xl-right{right:0;left:auto}
+}
+.dropup .dropdown-menu{top:auto;bottom:100%;margin-top:0;margin-bottom:.125rem}
+.dropup .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:0;border-right:.3em solid transparent;border-bottom:.3em solid;border-left:.3em solid transparent}
+.dropup .dropdown-toggle:empty::after{margin-left:0}
+.dropright .dropdown-menu{top:0;right:auto;left:100%;margin-top:0;margin-left:.125rem}
+.dropright .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:0;border-bottom:.3em solid transparent;border-left:.3em solid}
+.dropright .dropdown-toggle:empty::after{margin-left:0}
+.dropright .dropdown-toggle::after{vertical-align:0}
+.dropleft .dropdown-menu{top:0;right:100%;left:auto;margin-top:0;margin-right:.125rem}
+.dropleft .dropdown-toggle::after{display:inline-block;margin-left:.255em;vertical-align:.255em;content:""}
+.dropleft .dropdown-toggle::after{display:none}
+.dropleft .dropdown-toggle::before{display:inline-block;margin-right:.255em;vertical-align:.255em;content:"";border-top:.3em solid transparent;border-right:.3em solid;border-bottom:.3em solid transparent}
+.dropleft .dropdown-toggle:empty::after{margin-left:0}
+.dropleft .dropdown-toggle::before{vertical-align:0}
+.dropdown-menu[x-placement^=bottom],.dropdown-menu[x-placement^=left],.dropdown-menu[x-placement^=right],.dropdown-menu[x-placement^=top]{right:auto;bottom:auto}
+.dropdown-divider{height:0;margin:.5rem 0;overflow:hidden;border-top:1px solid #e9ecef}
+.dropdown-item{display:block;width:100%;padding:.25rem 1.5rem;clear:both;font-weight:400;color:#212529;text-align:inherit;white-space:nowrap;background-color:transparent;border:0}
+.dropdown-item:focus,.dropdown-item:hover{color:#16181b;text-decoration:none;background-color:#e9ecef}
+.dropdown-item.active,.dropdown-item:active{color:#fff;text-decoration:none;background-color:#007bff}
+.dropdown-item.disabled,.dropdown-item:disabled{color:#adb5bd;pointer-events:none;background-color:transparent}
+.dropdown-menu.show{display:block}
+.dropdown-header{display:block;padding:.5rem 1.5rem;margin-bottom:0;font-size:.875em;color:#6c757d;white-space:nowrap}
+.dropdown-item-text{display:block;padding:.25rem 1.5rem;color:#212529}
+.btn-group,.btn-group-vertical{position:relative;display:-ms-inline-flexbox;display:inline-flex;vertical-align:middle}
+.btn-group-vertical>.btn,.btn-group>.btn{position:relative;-ms-flex:1 1 auto;flex:1 1 auto}
+.btn-group-vertical>.btn:hover,.btn-group>.btn:hover{z-index:1}
+.btn-group-vertical>.btn.active,.btn-group-vertical>.btn:active,.btn-group-vertical>.btn:focus,.btn-group>.btn.active,.btn-group>.btn:active,.btn-group>.btn:focus{z-index:1}
+.btn-toolbar{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-pack:start;justify-content:flex-start}
+.btn-toolbar .input-group{width:auto}
+.btn-group>.btn-group:not(:first-child),.btn-group>.btn:not(:first-child){margin-left:-1px}
+.btn-group>.btn-group:not(:last-child)>.btn,.btn-group>.btn:not(:last-child):not(.dropdown-toggle){border-top-right-radius:0;border-bottom-right-radius:0}
+.btn-group>.btn-group:not(:first-child)>.btn,.btn-group>.btn:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}
+.dropdown-toggle-split{padding-right:.5625rem;padding-left:.5625rem}
+.dropdown-toggle-split::after,.dropright .dropdown-toggle-split::after,.dropup .dropdown-toggle-split::after{margin-left:0}
+.dropleft .dropdown-toggle-split::before{margin-right:0}
+.btn-group-sm>.btn+.dropdown-toggle-split,.btn-sm+.dropdown-toggle-split{padding-right:.375rem;padding-left:.375rem}
+.btn-group-lg>.btn+.dropdown-toggle-split,.btn-lg+.dropdown-toggle-split{padding-right:.75rem;padding-left:.75rem}
+.btn-group-vertical{-ms-flex-direction:column;flex-direction:column;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:center;justify-content:center}
+.btn-group-vertical>.btn,.btn-group-vertical>.btn-group{width:100%}
+.btn-group-vertical>.btn-group:not(:first-child),.btn-group-vertical>.btn:not(:first-child){margin-top:-1px}
+.btn-group-vertical>.btn-group:not(:last-child)>.btn,.btn-group-vertical>.btn:not(:last-child):not(.dropdown-toggle){border-bottom-right-radius:0;border-bottom-left-radius:0}
+.btn-group-vertical>.btn-group:not(:first-child)>.btn,.btn-group-vertical>.btn:not(:first-child){border-top-left-radius:0;border-top-right-radius:0}
+.btn-group-toggle>.btn,.btn-group-toggle>.btn-group>.btn{margin-bottom:0}
+.btn-group-toggle>.btn input[type=checkbox],.btn-group-toggle>.btn input[type=radio],.btn-group-toggle>.btn-group>.btn input[type=checkbox],.btn-group-toggle>.btn-group>.btn input[type=radio]{position:absolute;clip:rect(0,0,0,0);pointer-events:none}
+.input-group{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:stretch;align-items:stretch;width:100%}
+.input-group>.custom-file,.input-group>.custom-select,.input-group>.form-control,.input-group>.form-control-plaintext{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;width:1%;min-width:0;margin-bottom:0}
+.input-group>.custom-file+.custom-file,.input-group>.custom-file+.custom-select,.input-group>.custom-file+.form-control,.input-group>.custom-select+.custom-file,.input-group>.custom-select+.custom-select,.input-group>.custom-select+.form-control,.input-group>.form-control+.custom-file,.input-group>.form-control+.custom-select,.input-group>.form-control+.form-control,.input-group>.form-control-plaintext+.custom-file,.input-group>.form-control-plaintext+.custom-select,.input-group>.form-control-plaintext+.form-control{margin-left:-1px}
+.input-group>.custom-file .custom-file-input:focus~.custom-file-label,.input-group>.custom-select:focus,.input-group>.form-control:focus{z-index:3}
+.input-group>.custom-file .custom-file-input:focus{z-index:4}
+.input-group>.custom-select:not(:first-child),.input-group>.form-control:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}
+.input-group>.custom-file{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center}
+.input-group>.custom-file:not(:last-child) .custom-file-label,.input-group>.custom-file:not(:last-child) .custom-file-label::after{border-top-right-radius:0;border-bottom-right-radius:0}
+.input-group>.custom-file:not(:first-child) .custom-file-label{border-top-left-radius:0;border-bottom-left-radius:0}
+.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label,.input-group:not(.has-validation)>.custom-file:not(:last-child) .custom-file-label::after,.input-group:not(.has-validation)>.custom-select:not(:last-child),.input-group:not(.has-validation)>.form-control:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}
+.input-group.has-validation>.custom-file:nth-last-child(n+3) .custom-file-label,.input-group.has-validation>.custom-file:nth-last-child(n+3) .custom-file-label::after,.input-group.has-validation>.custom-select:nth-last-child(n+3),.input-group.has-validation>.form-control:nth-last-child(n+3){border-top-right-radius:0;border-bottom-right-radius:0}
+.input-group-append,.input-group-prepend{display:-ms-flexbox;display:flex}
+.input-group-append .btn,.input-group-prepend .btn{position:relative;z-index:2}
+.input-group-append .btn:focus,.input-group-prepend .btn:focus{z-index:3}
+.input-group-append .btn+.btn,.input-group-append .btn+.input-group-text,.input-group-append .input-group-text+.btn,.input-group-append .input-group-text+.input-group-text,.input-group-prepend .btn+.btn,.input-group-prepend .btn+.input-group-text,.input-group-prepend .input-group-text+.btn,.input-group-prepend .input-group-text+.input-group-text{margin-left:-1px}
+.input-group-prepend{margin-right:-1px}
+.input-group-append{margin-left:-1px}
+.input-group-text{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.375rem .75rem;margin-bottom:0;font-size:1em;font-weight:400;line-height:1.5;color:#495057;text-align:center;white-space:nowrap;background-color:#e9ecef;border:1px solid #ced4da;border-radius:.25rem}
+.input-group-text input[type=checkbox],.input-group-text input[type=radio]{margin-top:0}
+.input-group-lg>.custom-select,.input-group-lg>.form-control:not(textarea){height:calc(1.5em + 1rem + 2px)}
+.input-group-lg>.custom-select,.input-group-lg>.form-control,.input-group-lg>.input-group-append>.btn,.input-group-lg>.input-group-append>.input-group-text,.input-group-lg>.input-group-prepend>.btn,.input-group-lg>.input-group-prepend>.input-group-text{padding:.5rem 1rem;font-size:1.25em;line-height:1.5;border-radius:.3rem}
+.input-group-sm>.custom-select,.input-group-sm>.form-control:not(textarea){height:calc(1.5em + .5rem + 2px)}
+.input-group-sm>.custom-select,.input-group-sm>.form-control,.input-group-sm>.input-group-append>.btn,.input-group-sm>.input-group-append>.input-group-text,.input-group-sm>.input-group-prepend>.btn,.input-group-sm>.input-group-prepend>.input-group-text{padding:.25rem .5rem;font-size:.875em;line-height:1.5;border-radius:.2rem}
+.input-group-lg>.custom-select,.input-group-sm>.custom-select{padding-right:1.75rem}
+.input-group.has-validation>.input-group-append:nth-last-child(n+3)>.btn,.input-group.has-validation>.input-group-append:nth-last-child(n+3)>.input-group-text,.input-group:not(.has-validation)>.input-group-append:not(:last-child)>.btn,.input-group:not(.has-validation)>.input-group-append:not(:last-child)>.input-group-text,.input-group>.input-group-append:last-child>.btn:not(:last-child):not(.dropdown-toggle),.input-group>.input-group-append:last-child>.input-group-text:not(:last-child),.input-group>.input-group-prepend>.btn,.input-group>.input-group-prepend>.input-group-text{border-top-right-radius:0;border-bottom-right-radius:0}
+.input-group>.input-group-append>.btn,.input-group>.input-group-append>.input-group-text,.input-group>.input-group-prepend:first-child>.btn:not(:first-child),.input-group>.input-group-prepend:first-child>.input-group-text:not(:first-child),.input-group>.input-group-prepend:not(:first-child)>.btn,.input-group>.input-group-prepend:not(:first-child)>.input-group-text{border-top-left-radius:0;border-bottom-left-radius:0}
+.custom-control{position:relative;z-index:1;display:block;min-height:1.5rem;padding-left:1.5rem;-webkit-print-color-adjust:exact;color-adjust:exact;print-color-adjust:exact}
+.custom-control-inline{display:-ms-inline-flexbox;display:inline-flex;margin-right:1rem}
+.custom-control-input{position:absolute;left:0;z-index:-1;width:1rem;height:1.25rem;opacity:0}
+.custom-control-input:checked~.custom-control-label::before{color:#fff;border-color:#007bff;background-color:#007bff}
+.custom-control-input:focus~.custom-control-label::before{box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-control-input:focus:not(:checked)~.custom-control-label::before{border-color:#80bdff}
+.custom-control-input:not(:disabled):active~.custom-control-label::before{color:#fff;background-color:#b3d7ff;border-color:#b3d7ff}
+.custom-control-input:disabled~.custom-control-label,.custom-control-input[disabled]~.custom-control-label{color:#6c757d}
+.custom-control-input:disabled~.custom-control-label::before,.custom-control-input[disabled]~.custom-control-label::before{background-color:#e9ecef}
+.custom-control-label{position:relative;margin-bottom:0;vertical-align:top}
+.custom-control-label::before{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;pointer-events:none;content:"";background-color:#fff;border:1px solid #adb5bd}
+.custom-control-label::after{position:absolute;top:.25rem;left:-1.5rem;display:block;width:1rem;height:1rem;content:"";background:50%/50% 50% no-repeat}
+.custom-checkbox .custom-control-label::before{border-radius:.25rem}
+.custom-checkbox .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath fill='%23fff' d='M6.564.75l-3.59 3.612-1.538-1.55L0 4.26l2.974 2.99L8 2.193z'/%3e%3c/svg%3e")}
+.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::before{border-color:#007bff;background-color:#007bff}
+.custom-checkbox .custom-control-input:indeterminate~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='4' viewBox='0 0 4 4'%3e%3cpath stroke='%23fff' d='M0 2h4'/%3e%3c/svg%3e")}
+.custom-checkbox .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}
+.custom-checkbox .custom-control-input:disabled:indeterminate~.custom-control-label::before{background-color:rgba(0,123,255,.5)}
+.custom-radio .custom-control-label::before{border-radius:50%}
+.custom-radio .custom-control-input:checked~.custom-control-label::after{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='12' height='12' viewBox='-4 -4 8 8'%3e%3ccircle r='3' fill='%23fff'/%3e%3c/svg%3e")}
+.custom-radio .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}
+.custom-switch{padding-left:2.25rem}
+.custom-switch .custom-control-label::before{left:-2.25rem;width:1.75rem;pointer-events:all;border-radius:.5rem}
+.custom-switch .custom-control-label::after{top:calc(.25rem + 2px);left:calc(-2.25rem + 2px);width:calc(1rem - 4px);height:calc(1rem - 4px);background-color:#adb5bd;border-radius:.5rem;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:transform .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out,-webkit-transform .15s ease-in-out}
+@media (prefers-reduced-motion:reduce){.custom-switch .custom-control-label::after{transition:none}
+}
+.custom-switch .custom-control-input:checked~.custom-control-label::after{background-color:#fff;-webkit-transform:translateX(.75rem);transform:translateX(.75rem)}
+.custom-switch .custom-control-input:disabled:checked~.custom-control-label::before{background-color:rgba(0,123,255,.5)}
+.custom-select{display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);padding:.375rem 1.75rem .375rem .75rem;font-size:1em;font-weight:400;line-height:1.5;color:#495057;vertical-align:middle;background:#fff url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='4' height='5' viewBox='0 0 4 5'%3e%3cpath fill='%23343a40' d='M2 0L0 2h4zm0 5L0 3h4z'/%3e%3c/svg%3e") right .75rem center/8px 10px no-repeat;border:1px solid #ced4da;border-radius:.25rem;-webkit-appearance:none;-moz-appearance:none;appearance:none}
+.custom-select:focus{border-color:#80bdff;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-select:focus::-ms-value{color:#495057;background-color:#fff}
+.custom-select[multiple],.custom-select[size]:not([size="1"]){height:auto;padding-right:.75rem;background-image:none}
+.custom-select:disabled{color:#6c757d;background-color:#e9ecef}
+.custom-select::-ms-expand{display:none}
+.custom-select:-moz-focusring{color:transparent;text-shadow:0 0 0 #495057}
+.custom-select-sm{height:calc(1.5em + .5rem + 2px);padding-top:.25rem;padding-bottom:.25rem;padding-left:.5rem;font-size:.875rem}
+.custom-select-lg{height:calc(1.5em + 1rem + 2px);padding-top:.5rem;padding-bottom:.5rem;padding-left:1rem;font-size:1.25rem}
+.custom-file{position:relative;display:inline-block;width:100%;height:calc(1.5em + .75rem + 2px);margin-bottom:0}
+.custom-file-input{position:relative;z-index:2;width:100%;height:calc(1.5em + .75rem + 2px);margin:0;overflow:hidden;opacity:0}
+.custom-file-input:focus~.custom-file-label{border-color:#80bdff;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-file-input:disabled~.custom-file-label,.custom-file-input[disabled]~.custom-file-label{background-color:#e9ecef}
+.custom-file-input:lang(en)~.custom-file-label::after{content:"Browse"}
+.custom-file-input~.custom-file-label[data-browse]::after{content:attr(data-browse)}
+.custom-file-label{position:absolute;top:0;right:0;left:0;z-index:1;height:calc(1.5em + .75rem + 2px);padding:.375rem .75rem;overflow:hidden;font-weight:400;line-height:1.5;color:#495057;background-color:#fff;border:1px solid #ced4da;border-radius:.25rem}
+.custom-file-label::after{position:absolute;top:0;right:0;bottom:0;z-index:3;display:block;height:calc(1.5em + .75rem);padding:.375rem .75rem;line-height:1.5;color:#495057;content:"Browse";background-color:#e9ecef;border-left:inherit;border-radius:0 .25rem .25rem 0}
+.custom-range{width:100%;height:1.4rem;padding:0;background-color:transparent;-webkit-appearance:none;-moz-appearance:none;appearance:none}
+.custom-range:focus{outline:0}
+.custom-range:focus::-webkit-slider-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-range:focus::-moz-range-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-range:focus::-ms-thumb{box-shadow:0 0 0 1px #fff,0 0 0 .2rem rgba(0,123,255,.25)}
+.custom-range::-moz-focus-outer{border:0}
+.custom-range::-webkit-slider-thumb{width:1rem;height:1rem;margin-top:-.25rem;background-color:#007bff;border:0;border-radius:1rem;-webkit-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-webkit-appearance:none;appearance:none}
+@media (prefers-reduced-motion:reduce){.custom-range::-webkit-slider-thumb{-webkit-transition:none;transition:none}
+}
+.custom-range::-webkit-slider-thumb:active{background-color:#b3d7ff}
+.custom-range::-webkit-slider-runnable-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}
+.custom-range::-moz-range-thumb{width:1rem;height:1rem;background-color:#007bff;border:0;border-radius:1rem;-moz-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;-moz-appearance:none;appearance:none}
+@media (prefers-reduced-motion:reduce){.custom-range::-moz-range-thumb{-moz-transition:none;transition:none}
+}
+.custom-range::-moz-range-thumb:active{background-color:#b3d7ff}
+.custom-range::-moz-range-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:#dee2e6;border-color:transparent;border-radius:1rem}
+.custom-range::-ms-thumb{width:1rem;height:1rem;margin-top:0;margin-right:.2rem;margin-left:.2rem;background-color:#007bff;border:0;border-radius:1rem;-ms-transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out;appearance:none}
+@media (prefers-reduced-motion:reduce){.custom-range::-ms-thumb{-ms-transition:none;transition:none}
+}
+.custom-range::-ms-thumb:active{background-color:#b3d7ff}
+.custom-range::-ms-track{width:100%;height:.5rem;color:transparent;cursor:pointer;background-color:transparent;border-color:transparent;border-width:.5rem}
+.custom-range::-ms-fill-lower{background-color:#dee2e6;border-radius:1rem}
+.custom-range::-ms-fill-upper{margin-right:15px;background-color:#dee2e6;border-radius:1rem}
+.custom-range:disabled::-webkit-slider-thumb{background-color:#adb5bd}
+.custom-range:disabled::-webkit-slider-runnable-track{cursor:default}
+.custom-range:disabled::-moz-range-thumb{background-color:#adb5bd}
+.custom-range:disabled::-moz-range-track{cursor:default}
+.custom-range:disabled::-ms-thumb{background-color:#adb5bd}
+.custom-control-label::before,.custom-file-label,.custom-select{transition:background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}
+@media (prefers-reduced-motion:reduce){.custom-control-label::before,.custom-file-label,.custom-select{transition:none}
+}
+.nav{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding-left:0;margin-bottom:0;list-style:none}
+.nav-link{display:block;padding:.5rem 1rem}
+.nav-link:focus,.nav-link:hover{text-decoration:none}
+.nav-link.disabled{color:#6c757d;pointer-events:none;cursor:default}
+.nav-tabs{border-bottom:1px solid #dee2e6}
+.nav-tabs .nav-link{margin-bottom:-1px;background-color:transparent;border:1px solid transparent;border-top-left-radius:.25rem;border-top-right-radius:.25rem}
+.nav-tabs .nav-link:focus,.nav-tabs .nav-link:hover{isolation:isolate;border-color:#e9ecef #e9ecef #dee2e6}
+.nav-tabs .nav-link.disabled{color:#6c757d;background-color:transparent;border-color:transparent}
+.nav-tabs .nav-item.show .nav-link,.nav-tabs .nav-link.active{color:#495057;background-color:#fff;border-color:#dee2e6 #dee2e6 #fff}
+.nav-tabs .dropdown-menu{margin-top:-1px;border-top-left-radius:0;border-top-right-radius:0}
+.nav-pills .nav-link{background:0 0;border:0;border-radius:.25rem}
+.nav-pills .nav-link.active,.nav-pills .show>.nav-link{color:#fff;background-color:#007bff}
+.nav-fill .nav-item,.nav-fill>.nav-link{-ms-flex:1 1 auto;flex:1 1 auto;text-align:center}
+.nav-justified .nav-item,.nav-justified>.nav-link{-ms-flex-preferred-size:0;flex-basis:0;-ms-flex-positive:1;flex-grow:1;text-align:center}
+.tab-content>.tab-pane{display:none}
+.tab-content>.active{display:block}
+.navbar{position:relative;display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between;padding:.5rem 1rem}
+.navbar .container,.navbar .container-fluid,.navbar .container-lg,.navbar .container-md,.navbar .container-sm,.navbar .container-xl{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:justify;justify-content:space-between}
+.navbar-brand{display:inline-block;padding-top:.3125rem;padding-bottom:.3125rem;margin-right:1rem;font-size:1.25em;line-height:inherit;white-space:nowrap}
+.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}
+.navbar-nav{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;list-style:none}
+.navbar-nav .nav-link{padding-right:0;padding-left:0}
+.navbar-nav .dropdown-menu{position:static;float:none}
+.navbar-text{display:inline-block;padding-top:.5rem;padding-bottom:.5rem}
+.navbar-collapse{-ms-flex-preferred-size:100%;flex-basis:100%;-ms-flex-positive:1;flex-grow:1;-ms-flex-align:center;align-items:center}
+.navbar-toggler{padding:.25rem .75rem;font-size:1.25em;line-height:1;background-color:transparent;border:1px solid transparent;border-radius:.25rem}
+.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}
+.navbar-toggler-icon{display:inline-block;width:1.5em;height:1.5em;vertical-align:middle;content:"";background:50%/100% 100% no-repeat}
+.navbar-nav-scroll{max-height:75vh;overflow-y:auto}
+@media (max-width:575.98px){.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{padding-right:0;padding-left:0}
+}
+@media (min-width:576px){.navbar-expand-sm{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}
+.navbar-expand-sm .navbar-nav{-ms-flex-direction:row;flex-direction:row}
+.navbar-expand-sm .navbar-nav .dropdown-menu{position:absolute}
+.navbar-expand-sm .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}
+.navbar-expand-sm>.container,.navbar-expand-sm>.container-fluid,.navbar-expand-sm>.container-lg,.navbar-expand-sm>.container-md,.navbar-expand-sm>.container-sm,.navbar-expand-sm>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}
+.navbar-expand-sm .navbar-nav-scroll{overflow:visible}
+.navbar-expand-sm .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}
+.navbar-expand-sm .navbar-toggler{display:none}
+}
+@media (max-width:767.98px){.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{padding-right:0;padding-left:0}
+}
+@media (min-width:768px){.navbar-expand-md{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}
+.navbar-expand-md .navbar-nav{-ms-flex-direction:row;flex-direction:row}
+.navbar-expand-md .navbar-nav .dropdown-menu{position:absolute}
+.navbar-expand-md .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}
+.navbar-expand-md>.container,.navbar-expand-md>.container-fluid,.navbar-expand-md>.container-lg,.navbar-expand-md>.container-md,.navbar-expand-md>.container-sm,.navbar-expand-md>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}
+.navbar-expand-md .navbar-nav-scroll{overflow:visible}
+.navbar-expand-md .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}
+.navbar-expand-md .navbar-toggler{display:none}
+}
+@media (max-width:991.98px){.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{padding-right:0;padding-left:0}
+}
+@media (min-width:992px){.navbar-expand-lg{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}
+.navbar-expand-lg .navbar-nav{-ms-flex-direction:row;flex-direction:row}
+.navbar-expand-lg .navbar-nav .dropdown-menu{position:absolute}
+.navbar-expand-lg .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}
+.navbar-expand-lg>.container,.navbar-expand-lg>.container-fluid,.navbar-expand-lg>.container-lg,.navbar-expand-lg>.container-md,.navbar-expand-lg>.container-sm,.navbar-expand-lg>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}
+.navbar-expand-lg .navbar-nav-scroll{overflow:visible}
+.navbar-expand-lg .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}
+.navbar-expand-lg .navbar-toggler{display:none}
+}
+@media (max-width:1199.98px){.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{padding-right:0;padding-left:0}
+}
+@media (min-width:1200px){.navbar-expand-xl{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}
+.navbar-expand-xl .navbar-nav{-ms-flex-direction:row;flex-direction:row}
+.navbar-expand-xl .navbar-nav .dropdown-menu{position:absolute}
+.navbar-expand-xl .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}
+.navbar-expand-xl>.container,.navbar-expand-xl>.container-fluid,.navbar-expand-xl>.container-lg,.navbar-expand-xl>.container-md,.navbar-expand-xl>.container-sm,.navbar-expand-xl>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}
+.navbar-expand-xl .navbar-nav-scroll{overflow:visible}
+.navbar-expand-xl .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}
+.navbar-expand-xl .navbar-toggler{display:none}
+}
+.navbar-expand{-ms-flex-flow:row nowrap;flex-flow:row nowrap;-ms-flex-pack:start;justify-content:flex-start}
+.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{padding-right:0;padding-left:0}
+.navbar-expand .navbar-nav{-ms-flex-direction:row;flex-direction:row}
+.navbar-expand .navbar-nav .dropdown-menu{position:absolute}
+.navbar-expand .navbar-nav .nav-link{padding-right:.5rem;padding-left:.5rem}
+.navbar-expand>.container,.navbar-expand>.container-fluid,.navbar-expand>.container-lg,.navbar-expand>.container-md,.navbar-expand>.container-sm,.navbar-expand>.container-xl{-ms-flex-wrap:nowrap;flex-wrap:nowrap}
+.navbar-expand .navbar-nav-scroll{overflow:visible}
+.navbar-expand .navbar-collapse{display:-ms-flexbox!important;display:flex!important;-ms-flex-preferred-size:auto;flex-basis:auto}
+.navbar-expand .navbar-toggler{display:none}
+.navbar-light .navbar-brand{color:rgba(0,0,0,.9)}
+.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,.9)}
+.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,.5)}
+.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,.7)}
+.navbar-light .navbar-nav .nav-link.disabled{color:rgba(0,0,0,.3)}
+.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.show,.navbar-light .navbar-nav .show>.nav-link{color:rgba(0,0,0,.9)}
+.navbar-light .navbar-toggler{color:rgba(0,0,0,.5);border-color:rgba(0,0,0,.1)}
+.navbar-light .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%280, 0, 0, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}
+.navbar-light .navbar-text{color:rgba(0,0,0,.5)}
+.navbar-light .navbar-text a{color:rgba(0,0,0,.9)}
+.navbar-light .navbar-text a:focus,.navbar-light .navbar-text a:hover{color:rgba(0,0,0,.9)}
+.navbar-dark .navbar-brand{color:#fff}
+.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}
+.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,.5)}
+.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,.75)}
+.navbar-dark .navbar-nav .nav-link.disabled{color:rgba(255,255,255,.25)}
+.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.show,.navbar-dark .navbar-nav .show>.nav-link{color:#fff}
+.navbar-dark .navbar-toggler{color:rgba(255,255,255,.5);border-color:rgba(255,255,255,.1)}
+.navbar-dark .navbar-toggler-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' width='30' height='30' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.5%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e")}
+.navbar-dark .navbar-text{color:rgba(255,255,255,.5)}
+.navbar-dark .navbar-text a{color:#fff}
+.navbar-dark .navbar-text a:focus,.navbar-dark .navbar-text a:hover{color:#fff}
+.card{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;min-width:0;word-wrap:break-word;background-color:#fff;background-clip:border-box;border:1px solid rgba(0,0,0,.125);border-radius:.25rem}
+.card>hr{margin-right:0;margin-left:0}
+.card>.list-group{border-top:inherit;border-bottom:inherit}
+.card>.list-group:first-child{border-top-width:0;border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}
+.card>.list-group:last-child{border-bottom-width:0;border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}
+.card>.card-header+.list-group,.card>.list-group+.card-footer{border-top:0}
+.card-body{-ms-flex:1 1 auto;flex:1 1 auto;min-height:1px;padding:1.25rem}
+.card-title{margin-bottom:.75rem}
+.card-subtitle{margin-top:-.375rem;margin-bottom:0}
+.card-text:last-child{margin-bottom:0}
+.card-link:hover{text-decoration:none}
+.card-link+.card-link{margin-left:1.25rem}
+.card-header{padding:.75rem 1.25rem;margin-bottom:0;background-color:rgba(0,0,0,.03);border-bottom:1px solid rgba(0,0,0,.125)}
+.card-header:first-child{border-radius:calc(.25rem - 1px) calc(.25rem - 1px) 0 0}
+.card-footer{padding:.75rem 1.25rem;background-color:rgba(0,0,0,.03);border-top:1px solid rgba(0,0,0,.125)}
+.card-footer:last-child{border-radius:0 0 calc(.25rem - 1px) calc(.25rem - 1px)}
+.card-header-tabs{margin-right:-.625rem;margin-bottom:-.75rem;margin-left:-.625rem;border-bottom:0}
+.card-header-pills{margin-right:-.625rem;margin-left:-.625rem}
+.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem;border-radius:calc(.25rem - 1px)}
+.card-img,.card-img-bottom,.card-img-top{-ms-flex-negative:0;flex-shrink:0;width:100%}
+.card-img,.card-img-top{border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}
+.card-img,.card-img-bottom{border-bottom-right-radius:calc(.25rem - 1px);border-bottom-left-radius:calc(.25rem - 1px)}
+.card-deck .card{margin-bottom:15px}
+@media (min-width:576px){.card-deck{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-15px;margin-left:-15px}
+.card-deck .card{-ms-flex:1 0 0%;flex:1 0 0%;margin-right:15px;margin-bottom:0;margin-left:15px}
+}
+.card-group>.card{margin-bottom:15px}
+@media (min-width:576px){.card-group{display:-ms-flexbox;display:flex;-ms-flex-flow:row wrap;flex-flow:row wrap}
+.card-group>.card{-ms-flex:1 0 0%;flex:1 0 0%;margin-bottom:0}
+.card-group>.card+.card{margin-left:0;border-left:0}
+.card-group>.card:not(:last-child){border-top-right-radius:0;border-bottom-right-radius:0}
+.card-group>.card:not(:last-child) .card-header,.card-group>.card:not(:last-child) .card-img-top{border-top-right-radius:0}
+.card-group>.card:not(:last-child) .card-footer,.card-group>.card:not(:last-child) .card-img-bottom{border-bottom-right-radius:0}
+.card-group>.card:not(:first-child){border-top-left-radius:0;border-bottom-left-radius:0}
+.card-group>.card:not(:first-child) .card-header,.card-group>.card:not(:first-child) .card-img-top{border-top-left-radius:0}
+.card-group>.card:not(:first-child) .card-footer,.card-group>.card:not(:first-child) .card-img-bottom{border-bottom-left-radius:0}
+}
+.card-columns .card{margin-bottom:.75rem}
+@media (min-width:576px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem;orphans:1;widows:1}
+.card-columns .card{display:inline-block;width:100%}
+}
+.accordion{overflow-anchor:none}
+.accordion>.card{overflow:hidden}
+.accordion>.card:not(:last-of-type){border-bottom:0;border-bottom-right-radius:0;border-bottom-left-radius:0}
+.accordion>.card:not(:first-of-type){border-top-left-radius:0;border-top-right-radius:0}
+.accordion>.card>.card-header{border-radius:0;margin-bottom:-1px}
+.breadcrumb{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;padding:.75rem 1rem;margin-bottom:1rem;list-style:none;background-color:#e9ecef;border-radius:.25rem}
+.breadcrumb-item+.breadcrumb-item{padding-left:.5rem}
+.breadcrumb-item+.breadcrumb-item::before{float:left;padding-right:.5rem;color:#6c757d;content:"/"}
+.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:underline}
+.breadcrumb-item+.breadcrumb-item:hover::before{text-decoration:none}
+.breadcrumb-item.active{color:#6c757d}
+.pagination{display:-ms-flexbox;display:flex;padding-left:0;list-style:none;border-radius:.25rem}
+.page-link{position:relative;display:block;padding:.5rem .75rem;margin-left:-1px;line-height:1.25;color:#007bff;background-color:#fff;border:1px solid #dee2e6}
+.page-link:hover{z-index:2;color:#0056b3;text-decoration:none;background-color:#e9ecef;border-color:#dee2e6}
+.page-link:focus{z-index:3;outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.25)}
+.page-item:first-child .page-link{margin-left:0;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}
+.page-item:last-child .page-link{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}
+.page-item.active .page-link{z-index:3;color:#fff;background-color:#007bff;border-color:#007bff}
+.page-item.disabled .page-link{color:#6c757d;pointer-events:none;cursor:auto;background-color:#fff;border-color:#dee2e6}
+.pagination-lg .page-link{padding:.75rem 1.5rem;font-size:1.25em;line-height:1.5}
+.pagination-lg .page-item:first-child .page-link{border-top-left-radius:.3rem;border-bottom-left-radius:.3rem}
+.pagination-lg .page-item:last-child .page-link{border-top-right-radius:.3rem;border-bottom-right-radius:.3rem}
+.pagination-sm .page-link{padding:.25rem .5rem;font-size:.875em;line-height:1.5}
+.pagination-sm .page-item:first-child .page-link{border-top-left-radius:.2rem;border-bottom-left-radius:.2rem}
+.pagination-sm .page-item:last-child .page-link{border-top-right-radius:.2rem;border-bottom-right-radius:.2rem}
+.badge{display:inline-block;padding:.25em .4em;font-size:75%;font-weight:700;line-height:1;text-align:center;white-space:nowrap;vertical-align:baseline;border-radius:.25rem;transition:color .15s ease-in-out,background-color .15s ease-in-out,border-color .15s ease-in-out,box-shadow .15s ease-in-out}
+@media (prefers-reduced-motion:reduce){.badge{transition:none}
+}
+a.badge:focus,a.badge:hover{text-decoration:none}
+.badge:empty{display:none}
+.btn .badge{position:relative;top:-1px}
+.badge-pill{padding-right:.6em;padding-left:.6em;border-radius:10rem}
+.badge-primary{color:#fff;background-color:#007bff}
+a.badge-primary:focus,a.badge-primary:hover{color:#fff;background-color:#0062cc}
+a.badge-primary.focus,a.badge-primary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(0,123,255,.5)}
+.badge-secondary{color:#fff;background-color:#6c757d}
+a.badge-secondary:focus,a.badge-secondary:hover{color:#fff;background-color:#545b62}
+a.badge-secondary.focus,a.badge-secondary:focus{outline:0;box-shadow:0 0 0 .2rem rgba(108,117,125,.5)}
+.badge-success{color:#fff;background-color:#28a745}
+a.badge-success:focus,a.badge-success:hover{color:#fff;background-color:#1e7e34}
+a.badge-success.focus,a.badge-success:focus{outline:0;box-shadow:0 0 0 .2rem rgba(40,167,69,.5)}
+.badge-info{color:#fff;background-color:#17a2b8}
+a.badge-info:focus,a.badge-info:hover{color:#fff;background-color:#117a8b}
+a.badge-info.focus,a.badge-info:focus{outline:0;box-shadow:0 0 0 .2rem rgba(23,162,184,.5)}
+.badge-warning{color:#212529;background-color:#ffc107}
+a.badge-warning:focus,a.badge-warning:hover{color:#212529;background-color:#d39e00}
+a.badge-warning.focus,a.badge-warning:focus{outline:0;box-shadow:0 0 0 .2rem rgba(255,193,7,.5)}
+.badge-danger{color:#fff;background-color:#dc3545}
+a.badge-danger:focus,a.badge-danger:hover{color:#fff;background-color:#bd2130}
+a.badge-danger.focus,a.badge-danger:focus{outline:0;box-shadow:0 0 0 .2rem rgba(220,53,69,.5)}
+.badge-light{color:#212529;background-color:#f8f9fa}
+a.badge-light:focus,a.badge-light:hover{color:#212529;background-color:#dae0e5}
+a.badge-light.focus,a.badge-light:focus{outline:0;box-shadow:0 0 0 .2rem rgba(248,249,250,.5)}
+.badge-dark{color:#fff;background-color:#343a40}
+a.badge-dark:focus,a.badge-dark:hover{color:#fff;background-color:#1d2124}
+a.badge-dark.focus,a.badge-dark:focus{outline:0;box-shadow:0 0 0 .2rem rgba(52,58,64,.5)}
+.jumbotron{padding:2rem 1rem;margin-bottom:2rem;background-color:#e9ecef;border-radius:.3rem}
+@media (min-width:576px){.jumbotron{padding:4rem 2rem}
+}
+.jumbotron-fluid{padding-right:0;padding-left:0;border-radius:0}
+.alert{position:relative;padding:.75rem 1.25rem;margin-bottom:1rem;border:1px solid transparent;border-radius:.25rem}
+.alert-heading{color:inherit}
+.alert-link{font-weight:700}
+.alert-dismissible{padding-right:4rem}
+.alert-dismissible .close{position:absolute;top:0;right:0;z-index:2;padding:.75rem 1.25rem;color:inherit}
+.alert-primary{color:#004085;background-color:#cce5ff;border-color:#b8daff}
+.alert-primary hr{border-top-color:#9fcdff}
+.alert-primary .alert-link{color:#002752}
+.alert-secondary{color:#383d41;background-color:#e2e3e5;border-color:#d6d8db}
+.alert-secondary hr{border-top-color:#c8cbcf}
+.alert-secondary .alert-link{color:#202326}
+.alert-success{color:#155724;background-color:#d4edda;border-color:#c3e6cb}
+.alert-success hr{border-top-color:#b1dfbb}
+.alert-success .alert-link{color:#0b2e13}
+.alert-info{color:#0c5460;background-color:#d1ecf1;border-color:#bee5eb}
+.alert-info hr{border-top-color:#abdde5}
+.alert-info .alert-link{color:#062c33}
+.alert-warning{color:#856404;background-color:#fff3cd;border-color:#ffeeba}
+.alert-warning hr{border-top-color:#ffe8a1}
+.alert-warning .alert-link{color:#533f03}
+.alert-danger{color:#721c24;background-color:#f8d7da;border-color:#f5c6cb}
+.alert-danger hr{border-top-color:#f1b0b7}
+.alert-danger .alert-link{color:#491217}
+.alert-light{color:#818182;background-color:#fefefe;border-color:#fdfdfe}
+.alert-light hr{border-top-color:#ececf6}
+.alert-light .alert-link{color:#686868}
+.alert-dark{color:#1b1e21;background-color:#d6d8d9;border-color:#c6c8ca}
+.alert-dark hr{border-top-color:#b9bbbe}
+.alert-dark .alert-link{color:#040505}
+@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}
+to{background-position:0 0}
+}
+@keyframes progress-bar-stripes{from{background-position:1rem 0}
+to{background-position:0 0}
+}
+.progress{display:-ms-flexbox;display:flex;height:1rem;overflow:hidden;line-height:0;font-size:.75em;background-color:#e9ecef;border-radius:.25rem}
+.progress-bar{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;overflow:hidden;color:#fff;text-align:center;white-space:nowrap;background-color:#007bff;transition:width .6s ease}
+@media (prefers-reduced-motion:reduce){.progress-bar{transition:none}
+}
+.progress-bar-striped{background-image:linear-gradient(45deg,rgba(255,255,255,.15) 25%,transparent 25%,transparent 50%,rgba(255,255,255,.15) 50%,rgba(255,255,255,.15) 75%,transparent 75%,transparent);background-size:1rem 1rem}
+.progress-bar-animated{-webkit-animation:1s linear infinite progress-bar-stripes;animation:1s linear infinite progress-bar-stripes}
+@media (prefers-reduced-motion:reduce){.progress-bar-animated{-webkit-animation:none;animation:none}
+}
+.media{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start}
+.media-body{-ms-flex:1;flex:1}
+.list-group{display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;padding-left:0;margin-bottom:0;border-radius:.25rem}
+.list-group-item-action{width:100%;color:#495057;text-align:inherit}
+.list-group-item-action:focus,.list-group-item-action:hover{z-index:1;color:#495057;text-decoration:none;background-color:#f8f9fa}
+.list-group-item-action:active{color:#212529;background-color:#e9ecef}
+.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;background-color:#fff;border:1px solid rgba(0,0,0,.125)}
+.list-group-item:first-child{border-top-left-radius:inherit;border-top-right-radius:inherit}
+.list-group-item:last-child{border-bottom-right-radius:inherit;border-bottom-left-radius:inherit}
+.list-group-item.disabled,.list-group-item:disabled{color:#6c757d;pointer-events:none;background-color:#fff}
+.list-group-item.active{z-index:2;color:#fff;background-color:#007bff;border-color:#007bff}
+.list-group-item+.list-group-item{border-top-width:0}
+.list-group-item+.list-group-item.active{margin-top:-1px;border-top-width:1px}
+.list-group-horizontal{-ms-flex-direction:row;flex-direction:row}
+.list-group-horizontal>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}
+.list-group-horizontal>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}
+.list-group-horizontal>.list-group-item.active{margin-top:0}
+.list-group-horizontal>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}
+.list-group-horizontal>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}
+@media (min-width:576px){.list-group-horizontal-sm{-ms-flex-direction:row;flex-direction:row}
+.list-group-horizontal-sm>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}
+.list-group-horizontal-sm>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}
+.list-group-horizontal-sm>.list-group-item.active{margin-top:0}
+.list-group-horizontal-sm>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}
+.list-group-horizontal-sm>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}
+}
+@media (min-width:768px){.list-group-horizontal-md{-ms-flex-direction:row;flex-direction:row}
+.list-group-horizontal-md>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}
+.list-group-horizontal-md>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}
+.list-group-horizontal-md>.list-group-item.active{margin-top:0}
+.list-group-horizontal-md>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}
+.list-group-horizontal-md>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}
+}
+@media (min-width:992px){.list-group-horizontal-lg{-ms-flex-direction:row;flex-direction:row}
+.list-group-horizontal-lg>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}
+.list-group-horizontal-lg>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}
+.list-group-horizontal-lg>.list-group-item.active{margin-top:0}
+.list-group-horizontal-lg>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}
+.list-group-horizontal-lg>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}
+}
+@media (min-width:1200px){.list-group-horizontal-xl{-ms-flex-direction:row;flex-direction:row}
+.list-group-horizontal-xl>.list-group-item:first-child{border-bottom-left-radius:.25rem;border-top-right-radius:0}
+.list-group-horizontal-xl>.list-group-item:last-child{border-top-right-radius:.25rem;border-bottom-left-radius:0}
+.list-group-horizontal-xl>.list-group-item.active{margin-top:0}
+.list-group-horizontal-xl>.list-group-item+.list-group-item{border-top-width:1px;border-left-width:0}
+.list-group-horizontal-xl>.list-group-item+.list-group-item.active{margin-left:-1px;border-left-width:1px}
+}
+.list-group-flush{border-radius:0}
+.list-group-flush>.list-group-item{border-width:0 0 1px}
+.list-group-flush>.list-group-item:last-child{border-bottom-width:0}
+.list-group-item-primary{color:#004085;background-color:#b8daff}
+.list-group-item-primary.list-group-item-action:focus,.list-group-item-primary.list-group-item-action:hover{color:#004085;background-color:#9fcdff}
+.list-group-item-primary.list-group-item-action.active{color:#fff;background-color:#004085;border-color:#004085}
+.list-group-item-secondary{color:#383d41;background-color:#d6d8db}
+.list-group-item-secondary.list-group-item-action:focus,.list-group-item-secondary.list-group-item-action:hover{color:#383d41;background-color:#c8cbcf}
+.list-group-item-secondary.list-group-item-action.active{color:#fff;background-color:#383d41;border-color:#383d41}
+.list-group-item-success{color:#155724;background-color:#c3e6cb}
+.list-group-item-success.list-group-item-action:focus,.list-group-item-success.list-group-item-action:hover{color:#155724;background-color:#b1dfbb}
+.list-group-item-success.list-group-item-action.active{color:#fff;background-color:#155724;border-color:#155724}
+.list-group-item-info{color:#0c5460;background-color:#bee5eb}
+.list-group-item-info.list-group-item-action:focus,.list-group-item-info.list-group-item-action:hover{color:#0c5460;background-color:#abdde5}
+.list-group-item-info.list-group-item-action.active{color:#fff;background-color:#0c5460;border-color:#0c5460}
+.list-group-item-warning{color:#856404;background-color:#ffeeba}
+.list-group-item-warning.list-group-item-action:focus,.list-group-item-warning.list-group-item-action:hover{color:#856404;background-color:#ffe8a1}
+.list-group-item-warning.list-group-item-action.active{color:#fff;background-color:#856404;border-color:#856404}
+.list-group-item-danger{color:#721c24;background-color:#f5c6cb}
+.list-group-item-danger.list-group-item-action:focus,.list-group-item-danger.list-group-item-action:hover{color:#721c24;background-color:#f1b0b7}
+.list-group-item-danger.list-group-item-action.active{color:#fff;background-color:#721c24;border-color:#721c24}
+.list-group-item-light{color:#818182;background-color:#fdfdfe}
+.list-group-item-light.list-group-item-action:focus,.list-group-item-light.list-group-item-action:hover{color:#818182;background-color:#ececf6}
+.list-group-item-light.list-group-item-action.active{color:#fff;background-color:#818182;border-color:#818182}
+.list-group-item-dark{color:#1b1e21;background-color:#c6c8ca}
+.list-group-item-dark.list-group-item-action:focus,.list-group-item-dark.list-group-item-action:hover{color:#1b1e21;background-color:#b9bbbe}
+.list-group-item-dark.list-group-item-action.active{color:#fff;background-color:#1b1e21;border-color:#1b1e21}
+.close{float:right;font-size:1.5em;font-weight:700;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.5}
+.close:hover{color:#000;text-decoration:none}
+.close:not(:disabled):not(.disabled):focus,.close:not(:disabled):not(.disabled):hover{opacity:.75}
+button.close{padding:0;background-color:transparent;border:0}
+a.close.disabled{pointer-events:none}
+.toast{-ms-flex-preferred-size:350px;flex-basis:350px;max-width:350px;font-size:.875em;background-color:rgba(255,255,255,.85);background-clip:padding-box;border:1px solid rgba(0,0,0,.1);box-shadow:0 .25rem .75rem rgba(0,0,0,.1);opacity:0;border-radius:.25rem}
+.toast:not(:last-child){margin-bottom:.75rem}
+.toast.showing{opacity:1}
+.toast.show{display:block;opacity:1}
+.toast.hide{display:none}
+.toast-header{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;padding:.25rem .75rem;color:#6c757d;background-color:rgba(255,255,255,.85);background-clip:padding-box;border-bottom:1px solid rgba(0,0,0,.05);border-top-left-radius:calc(.25rem - 1px);border-top-right-radius:calc(.25rem - 1px)}
+.toast-body{padding:.75rem}
+.modal-open{overflow:hidden}
+.modal-open .modal{overflow-x:hidden;overflow-y:auto}
+.modal{position:fixed;top:0;left:0;z-index:1050;display:none;width:100%;height:100%;overflow:hidden;outline:0}
+.modal-dialog{position:relative;width:auto;margin:.5rem;pointer-events:none}
+.modal.fade .modal-dialog{transition:-webkit-transform .3s ease-out;transition:transform .3s ease-out;transition:transform .3s ease-out,-webkit-transform .3s ease-out;-webkit-transform:translate(0,-50px);transform:translate(0,-50px)}
+@media (prefers-reduced-motion:reduce){.modal.fade .modal-dialog{transition:none}
+}
+.modal.show .modal-dialog{-webkit-transform:none;transform:none}
+.modal.modal-static .modal-dialog{-webkit-transform:scale(1.02);transform:scale(1.02)}
+.modal-dialog-scrollable{display:-ms-flexbox;display:flex;max-height:calc(100% - 1rem)}
+.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 1rem);overflow:hidden}
+.modal-dialog-scrollable .modal-footer,.modal-dialog-scrollable .modal-header{-ms-flex-negative:0;flex-shrink:0}
+.modal-dialog-scrollable .modal-body{overflow-y:auto}
+.modal-dialog-centered{display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;min-height:calc(100% - 1rem)}
+.modal-dialog-centered::before{display:block;height:calc(100vh - 1rem);height:-webkit-min-content;height:-moz-min-content;height:min-content;content:""}
+.modal-dialog-centered.modal-dialog-scrollable{-ms-flex-direction:column;flex-direction:column;-ms-flex-pack:center;justify-content:center;height:100%}
+.modal-dialog-centered.modal-dialog-scrollable .modal-content{max-height:none}
+.modal-dialog-centered.modal-dialog-scrollable::before{content:none}
+.modal-content{position:relative;display:-ms-flexbox;display:flex;-ms-flex-direction:column;flex-direction:column;width:100%;pointer-events:auto;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem;outline:0}
+.modal-backdrop{position:fixed;top:0;left:0;z-index:1040;width:100vw;height:100vh;background-color:#000}
+.modal-backdrop.fade{opacity:0}
+.modal-backdrop.show{opacity:.5}
+.modal-header{display:-ms-flexbox;display:flex;-ms-flex-align:start;align-items:flex-start;-ms-flex-pack:justify;justify-content:space-between;padding:1rem 1rem;border-bottom:1px solid #dee2e6;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}
+.modal-header .close{padding:1rem 1rem;margin:-1rem -1rem -1rem auto}
+.modal-title{margin-bottom:0;line-height:1.5}
+.modal-body{position:relative;-ms-flex:1 1 auto;flex:1 1 auto;padding:1rem}
+.modal-footer{display:-ms-flexbox;display:flex;-ms-flex-wrap:wrap;flex-wrap:wrap;-ms-flex-align:center;align-items:center;-ms-flex-pack:end;justify-content:flex-end;padding:.75rem;border-top:1px solid #dee2e6;border-bottom-right-radius:calc(.3rem - 1px);border-bottom-left-radius:calc(.3rem - 1px)}
+.modal-footer>*{margin:.25rem}
+.modal-scrollbar-measure{position:absolute;top:-9999px;width:50px;height:50px;overflow:scroll}
+@media (min-width:576px){.modal-dialog{max-width:500px;margin:1.75rem auto}
+.modal-dialog-scrollable{max-height:calc(100% - 3.5rem)}
+.modal-dialog-scrollable .modal-content{max-height:calc(100vh - 3.5rem)}
+.modal-dialog-centered{min-height:calc(100% - 3.5rem)}
+.modal-dialog-centered::before{height:calc(100vh - 3.5rem);height:-webkit-min-content;height:-moz-min-content;height:min-content}
+.modal-sm{max-width:300px}
+}
+@media (min-width:992px){.modal-lg,.modal-xl{max-width:800px}
+}
+@media (min-width:1200px){.modal-xl{max-width:1140px}
+}
+.tooltip{position:absolute;z-index:1070;display:block;margin:0;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;white-space:normal;word-spacing:normal;line-break:auto;font-size:.875em;word-wrap:break-word;opacity:0}
+.tooltip.show{opacity:.9}
+.tooltip .arrow{position:absolute;display:block;width:.8rem;height:.4rem}
+.tooltip .arrow::before{position:absolute;content:"";border-color:transparent;border-style:solid}
+.bs-tooltip-auto[x-placement^=top],.bs-tooltip-top{padding:.4rem 0}
+.bs-tooltip-auto[x-placement^=top] .arrow,.bs-tooltip-top .arrow{bottom:0}
+.bs-tooltip-auto[x-placement^=top] .arrow::before,.bs-tooltip-top .arrow::before{top:0;border-width:.4rem .4rem 0;border-top-color:#000}
+.bs-tooltip-auto[x-placement^=right],.bs-tooltip-right{padding:0 .4rem}
+.bs-tooltip-auto[x-placement^=right] .arrow,.bs-tooltip-right .arrow{left:0;width:.4rem;height:.8rem}
+.bs-tooltip-auto[x-placement^=right] .arrow::before,.bs-tooltip-right .arrow::before{right:0;border-width:.4rem .4rem .4rem 0;border-right-color:#000}
+.bs-tooltip-auto[x-placement^=bottom],.bs-tooltip-bottom{padding:.4rem 0}
+.bs-tooltip-auto[x-placement^=bottom] .arrow,.bs-tooltip-bottom .arrow{top:0}
+.bs-tooltip-auto[x-placement^=bottom] .arrow::before,.bs-tooltip-bottom .arrow::before{bottom:0;border-width:0 .4rem .4rem;border-bottom-color:#000}
+.bs-tooltip-auto[x-placement^=left],.bs-tooltip-left{padding:0 .4rem}
+.bs-tooltip-auto[x-placement^=left] .arrow,.bs-tooltip-left .arrow{right:0;width:.4rem;height:.8rem}
+.bs-tooltip-auto[x-placement^=left] .arrow::before,.bs-tooltip-left .arrow::before{left:0;border-width:.4rem 0 .4rem .4rem;border-left-color:#000}
+.tooltip-inner{max-width:200px;padding:.25rem .5rem;color:#fff;text-align:center;background-color:#000;border-radius:.25rem}
+.popover{position:absolute;top:0;left:0;z-index:1060;display:block;max-width:276px;font-style:normal;font-weight:400;line-height:1.5;text-align:left;text-align:start;text-decoration:none;text-shadow:none;text-transform:none;letter-spacing:normal;word-break:normal;white-space:normal;word-spacing:normal;line-break:auto;font-size:.875em;word-wrap:break-word;background-color:#fff;background-clip:padding-box;border:1px solid rgba(0,0,0,.2);border-radius:.3rem}
+.popover .arrow{position:absolute;display:block;width:1rem;height:.5rem;margin:0 .3rem}
+.popover .arrow::after,.popover .arrow::before{position:absolute;display:block;content:"";border-color:transparent;border-style:solid}
+.bs-popover-auto[x-placement^=top],.bs-popover-top{margin-bottom:.5rem}
+.bs-popover-auto[x-placement^=top]>.arrow,.bs-popover-top>.arrow{bottom:calc(-.5rem - 1px)}
+.bs-popover-auto[x-placement^=top]>.arrow::before,.bs-popover-top>.arrow::before{bottom:0;border-width:.5rem .5rem 0;border-top-color:rgba(0,0,0,.25)}
+.bs-popover-auto[x-placement^=top]>.arrow::after,.bs-popover-top>.arrow::after{bottom:1px;border-width:.5rem .5rem 0;border-top-color:#fff}
+.bs-popover-auto[x-placement^=right],.bs-popover-right{margin-left:.5rem}
+.bs-popover-auto[x-placement^=right]>.arrow,.bs-popover-right>.arrow{left:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}
+.bs-popover-auto[x-placement^=right]>.arrow::before,.bs-popover-right>.arrow::before{left:0;border-width:.5rem .5rem .5rem 0;border-right-color:rgba(0,0,0,.25)}
+.bs-popover-auto[x-placement^=right]>.arrow::after,.bs-popover-right>.arrow::after{left:1px;border-width:.5rem .5rem .5rem 0;border-right-color:#fff}
+.bs-popover-auto[x-placement^=bottom],.bs-popover-bottom{margin-top:.5rem}
+.bs-popover-auto[x-placement^=bottom]>.arrow,.bs-popover-bottom>.arrow{top:calc(-.5rem - 1px)}
+.bs-popover-auto[x-placement^=bottom]>.arrow::before,.bs-popover-bottom>.arrow::before{top:0;border-width:0 .5rem .5rem .5rem;border-bottom-color:rgba(0,0,0,.25)}
+.bs-popover-auto[x-placement^=bottom]>.arrow::after,.bs-popover-bottom>.arrow::after{top:1px;border-width:0 .5rem .5rem .5rem;border-bottom-color:#fff}
+.bs-popover-auto[x-placement^=bottom] .popover-header::before,.bs-popover-bottom .popover-header::before{position:absolute;top:0;left:50%;display:block;width:1rem;margin-left:-.5rem;content:"";border-bottom:1px solid #f7f7f7}
+.bs-popover-auto[x-placement^=left],.bs-popover-left{margin-right:.5rem}
+.bs-popover-auto[x-placement^=left]>.arrow,.bs-popover-left>.arrow{right:calc(-.5rem - 1px);width:.5rem;height:1rem;margin:.3rem 0}
+.bs-popover-auto[x-placement^=left]>.arrow::before,.bs-popover-left>.arrow::before{right:0;border-width:.5rem 0 .5rem .5rem;border-left-color:rgba(0,0,0,.25)}
+.bs-popover-auto[x-placement^=left]>.arrow::after,.bs-popover-left>.arrow::after{right:1px;border-width:.5rem 0 .5rem .5rem;border-left-color:#fff}
+.popover-header{padding:.5rem .75rem;margin-bottom:0;font-size:1em;background-color:#f7f7f7;border-bottom:1px solid #ebebeb;border-top-left-radius:calc(.3rem - 1px);border-top-right-radius:calc(.3rem - 1px)}
+.popover-header:empty{display:none}
+.popover-body{padding:.5rem .75rem;color:#212529}
+.carousel{position:relative}
+.carousel.pointer-event{-ms-touch-action:pan-y;touch-action:pan-y}
+.carousel-inner{position:relative;width:100%;overflow:hidden}
+.carousel-inner::after{display:block;clear:both;content:""}
+.carousel-item{position:relative;display:none;float:left;width:100%;margin-right:-100%;-webkit-backface-visibility:hidden;backface-visibility:hidden;transition:-webkit-transform .6s ease-in-out;transition:transform .6s ease-in-out;transition:transform .6s ease-in-out,-webkit-transform .6s ease-in-out}
+@media (prefers-reduced-motion:reduce){.carousel-item{transition:none}
+}
+.carousel-item-next,.carousel-item-prev,.carousel-item.active{display:block}
+.active.carousel-item-right,.carousel-item-next:not(.carousel-item-left){-webkit-transform:translateX(100%);transform:translateX(100%)}
+.active.carousel-item-left,.carousel-item-prev:not(.carousel-item-right){-webkit-transform:translateX(-100%);transform:translateX(-100%)}
+.carousel-fade .carousel-item{opacity:0;transition-property:opacity;-webkit-transform:none;transform:none}
+.carousel-fade .carousel-item-next.carousel-item-left,.carousel-fade .carousel-item-prev.carousel-item-right,.carousel-fade .carousel-item.active{z-index:1;opacity:1}
+.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{z-index:0;opacity:0;transition:opacity 0s .6s}
+@media (prefers-reduced-motion:reduce){.carousel-fade .active.carousel-item-left,.carousel-fade .active.carousel-item-right{transition:none}
+}
+.carousel-control-next,.carousel-control-prev{position:absolute;top:0;bottom:0;z-index:1;display:-ms-flexbox;display:flex;-ms-flex-align:center;align-items:center;-ms-flex-pack:center;justify-content:center;width:15%;padding:0;color:#fff;text-align:center;background:0 0;border:0;opacity:.5;transition:opacity .15s ease}
+@media (prefers-reduced-motion:reduce){.carousel-control-next,.carousel-control-prev{transition:none}
+}
+.carousel-control-next:focus,.carousel-control-next:hover,.carousel-control-prev:focus,.carousel-control-prev:hover{color:#fff;text-decoration:none;outline:0;opacity:.9}
+.carousel-control-prev{left:0}
+.carousel-control-next{right:0}
+.carousel-control-next-icon,.carousel-control-prev-icon{display:inline-block;width:20px;height:20px;background:50%/100% 100% no-repeat}
+.carousel-control-prev-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M5.25 0l-4 4 4 4 1.5-1.5L4.25 4l2.5-2.5L5.25 0z'/%3e%3c/svg%3e")}
+.carousel-control-next-icon{background-image:url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' fill='%23fff' width='8' height='8' viewBox='0 0 8 8'%3e%3cpath d='M2.75 0l-1.5 1.5L3.75 4l-2.5 2.5L2.75 8l4-4-4-4z'/%3e%3c/svg%3e")}
+.carousel-indicators{position:absolute;right:0;bottom:0;left:0;z-index:15;display:-ms-flexbox;display:flex;-ms-flex-pack:center;justify-content:center;padding-left:0;margin-right:15%;margin-left:15%;list-style:none}
+.carousel-indicators li{box-sizing:content-box;-ms-flex:0 1 auto;flex:0 1 auto;width:30px;height:3px;margin-right:3px;margin-left:3px;text-indent:-999px;cursor:pointer;background-color:#fff;background-clip:padding-box;border-top:10px solid transparent;border-bottom:10px solid transparent;opacity:.5;transition:opacity .6s ease}
+@media (prefers-reduced-motion:reduce){.carousel-indicators li{transition:none}
+}
+.carousel-indicators .active{opacity:1}
+.carousel-caption{position:absolute;right:15%;bottom:20px;left:15%;z-index:10;padding-top:20px;padding-bottom:20px;color:#fff;text-align:center}
+@-webkit-keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}
+}
+@keyframes spinner-border{to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}
+}
+.spinner-border{display:inline-block;width:2rem;height:2rem;vertical-align:-.125em;border:.25em solid currentcolor;border-right-color:transparent;border-radius:50%;-webkit-animation:.75s linear infinite spinner-border;animation:.75s linear infinite spinner-border}
+.spinner-border-sm{width:1rem;height:1rem;border-width:.2em}
+@-webkit-keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}
+50%{opacity:1;-webkit-transform:none;transform:none}
+}
+@keyframes spinner-grow{0%{-webkit-transform:scale(0);transform:scale(0)}
+50%{opacity:1;-webkit-transform:none;transform:none}
+}
+.spinner-grow{display:inline-block;width:2rem;height:2rem;vertical-align:-.125em;background-color:currentcolor;border-radius:50%;opacity:0;-webkit-animation:.75s linear infinite spinner-grow;animation:.75s linear infinite spinner-grow}
+.spinner-grow-sm{width:1rem;height:1rem}
+@media (prefers-reduced-motion:reduce){.spinner-border,.spinner-grow{-webkit-animation-duration:1.5s;animation-duration:1.5s}
+}
+.align-baseline{vertical-align:baseline!important}
+.align-top{vertical-align:top!important}
+.align-middle{vertical-align:middle!important}
+.align-bottom{vertical-align:bottom!important}
+.align-text-bottom{vertical-align:text-bottom!important}
+.align-text-top{vertical-align:text-top!important}
+.bg-primary{background-color:#007bff!important}
+a.bg-primary:focus,a.bg-primary:hover,button.bg-primary:focus,button.bg-primary:hover{background-color:#0062cc!important}
+.bg-secondary{background-color:#6c757d!important}
+a.bg-secondary:focus,a.bg-secondary:hover,button.bg-secondary:focus,button.bg-secondary:hover{background-color:#545b62!important}
+.bg-success{background-color:#28a745!important}
+a.bg-success:focus,a.bg-success:hover,button.bg-success:focus,button.bg-success:hover{background-color:#1e7e34!important}
+.bg-info{background-color:#17a2b8!important}
+a.bg-info:focus,a.bg-info:hover,button.bg-info:focus,button.bg-info:hover{background-color:#117a8b!important}
+.bg-warning{background-color:#ffc107!important}
+a.bg-warning:focus,a.bg-warning:hover,button.bg-warning:focus,button.bg-warning:hover{background-color:#d39e00!important}
+.bg-danger{background-color:#dc3545!important}
+a.bg-danger:focus,a.bg-danger:hover,button.bg-danger:focus,button.bg-danger:hover{background-color:#bd2130!important}
+.bg-light{background-color:#f8f9fa!important}
+a.bg-light:focus,a.bg-light:hover,button.bg-light:focus,button.bg-light:hover{background-color:#dae0e5!important}
+.bg-dark{background-color:#343a40!important}
+a.bg-dark:focus,a.bg-dark:hover,button.bg-dark:focus,button.bg-dark:hover{background-color:#1d2124!important}
+.bg-white{background-color:#fff!important}
+.bg-transparent{background-color:transparent!important}
+.border{border:1px solid #dee2e6!important}
+.border-top{border-top:1px solid #dee2e6!important}
+.border-right{border-right:1px solid #dee2e6!important}
+.border-bottom{border-bottom:1px solid #dee2e6!important}
+.border-left{border-left:1px solid #dee2e6!important}
+.border-0{border:0!important}
+.border-top-0{border-top:0!important}
+.border-right-0{border-right:0!important}
+.border-bottom-0{border-bottom:0!important}
+.border-left-0{border-left:0!important}
+.border-primary{border-color:#007bff!important}
+.border-secondary{border-color:#6c757d!important}
+.border-success{border-color:#28a745!important}
+.border-info{border-color:#17a2b8!important}
+.border-warning{border-color:#ffc107!important}
+.border-danger{border-color:#dc3545!important}
+.border-light{border-color:#f8f9fa!important}
+.border-dark{border-color:#343a40!important}
+.border-white{border-color:#fff!important}
+.rounded-sm{border-radius:.2rem!important}
+.rounded{border-radius:.25rem!important}
+.rounded-top{border-top-left-radius:.25rem!important;border-top-right-radius:.25rem!important}
+.rounded-right{border-top-right-radius:.25rem!important;border-bottom-right-radius:.25rem!important}
+.rounded-bottom{border-bottom-right-radius:.25rem!important;border-bottom-left-radius:.25rem!important}
+.rounded-left{border-top-left-radius:.25rem!important;border-bottom-left-radius:.25rem!important}
+.rounded-lg{border-radius:.3rem!important}
+.rounded-circle{border-radius:50%!important}
+.rounded-pill{border-radius:50rem!important}
+.rounded-0{border-radius:0!important}
+.clearfix::after{display:block;clear:both;content:""}
+.d-none{display:none!important}
+.d-inline{display:inline!important}
+.d-inline-block{display:inline-block!important}
+.d-block{display:block!important}
+.d-table{display:table!important}
+.d-table-row{display:table-row!important}
+.d-table-cell{display:table-cell!important}
+.d-flex{display:-ms-flexbox!important;display:flex!important}
+.d-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+@media (min-width:576px){.d-sm-none{display:none!important}
+.d-sm-inline{display:inline!important}
+.d-sm-inline-block{display:inline-block!important}
+.d-sm-block{display:block!important}
+.d-sm-table{display:table!important}
+.d-sm-table-row{display:table-row!important}
+.d-sm-table-cell{display:table-cell!important}
+.d-sm-flex{display:-ms-flexbox!important;display:flex!important}
+.d-sm-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+}
+@media (min-width:768px){.d-md-none{display:none!important}
+.d-md-inline{display:inline!important}
+.d-md-inline-block{display:inline-block!important}
+.d-md-block{display:block!important}
+.d-md-table{display:table!important}
+.d-md-table-row{display:table-row!important}
+.d-md-table-cell{display:table-cell!important}
+.d-md-flex{display:-ms-flexbox!important;display:flex!important}
+.d-md-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+}
+@media (min-width:992px){.d-lg-none{display:none!important}
+.d-lg-inline{display:inline!important}
+.d-lg-inline-block{display:inline-block!important}
+.d-lg-block{display:block!important}
+.d-lg-table{display:table!important}
+.d-lg-table-row{display:table-row!important}
+.d-lg-table-cell{display:table-cell!important}
+.d-lg-flex{display:-ms-flexbox!important;display:flex!important}
+.d-lg-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+}
+@media (min-width:1200px){.d-xl-none{display:none!important}
+.d-xl-inline{display:inline!important}
+.d-xl-inline-block{display:inline-block!important}
+.d-xl-block{display:block!important}
+.d-xl-table{display:table!important}
+.d-xl-table-row{display:table-row!important}
+.d-xl-table-cell{display:table-cell!important}
+.d-xl-flex{display:-ms-flexbox!important;display:flex!important}
+.d-xl-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+}
+@media print{.d-print-none{display:none!important}
+.d-print-inline{display:inline!important}
+.d-print-inline-block{display:inline-block!important}
+.d-print-block{display:block!important}
+.d-print-table{display:table!important}
+.d-print-table-row{display:table-row!important}
+.d-print-table-cell{display:table-cell!important}
+.d-print-flex{display:-ms-flexbox!important;display:flex!important}
+.d-print-inline-flex{display:-ms-inline-flexbox!important;display:inline-flex!important}
+}
+.embed-responsive{position:relative;display:block;width:100%;padding:0;overflow:hidden}
+.embed-responsive::before{display:block;content:""}
+.embed-responsive .embed-responsive-item,.embed-responsive embed,.embed-responsive iframe,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}
+.embed-responsive-21by9::before{padding-top:42.857143%}
+.embed-responsive-16by9::before{padding-top:56.25%}
+.embed-responsive-4by3::before{padding-top:75%}
+.embed-responsive-1by1::before{padding-top:100%}
+.flex-row{-ms-flex-direction:row!important;flex-direction:row!important}
+.flex-column{-ms-flex-direction:column!important;flex-direction:column!important}
+.flex-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}
+.flex-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}
+.flex-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}
+.flex-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}
+.flex-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}
+.flex-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}
+.flex-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}
+.flex-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}
+.flex-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}
+.flex-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}
+.justify-content-start{-ms-flex-pack:start!important;justify-content:flex-start!important}
+.justify-content-end{-ms-flex-pack:end!important;justify-content:flex-end!important}
+.justify-content-center{-ms-flex-pack:center!important;justify-content:center!important}
+.justify-content-between{-ms-flex-pack:justify!important;justify-content:space-between!important}
+.justify-content-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}
+.align-items-start{-ms-flex-align:start!important;align-items:flex-start!important}
+.align-items-end{-ms-flex-align:end!important;align-items:flex-end!important}
+.align-items-center{-ms-flex-align:center!important;align-items:center!important}
+.align-items-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}
+.align-items-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}
+.align-content-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}
+.align-content-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}
+.align-content-center{-ms-flex-line-pack:center!important;align-content:center!important}
+.align-content-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}
+.align-content-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}
+.align-content-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}
+.align-self-auto{-ms-flex-item-align:auto!important;align-self:auto!important}
+.align-self-start{-ms-flex-item-align:start!important;align-self:flex-start!important}
+.align-self-end{-ms-flex-item-align:end!important;align-self:flex-end!important}
+.align-self-center{-ms-flex-item-align:center!important;align-self:center!important}
+.align-self-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}
+.align-self-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}
+@media (min-width:576px){.flex-sm-row{-ms-flex-direction:row!important;flex-direction:row!important}
+.flex-sm-column{-ms-flex-direction:column!important;flex-direction:column!important}
+.flex-sm-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}
+.flex-sm-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}
+.flex-sm-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}
+.flex-sm-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}
+.flex-sm-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}
+.flex-sm-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}
+.flex-sm-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}
+.flex-sm-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}
+.flex-sm-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}
+.flex-sm-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}
+.justify-content-sm-start{-ms-flex-pack:start!important;justify-content:flex-start!important}
+.justify-content-sm-end{-ms-flex-pack:end!important;justify-content:flex-end!important}
+.justify-content-sm-center{-ms-flex-pack:center!important;justify-content:center!important}
+.justify-content-sm-between{-ms-flex-pack:justify!important;justify-content:space-between!important}
+.justify-content-sm-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}
+.align-items-sm-start{-ms-flex-align:start!important;align-items:flex-start!important}
+.align-items-sm-end{-ms-flex-align:end!important;align-items:flex-end!important}
+.align-items-sm-center{-ms-flex-align:center!important;align-items:center!important}
+.align-items-sm-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}
+.align-items-sm-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}
+.align-content-sm-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}
+.align-content-sm-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}
+.align-content-sm-center{-ms-flex-line-pack:center!important;align-content:center!important}
+.align-content-sm-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}
+.align-content-sm-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}
+.align-content-sm-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}
+.align-self-sm-auto{-ms-flex-item-align:auto!important;align-self:auto!important}
+.align-self-sm-start{-ms-flex-item-align:start!important;align-self:flex-start!important}
+.align-self-sm-end{-ms-flex-item-align:end!important;align-self:flex-end!important}
+.align-self-sm-center{-ms-flex-item-align:center!important;align-self:center!important}
+.align-self-sm-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}
+.align-self-sm-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}
+}
+@media (min-width:768px){.flex-md-row{-ms-flex-direction:row!important;flex-direction:row!important}
+.flex-md-column{-ms-flex-direction:column!important;flex-direction:column!important}
+.flex-md-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}
+.flex-md-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}
+.flex-md-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}
+.flex-md-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}
+.flex-md-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}
+.flex-md-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}
+.flex-md-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}
+.flex-md-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}
+.flex-md-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}
+.flex-md-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}
+.justify-content-md-start{-ms-flex-pack:start!important;justify-content:flex-start!important}
+.justify-content-md-end{-ms-flex-pack:end!important;justify-content:flex-end!important}
+.justify-content-md-center{-ms-flex-pack:center!important;justify-content:center!important}
+.justify-content-md-between{-ms-flex-pack:justify!important;justify-content:space-between!important}
+.justify-content-md-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}
+.align-items-md-start{-ms-flex-align:start!important;align-items:flex-start!important}
+.align-items-md-end{-ms-flex-align:end!important;align-items:flex-end!important}
+.align-items-md-center{-ms-flex-align:center!important;align-items:center!important}
+.align-items-md-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}
+.align-items-md-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}
+.align-content-md-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}
+.align-content-md-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}
+.align-content-md-center{-ms-flex-line-pack:center!important;align-content:center!important}
+.align-content-md-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}
+.align-content-md-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}
+.align-content-md-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}
+.align-self-md-auto{-ms-flex-item-align:auto!important;align-self:auto!important}
+.align-self-md-start{-ms-flex-item-align:start!important;align-self:flex-start!important}
+.align-self-md-end{-ms-flex-item-align:end!important;align-self:flex-end!important}
+.align-self-md-center{-ms-flex-item-align:center!important;align-self:center!important}
+.align-self-md-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}
+.align-self-md-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}
+}
+@media (min-width:992px){.flex-lg-row{-ms-flex-direction:row!important;flex-direction:row!important}
+.flex-lg-column{-ms-flex-direction:column!important;flex-direction:column!important}
+.flex-lg-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}
+.flex-lg-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}
+.flex-lg-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}
+.flex-lg-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}
+.flex-lg-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}
+.flex-lg-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}
+.flex-lg-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}
+.flex-lg-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}
+.flex-lg-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}
+.flex-lg-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}
+.justify-content-lg-start{-ms-flex-pack:start!important;justify-content:flex-start!important}
+.justify-content-lg-end{-ms-flex-pack:end!important;justify-content:flex-end!important}
+.justify-content-lg-center{-ms-flex-pack:center!important;justify-content:center!important}
+.justify-content-lg-between{-ms-flex-pack:justify!important;justify-content:space-between!important}
+.justify-content-lg-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}
+.align-items-lg-start{-ms-flex-align:start!important;align-items:flex-start!important}
+.align-items-lg-end{-ms-flex-align:end!important;align-items:flex-end!important}
+.align-items-lg-center{-ms-flex-align:center!important;align-items:center!important}
+.align-items-lg-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}
+.align-items-lg-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}
+.align-content-lg-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}
+.align-content-lg-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}
+.align-content-lg-center{-ms-flex-line-pack:center!important;align-content:center!important}
+.align-content-lg-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}
+.align-content-lg-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}
+.align-content-lg-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}
+.align-self-lg-auto{-ms-flex-item-align:auto!important;align-self:auto!important}
+.align-self-lg-start{-ms-flex-item-align:start!important;align-self:flex-start!important}
+.align-self-lg-end{-ms-flex-item-align:end!important;align-self:flex-end!important}
+.align-self-lg-center{-ms-flex-item-align:center!important;align-self:center!important}
+.align-self-lg-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}
+.align-self-lg-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}
+}
+@media (min-width:1200px){.flex-xl-row{-ms-flex-direction:row!important;flex-direction:row!important}
+.flex-xl-column{-ms-flex-direction:column!important;flex-direction:column!important}
+.flex-xl-row-reverse{-ms-flex-direction:row-reverse!important;flex-direction:row-reverse!important}
+.flex-xl-column-reverse{-ms-flex-direction:column-reverse!important;flex-direction:column-reverse!important}
+.flex-xl-wrap{-ms-flex-wrap:wrap!important;flex-wrap:wrap!important}
+.flex-xl-nowrap{-ms-flex-wrap:nowrap!important;flex-wrap:nowrap!important}
+.flex-xl-wrap-reverse{-ms-flex-wrap:wrap-reverse!important;flex-wrap:wrap-reverse!important}
+.flex-xl-fill{-ms-flex:1 1 auto!important;flex:1 1 auto!important}
+.flex-xl-grow-0{-ms-flex-positive:0!important;flex-grow:0!important}
+.flex-xl-grow-1{-ms-flex-positive:1!important;flex-grow:1!important}
+.flex-xl-shrink-0{-ms-flex-negative:0!important;flex-shrink:0!important}
+.flex-xl-shrink-1{-ms-flex-negative:1!important;flex-shrink:1!important}
+.justify-content-xl-start{-ms-flex-pack:start!important;justify-content:flex-start!important}
+.justify-content-xl-end{-ms-flex-pack:end!important;justify-content:flex-end!important}
+.justify-content-xl-center{-ms-flex-pack:center!important;justify-content:center!important}
+.justify-content-xl-between{-ms-flex-pack:justify!important;justify-content:space-between!important}
+.justify-content-xl-around{-ms-flex-pack:distribute!important;justify-content:space-around!important}
+.align-items-xl-start{-ms-flex-align:start!important;align-items:flex-start!important}
+.align-items-xl-end{-ms-flex-align:end!important;align-items:flex-end!important}
+.align-items-xl-center{-ms-flex-align:center!important;align-items:center!important}
+.align-items-xl-baseline{-ms-flex-align:baseline!important;align-items:baseline!important}
+.align-items-xl-stretch{-ms-flex-align:stretch!important;align-items:stretch!important}
+.align-content-xl-start{-ms-flex-line-pack:start!important;align-content:flex-start!important}
+.align-content-xl-end{-ms-flex-line-pack:end!important;align-content:flex-end!important}
+.align-content-xl-center{-ms-flex-line-pack:center!important;align-content:center!important}
+.align-content-xl-between{-ms-flex-line-pack:justify!important;align-content:space-between!important}
+.align-content-xl-around{-ms-flex-line-pack:distribute!important;align-content:space-around!important}
+.align-content-xl-stretch{-ms-flex-line-pack:stretch!important;align-content:stretch!important}
+.align-self-xl-auto{-ms-flex-item-align:auto!important;align-self:auto!important}
+.align-self-xl-start{-ms-flex-item-align:start!important;align-self:flex-start!important}
+.align-self-xl-end{-ms-flex-item-align:end!important;align-self:flex-end!important}
+.align-self-xl-center{-ms-flex-item-align:center!important;align-self:center!important}
+.align-self-xl-baseline{-ms-flex-item-align:baseline!important;align-self:baseline!important}
+.align-self-xl-stretch{-ms-flex-item-align:stretch!important;align-self:stretch!important}
+}
+.float-left{float:left!important}
+.float-right{float:right!important}
+.float-none{float:none!important}
+@media (min-width:576px){.float-sm-left{float:left!important}
+.float-sm-right{float:right!important}
+.float-sm-none{float:none!important}
+}
+@media (min-width:768px){.float-md-left{float:left!important}
+.float-md-right{float:right!important}
+.float-md-none{float:none!important}
+}
+@media (min-width:992px){.float-lg-left{float:left!important}
+.float-lg-right{float:right!important}
+.float-lg-none{float:none!important}
+}
+@media (min-width:1200px){.float-xl-left{float:left!important}
+.float-xl-right{float:right!important}
+.float-xl-none{float:none!important}
+}
+.user-select-all{-webkit-user-select:all!important;-moz-user-select:all!important;user-select:all!important}
+.user-select-auto{-webkit-user-select:auto!important;-moz-user-select:auto!important;-ms-user-select:auto!important;user-select:auto!important}
+.user-select-none{-webkit-user-select:none!important;-moz-user-select:none!important;-ms-user-select:none!important;user-select:none!important}
+.overflow-auto{overflow:auto!important}
+.overflow-hidden{overflow:hidden!important}
+.position-static{position:static!important}
+.position-relative{position:relative!important}
+.position-absolute{position:absolute!important}
+.position-fixed{position:fixed!important}
+.position-sticky{position:-webkit-sticky!important;position:sticky!important}
+.fixed-top{position:fixed;top:0;right:0;left:0;z-index:1030}
+.fixed-bottom{position:fixed;right:0;bottom:0;left:0;z-index:1030}
+@supports ((position:-webkit-sticky) or (position:sticky)){.sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1020}
+}
+.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0,0,0,0);white-space:nowrap;border:0}
+.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;overflow:visible;clip:auto;white-space:normal}
+.shadow-sm{box-shadow:0 .125rem .25rem rgba(0,0,0,.075)!important}
+.shadow{box-shadow:0 .5rem 1rem rgba(0,0,0,.15)!important}
+.shadow-lg{box-shadow:0 1rem 3rem rgba(0,0,0,.175)!important}
+.shadow-none{box-shadow:none!important}
+.w-25{width:25%!important}
+.w-50{width:50%!important}
+.w-75{width:75%!important}
+.w-100{width:100%!important}
+.w-auto{width:auto!important}
+.h-25{height:25%!important}
+.h-50{height:50%!important}
+.h-75{height:75%!important}
+.h-100{height:100%!important}
+.h-auto{height:auto!important}
+.mw-100{max-width:100%!important}
+.mh-100{max-height:100%!important}
+.min-vw-100{min-width:100vw!important}
+.min-vh-100{min-height:100vh!important}
+.vw-100{width:100vw!important}
+.vh-100{height:100vh!important}
+.m-0{margin:0!important}
+.mt-0,.my-0{margin-top:0!important}
+.mr-0,.mx-0{margin-right:0!important}
+.mb-0,.my-0{margin-bottom:0!important}
+.ml-0,.mx-0{margin-left:0!important}
+.m-1{margin:.25rem!important}
+.mt-1,.my-1{margin-top:.25rem!important}
+.mr-1,.mx-1{margin-right:.25rem!important}
+.mb-1,.my-1{margin-bottom:.25rem!important}
+.ml-1,.mx-1{margin-left:.25rem!important}
+.m-2{margin:.5rem!important}
+.mt-2,.my-2{margin-top:.5rem!important}
+.mr-2,.mx-2{margin-right:.5rem!important}
+.mb-2,.my-2{margin-bottom:.5rem!important}
+.ml-2,.mx-2{margin-left:.5rem!important}
+.m-3{margin:1rem!important}
+.mt-3,.my-3{margin-top:1rem!important}
+.mr-3,.mx-3{margin-right:1rem!important}
+.mb-3,.my-3{margin-bottom:1rem!important}
+.ml-3,.mx-3{margin-left:1rem!important}
+.m-4{margin:1.5rem!important}
+.mt-4,.my-4{margin-top:1.5rem!important}
+.mr-4,.mx-4{margin-right:1.5rem!important}
+.mb-4,.my-4{margin-bottom:1.5rem!important}
+.ml-4,.mx-4{margin-left:1.5rem!important}
+.m-5{margin:3rem!important}
+.mt-5,.my-5{margin-top:3rem!important}
+.mr-5,.mx-5{margin-right:3rem!important}
+.mb-5,.my-5{margin-bottom:3rem!important}
+.ml-5,.mx-5{margin-left:3rem!important}
+.p-0{padding:0!important}
+.pt-0,.py-0{padding-top:0!important}
+.pr-0,.px-0{padding-right:0!important}
+.pb-0,.py-0{padding-bottom:0!important}
+.pl-0,.px-0{padding-left:0!important}
+.p-1{padding:.25rem!important}
+.pt-1,.py-1{padding-top:.25rem!important}
+.pr-1,.px-1{padding-right:.25rem!important}
+.pb-1,.py-1{padding-bottom:.25rem!important}
+.pl-1,.px-1{padding-left:.25rem!important}
+.p-2{padding:.5rem!important}
+.pt-2,.py-2{padding-top:.5rem!important}
+.pr-2,.px-2{padding-right:.5rem!important}
+.pb-2,.py-2{padding-bottom:.5rem!important}
+.pl-2,.px-2{padding-left:.5rem!important}
+.p-3{padding:1rem!important}
+.pt-3,.py-3{padding-top:1rem!important}
+.pr-3,.px-3{padding-right:1rem!important}
+.pb-3,.py-3{padding-bottom:1rem!important}
+.pl-3,.px-3{padding-left:1rem!important}
+.p-4{padding:1.5rem!important}
+.pt-4,.py-4{padding-top:1.5rem!important}
+.pr-4,.px-4{padding-right:1.5rem!important}
+.pb-4,.py-4{padding-bottom:1.5rem!important}
+.pl-4,.px-4{padding-left:1.5rem!important}
+.p-5{padding:3rem!important}
+.pt-5,.py-5{padding-top:3rem!important}
+.pr-5,.px-5{padding-right:3rem!important}
+.pb-5,.py-5{padding-bottom:3rem!important}
+.pl-5,.px-5{padding-left:3rem!important}
+.m-n1{margin:-.25rem!important}
+.mt-n1,.my-n1{margin-top:-.25rem!important}
+.mr-n1,.mx-n1{margin-right:-.25rem!important}
+.mb-n1,.my-n1{margin-bottom:-.25rem!important}
+.ml-n1,.mx-n1{margin-left:-.25rem!important}
+.m-n2{margin:-.5rem!important}
+.mt-n2,.my-n2{margin-top:-.5rem!important}
+.mr-n2,.mx-n2{margin-right:-.5rem!important}
+.mb-n2,.my-n2{margin-bottom:-.5rem!important}
+.ml-n2,.mx-n2{margin-left:-.5rem!important}
+.m-n3{margin:-1rem!important}
+.mt-n3,.my-n3{margin-top:-1rem!important}
+.mr-n3,.mx-n3{margin-right:-1rem!important}
+.mb-n3,.my-n3{margin-bottom:-1rem!important}
+.ml-n3,.mx-n3{margin-left:-1rem!important}
+.m-n4{margin:-1.5rem!important}
+.mt-n4,.my-n4{margin-top:-1.5rem!important}
+.mr-n4,.mx-n4{margin-right:-1.5rem!important}
+.mb-n4,.my-n4{margin-bottom:-1.5rem!important}
+.ml-n4,.mx-n4{margin-left:-1.5rem!important}
+.m-n5{margin:-3rem!important}
+.mt-n5,.my-n5{margin-top:-3rem!important}
+.mr-n5,.mx-n5{margin-right:-3rem!important}
+.mb-n5,.my-n5{margin-bottom:-3rem!important}
+.ml-n5,.mx-n5{margin-left:-3rem!important}
+.m-auto{margin:auto!important}
+.mt-auto,.my-auto{margin-top:auto!important}
+.mr-auto,.mx-auto{margin-right:auto!important}
+.mb-auto,.my-auto{margin-bottom:auto!important}
+.ml-auto,.mx-auto{margin-left:auto!important}
+@media (min-width:576px){.m-sm-0{margin:0!important}
+.mt-sm-0,.my-sm-0{margin-top:0!important}
+.mr-sm-0,.mx-sm-0{margin-right:0!important}
+.mb-sm-0,.my-sm-0{margin-bottom:0!important}
+.ml-sm-0,.mx-sm-0{margin-left:0!important}
+.m-sm-1{margin:.25rem!important}
+.mt-sm-1,.my-sm-1{margin-top:.25rem!important}
+.mr-sm-1,.mx-sm-1{margin-right:.25rem!important}
+.mb-sm-1,.my-sm-1{margin-bottom:.25rem!important}
+.ml-sm-1,.mx-sm-1{margin-left:.25rem!important}
+.m-sm-2{margin:.5rem!important}
+.mt-sm-2,.my-sm-2{margin-top:.5rem!important}
+.mr-sm-2,.mx-sm-2{margin-right:.5rem!important}
+.mb-sm-2,.my-sm-2{margin-bottom:.5rem!important}
+.ml-sm-2,.mx-sm-2{margin-left:.5rem!important}
+.m-sm-3{margin:1rem!important}
+.mt-sm-3,.my-sm-3{margin-top:1rem!important}
+.mr-sm-3,.mx-sm-3{margin-right:1rem!important}
+.mb-sm-3,.my-sm-3{margin-bottom:1rem!important}
+.ml-sm-3,.mx-sm-3{margin-left:1rem!important}
+.m-sm-4{margin:1.5rem!important}
+.mt-sm-4,.my-sm-4{margin-top:1.5rem!important}
+.mr-sm-4,.mx-sm-4{margin-right:1.5rem!important}
+.mb-sm-4,.my-sm-4{margin-bottom:1.5rem!important}
+.ml-sm-4,.mx-sm-4{margin-left:1.5rem!important}
+.m-sm-5{margin:3rem!important}
+.mt-sm-5,.my-sm-5{margin-top:3rem!important}
+.mr-sm-5,.mx-sm-5{margin-right:3rem!important}
+.mb-sm-5,.my-sm-5{margin-bottom:3rem!important}
+.ml-sm-5,.mx-sm-5{margin-left:3rem!important}
+.p-sm-0{padding:0!important}
+.pt-sm-0,.py-sm-0{padding-top:0!important}
+.pr-sm-0,.px-sm-0{padding-right:0!important}
+.pb-sm-0,.py-sm-0{padding-bottom:0!important}
+.pl-sm-0,.px-sm-0{padding-left:0!important}
+.p-sm-1{padding:.25rem!important}
+.pt-sm-1,.py-sm-1{padding-top:.25rem!important}
+.pr-sm-1,.px-sm-1{padding-right:.25rem!important}
+.pb-sm-1,.py-sm-1{padding-bottom:.25rem!important}
+.pl-sm-1,.px-sm-1{padding-left:.25rem!important}
+.p-sm-2{padding:.5rem!important}
+.pt-sm-2,.py-sm-2{padding-top:.5rem!important}
+.pr-sm-2,.px-sm-2{padding-right:.5rem!important}
+.pb-sm-2,.py-sm-2{padding-bottom:.5rem!important}
+.pl-sm-2,.px-sm-2{padding-left:.5rem!important}
+.p-sm-3{padding:1rem!important}
+.pt-sm-3,.py-sm-3{padding-top:1rem!important}
+.pr-sm-3,.px-sm-3{padding-right:1rem!important}
+.pb-sm-3,.py-sm-3{padding-bottom:1rem!important}
+.pl-sm-3,.px-sm-3{padding-left:1rem!important}
+.p-sm-4{padding:1.5rem!important}
+.pt-sm-4,.py-sm-4{padding-top:1.5rem!important}
+.pr-sm-4,.px-sm-4{padding-right:1.5rem!important}
+.pb-sm-4,.py-sm-4{padding-bottom:1.5rem!important}
+.pl-sm-4,.px-sm-4{padding-left:1.5rem!important}
+.p-sm-5{padding:3rem!important}
+.pt-sm-5,.py-sm-5{padding-top:3rem!important}
+.pr-sm-5,.px-sm-5{padding-right:3rem!important}
+.pb-sm-5,.py-sm-5{padding-bottom:3rem!important}
+.pl-sm-5,.px-sm-5{padding-left:3rem!important}
+.m-sm-n1{margin:-.25rem!important}
+.mt-sm-n1,.my-sm-n1{margin-top:-.25rem!important}
+.mr-sm-n1,.mx-sm-n1{margin-right:-.25rem!important}
+.mb-sm-n1,.my-sm-n1{margin-bottom:-.25rem!important}
+.ml-sm-n1,.mx-sm-n1{margin-left:-.25rem!important}
+.m-sm-n2{margin:-.5rem!important}
+.mt-sm-n2,.my-sm-n2{margin-top:-.5rem!important}
+.mr-sm-n2,.mx-sm-n2{margin-right:-.5rem!important}
+.mb-sm-n2,.my-sm-n2{margin-bottom:-.5rem!important}
+.ml-sm-n2,.mx-sm-n2{margin-left:-.5rem!important}
+.m-sm-n3{margin:-1rem!important}
+.mt-sm-n3,.my-sm-n3{margin-top:-1rem!important}
+.mr-sm-n3,.mx-sm-n3{margin-right:-1rem!important}
+.mb-sm-n3,.my-sm-n3{margin-bottom:-1rem!important}
+.ml-sm-n3,.mx-sm-n3{margin-left:-1rem!important}
+.m-sm-n4{margin:-1.5rem!important}
+.mt-sm-n4,.my-sm-n4{margin-top:-1.5rem!important}
+.mr-sm-n4,.mx-sm-n4{margin-right:-1.5rem!important}
+.mb-sm-n4,.my-sm-n4{margin-bottom:-1.5rem!important}
+.ml-sm-n4,.mx-sm-n4{margin-left:-1.5rem!important}
+.m-sm-n5{margin:-3rem!important}
+.mt-sm-n5,.my-sm-n5{margin-top:-3rem!important}
+.mr-sm-n5,.mx-sm-n5{margin-right:-3rem!important}
+.mb-sm-n5,.my-sm-n5{margin-bottom:-3rem!important}
+.ml-sm-n5,.mx-sm-n5{margin-left:-3rem!important}
+.m-sm-auto{margin:auto!important}
+.mt-sm-auto,.my-sm-auto{margin-top:auto!important}
+.mr-sm-auto,.mx-sm-auto{margin-right:auto!important}
+.mb-sm-auto,.my-sm-auto{margin-bottom:auto!important}
+.ml-sm-auto,.mx-sm-auto{margin-left:auto!important}
+}
+@media (min-width:768px){.m-md-0{margin:0!important}
+.mt-md-0,.my-md-0{margin-top:0!important}
+.mr-md-0,.mx-md-0{margin-right:0!important}
+.mb-md-0,.my-md-0{margin-bottom:0!important}
+.ml-md-0,.mx-md-0{margin-left:0!important}
+.m-md-1{margin:.25rem!important}
+.mt-md-1,.my-md-1{margin-top:.25rem!important}
+.mr-md-1,.mx-md-1{margin-right:.25rem!important}
+.mb-md-1,.my-md-1{margin-bottom:.25rem!important}
+.ml-md-1,.mx-md-1{margin-left:.25rem!important}
+.m-md-2{margin:.5rem!important}
+.mt-md-2,.my-md-2{margin-top:.5rem!important}
+.mr-md-2,.mx-md-2{margin-right:.5rem!important}
+.mb-md-2,.my-md-2{margin-bottom:.5rem!important}
+.ml-md-2,.mx-md-2{margin-left:.5rem!important}
+.m-md-3{margin:1rem!important}
+.mt-md-3,.my-md-3{margin-top:1rem!important}
+.mr-md-3,.mx-md-3{margin-right:1rem!important}
+.mb-md-3,.my-md-3{margin-bottom:1rem!important}
+.ml-md-3,.mx-md-3{margin-left:1rem!important}
+.m-md-4{margin:1.5rem!important}
+.mt-md-4,.my-md-4{margin-top:1.5rem!important}
+.mr-md-4,.mx-md-4{margin-right:1.5rem!important}
+.mb-md-4,.my-md-4{margin-bottom:1.5rem!important}
+.ml-md-4,.mx-md-4{margin-left:1.5rem!important}
+.m-md-5{margin:3rem!important}
+.mt-md-5,.my-md-5{margin-top:3rem!important}
+.mr-md-5,.mx-md-5{margin-right:3rem!important}
+.mb-md-5,.my-md-5{margin-bottom:3rem!important}
+.ml-md-5,.mx-md-5{margin-left:3rem!important}
+.p-md-0{padding:0!important}
+.pt-md-0,.py-md-0{padding-top:0!important}
+.pr-md-0,.px-md-0{padding-right:0!important}
+.pb-md-0,.py-md-0{padding-bottom:0!important}
+.pl-md-0,.px-md-0{padding-left:0!important}
+.p-md-1{padding:.25rem!important}
+.pt-md-1,.py-md-1{padding-top:.25rem!important}
+.pr-md-1,.px-md-1{padding-right:.25rem!important}
+.pb-md-1,.py-md-1{padding-bottom:.25rem!important}
+.pl-md-1,.px-md-1{padding-left:.25rem!important}
+.p-md-2{padding:.5rem!important}
+.pt-md-2,.py-md-2{padding-top:.5rem!important}
+.pr-md-2,.px-md-2{padding-right:.5rem!important}
+.pb-md-2,.py-md-2{padding-bottom:.5rem!important}
+.pl-md-2,.px-md-2{padding-left:.5rem!important}
+.p-md-3{padding:1rem!important}
+.pt-md-3,.py-md-3{padding-top:1rem!important}
+.pr-md-3,.px-md-3{padding-right:1rem!important}
+.pb-md-3,.py-md-3{padding-bottom:1rem!important}
+.pl-md-3,.px-md-3{padding-left:1rem!important}
+.p-md-4{padding:1.5rem!important}
+.pt-md-4,.py-md-4{padding-top:1.5rem!important}
+.pr-md-4,.px-md-4{padding-right:1.5rem!important}
+.pb-md-4,.py-md-4{padding-bottom:1.5rem!important}
+.pl-md-4,.px-md-4{padding-left:1.5rem!important}
+.p-md-5{padding:3rem!important}
+.pt-md-5,.py-md-5{padding-top:3rem!important}
+.pr-md-5,.px-md-5{padding-right:3rem!important}
+.pb-md-5,.py-md-5{padding-bottom:3rem!important}
+.pl-md-5,.px-md-5{padding-left:3rem!important}
+.m-md-n1{margin:-.25rem!important}
+.mt-md-n1,.my-md-n1{margin-top:-.25rem!important}
+.mr-md-n1,.mx-md-n1{margin-right:-.25rem!important}
+.mb-md-n1,.my-md-n1{margin-bottom:-.25rem!important}
+.ml-md-n1,.mx-md-n1{margin-left:-.25rem!important}
+.m-md-n2{margin:-.5rem!important}
+.mt-md-n2,.my-md-n2{margin-top:-.5rem!important}
+.mr-md-n2,.mx-md-n2{margin-right:-.5rem!important}
+.mb-md-n2,.my-md-n2{margin-bottom:-.5rem!important}
+.ml-md-n2,.mx-md-n2{margin-left:-.5rem!important}
+.m-md-n3{margin:-1rem!important}
+.mt-md-n3,.my-md-n3{margin-top:-1rem!important}
+.mr-md-n3,.mx-md-n3{margin-right:-1rem!important}
+.mb-md-n3,.my-md-n3{margin-bottom:-1rem!important}
+.ml-md-n3,.mx-md-n3{margin-left:-1rem!important}
+.m-md-n4{margin:-1.5rem!important}
+.mt-md-n4,.my-md-n4{margin-top:-1.5rem!important}
+.mr-md-n4,.mx-md-n4{margin-right:-1.5rem!important}
+.mb-md-n4,.my-md-n4{margin-bottom:-1.5rem!important}
+.ml-md-n4,.mx-md-n4{margin-left:-1.5rem!important}
+.m-md-n5{margin:-3rem!important}
+.mt-md-n5,.my-md-n5{margin-top:-3rem!important}
+.mr-md-n5,.mx-md-n5{margin-right:-3rem!important}
+.mb-md-n5,.my-md-n5{margin-bottom:-3rem!important}
+.ml-md-n5,.mx-md-n5{margin-left:-3rem!important}
+.m-md-auto{margin:auto!important}
+.mt-md-auto,.my-md-auto{margin-top:auto!important}
+.mr-md-auto,.mx-md-auto{margin-right:auto!important}
+.mb-md-auto,.my-md-auto{margin-bottom:auto!important}
+.ml-md-auto,.mx-md-auto{margin-left:auto!important}
+}
+@media (min-width:992px){.m-lg-0{margin:0!important}
+.mt-lg-0,.my-lg-0{margin-top:0!important}
+.mr-lg-0,.mx-lg-0{margin-right:0!important}
+.mb-lg-0,.my-lg-0{margin-bottom:0!important}
+.ml-lg-0,.mx-lg-0{margin-left:0!important}
+.m-lg-1{margin:.25rem!important}
+.mt-lg-1,.my-lg-1{margin-top:.25rem!important}
+.mr-lg-1,.mx-lg-1{margin-right:.25rem!important}
+.mb-lg-1,.my-lg-1{margin-bottom:.25rem!important}
+.ml-lg-1,.mx-lg-1{margin-left:.25rem!important}
+.m-lg-2{margin:.5rem!important}
+.mt-lg-2,.my-lg-2{margin-top:.5rem!important}
+.mr-lg-2,.mx-lg-2{margin-right:.5rem!important}
+.mb-lg-2,.my-lg-2{margin-bottom:.5rem!important}
+.ml-lg-2,.mx-lg-2{margin-left:.5rem!important}
+.m-lg-3{margin:1rem!important}
+.mt-lg-3,.my-lg-3{margin-top:1rem!important}
+.mr-lg-3,.mx-lg-3{margin-right:1rem!important}
+.mb-lg-3,.my-lg-3{margin-bottom:1rem!important}
+.ml-lg-3,.mx-lg-3{margin-left:1rem!important}
+.m-lg-4{margin:1.5rem!important}
+.mt-lg-4,.my-lg-4{margin-top:1.5rem!important}
+.mr-lg-4,.mx-lg-4{margin-right:1.5rem!important}
+.mb-lg-4,.my-lg-4{margin-bottom:1.5rem!important}
+.ml-lg-4,.mx-lg-4{margin-left:1.5rem!important}
+.m-lg-5{margin:3rem!important}
+.mt-lg-5,.my-lg-5{margin-top:3rem!important}
+.mr-lg-5,.mx-lg-5{margin-right:3rem!important}
+.mb-lg-5,.my-lg-5{margin-bottom:3rem!important}
+.ml-lg-5,.mx-lg-5{margin-left:3rem!important}
+.p-lg-0{padding:0!important}
+.pt-lg-0,.py-lg-0{padding-top:0!important}
+.pr-lg-0,.px-lg-0{padding-right:0!important}
+.pb-lg-0,.py-lg-0{padding-bottom:0!important}
+.pl-lg-0,.px-lg-0{padding-left:0!important}
+.p-lg-1{padding:.25rem!important}
+.pt-lg-1,.py-lg-1{padding-top:.25rem!important}
+.pr-lg-1,.px-lg-1{padding-right:.25rem!important}
+.pb-lg-1,.py-lg-1{padding-bottom:.25rem!important}
+.pl-lg-1,.px-lg-1{padding-left:.25rem!important}
+.p-lg-2{padding:.5rem!important}
+.pt-lg-2,.py-lg-2{padding-top:.5rem!important}
+.pr-lg-2,.px-lg-2{padding-right:.5rem!important}
+.pb-lg-2,.py-lg-2{padding-bottom:.5rem!important}
+.pl-lg-2,.px-lg-2{padding-left:.5rem!important}
+.p-lg-3{padding:1rem!important}
+.pt-lg-3,.py-lg-3{padding-top:1rem!important}
+.pr-lg-3,.px-lg-3{padding-right:1rem!important}
+.pb-lg-3,.py-lg-3{padding-bottom:1rem!important}
+.pl-lg-3,.px-lg-3{padding-left:1rem!important}
+.p-lg-4{padding:1.5rem!important}
+.pt-lg-4,.py-lg-4{padding-top:1.5rem!important}
+.pr-lg-4,.px-lg-4{padding-right:1.5rem!important}
+.pb-lg-4,.py-lg-4{padding-bottom:1.5rem!important}
+.pl-lg-4,.px-lg-4{padding-left:1.5rem!important}
+.p-lg-5{padding:3rem!important}
+.pt-lg-5,.py-lg-5{padding-top:3rem!important}
+.pr-lg-5,.px-lg-5{padding-right:3rem!important}
+.pb-lg-5,.py-lg-5{padding-bottom:3rem!important}
+.pl-lg-5,.px-lg-5{padding-left:3rem!important}
+.m-lg-n1{margin:-.25rem!important}
+.mt-lg-n1,.my-lg-n1{margin-top:-.25rem!important}
+.mr-lg-n1,.mx-lg-n1{margin-right:-.25rem!important}
+.mb-lg-n1,.my-lg-n1{margin-bottom:-.25rem!important}
+.ml-lg-n1,.mx-lg-n1{margin-left:-.25rem!important}
+.m-lg-n2{margin:-.5rem!important}
+.mt-lg-n2,.my-lg-n2{margin-top:-.5rem!important}
+.mr-lg-n2,.mx-lg-n2{margin-right:-.5rem!important}
+.mb-lg-n2,.my-lg-n2{margin-bottom:-.5rem!important}
+.ml-lg-n2,.mx-lg-n2{margin-left:-.5rem!important}
+.m-lg-n3{margin:-1rem!important}
+.mt-lg-n3,.my-lg-n3{margin-top:-1rem!important}
+.mr-lg-n3,.mx-lg-n3{margin-right:-1rem!important}
+.mb-lg-n3,.my-lg-n3{margin-bottom:-1rem!important}
+.ml-lg-n3,.mx-lg-n3{margin-left:-1rem!important}
+.m-lg-n4{margin:-1.5rem!important}
+.mt-lg-n4,.my-lg-n4{margin-top:-1.5rem!important}
+.mr-lg-n4,.mx-lg-n4{margin-right:-1.5rem!important}
+.mb-lg-n4,.my-lg-n4{margin-bottom:-1.5rem!important}
+.ml-lg-n4,.mx-lg-n4{margin-left:-1.5rem!important}
+.m-lg-n5{margin:-3rem!important}
+.mt-lg-n5,.my-lg-n5{margin-top:-3rem!important}
+.mr-lg-n5,.mx-lg-n5{margin-right:-3rem!important}
+.mb-lg-n5,.my-lg-n5{margin-bottom:-3rem!important}
+.ml-lg-n5,.mx-lg-n5{margin-left:-3rem!important}
+.m-lg-auto{margin:auto!important}
+.mt-lg-auto,.my-lg-auto{margin-top:auto!important}
+.mr-lg-auto,.mx-lg-auto{margin-right:auto!important}
+.mb-lg-auto,.my-lg-auto{margin-bottom:auto!important}
+.ml-lg-auto,.mx-lg-auto{margin-left:auto!important}
+}
+@media (min-width:1200px){.m-xl-0{margin:0!important}
+.mt-xl-0,.my-xl-0{margin-top:0!important}
+.mr-xl-0,.mx-xl-0{margin-right:0!important}
+.mb-xl-0,.my-xl-0{margin-bottom:0!important}
+.ml-xl-0,.mx-xl-0{margin-left:0!important}
+.m-xl-1{margin:.25rem!important}
+.mt-xl-1,.my-xl-1{margin-top:.25rem!important}
+.mr-xl-1,.mx-xl-1{margin-right:.25rem!important}
+.mb-xl-1,.my-xl-1{margin-bottom:.25rem!important}
+.ml-xl-1,.mx-xl-1{margin-left:.25rem!important}
+.m-xl-2{margin:.5rem!important}
+.mt-xl-2,.my-xl-2{margin-top:.5rem!important}
+.mr-xl-2,.mx-xl-2{margin-right:.5rem!important}
+.mb-xl-2,.my-xl-2{margin-bottom:.5rem!important}
+.ml-xl-2,.mx-xl-2{margin-left:.5rem!important}
+.m-xl-3{margin:1rem!important}
+.mt-xl-3,.my-xl-3{margin-top:1rem!important}
+.mr-xl-3,.mx-xl-3{margin-right:1rem!important}
+.mb-xl-3,.my-xl-3{margin-bottom:1rem!important}
+.ml-xl-3,.mx-xl-3{margin-left:1rem!important}
+.m-xl-4{margin:1.5rem!important}
+.mt-xl-4,.my-xl-4{margin-top:1.5rem!important}
+.mr-xl-4,.mx-xl-4{margin-right:1.5rem!important}
+.mb-xl-4,.my-xl-4{margin-bottom:1.5rem!important}
+.ml-xl-4,.mx-xl-4{margin-left:1.5rem!important}
+.m-xl-5{margin:3rem!important}
+.mt-xl-5,.my-xl-5{margin-top:3rem!important}
+.mr-xl-5,.mx-xl-5{margin-right:3rem!important}
+.mb-xl-5,.my-xl-5{margin-bottom:3rem!important}
+.ml-xl-5,.mx-xl-5{margin-left:3rem!important}
+.p-xl-0{padding:0!important}
+.pt-xl-0,.py-xl-0{padding-top:0!important}
+.pr-xl-0,.px-xl-0{padding-right:0!important}
+.pb-xl-0,.py-xl-0{padding-bottom:0!important}
+.pl-xl-0,.px-xl-0{padding-left:0!important}
+.p-xl-1{padding:.25rem!important}
+.pt-xl-1,.py-xl-1{padding-top:.25rem!important}
+.pr-xl-1,.px-xl-1{padding-right:.25rem!important}
+.pb-xl-1,.py-xl-1{padding-bottom:.25rem!important}
+.pl-xl-1,.px-xl-1{padding-left:.25rem!important}
+.p-xl-2{padding:.5rem!important}
+.pt-xl-2,.py-xl-2{padding-top:.5rem!important}
+.pr-xl-2,.px-xl-2{padding-right:.5rem!important}
+.pb-xl-2,.py-xl-2{padding-bottom:.5rem!important}
+.pl-xl-2,.px-xl-2{padding-left:.5rem!important}
+.p-xl-3{padding:1rem!important}
+.pt-xl-3,.py-xl-3{padding-top:1rem!important}
+.pr-xl-3,.px-xl-3{padding-right:1rem!important}
+.pb-xl-3,.py-xl-3{padding-bottom:1rem!important}
+.pl-xl-3,.px-xl-3{padding-left:1rem!important}
+.p-xl-4{padding:1.5rem!important}
+.pt-xl-4,.py-xl-4{padding-top:1.5rem!important}
+.pr-xl-4,.px-xl-4{padding-right:1.5rem!important}
+.pb-xl-4,.py-xl-4{padding-bottom:1.5rem!important}
+.pl-xl-4,.px-xl-4{padding-left:1.5rem!important}
+.p-xl-5{padding:3rem!important}
+.pt-xl-5,.py-xl-5{padding-top:3rem!important}
+.pr-xl-5,.px-xl-5{padding-right:3rem!important}
+.pb-xl-5,.py-xl-5{padding-bottom:3rem!important}
+.pl-xl-5,.px-xl-5{padding-left:3rem!important}
+.m-xl-n1{margin:-.25rem!important}
+.mt-xl-n1,.my-xl-n1{margin-top:-.25rem!important}
+.mr-xl-n1,.mx-xl-n1{margin-right:-.25rem!important}
+.mb-xl-n1,.my-xl-n1{margin-bottom:-.25rem!important}
+.ml-xl-n1,.mx-xl-n1{margin-left:-.25rem!important}
+.m-xl-n2{margin:-.5rem!important}
+.mt-xl-n2,.my-xl-n2{margin-top:-.5rem!important}
+.mr-xl-n2,.mx-xl-n2{margin-right:-.5rem!important}
+.mb-xl-n2,.my-xl-n2{margin-bottom:-.5rem!important}
+.ml-xl-n2,.mx-xl-n2{margin-left:-.5rem!important}
+.m-xl-n3{margin:-1rem!important}
+.mt-xl-n3,.my-xl-n3{margin-top:-1rem!important}
+.mr-xl-n3,.mx-xl-n3{margin-right:-1rem!important}
+.mb-xl-n3,.my-xl-n3{margin-bottom:-1rem!important}
+.ml-xl-n3,.mx-xl-n3{margin-left:-1rem!important}
+.m-xl-n4{margin:-1.5rem!important}
+.mt-xl-n4,.my-xl-n4{margin-top:-1.5rem!important}
+.mr-xl-n4,.mx-xl-n4{margin-right:-1.5rem!important}
+.mb-xl-n4,.my-xl-n4{margin-bottom:-1.5rem!important}
+.ml-xl-n4,.mx-xl-n4{margin-left:-1.5rem!important}
+.m-xl-n5{margin:-3rem!important}
+.mt-xl-n5,.my-xl-n5{margin-top:-3rem!important}
+.mr-xl-n5,.mx-xl-n5{margin-right:-3rem!important}
+.mb-xl-n5,.my-xl-n5{margin-bottom:-3rem!important}
+.ml-xl-n5,.mx-xl-n5{margin-left:-3rem!important}
+.m-xl-auto{margin:auto!important}
+.mt-xl-auto,.my-xl-auto{margin-top:auto!important}
+.mr-xl-auto,.mx-xl-auto{margin-right:auto!important}
+.mb-xl-auto,.my-xl-auto{margin-bottom:auto!important}
+.ml-xl-auto,.mx-xl-auto{margin-left:auto!important}
+}
+.stretched-link::after{position:absolute;top:0;right:0;bottom:0;left:0;z-index:1;pointer-events:auto;content:"";background-color:rgba(0,0,0,0)}
+.text-justify{text-align:justify!important}
+.text-wrap{white-space:normal!important}
+.text-nowrap{white-space:nowrap!important}
+.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
+.text-left{text-align:left!important}
+.text-right{text-align:right!important}
+.text-center{text-align:center!important}
+@media (min-width:576px){.text-sm-left{text-align:left!important}
+.text-sm-right{text-align:right!important}
+.text-sm-center{text-align:center!important}
+}
+@media (min-width:768px){.text-md-left{text-align:left!important}
+.text-md-right{text-align:right!important}
+.text-md-center{text-align:center!important}
+}
+@media (min-width:992px){.text-lg-left{text-align:left!important}
+.text-lg-right{text-align:right!important}
+.text-lg-center{text-align:center!important}
+}
+@media (min-width:1200px){.text-xl-left{text-align:left!important}
+.text-xl-right{text-align:right!important}
+.text-xl-center{text-align:center!important}
+}
+.text-lowercase{text-transform:lowercase!important}
+.text-uppercase{text-transform:uppercase!important}
+.text-capitalize{text-transform:capitalize!important}
+.font-weight-light{font-weight:300!important}
+.font-weight-lighter{font-weight:lighter!important}
+.font-weight-normal{font-weight:400!important}
+.font-weight-bold{font-weight:700!important}
+.font-weight-bolder{font-weight:bolder!important}
+.font-italic{font-style:italic!important}
+.text-white{color:#fff!important}
+.text-primary{color:#007bff!important}
+a.text-primary:focus,a.text-primary:hover{color:#0056b3!important}
+.text-secondary{color:#6c757d!important}
+a.text-secondary:focus,a.text-secondary:hover{color:#494f54!important}
+.text-success{color:#28a745!important}
+a.text-success:focus,a.text-success:hover{color:#19692c!important}
+.text-info{color:#17a2b8!important}
+a.text-info:focus,a.text-info:hover{color:#0f6674!important}
+.text-warning{color:#ffc107!important}
+a.text-warning:focus,a.text-warning:hover{color:#ba8b00!important}
+.text-danger{color:#dc3545!important}
+a.text-danger:focus,a.text-danger:hover{color:#a71d2a!important}
+.text-light{color:#f8f9fa!important}
+a.text-light:focus,a.text-light:hover{color:#cbd3da!important}
+.text-dark{color:#343a40!important}
+a.text-dark:focus,a.text-dark:hover{color:#121416!important}
+.text-body{color:#212529!important}
+.text-muted{color:#6c757d!important}
+.text-black-50{color:rgba(0,0,0,.5)!important}
+.text-white-50{color:rgba(255,255,255,.5)!important}
+.text-hide{font:0/0 a;color:transparent;text-shadow:none;background-color:transparent;border:0}
+.text-decoration-none{text-decoration:none!important}
+.text-break{word-break:break-word!important;word-wrap:break-word!important}
+.text-reset{color:inherit!important}
+.visible{visibility:visible!important}
+.invisible{visibility:hidden!important}
+@media print{*,::after,::before{text-shadow:none!important;box-shadow:none!important}
+a:not(.btn){text-decoration:underline}
+abbr[title]::after{content:" (" attr(title) ")"}
+pre{white-space:pre-wrap!important}
+blockquote,pre{border:1px solid #adb5bd;page-break-inside:avoid}
+img,tr{page-break-inside:avoid}
+h2,h3,p{orphans:3;widows:3}
+h2,h3{page-break-after:avoid}
+@page{size:a3}
+body{min-width:992px!important}
+.container{min-width:992px!important}
+.navbar{display:none}
+.badge{border:1px solid #000}
+.table{border-collapse:collapse!important}
+.table td,.table th{background-color:#fff!important}
+.table-bordered td,.table-bordered th{border:1px solid #dee2e6!important}
+.table-dark{color:inherit}
+.table-dark tbody+tbody,.table-dark td,.table-dark th,.table-dark thead th{border-color:#dee2e6}
+.table .thead-dark th{color:inherit;border-color:#dee2e6}
+}
+
+/*# sourceMappingURL=bootstrap.min.css.map */
diff --git a/html/changelogs/archive/2024-02.yml b/html/changelogs/archive/2024-02.yml
index fd8d3b60ad3..6b848daaa60 100644
--- a/html/changelogs/archive/2024-02.yml
+++ b/html/changelogs/archive/2024-02.yml
@@ -18,3 +18,237 @@
- bugfix: Crematorium IDs (#4327)
- bugfix: Temporaty Shieldgen Fix (#4330)
- bugfix: HUD Zone Select Fixes (#4325)
+'2024-02-06':
+ ArtemDerp:
+ - bugfix: Gorkiy17 reduced number of active turfs (#4253)
+ - bugfix: fixed missed floor tiles (#4368)
+ Daeberdir:
+ - bugfix: pet vanishing in pet carrier. (#4355)
+ - tweak: job updating for PDA messenger receiver. (#4338)
+ - add: Nucleation racial implant for uplink. (#4335)
+ - add: cucumber mask craft. (#4277)
+ - bugfix: AI can't see roundstart `restricted_camera_networks` and normal borg accessability
+ for malf hacked APC. (#4239)
+ - refactor: mecha `Actions` and `Radial Menu` not only for selecting modules. (#4219)
+ - add: delayed examine. (#4080)
+ Dimach:
+ - bugfix: fixed cqc runtime (#4363)
+ KriegThunder:
+ - add: Black ops kit and black ops coverall (#4295)
+ LiquidPotroh:
+ - bugfix: afterattacks is not called (#4356)
+ - tweak: Vampires can eat creatures that their race allows, but they don't get any
+ nutrients (#4293)
+ MadGRaf:
+ - add: add wrench action to raise bolt on unpowered airlock (#4288)
+ MataVsn:
+ - add: Kidan's Pheromones (#4043)
+ MeowEmiya:
+ - tweak: Ashwalkers guaranteed spawn (#4275)
+ Nerrol:
+ - bugfix: reload huds issues (#4367)
+ Pavel Poltaves:
+ - qol: add the ability to animals to ask to be picked up. (#4164)
+ ROdenFL:
+ - add: highlight list for ghosts (#3870)
+ Renascitur:
+ - add: New spell and suit for hardmode Blood-Drunk miner (#4262)
+ Rerik007:
+ - bugfix: circuits of mapping vendors with custom names broken (#4357)
+ - bugfix: cable healing roboparts runtime (#4351)
+ - tweak: add some cargo tweaks (#4286)
+ - refactor: martials now use a weight system to determine which one is active (#4265)
+ RuinaRuiner:
+ - bugfix: small-syndicate-fix (#4226)
+ SAAD:
+ - bugfix: February Delta patch (#4334)
+ - bugfix: delta feb patch (#4366)
+ TimChi:
+ - qol: add pestspray for jani borg (#4283)
+ Valtor:
+ - bugfix: fixed devil`s powers (#4350)
+ VasilevAY:
+ - bugfix: medical gown unathi sprite (#4353)
+ Vladisvell:
+ - refactor: Optimized announcement reciever getting (#4349)
+ - bugfix: Fixed meson vision for cyborgs (#4344)
+ - tweak: Allowed view timer's info in View Variables (#4347)
+ - tweak: added Show/Hide MC Tabs for people with access to runtimes view (#4348)
+ - add: Added pagination for View Flagged Books Admin tool (#4345)
+ - refactor: Optimized cables performance (#4342)
+ - bugfix: Fixed runtime on unequipping clothing with accessories attached (#4358)
+ - refactor: Optimized turrets target search algorithm (#4323)
+ - bugfix: Robots now can't be stunned by watcher's beam (#4364)
+ - bugfix: Fixed turrets runtime (#4365)
+ WolfLox:
+ - tweak: some bugfix and minor changes based on feedback (#4337)
+ Zwei:
+ - bugfix: Animate Projectile Fix (#4339)
+ - bugfix: Extinguish Light Fixes (#4340)
+'2024-02-07':
+ BeebBeebBoob:
+ - bugfix: Corrects costs of ammo casings and ammo box itself (#4370)
+ - bugfix: making ai from clocked mmi + fabricator building (#4369)
+ dontbetank:
+ - bugfix: PAI HUD fix (#4360)
+'2024-02-09':
+ Aziz Chynaliev:
+ - unknown: bump byond version to 515.1630 and add CI trigger on merge queue
+ - unknown: enable BETA byond CI
+ - unknown: bump dmjit version
+ BeebBeebBoob:
+ - bugfix: AI core playtime requirement (#4380)
+'2024-02-10':
+ Aziz Chynaliev:
+ - unknown: bump stable byond and dmjit versions
+ Rerik007:
+ - add: (added) new cargo packs (#4383)
+ - bugfix: two small typo fixes (#4385)
+ Valtor:
+ - bugfix: returns mage-simplemob spells (#4378)
+ Vladisvell:
+ - bugfix: Fixed wrong machinery cache initialization (#4376)
+ Zwei:
+ - bugfix: Morgue Label Return (#4382)
+ - tweak: Pointing With Gun Spelling (#4374)
+ dontbetank:
+ - add: Remove Mr.Cheng Technique from melee thunderdome (#4359)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#4372)
+'2024-02-11':
+ ArtemDerp:
+ - bugfix: reconstruction of the disposal pipe system (#4375)
+'2024-02-12':
+ ArtemDerp:
+ - bugfix: added missed sprites for sec bundles (#4268)
+ - bugfix: fixed overlap of wall objects (#4398)
+ - add: security drip update (#4371)
+ - add: Updated Wizard Clothing (#4252)
+ - add: laser gun reskin (#4278)
+ - add: new species meat (#4259)
+ BeebBeebBoob:
+ - refactor: Define bitflags (#4181)
+ Daeberdir:
+ - bugfix: correct view range calculating and examine corrections. (#4400)
+ - add: Zaza drink. (#4318)
+ Darkest08:
+ - imageadd: added sst hardsuit skins (#4120)
+ Den109G:
+ - add: Added adds a popup window with suggested version (#4386)
+ Etrnlmelancholy:
+ - tweak: ipc and pai wire sprite update (#4391)
+ Renascitur:
+ - add: Hierophant Talisman from hardmode Hierophant (#4314)
+ Rerik007:
+ - bugfix: fix null.len runtime (#4388)
+ - bugfix: mecha cargomodule for lockermech broken (#4396)
+ - bugfix: fix runtime to_chat called with invalid message (#4387)
+ SAAD:
+ - tweak: Remove extra atmos different turfes and useless dirs and tags (#4394)
+ Vladisvell:
+ - bugfix: Removed incorrect winsets for dark and light themes (#4392)
+ Zwei:
+ - refactor: Icon Updates Rework Part2 (#4170)
+ - bugfix: Paper Fix (#4407)
+ - add: Added Adidas Uniform (#4381)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#4399)
+ xTrogwaRx:
+ - bugfix: show panel virology fridge after screw act (#4321)
+ - qol: keybinds for tail and wings (#4320)
+'2024-02-13':
+ ArtemDerp:
+ - bugfix: correct naming for tasers locker (#4415)
+ - bugfix: fixed missed cheks for sec scarf and googles (#4409)
+ BeebBeebBoob:
+ - bugfix: inflatable barrier box could fit anything (#4408)
+ Daeberdir:
+ - bugfix: outfit inhand items disappearing. (#4401)
+ Valtor:
+ - qol: Borer QoL update (#4343)
+ Zwei:
+ - bugfix: Laser Weapons In Hands Fix (#4410)
+ - bugfix: ChemDispenser Overlays Fix (#4418)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#4412)
+'2024-02-14':
+ ArtemDerp:
+ - bugfix: security gas mask removed extra cover flags (#4426)
+ - add: new meat steak recipes (#4425)
+ - add: removed meatwheat mutation and syntiflesh reaction (#4417)
+ - add: new meat pie recipes (#4416)
+ BeebBeebBoob:
+ - refactor: Update CONTRIBUTING.md (#4402)
+ Daeberdir:
+ - tweak: progressbar for examining and possibility to examine items in storages.
+ (#4427)
+ ROdenFL:
+ - bugfix: pain hunter late game fix (#4424)
+ Rerik007:
+ - bugfix: glands names was the same (#4421)
+ - qol: bindable action buttons (#4420)
+ Zwei:
+ - bugfix: Inflatable Door Vision Fix (#4429)
+ - bugfix: Falsewall Opacity Fix (#4431)
+ - bugfix: Multicolored Pen Overlay Fix (#4430)
+ - bugfix: Taperecorder Fix (#4419)
+ - tweak: Vision And Emotes Fixes (#4233)
+'2024-02-15':
+ ArtemDerp:
+ - add: Resprited Stoks (#4322)
+'2024-02-16':
+ Den109G:
+ - bugfix: Construction bag from cloth craft (#4433)
+ Etrnlmelancholy:
+ - tweak: seccie webbing to sectech (#4437)
+'2024-02-17':
+ ARZUMATA:
+ - bugfix: airlock electronics null fix (#4397)
+ ArtemDerp:
+ - bugfix: humans have human meat (#4457)
+ Aziz Chynaliev:
+ - server: auto review requests for maps
+ Mindfri:
+ - add: NT Mecha PaintKit (#4438)
+ NightDawnFox:
+ - refactor: moving almost all tool checks to "tool_behaviour" (#4434)
+ - add: frosty breath effect in low-temperature rooms (#3385)
+ Pavel Lysenko:
+ - spellcheck: Исправлены опечатки и мелкие ошибки в описаниях ролей Тайпана (#2310)
+ ROdenFL:
+ - experiment: dark theme, colors, font-awesome, blob update (#4354)
+ WolfLox:
+ - tweak: lots of small, varied and not too noticeable changes ERT loadout (#4154)
+ Zwei:
+ - bugfix: Welding Mask Overlays (#4448)
+ mrWhiteFox365:
+ - unknown: Kerberos R&D Cafeteria (#4285)
+ xTrogwaRx:
+ - qol: Recolor "Set Occupation Preferences" menu (#4428)
+'2024-02-18':
+ ArtemDerp:
+ - bugfix: fixed glasses over mask layer position (#4449)
+ Daeberdir:
+ - bugfix: alphabet sorting for chem dispensers on spawn. (#4453)
+ - bugfix: silicon PDA UI working properly. (#4445)
+ - bugfix: '`update_equipped_item()` correct updating clothing sprites. (#4456)'
+ Den109G:
+ - bugfix: adds area to AI's cams (#4452)
+ LiquidPotroh:
+ - tweak: Amomaly extract cooldown & cost (#4447)
+ - bugfix: invincibility machinepersons to neurotoxin spit (#4225)
+ ROdenFL:
+ - bugfix: darkmode runtime (#4455)
+ - balance: pulse demon only shitspawn and mage pet (#4440)
+ - unknown: NULL crate (#4422)
+ Rerik007:
+ - add: alt-click on the damage zone will be equivalent to clicking on itself (#4384)
+ - bugfix: flashbangs can permanently break your hearing (#4439)
+ SAAD:
+ - refactor: Transit tubes (#4443)
+ Zwei:
+ - bugfix: Matchbox Icons Fix (#4441)
+ - bugfix: Barrel Icon State Fix (#4451)
+ - tweak: Tables Flip Hotkey Change (#4423)
+ github-actions[bot]:
+ - server: Automatic NanoMap Update (#4458)
diff --git a/html/font-awesome/css/all.min.css b/html/font-awesome/css/all.min.css
index e7cdfffe751..12b385404d7 100644
--- a/html/font-awesome/css/all.min.css
+++ b/html/font-awesome/css/all.min.css
@@ -1,5 +1,5 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
-.fa,.fab,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{animation:fa-spin 2s infinite linear}.fa-pulse{animation:fa-spin 1s infinite steps(8)}@keyframes fa-spin{0%{transform:rotate(0deg)}to{transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";transform:scaleX(-1)}.fa-flip-vertical{transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adobe:before{content:"\f778"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-handshake:before{content:"\f2b5"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-wizard:before{content:"\f6e8"}.fa-haykal:before{content:"\f666"}.fa-hdd:before{content:"\f0a0"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-instagram:before{content:"\f16d"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-tripadvisor:before{content:"\f262"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:auto;src:url(fa-regular-400.eot);src:url(fa-regular-400.eot?#iefix) format("embedded-opentype"),url(fa-regular-400.woff) format("woff")}.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:auto;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot?#iefix) format("embedded-opentype"),url(fa-solid-900.woff) format("woff")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
\ No newline at end of file
+.fa,.fab,.fad,.fal,.far,.fas{-moz-osx-font-smoothing:grayscale;-webkit-font-smoothing:antialiased;display:inline-block;font-style:normal;font-variant:normal;text-rendering:auto;line-height:1}.fa-lg{font-size:1.33333em;line-height:.75em;vertical-align:-.0667em}.fa-xs{font-size:.75em}.fa-sm{font-size:.875em}.fa-1x{font-size:1em}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-6x{font-size:6em}.fa-7x{font-size:7em}.fa-8x{font-size:8em}.fa-9x{font-size:9em}.fa-10x{font-size:10em}.fa-fw{text-align:center;width:1.25em}.fa-ul{list-style-type:none;margin-left:2.5em;padding-left:0}.fa-ul>li{position:relative}.fa-li{left:-2em;position:absolute;text-align:center;width:2em;line-height:inherit}.fa-border{border:.08em solid #eee;border-radius:.1em;padding:.2em .25em .15em}.fa-pull-left{float:left}.fa-pull-right{float:right}.fa.fa-pull-left,.fab.fa-pull-left,.fal.fa-pull-left,.far.fa-pull-left,.fas.fa-pull-left{margin-right:.3em}.fa.fa-pull-right,.fab.fa-pull-right,.fal.fa-pull-right,.far.fa-pull-right,.fas.fa-pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s linear infinite;animation:fa-spin 2s linear infinite}.fa-pulse{-webkit-animation:fa-spin 1s steps(8) infinite;animation:fa-spin 1s steps(8) infinite}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}to{-webkit-transform:rotate(1turn);transform:rotate(1turn)}}.fa-rotate-90{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=1)";-webkit-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2)";-webkit-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=3)";-webkit-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1)";-webkit-transform:scaleX(-1);transform:scaleX(-1)}.fa-flip-vertical{-webkit-transform:scaleY(-1);transform:scaleY(-1)}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical,.fa-flip-vertical{-ms-filter:"progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1)"}.fa-flip-both,.fa-flip-horizontal.fa-flip-vertical{-webkit-transform:scale(-1);transform:scale(-1)}:root .fa-flip-both,:root .fa-flip-horizontal,:root .fa-flip-vertical,:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270{-webkit-filter:none;filter:none}.fa-stack{display:inline-block;height:2em;line-height:2em;position:relative;vertical-align:middle;width:2.5em}.fa-stack-1x,.fa-stack-2x{left:0;position:absolute;text-align:center;width:100%}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-500px:before{content:"\f26e"}.fa-accessible-icon:before{content:"\f368"}.fa-accusoft:before{content:"\f369"}.fa-acquisitions-incorporated:before{content:"\f6af"}.fa-ad:before{content:"\f641"}.fa-address-book:before{content:"\f2b9"}.fa-address-card:before{content:"\f2bb"}.fa-adjust:before{content:"\f042"}.fa-adn:before{content:"\f170"}.fa-adversal:before{content:"\f36a"}.fa-affiliatetheme:before{content:"\f36b"}.fa-air-freshener:before{content:"\f5d0"}.fa-airbnb:before{content:"\f834"}.fa-algolia:before{content:"\f36c"}.fa-align-center:before{content:"\f037"}.fa-align-justify:before{content:"\f039"}.fa-align-left:before{content:"\f036"}.fa-align-right:before{content:"\f038"}.fa-alipay:before{content:"\f642"}.fa-allergies:before{content:"\f461"}.fa-amazon:before{content:"\f270"}.fa-amazon-pay:before{content:"\f42c"}.fa-ambulance:before{content:"\f0f9"}.fa-american-sign-language-interpreting:before{content:"\f2a3"}.fa-amilia:before{content:"\f36d"}.fa-anchor:before{content:"\f13d"}.fa-android:before{content:"\f17b"}.fa-angellist:before{content:"\f209"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-down:before{content:"\f107"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angry:before{content:"\f556"}.fa-angrycreative:before{content:"\f36e"}.fa-angular:before{content:"\f420"}.fa-ankh:before{content:"\f644"}.fa-app-store:before{content:"\f36f"}.fa-app-store-ios:before{content:"\f370"}.fa-apper:before{content:"\f371"}.fa-apple:before{content:"\f179"}.fa-apple-alt:before{content:"\f5d1"}.fa-apple-pay:before{content:"\f415"}.fa-archive:before{content:"\f187"}.fa-archway:before{content:"\f557"}.fa-arrow-alt-circle-down:before{content:"\f358"}.fa-arrow-alt-circle-left:before{content:"\f359"}.fa-arrow-alt-circle-right:before{content:"\f35a"}.fa-arrow-alt-circle-up:before{content:"\f35b"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-down:before{content:"\f063"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrows-alt:before{content:"\f0b2"}.fa-arrows-alt-h:before{content:"\f337"}.fa-arrows-alt-v:before{content:"\f338"}.fa-artstation:before{content:"\f77a"}.fa-assistive-listening-systems:before{content:"\f2a2"}.fa-asterisk:before{content:"\f069"}.fa-asymmetrik:before{content:"\f372"}.fa-at:before{content:"\f1fa"}.fa-atlas:before{content:"\f558"}.fa-atlassian:before{content:"\f77b"}.fa-atom:before{content:"\f5d2"}.fa-audible:before{content:"\f373"}.fa-audio-description:before{content:"\f29e"}.fa-autoprefixer:before{content:"\f41c"}.fa-avianex:before{content:"\f374"}.fa-aviato:before{content:"\f421"}.fa-award:before{content:"\f559"}.fa-aws:before{content:"\f375"}.fa-baby:before{content:"\f77c"}.fa-baby-carriage:before{content:"\f77d"}.fa-backspace:before{content:"\f55a"}.fa-backward:before{content:"\f04a"}.fa-bacon:before{content:"\f7e5"}.fa-bacteria:before{content:"\e059"}.fa-bacterium:before{content:"\e05a"}.fa-bahai:before{content:"\f666"}.fa-balance-scale:before{content:"\f24e"}.fa-balance-scale-left:before{content:"\f515"}.fa-balance-scale-right:before{content:"\f516"}.fa-ban:before{content:"\f05e"}.fa-band-aid:before{content:"\f462"}.fa-bandcamp:before{content:"\f2d5"}.fa-barcode:before{content:"\f02a"}.fa-bars:before{content:"\f0c9"}.fa-baseball-ball:before{content:"\f433"}.fa-basketball-ball:before{content:"\f434"}.fa-bath:before{content:"\f2cd"}.fa-battery-empty:before{content:"\f244"}.fa-battery-full:before{content:"\f240"}.fa-battery-half:before{content:"\f242"}.fa-battery-quarter:before{content:"\f243"}.fa-battery-three-quarters:before{content:"\f241"}.fa-battle-net:before{content:"\f835"}.fa-bed:before{content:"\f236"}.fa-beer:before{content:"\f0fc"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-bell:before{content:"\f0f3"}.fa-bell-slash:before{content:"\f1f6"}.fa-bezier-curve:before{content:"\f55b"}.fa-bible:before{content:"\f647"}.fa-bicycle:before{content:"\f206"}.fa-biking:before{content:"\f84a"}.fa-bimobject:before{content:"\f378"}.fa-binoculars:before{content:"\f1e5"}.fa-biohazard:before{content:"\f780"}.fa-birthday-cake:before{content:"\f1fd"}.fa-bitbucket:before{content:"\f171"}.fa-bitcoin:before{content:"\f379"}.fa-bity:before{content:"\f37a"}.fa-black-tie:before{content:"\f27e"}.fa-blackberry:before{content:"\f37b"}.fa-blender:before{content:"\f517"}.fa-blender-phone:before{content:"\f6b6"}.fa-blind:before{content:"\f29d"}.fa-blog:before{content:"\f781"}.fa-blogger:before{content:"\f37c"}.fa-blogger-b:before{content:"\f37d"}.fa-bluetooth:before{content:"\f293"}.fa-bluetooth-b:before{content:"\f294"}.fa-bold:before{content:"\f032"}.fa-bolt:before{content:"\f0e7"}.fa-bomb:before{content:"\f1e2"}.fa-bone:before{content:"\f5d7"}.fa-bong:before{content:"\f55c"}.fa-book:before{content:"\f02d"}.fa-book-dead:before{content:"\f6b7"}.fa-book-medical:before{content:"\f7e6"}.fa-book-open:before{content:"\f518"}.fa-book-reader:before{content:"\f5da"}.fa-bookmark:before{content:"\f02e"}.fa-bootstrap:before{content:"\f836"}.fa-border-all:before{content:"\f84c"}.fa-border-none:before{content:"\f850"}.fa-border-style:before{content:"\f853"}.fa-bowling-ball:before{content:"\f436"}.fa-box:before{content:"\f466"}.fa-box-open:before{content:"\f49e"}.fa-box-tissue:before{content:"\e05b"}.fa-boxes:before{content:"\f468"}.fa-braille:before{content:"\f2a1"}.fa-brain:before{content:"\f5dc"}.fa-bread-slice:before{content:"\f7ec"}.fa-briefcase:before{content:"\f0b1"}.fa-briefcase-medical:before{content:"\f469"}.fa-broadcast-tower:before{content:"\f519"}.fa-broom:before{content:"\f51a"}.fa-brush:before{content:"\f55d"}.fa-btc:before{content:"\f15a"}.fa-buffer:before{content:"\f837"}.fa-bug:before{content:"\f188"}.fa-building:before{content:"\f1ad"}.fa-bullhorn:before{content:"\f0a1"}.fa-bullseye:before{content:"\f140"}.fa-burn:before{content:"\f46a"}.fa-buromobelexperte:before{content:"\f37f"}.fa-bus:before{content:"\f207"}.fa-bus-alt:before{content:"\f55e"}.fa-business-time:before{content:"\f64a"}.fa-buy-n-large:before{content:"\f8a6"}.fa-buysellads:before{content:"\f20d"}.fa-calculator:before{content:"\f1ec"}.fa-calendar:before{content:"\f133"}.fa-calendar-alt:before{content:"\f073"}.fa-calendar-check:before{content:"\f274"}.fa-calendar-day:before{content:"\f783"}.fa-calendar-minus:before{content:"\f272"}.fa-calendar-plus:before{content:"\f271"}.fa-calendar-times:before{content:"\f273"}.fa-calendar-week:before{content:"\f784"}.fa-camera:before{content:"\f030"}.fa-camera-retro:before{content:"\f083"}.fa-campground:before{content:"\f6bb"}.fa-canadian-maple-leaf:before{content:"\f785"}.fa-candy-cane:before{content:"\f786"}.fa-cannabis:before{content:"\f55f"}.fa-capsules:before{content:"\f46b"}.fa-car:before{content:"\f1b9"}.fa-car-alt:before{content:"\f5de"}.fa-car-battery:before{content:"\f5df"}.fa-car-crash:before{content:"\f5e1"}.fa-car-side:before{content:"\f5e4"}.fa-caravan:before{content:"\f8ff"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-caret-square-down:before{content:"\f150"}.fa-caret-square-left:before{content:"\f191"}.fa-caret-square-right:before{content:"\f152"}.fa-caret-square-up:before{content:"\f151"}.fa-caret-up:before{content:"\f0d8"}.fa-carrot:before{content:"\f787"}.fa-cart-arrow-down:before{content:"\f218"}.fa-cart-plus:before{content:"\f217"}.fa-cash-register:before{content:"\f788"}.fa-cat:before{content:"\f6be"}.fa-cc-amazon-pay:before{content:"\f42d"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-apple-pay:before{content:"\f416"}.fa-cc-diners-club:before{content:"\f24c"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-jcb:before{content:"\f24b"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-cc-visa:before{content:"\f1f0"}.fa-centercode:before{content:"\f380"}.fa-centos:before{content:"\f789"}.fa-certificate:before{content:"\f0a3"}.fa-chair:before{content:"\f6c0"}.fa-chalkboard:before{content:"\f51b"}.fa-chalkboard-teacher:before{content:"\f51c"}.fa-charging-station:before{content:"\f5e7"}.fa-chart-area:before{content:"\f1fe"}.fa-chart-bar:before{content:"\f080"}.fa-chart-line:before{content:"\f201"}.fa-chart-pie:before{content:"\f200"}.fa-check:before{content:"\f00c"}.fa-check-circle:before{content:"\f058"}.fa-check-double:before{content:"\f560"}.fa-check-square:before{content:"\f14a"}.fa-cheese:before{content:"\f7ef"}.fa-chess:before{content:"\f439"}.fa-chess-bishop:before{content:"\f43a"}.fa-chess-board:before{content:"\f43c"}.fa-chess-king:before{content:"\f43f"}.fa-chess-knight:before{content:"\f441"}.fa-chess-pawn:before{content:"\f443"}.fa-chess-queen:before{content:"\f445"}.fa-chess-rook:before{content:"\f447"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-down:before{content:"\f078"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-chevron-up:before{content:"\f077"}.fa-child:before{content:"\f1ae"}.fa-chrome:before{content:"\f268"}.fa-chromecast:before{content:"\f838"}.fa-church:before{content:"\f51d"}.fa-circle:before{content:"\f111"}.fa-circle-notch:before{content:"\f1ce"}.fa-city:before{content:"\f64f"}.fa-clinic-medical:before{content:"\f7f2"}.fa-clipboard:before{content:"\f328"}.fa-clipboard-check:before{content:"\f46c"}.fa-clipboard-list:before{content:"\f46d"}.fa-clock:before{content:"\f017"}.fa-clone:before{content:"\f24d"}.fa-closed-captioning:before{content:"\f20a"}.fa-cloud:before{content:"\f0c2"}.fa-cloud-download-alt:before{content:"\f381"}.fa-cloud-meatball:before{content:"\f73b"}.fa-cloud-moon:before{content:"\f6c3"}.fa-cloud-moon-rain:before{content:"\f73c"}.fa-cloud-rain:before{content:"\f73d"}.fa-cloud-showers-heavy:before{content:"\f740"}.fa-cloud-sun:before{content:"\f6c4"}.fa-cloud-sun-rain:before{content:"\f743"}.fa-cloud-upload-alt:before{content:"\f382"}.fa-cloudflare:before{content:"\e07d"}.fa-cloudscale:before{content:"\f383"}.fa-cloudsmith:before{content:"\f384"}.fa-cloudversify:before{content:"\f385"}.fa-cocktail:before{content:"\f561"}.fa-code:before{content:"\f121"}.fa-code-branch:before{content:"\f126"}.fa-codepen:before{content:"\f1cb"}.fa-codiepie:before{content:"\f284"}.fa-coffee:before{content:"\f0f4"}.fa-cog:before{content:"\f013"}.fa-cogs:before{content:"\f085"}.fa-coins:before{content:"\f51e"}.fa-columns:before{content:"\f0db"}.fa-comment:before{content:"\f075"}.fa-comment-alt:before{content:"\f27a"}.fa-comment-dollar:before{content:"\f651"}.fa-comment-dots:before{content:"\f4ad"}.fa-comment-medical:before{content:"\f7f5"}.fa-comment-slash:before{content:"\f4b3"}.fa-comments:before{content:"\f086"}.fa-comments-dollar:before{content:"\f653"}.fa-compact-disc:before{content:"\f51f"}.fa-compass:before{content:"\f14e"}.fa-compress:before{content:"\f066"}.fa-compress-alt:before{content:"\f422"}.fa-compress-arrows-alt:before{content:"\f78c"}.fa-concierge-bell:before{content:"\f562"}.fa-confluence:before{content:"\f78d"}.fa-connectdevelop:before{content:"\f20e"}.fa-contao:before{content:"\f26d"}.fa-cookie:before{content:"\f563"}.fa-cookie-bite:before{content:"\f564"}.fa-copy:before{content:"\f0c5"}.fa-copyright:before{content:"\f1f9"}.fa-cotton-bureau:before{content:"\f89e"}.fa-couch:before{content:"\f4b8"}.fa-cpanel:before{content:"\f388"}.fa-creative-commons:before{content:"\f25e"}.fa-creative-commons-by:before{content:"\f4e7"}.fa-creative-commons-nc:before{content:"\f4e8"}.fa-creative-commons-nc-eu:before{content:"\f4e9"}.fa-creative-commons-nc-jp:before{content:"\f4ea"}.fa-creative-commons-nd:before{content:"\f4eb"}.fa-creative-commons-pd:before{content:"\f4ec"}.fa-creative-commons-pd-alt:before{content:"\f4ed"}.fa-creative-commons-remix:before{content:"\f4ee"}.fa-creative-commons-sa:before{content:"\f4ef"}.fa-creative-commons-sampling:before{content:"\f4f0"}.fa-creative-commons-sampling-plus:before{content:"\f4f1"}.fa-creative-commons-share:before{content:"\f4f2"}.fa-creative-commons-zero:before{content:"\f4f3"}.fa-credit-card:before{content:"\f09d"}.fa-critical-role:before{content:"\f6c9"}.fa-crop:before{content:"\f125"}.fa-crop-alt:before{content:"\f565"}.fa-cross:before{content:"\f654"}.fa-crosshairs:before{content:"\f05b"}.fa-crow:before{content:"\f520"}.fa-crown:before{content:"\f521"}.fa-crutch:before{content:"\f7f7"}.fa-css3:before{content:"\f13c"}.fa-css3-alt:before{content:"\f38b"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-cut:before{content:"\f0c4"}.fa-cuttlefish:before{content:"\f38c"}.fa-d-and-d:before{content:"\f38d"}.fa-d-and-d-beyond:before{content:"\f6ca"}.fa-dailymotion:before{content:"\e052"}.fa-dashcube:before{content:"\f210"}.fa-database:before{content:"\f1c0"}.fa-deaf:before{content:"\f2a4"}.fa-deezer:before{content:"\e077"}.fa-delicious:before{content:"\f1a5"}.fa-democrat:before{content:"\f747"}.fa-deploydog:before{content:"\f38e"}.fa-deskpro:before{content:"\f38f"}.fa-desktop:before{content:"\f108"}.fa-dev:before{content:"\f6cc"}.fa-deviantart:before{content:"\f1bd"}.fa-dharmachakra:before{content:"\f655"}.fa-dhl:before{content:"\f790"}.fa-diagnoses:before{content:"\f470"}.fa-diaspora:before{content:"\f791"}.fa-dice:before{content:"\f522"}.fa-dice-d20:before{content:"\f6cf"}.fa-dice-d6:before{content:"\f6d1"}.fa-dice-five:before{content:"\f523"}.fa-dice-four:before{content:"\f524"}.fa-dice-one:before{content:"\f525"}.fa-dice-six:before{content:"\f526"}.fa-dice-three:before{content:"\f527"}.fa-dice-two:before{content:"\f528"}.fa-digg:before{content:"\f1a6"}.fa-digital-ocean:before{content:"\f391"}.fa-digital-tachograph:before{content:"\f566"}.fa-directions:before{content:"\f5eb"}.fa-discord:before{content:"\f392"}.fa-discourse:before{content:"\f393"}.fa-disease:before{content:"\f7fa"}.fa-divide:before{content:"\f529"}.fa-dizzy:before{content:"\f567"}.fa-dna:before{content:"\f471"}.fa-dochub:before{content:"\f394"}.fa-docker:before{content:"\f395"}.fa-dog:before{content:"\f6d3"}.fa-dollar-sign:before{content:"\f155"}.fa-dolly:before{content:"\f472"}.fa-dolly-flatbed:before{content:"\f474"}.fa-donate:before{content:"\f4b9"}.fa-door-closed:before{content:"\f52a"}.fa-door-open:before{content:"\f52b"}.fa-dot-circle:before{content:"\f192"}.fa-dove:before{content:"\f4ba"}.fa-download:before{content:"\f019"}.fa-draft2digital:before{content:"\f396"}.fa-drafting-compass:before{content:"\f568"}.fa-dragon:before{content:"\f6d5"}.fa-draw-polygon:before{content:"\f5ee"}.fa-dribbble:before{content:"\f17d"}.fa-dribbble-square:before{content:"\f397"}.fa-dropbox:before{content:"\f16b"}.fa-drum:before{content:"\f569"}.fa-drum-steelpan:before{content:"\f56a"}.fa-drumstick-bite:before{content:"\f6d7"}.fa-drupal:before{content:"\f1a9"}.fa-dumbbell:before{content:"\f44b"}.fa-dumpster:before{content:"\f793"}.fa-dumpster-fire:before{content:"\f794"}.fa-dungeon:before{content:"\f6d9"}.fa-dyalog:before{content:"\f399"}.fa-earlybirds:before{content:"\f39a"}.fa-ebay:before{content:"\f4f4"}.fa-edge:before{content:"\f282"}.fa-edge-legacy:before{content:"\e078"}.fa-edit:before{content:"\f044"}.fa-egg:before{content:"\f7fb"}.fa-eject:before{content:"\f052"}.fa-elementor:before{content:"\f430"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-ello:before{content:"\f5f1"}.fa-ember:before{content:"\f423"}.fa-empire:before{content:"\f1d1"}.fa-envelope:before{content:"\f0e0"}.fa-envelope-open:before{content:"\f2b6"}.fa-envelope-open-text:before{content:"\f658"}.fa-envelope-square:before{content:"\f199"}.fa-envira:before{content:"\f299"}.fa-equals:before{content:"\f52c"}.fa-eraser:before{content:"\f12d"}.fa-erlang:before{content:"\f39d"}.fa-ethereum:before{content:"\f42e"}.fa-ethernet:before{content:"\f796"}.fa-etsy:before{content:"\f2d7"}.fa-euro-sign:before{content:"\f153"}.fa-evernote:before{content:"\f839"}.fa-exchange-alt:before{content:"\f362"}.fa-exclamation:before{content:"\f12a"}.fa-exclamation-circle:before{content:"\f06a"}.fa-exclamation-triangle:before{content:"\f071"}.fa-expand:before{content:"\f065"}.fa-expand-alt:before{content:"\f424"}.fa-expand-arrows-alt:before{content:"\f31e"}.fa-expeditedssl:before{content:"\f23e"}.fa-external-link-alt:before{content:"\f35d"}.fa-external-link-square-alt:before{content:"\f360"}.fa-eye:before{content:"\f06e"}.fa-eye-dropper:before{content:"\f1fb"}.fa-eye-slash:before{content:"\f070"}.fa-facebook:before{content:"\f09a"}.fa-facebook-f:before{content:"\f39e"}.fa-facebook-messenger:before{content:"\f39f"}.fa-facebook-square:before{content:"\f082"}.fa-fan:before{content:"\f863"}.fa-fantasy-flight-games:before{content:"\f6dc"}.fa-fast-backward:before{content:"\f049"}.fa-fast-forward:before{content:"\f050"}.fa-faucet:before{content:"\e005"}.fa-fax:before{content:"\f1ac"}.fa-feather:before{content:"\f52d"}.fa-feather-alt:before{content:"\f56b"}.fa-fedex:before{content:"\f797"}.fa-fedora:before{content:"\f798"}.fa-female:before{content:"\f182"}.fa-fighter-jet:before{content:"\f0fb"}.fa-figma:before{content:"\f799"}.fa-file:before{content:"\f15b"}.fa-file-alt:before{content:"\f15c"}.fa-file-archive:before{content:"\f1c6"}.fa-file-audio:before{content:"\f1c7"}.fa-file-code:before{content:"\f1c9"}.fa-file-contract:before{content:"\f56c"}.fa-file-csv:before{content:"\f6dd"}.fa-file-download:before{content:"\f56d"}.fa-file-excel:before{content:"\f1c3"}.fa-file-export:before{content:"\f56e"}.fa-file-image:before{content:"\f1c5"}.fa-file-import:before{content:"\f56f"}.fa-file-invoice:before{content:"\f570"}.fa-file-invoice-dollar:before{content:"\f571"}.fa-file-medical:before{content:"\f477"}.fa-file-medical-alt:before{content:"\f478"}.fa-file-pdf:before{content:"\f1c1"}.fa-file-powerpoint:before{content:"\f1c4"}.fa-file-prescription:before{content:"\f572"}.fa-file-signature:before{content:"\f573"}.fa-file-upload:before{content:"\f574"}.fa-file-video:before{content:"\f1c8"}.fa-file-word:before{content:"\f1c2"}.fa-fill:before{content:"\f575"}.fa-fill-drip:before{content:"\f576"}.fa-film:before{content:"\f008"}.fa-filter:before{content:"\f0b0"}.fa-fingerprint:before{content:"\f577"}.fa-fire:before{content:"\f06d"}.fa-fire-alt:before{content:"\f7e4"}.fa-fire-extinguisher:before{content:"\f134"}.fa-firefox:before{content:"\f269"}.fa-firefox-browser:before{content:"\e007"}.fa-first-aid:before{content:"\f479"}.fa-first-order:before{content:"\f2b0"}.fa-first-order-alt:before{content:"\f50a"}.fa-firstdraft:before{content:"\f3a1"}.fa-fish:before{content:"\f578"}.fa-fist-raised:before{content:"\f6de"}.fa-flag:before{content:"\f024"}.fa-flag-checkered:before{content:"\f11e"}.fa-flag-usa:before{content:"\f74d"}.fa-flask:before{content:"\f0c3"}.fa-flickr:before{content:"\f16e"}.fa-flipboard:before{content:"\f44d"}.fa-flushed:before{content:"\f579"}.fa-fly:before{content:"\f417"}.fa-folder:before{content:"\f07b"}.fa-folder-minus:before{content:"\f65d"}.fa-folder-open:before{content:"\f07c"}.fa-folder-plus:before{content:"\f65e"}.fa-font:before{content:"\f031"}.fa-font-awesome:before{content:"\f2b4"}.fa-font-awesome-alt:before{content:"\f35c"}.fa-font-awesome-flag:before{content:"\f425"}.fa-font-awesome-logo-full:before{content:"\f4e6"}.fa-fonticons:before{content:"\f280"}.fa-fonticons-fi:before{content:"\f3a2"}.fa-football-ball:before{content:"\f44e"}.fa-fort-awesome:before{content:"\f286"}.fa-fort-awesome-alt:before{content:"\f3a3"}.fa-forumbee:before{content:"\f211"}.fa-forward:before{content:"\f04e"}.fa-foursquare:before{content:"\f180"}.fa-free-code-camp:before{content:"\f2c5"}.fa-freebsd:before{content:"\f3a4"}.fa-frog:before{content:"\f52e"}.fa-frown:before{content:"\f119"}.fa-frown-open:before{content:"\f57a"}.fa-fulcrum:before{content:"\f50b"}.fa-funnel-dollar:before{content:"\f662"}.fa-futbol:before{content:"\f1e3"}.fa-galactic-republic:before{content:"\f50c"}.fa-galactic-senate:before{content:"\f50d"}.fa-gamepad:before{content:"\f11b"}.fa-gas-pump:before{content:"\f52f"}.fa-gavel:before{content:"\f0e3"}.fa-gem:before{content:"\f3a5"}.fa-genderless:before{content:"\f22d"}.fa-get-pocket:before{content:"\f265"}.fa-gg:before{content:"\f260"}.fa-gg-circle:before{content:"\f261"}.fa-ghost:before{content:"\f6e2"}.fa-gift:before{content:"\f06b"}.fa-gifts:before{content:"\f79c"}.fa-git:before{content:"\f1d3"}.fa-git-alt:before{content:"\f841"}.fa-git-square:before{content:"\f1d2"}.fa-github:before{content:"\f09b"}.fa-github-alt:before{content:"\f113"}.fa-github-square:before{content:"\f092"}.fa-gitkraken:before{content:"\f3a6"}.fa-gitlab:before{content:"\f296"}.fa-gitter:before{content:"\f426"}.fa-glass-cheers:before{content:"\f79f"}.fa-glass-martini:before{content:"\f000"}.fa-glass-martini-alt:before{content:"\f57b"}.fa-glass-whiskey:before{content:"\f7a0"}.fa-glasses:before{content:"\f530"}.fa-glide:before{content:"\f2a5"}.fa-glide-g:before{content:"\f2a6"}.fa-globe:before{content:"\f0ac"}.fa-globe-africa:before{content:"\f57c"}.fa-globe-americas:before{content:"\f57d"}.fa-globe-asia:before{content:"\f57e"}.fa-globe-europe:before{content:"\f7a2"}.fa-gofore:before{content:"\f3a7"}.fa-golf-ball:before{content:"\f450"}.fa-goodreads:before{content:"\f3a8"}.fa-goodreads-g:before{content:"\f3a9"}.fa-google:before{content:"\f1a0"}.fa-google-drive:before{content:"\f3aa"}.fa-google-pay:before{content:"\e079"}.fa-google-play:before{content:"\f3ab"}.fa-google-plus:before{content:"\f2b3"}.fa-google-plus-g:before{content:"\f0d5"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-wallet:before{content:"\f1ee"}.fa-gopuram:before{content:"\f664"}.fa-graduation-cap:before{content:"\f19d"}.fa-gratipay:before{content:"\f184"}.fa-grav:before{content:"\f2d6"}.fa-greater-than:before{content:"\f531"}.fa-greater-than-equal:before{content:"\f532"}.fa-grimace:before{content:"\f57f"}.fa-grin:before{content:"\f580"}.fa-grin-alt:before{content:"\f581"}.fa-grin-beam:before{content:"\f582"}.fa-grin-beam-sweat:before{content:"\f583"}.fa-grin-hearts:before{content:"\f584"}.fa-grin-squint:before{content:"\f585"}.fa-grin-squint-tears:before{content:"\f586"}.fa-grin-stars:before{content:"\f587"}.fa-grin-tears:before{content:"\f588"}.fa-grin-tongue:before{content:"\f589"}.fa-grin-tongue-squint:before{content:"\f58a"}.fa-grin-tongue-wink:before{content:"\f58b"}.fa-grin-wink:before{content:"\f58c"}.fa-grip-horizontal:before{content:"\f58d"}.fa-grip-lines:before{content:"\f7a4"}.fa-grip-lines-vertical:before{content:"\f7a5"}.fa-grip-vertical:before{content:"\f58e"}.fa-gripfire:before{content:"\f3ac"}.fa-grunt:before{content:"\f3ad"}.fa-guilded:before{content:"\e07e"}.fa-guitar:before{content:"\f7a6"}.fa-gulp:before{content:"\f3ae"}.fa-h-square:before{content:"\f0fd"}.fa-hacker-news:before{content:"\f1d4"}.fa-hacker-news-square:before{content:"\f3af"}.fa-hackerrank:before{content:"\f5f7"}.fa-hamburger:before{content:"\f805"}.fa-hammer:before{content:"\f6e3"}.fa-hamsa:before{content:"\f665"}.fa-hand-holding:before{content:"\f4bd"}.fa-hand-holding-heart:before{content:"\f4be"}.fa-hand-holding-medical:before{content:"\e05c"}.fa-hand-holding-usd:before{content:"\f4c0"}.fa-hand-holding-water:before{content:"\f4c1"}.fa-hand-lizard:before{content:"\f258"}.fa-hand-middle-finger:before{content:"\f806"}.fa-hand-paper:before{content:"\f256"}.fa-hand-peace:before{content:"\f25b"}.fa-hand-point-down:before{content:"\f0a7"}.fa-hand-point-left:before{content:"\f0a5"}.fa-hand-point-right:before{content:"\f0a4"}.fa-hand-point-up:before{content:"\f0a6"}.fa-hand-pointer:before{content:"\f25a"}.fa-hand-rock:before{content:"\f255"}.fa-hand-scissors:before{content:"\f257"}.fa-hand-sparkles:before{content:"\e05d"}.fa-hand-spock:before{content:"\f259"}.fa-hands:before{content:"\f4c2"}.fa-hands-helping:before{content:"\f4c4"}.fa-hands-wash:before{content:"\e05e"}.fa-handshake:before{content:"\f2b5"}.fa-handshake-alt-slash:before{content:"\e05f"}.fa-handshake-slash:before{content:"\e060"}.fa-hanukiah:before{content:"\f6e6"}.fa-hard-hat:before{content:"\f807"}.fa-hashtag:before{content:"\f292"}.fa-hat-cowboy:before{content:"\f8c0"}.fa-hat-cowboy-side:before{content:"\f8c1"}.fa-hat-wizard:before{content:"\f6e8"}.fa-hdd:before{content:"\f0a0"}.fa-head-side-cough:before{content:"\e061"}.fa-head-side-cough-slash:before{content:"\e062"}.fa-head-side-mask:before{content:"\e063"}.fa-head-side-virus:before{content:"\e064"}.fa-heading:before{content:"\f1dc"}.fa-headphones:before{content:"\f025"}.fa-headphones-alt:before{content:"\f58f"}.fa-headset:before{content:"\f590"}.fa-heart:before{content:"\f004"}.fa-heart-broken:before{content:"\f7a9"}.fa-heartbeat:before{content:"\f21e"}.fa-helicopter:before{content:"\f533"}.fa-highlighter:before{content:"\f591"}.fa-hiking:before{content:"\f6ec"}.fa-hippo:before{content:"\f6ed"}.fa-hips:before{content:"\f452"}.fa-hire-a-helper:before{content:"\f3b0"}.fa-history:before{content:"\f1da"}.fa-hive:before{content:"\e07f"}.fa-hockey-puck:before{content:"\f453"}.fa-holly-berry:before{content:"\f7aa"}.fa-home:before{content:"\f015"}.fa-hooli:before{content:"\f427"}.fa-hornbill:before{content:"\f592"}.fa-horse:before{content:"\f6f0"}.fa-horse-head:before{content:"\f7ab"}.fa-hospital:before{content:"\f0f8"}.fa-hospital-alt:before{content:"\f47d"}.fa-hospital-symbol:before{content:"\f47e"}.fa-hospital-user:before{content:"\f80d"}.fa-hot-tub:before{content:"\f593"}.fa-hotdog:before{content:"\f80f"}.fa-hotel:before{content:"\f594"}.fa-hotjar:before{content:"\f3b1"}.fa-hourglass:before{content:"\f254"}.fa-hourglass-end:before{content:"\f253"}.fa-hourglass-half:before{content:"\f252"}.fa-hourglass-start:before{content:"\f251"}.fa-house-damage:before{content:"\f6f1"}.fa-house-user:before{content:"\e065"}.fa-houzz:before{content:"\f27c"}.fa-hryvnia:before{content:"\f6f2"}.fa-html5:before{content:"\f13b"}.fa-hubspot:before{content:"\f3b2"}.fa-i-cursor:before{content:"\f246"}.fa-ice-cream:before{content:"\f810"}.fa-icicles:before{content:"\f7ad"}.fa-icons:before{content:"\f86d"}.fa-id-badge:before{content:"\f2c1"}.fa-id-card:before{content:"\f2c2"}.fa-id-card-alt:before{content:"\f47f"}.fa-ideal:before{content:"\e013"}.fa-igloo:before{content:"\f7ae"}.fa-image:before{content:"\f03e"}.fa-images:before{content:"\f302"}.fa-imdb:before{content:"\f2d8"}.fa-inbox:before{content:"\f01c"}.fa-indent:before{content:"\f03c"}.fa-industry:before{content:"\f275"}.fa-infinity:before{content:"\f534"}.fa-info:before{content:"\f129"}.fa-info-circle:before{content:"\f05a"}.fa-innosoft:before{content:"\e080"}.fa-instagram:before{content:"\f16d"}.fa-instagram-square:before{content:"\e055"}.fa-instalod:before{content:"\e081"}.fa-intercom:before{content:"\f7af"}.fa-internet-explorer:before{content:"\f26b"}.fa-invision:before{content:"\f7b0"}.fa-ioxhost:before{content:"\f208"}.fa-italic:before{content:"\f033"}.fa-itch-io:before{content:"\f83a"}.fa-itunes:before{content:"\f3b4"}.fa-itunes-note:before{content:"\f3b5"}.fa-java:before{content:"\f4e4"}.fa-jedi:before{content:"\f669"}.fa-jedi-order:before{content:"\f50e"}.fa-jenkins:before{content:"\f3b6"}.fa-jira:before{content:"\f7b1"}.fa-joget:before{content:"\f3b7"}.fa-joint:before{content:"\f595"}.fa-joomla:before{content:"\f1aa"}.fa-journal-whills:before{content:"\f66a"}.fa-js:before{content:"\f3b8"}.fa-js-square:before{content:"\f3b9"}.fa-jsfiddle:before{content:"\f1cc"}.fa-kaaba:before{content:"\f66b"}.fa-kaggle:before{content:"\f5fa"}.fa-key:before{content:"\f084"}.fa-keybase:before{content:"\f4f5"}.fa-keyboard:before{content:"\f11c"}.fa-keycdn:before{content:"\f3ba"}.fa-khanda:before{content:"\f66d"}.fa-kickstarter:before{content:"\f3bb"}.fa-kickstarter-k:before{content:"\f3bc"}.fa-kiss:before{content:"\f596"}.fa-kiss-beam:before{content:"\f597"}.fa-kiss-wink-heart:before{content:"\f598"}.fa-kiwi-bird:before{content:"\f535"}.fa-korvue:before{content:"\f42f"}.fa-landmark:before{content:"\f66f"}.fa-language:before{content:"\f1ab"}.fa-laptop:before{content:"\f109"}.fa-laptop-code:before{content:"\f5fc"}.fa-laptop-house:before{content:"\e066"}.fa-laptop-medical:before{content:"\f812"}.fa-laravel:before{content:"\f3bd"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-laugh:before{content:"\f599"}.fa-laugh-beam:before{content:"\f59a"}.fa-laugh-squint:before{content:"\f59b"}.fa-laugh-wink:before{content:"\f59c"}.fa-layer-group:before{content:"\f5fd"}.fa-leaf:before{content:"\f06c"}.fa-leanpub:before{content:"\f212"}.fa-lemon:before{content:"\f094"}.fa-less:before{content:"\f41d"}.fa-less-than:before{content:"\f536"}.fa-less-than-equal:before{content:"\f537"}.fa-level-down-alt:before{content:"\f3be"}.fa-level-up-alt:before{content:"\f3bf"}.fa-life-ring:before{content:"\f1cd"}.fa-lightbulb:before{content:"\f0eb"}.fa-line:before{content:"\f3c0"}.fa-link:before{content:"\f0c1"}.fa-linkedin:before{content:"\f08c"}.fa-linkedin-in:before{content:"\f0e1"}.fa-linode:before{content:"\f2b8"}.fa-linux:before{content:"\f17c"}.fa-lira-sign:before{content:"\f195"}.fa-list:before{content:"\f03a"}.fa-list-alt:before{content:"\f022"}.fa-list-ol:before{content:"\f0cb"}.fa-list-ul:before{content:"\f0ca"}.fa-location-arrow:before{content:"\f124"}.fa-lock:before{content:"\f023"}.fa-lock-open:before{content:"\f3c1"}.fa-long-arrow-alt-down:before{content:"\f309"}.fa-long-arrow-alt-left:before{content:"\f30a"}.fa-long-arrow-alt-right:before{content:"\f30b"}.fa-long-arrow-alt-up:before{content:"\f30c"}.fa-low-vision:before{content:"\f2a8"}.fa-luggage-cart:before{content:"\f59d"}.fa-lungs:before{content:"\f604"}.fa-lungs-virus:before{content:"\e067"}.fa-lyft:before{content:"\f3c3"}.fa-magento:before{content:"\f3c4"}.fa-magic:before{content:"\f0d0"}.fa-magnet:before{content:"\f076"}.fa-mail-bulk:before{content:"\f674"}.fa-mailchimp:before{content:"\f59e"}.fa-male:before{content:"\f183"}.fa-mandalorian:before{content:"\f50f"}.fa-map:before{content:"\f279"}.fa-map-marked:before{content:"\f59f"}.fa-map-marked-alt:before{content:"\f5a0"}.fa-map-marker:before{content:"\f041"}.fa-map-marker-alt:before{content:"\f3c5"}.fa-map-pin:before{content:"\f276"}.fa-map-signs:before{content:"\f277"}.fa-markdown:before{content:"\f60f"}.fa-marker:before{content:"\f5a1"}.fa-mars:before{content:"\f222"}.fa-mars-double:before{content:"\f227"}.fa-mars-stroke:before{content:"\f229"}.fa-mars-stroke-h:before{content:"\f22b"}.fa-mars-stroke-v:before{content:"\f22a"}.fa-mask:before{content:"\f6fa"}.fa-mastodon:before{content:"\f4f6"}.fa-maxcdn:before{content:"\f136"}.fa-mdb:before{content:"\f8ca"}.fa-medal:before{content:"\f5a2"}.fa-medapps:before{content:"\f3c6"}.fa-medium:before{content:"\f23a"}.fa-medium-m:before{content:"\f3c7"}.fa-medkit:before{content:"\f0fa"}.fa-medrt:before{content:"\f3c8"}.fa-meetup:before{content:"\f2e0"}.fa-megaport:before{content:"\f5a3"}.fa-meh:before{content:"\f11a"}.fa-meh-blank:before{content:"\f5a4"}.fa-meh-rolling-eyes:before{content:"\f5a5"}.fa-memory:before{content:"\f538"}.fa-mendeley:before{content:"\f7b3"}.fa-menorah:before{content:"\f676"}.fa-mercury:before{content:"\f223"}.fa-meteor:before{content:"\f753"}.fa-microblog:before{content:"\e01a"}.fa-microchip:before{content:"\f2db"}.fa-microphone:before{content:"\f130"}.fa-microphone-alt:before{content:"\f3c9"}.fa-microphone-alt-slash:before{content:"\f539"}.fa-microphone-slash:before{content:"\f131"}.fa-microscope:before{content:"\f610"}.fa-microsoft:before{content:"\f3ca"}.fa-minus:before{content:"\f068"}.fa-minus-circle:before{content:"\f056"}.fa-minus-square:before{content:"\f146"}.fa-mitten:before{content:"\f7b5"}.fa-mix:before{content:"\f3cb"}.fa-mixcloud:before{content:"\f289"}.fa-mixer:before{content:"\e056"}.fa-mizuni:before{content:"\f3cc"}.fa-mobile:before{content:"\f10b"}.fa-mobile-alt:before{content:"\f3cd"}.fa-modx:before{content:"\f285"}.fa-monero:before{content:"\f3d0"}.fa-money-bill:before{content:"\f0d6"}.fa-money-bill-alt:before{content:"\f3d1"}.fa-money-bill-wave:before{content:"\f53a"}.fa-money-bill-wave-alt:before{content:"\f53b"}.fa-money-check:before{content:"\f53c"}.fa-money-check-alt:before{content:"\f53d"}.fa-monument:before{content:"\f5a6"}.fa-moon:before{content:"\f186"}.fa-mortar-pestle:before{content:"\f5a7"}.fa-mosque:before{content:"\f678"}.fa-motorcycle:before{content:"\f21c"}.fa-mountain:before{content:"\f6fc"}.fa-mouse:before{content:"\f8cc"}.fa-mouse-pointer:before{content:"\f245"}.fa-mug-hot:before{content:"\f7b6"}.fa-music:before{content:"\f001"}.fa-napster:before{content:"\f3d2"}.fa-neos:before{content:"\f612"}.fa-network-wired:before{content:"\f6ff"}.fa-neuter:before{content:"\f22c"}.fa-newspaper:before{content:"\f1ea"}.fa-nimblr:before{content:"\f5a8"}.fa-node:before{content:"\f419"}.fa-node-js:before{content:"\f3d3"}.fa-not-equal:before{content:"\f53e"}.fa-notes-medical:before{content:"\f481"}.fa-npm:before{content:"\f3d4"}.fa-ns8:before{content:"\f3d5"}.fa-nutritionix:before{content:"\f3d6"}.fa-object-group:before{content:"\f247"}.fa-object-ungroup:before{content:"\f248"}.fa-octopus-deploy:before{content:"\e082"}.fa-odnoklassniki:before{content:"\f263"}.fa-odnoklassniki-square:before{content:"\f264"}.fa-oil-can:before{content:"\f613"}.fa-old-republic:before{content:"\f510"}.fa-om:before{content:"\f679"}.fa-opencart:before{content:"\f23d"}.fa-openid:before{content:"\f19b"}.fa-opera:before{content:"\f26a"}.fa-optin-monster:before{content:"\f23c"}.fa-orcid:before{content:"\f8d2"}.fa-osi:before{content:"\f41a"}.fa-otter:before{content:"\f700"}.fa-outdent:before{content:"\f03b"}.fa-page4:before{content:"\f3d7"}.fa-pagelines:before{content:"\f18c"}.fa-pager:before{content:"\f815"}.fa-paint-brush:before{content:"\f1fc"}.fa-paint-roller:before{content:"\f5aa"}.fa-palette:before{content:"\f53f"}.fa-palfed:before{content:"\f3d8"}.fa-pallet:before{content:"\f482"}.fa-paper-plane:before{content:"\f1d8"}.fa-paperclip:before{content:"\f0c6"}.fa-parachute-box:before{content:"\f4cd"}.fa-paragraph:before{content:"\f1dd"}.fa-parking:before{content:"\f540"}.fa-passport:before{content:"\f5ab"}.fa-pastafarianism:before{content:"\f67b"}.fa-paste:before{content:"\f0ea"}.fa-patreon:before{content:"\f3d9"}.fa-pause:before{content:"\f04c"}.fa-pause-circle:before{content:"\f28b"}.fa-paw:before{content:"\f1b0"}.fa-paypal:before{content:"\f1ed"}.fa-peace:before{content:"\f67c"}.fa-pen:before{content:"\f304"}.fa-pen-alt:before{content:"\f305"}.fa-pen-fancy:before{content:"\f5ac"}.fa-pen-nib:before{content:"\f5ad"}.fa-pen-square:before{content:"\f14b"}.fa-pencil-alt:before{content:"\f303"}.fa-pencil-ruler:before{content:"\f5ae"}.fa-penny-arcade:before{content:"\f704"}.fa-people-arrows:before{content:"\e068"}.fa-people-carry:before{content:"\f4ce"}.fa-pepper-hot:before{content:"\f816"}.fa-perbyte:before{content:"\e083"}.fa-percent:before{content:"\f295"}.fa-percentage:before{content:"\f541"}.fa-periscope:before{content:"\f3da"}.fa-person-booth:before{content:"\f756"}.fa-phabricator:before{content:"\f3db"}.fa-phoenix-framework:before{content:"\f3dc"}.fa-phoenix-squadron:before{content:"\f511"}.fa-phone:before{content:"\f095"}.fa-phone-alt:before{content:"\f879"}.fa-phone-slash:before{content:"\f3dd"}.fa-phone-square:before{content:"\f098"}.fa-phone-square-alt:before{content:"\f87b"}.fa-phone-volume:before{content:"\f2a0"}.fa-photo-video:before{content:"\f87c"}.fa-php:before{content:"\f457"}.fa-pied-piper:before{content:"\f2ae"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-pied-piper-hat:before{content:"\f4e5"}.fa-pied-piper-pp:before{content:"\f1a7"}.fa-pied-piper-square:before{content:"\e01e"}.fa-piggy-bank:before{content:"\f4d3"}.fa-pills:before{content:"\f484"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-p:before{content:"\f231"}.fa-pinterest-square:before{content:"\f0d3"}.fa-pizza-slice:before{content:"\f818"}.fa-place-of-worship:before{content:"\f67f"}.fa-plane:before{content:"\f072"}.fa-plane-arrival:before{content:"\f5af"}.fa-plane-departure:before{content:"\f5b0"}.fa-plane-slash:before{content:"\e069"}.fa-play:before{content:"\f04b"}.fa-play-circle:before{content:"\f144"}.fa-playstation:before{content:"\f3df"}.fa-plug:before{content:"\f1e6"}.fa-plus:before{content:"\f067"}.fa-plus-circle:before{content:"\f055"}.fa-plus-square:before{content:"\f0fe"}.fa-podcast:before{content:"\f2ce"}.fa-poll:before{content:"\f681"}.fa-poll-h:before{content:"\f682"}.fa-poo:before{content:"\f2fe"}.fa-poo-storm:before{content:"\f75a"}.fa-poop:before{content:"\f619"}.fa-portrait:before{content:"\f3e0"}.fa-pound-sign:before{content:"\f154"}.fa-power-off:before{content:"\f011"}.fa-pray:before{content:"\f683"}.fa-praying-hands:before{content:"\f684"}.fa-prescription:before{content:"\f5b1"}.fa-prescription-bottle:before{content:"\f485"}.fa-prescription-bottle-alt:before{content:"\f486"}.fa-print:before{content:"\f02f"}.fa-procedures:before{content:"\f487"}.fa-product-hunt:before{content:"\f288"}.fa-project-diagram:before{content:"\f542"}.fa-pump-medical:before{content:"\e06a"}.fa-pump-soap:before{content:"\e06b"}.fa-pushed:before{content:"\f3e1"}.fa-puzzle-piece:before{content:"\f12e"}.fa-python:before{content:"\f3e2"}.fa-qq:before{content:"\f1d6"}.fa-qrcode:before{content:"\f029"}.fa-question:before{content:"\f128"}.fa-question-circle:before{content:"\f059"}.fa-quidditch:before{content:"\f458"}.fa-quinscape:before{content:"\f459"}.fa-quora:before{content:"\f2c4"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-quran:before{content:"\f687"}.fa-r-project:before{content:"\f4f7"}.fa-radiation:before{content:"\f7b9"}.fa-radiation-alt:before{content:"\f7ba"}.fa-rainbow:before{content:"\f75b"}.fa-random:before{content:"\f074"}.fa-raspberry-pi:before{content:"\f7bb"}.fa-ravelry:before{content:"\f2d9"}.fa-react:before{content:"\f41b"}.fa-reacteurope:before{content:"\f75d"}.fa-readme:before{content:"\f4d5"}.fa-rebel:before{content:"\f1d0"}.fa-receipt:before{content:"\f543"}.fa-record-vinyl:before{content:"\f8d9"}.fa-recycle:before{content:"\f1b8"}.fa-red-river:before{content:"\f3e3"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-alien:before{content:"\f281"}.fa-reddit-square:before{content:"\f1a2"}.fa-redhat:before{content:"\f7bc"}.fa-redo:before{content:"\f01e"}.fa-redo-alt:before{content:"\f2f9"}.fa-registered:before{content:"\f25d"}.fa-remove-format:before{content:"\f87d"}.fa-renren:before{content:"\f18b"}.fa-reply:before{content:"\f3e5"}.fa-reply-all:before{content:"\f122"}.fa-replyd:before{content:"\f3e6"}.fa-republican:before{content:"\f75e"}.fa-researchgate:before{content:"\f4f8"}.fa-resolving:before{content:"\f3e7"}.fa-restroom:before{content:"\f7bd"}.fa-retweet:before{content:"\f079"}.fa-rev:before{content:"\f5b2"}.fa-ribbon:before{content:"\f4d6"}.fa-ring:before{content:"\f70b"}.fa-road:before{content:"\f018"}.fa-robot:before{content:"\f544"}.fa-rocket:before{content:"\f135"}.fa-rocketchat:before{content:"\f3e8"}.fa-rockrms:before{content:"\f3e9"}.fa-route:before{content:"\f4d7"}.fa-rss:before{content:"\f09e"}.fa-rss-square:before{content:"\f143"}.fa-ruble-sign:before{content:"\f158"}.fa-ruler:before{content:"\f545"}.fa-ruler-combined:before{content:"\f546"}.fa-ruler-horizontal:before{content:"\f547"}.fa-ruler-vertical:before{content:"\f548"}.fa-running:before{content:"\f70c"}.fa-rupee-sign:before{content:"\f156"}.fa-rust:before{content:"\e07a"}.fa-sad-cry:before{content:"\f5b3"}.fa-sad-tear:before{content:"\f5b4"}.fa-safari:before{content:"\f267"}.fa-salesforce:before{content:"\f83b"}.fa-sass:before{content:"\f41e"}.fa-satellite:before{content:"\f7bf"}.fa-satellite-dish:before{content:"\f7c0"}.fa-save:before{content:"\f0c7"}.fa-schlix:before{content:"\f3ea"}.fa-school:before{content:"\f549"}.fa-screwdriver:before{content:"\f54a"}.fa-scribd:before{content:"\f28a"}.fa-scroll:before{content:"\f70e"}.fa-sd-card:before{content:"\f7c2"}.fa-search:before{content:"\f002"}.fa-search-dollar:before{content:"\f688"}.fa-search-location:before{content:"\f689"}.fa-search-minus:before{content:"\f010"}.fa-search-plus:before{content:"\f00e"}.fa-searchengin:before{content:"\f3eb"}.fa-seedling:before{content:"\f4d8"}.fa-sellcast:before{content:"\f2da"}.fa-sellsy:before{content:"\f213"}.fa-server:before{content:"\f233"}.fa-servicestack:before{content:"\f3ec"}.fa-shapes:before{content:"\f61f"}.fa-share:before{content:"\f064"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-share-square:before{content:"\f14d"}.fa-shekel-sign:before{content:"\f20b"}.fa-shield-alt:before{content:"\f3ed"}.fa-shield-virus:before{content:"\e06c"}.fa-ship:before{content:"\f21a"}.fa-shipping-fast:before{content:"\f48b"}.fa-shirtsinbulk:before{content:"\f214"}.fa-shoe-prints:before{content:"\f54b"}.fa-shopify:before{content:"\e057"}.fa-shopping-bag:before{content:"\f290"}.fa-shopping-basket:before{content:"\f291"}.fa-shopping-cart:before{content:"\f07a"}.fa-shopware:before{content:"\f5b5"}.fa-shower:before{content:"\f2cc"}.fa-shuttle-van:before{content:"\f5b6"}.fa-sign:before{content:"\f4d9"}.fa-sign-in-alt:before{content:"\f2f6"}.fa-sign-language:before{content:"\f2a7"}.fa-sign-out-alt:before{content:"\f2f5"}.fa-signal:before{content:"\f012"}.fa-signature:before{content:"\f5b7"}.fa-sim-card:before{content:"\f7c4"}.fa-simplybuilt:before{content:"\f215"}.fa-sink:before{content:"\e06d"}.fa-sistrix:before{content:"\f3ee"}.fa-sitemap:before{content:"\f0e8"}.fa-sith:before{content:"\f512"}.fa-skating:before{content:"\f7c5"}.fa-sketch:before{content:"\f7c6"}.fa-skiing:before{content:"\f7c9"}.fa-skiing-nordic:before{content:"\f7ca"}.fa-skull:before{content:"\f54c"}.fa-skull-crossbones:before{content:"\f714"}.fa-skyatlas:before{content:"\f216"}.fa-skype:before{content:"\f17e"}.fa-slack:before{content:"\f198"}.fa-slack-hash:before{content:"\f3ef"}.fa-slash:before{content:"\f715"}.fa-sleigh:before{content:"\f7cc"}.fa-sliders-h:before{content:"\f1de"}.fa-slideshare:before{content:"\f1e7"}.fa-smile:before{content:"\f118"}.fa-smile-beam:before{content:"\f5b8"}.fa-smile-wink:before{content:"\f4da"}.fa-smog:before{content:"\f75f"}.fa-smoking:before{content:"\f48d"}.fa-smoking-ban:before{content:"\f54d"}.fa-sms:before{content:"\f7cd"}.fa-snapchat:before{content:"\f2ab"}.fa-snapchat-ghost:before{content:"\f2ac"}.fa-snapchat-square:before{content:"\f2ad"}.fa-snowboarding:before{content:"\f7ce"}.fa-snowflake:before{content:"\f2dc"}.fa-snowman:before{content:"\f7d0"}.fa-snowplow:before{content:"\f7d2"}.fa-soap:before{content:"\e06e"}.fa-socks:before{content:"\f696"}.fa-solar-panel:before{content:"\f5ba"}.fa-sort:before{content:"\f0dc"}.fa-sort-alpha-down:before{content:"\f15d"}.fa-sort-alpha-down-alt:before{content:"\f881"}.fa-sort-alpha-up:before{content:"\f15e"}.fa-sort-alpha-up-alt:before{content:"\f882"}.fa-sort-amount-down:before{content:"\f160"}.fa-sort-amount-down-alt:before{content:"\f884"}.fa-sort-amount-up:before{content:"\f161"}.fa-sort-amount-up-alt:before{content:"\f885"}.fa-sort-down:before{content:"\f0dd"}.fa-sort-numeric-down:before{content:"\f162"}.fa-sort-numeric-down-alt:before{content:"\f886"}.fa-sort-numeric-up:before{content:"\f163"}.fa-sort-numeric-up-alt:before{content:"\f887"}.fa-sort-up:before{content:"\f0de"}.fa-soundcloud:before{content:"\f1be"}.fa-sourcetree:before{content:"\f7d3"}.fa-spa:before{content:"\f5bb"}.fa-space-shuttle:before{content:"\f197"}.fa-speakap:before{content:"\f3f3"}.fa-speaker-deck:before{content:"\f83c"}.fa-spell-check:before{content:"\f891"}.fa-spider:before{content:"\f717"}.fa-spinner:before{content:"\f110"}.fa-splotch:before{content:"\f5bc"}.fa-spotify:before{content:"\f1bc"}.fa-spray-can:before{content:"\f5bd"}.fa-square:before{content:"\f0c8"}.fa-square-full:before{content:"\f45c"}.fa-square-root-alt:before{content:"\f698"}.fa-squarespace:before{content:"\f5be"}.fa-stack-exchange:before{content:"\f18d"}.fa-stack-overflow:before{content:"\f16c"}.fa-stackpath:before{content:"\f842"}.fa-stamp:before{content:"\f5bf"}.fa-star:before{content:"\f005"}.fa-star-and-crescent:before{content:"\f699"}.fa-star-half:before{content:"\f089"}.fa-star-half-alt:before{content:"\f5c0"}.fa-star-of-david:before{content:"\f69a"}.fa-star-of-life:before{content:"\f621"}.fa-staylinked:before{content:"\f3f5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-steam-symbol:before{content:"\f3f6"}.fa-step-backward:before{content:"\f048"}.fa-step-forward:before{content:"\f051"}.fa-stethoscope:before{content:"\f0f1"}.fa-sticker-mule:before{content:"\f3f7"}.fa-sticky-note:before{content:"\f249"}.fa-stop:before{content:"\f04d"}.fa-stop-circle:before{content:"\f28d"}.fa-stopwatch:before{content:"\f2f2"}.fa-stopwatch-20:before{content:"\e06f"}.fa-store:before{content:"\f54e"}.fa-store-alt:before{content:"\f54f"}.fa-store-alt-slash:before{content:"\e070"}.fa-store-slash:before{content:"\e071"}.fa-strava:before{content:"\f428"}.fa-stream:before{content:"\f550"}.fa-street-view:before{content:"\f21d"}.fa-strikethrough:before{content:"\f0cc"}.fa-stripe:before{content:"\f429"}.fa-stripe-s:before{content:"\f42a"}.fa-stroopwafel:before{content:"\f551"}.fa-studiovinari:before{content:"\f3f8"}.fa-stumbleupon:before{content:"\f1a4"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-subscript:before{content:"\f12c"}.fa-subway:before{content:"\f239"}.fa-suitcase:before{content:"\f0f2"}.fa-suitcase-rolling:before{content:"\f5c1"}.fa-sun:before{content:"\f185"}.fa-superpowers:before{content:"\f2dd"}.fa-superscript:before{content:"\f12b"}.fa-supple:before{content:"\f3f9"}.fa-surprise:before{content:"\f5c2"}.fa-suse:before{content:"\f7d6"}.fa-swatchbook:before{content:"\f5c3"}.fa-swift:before{content:"\f8e1"}.fa-swimmer:before{content:"\f5c4"}.fa-swimming-pool:before{content:"\f5c5"}.fa-symfony:before{content:"\f83d"}.fa-synagogue:before{content:"\f69b"}.fa-sync:before{content:"\f021"}.fa-sync-alt:before{content:"\f2f1"}.fa-syringe:before{content:"\f48e"}.fa-table:before{content:"\f0ce"}.fa-table-tennis:before{content:"\f45d"}.fa-tablet:before{content:"\f10a"}.fa-tablet-alt:before{content:"\f3fa"}.fa-tablets:before{content:"\f490"}.fa-tachometer-alt:before{content:"\f3fd"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-tape:before{content:"\f4db"}.fa-tasks:before{content:"\f0ae"}.fa-taxi:before{content:"\f1ba"}.fa-teamspeak:before{content:"\f4f9"}.fa-teeth:before{content:"\f62e"}.fa-teeth-open:before{content:"\f62f"}.fa-telegram:before{content:"\f2c6"}.fa-telegram-plane:before{content:"\f3fe"}.fa-temperature-high:before{content:"\f769"}.fa-temperature-low:before{content:"\f76b"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-tenge:before{content:"\f7d7"}.fa-terminal:before{content:"\f120"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-th:before{content:"\f00a"}.fa-th-large:before{content:"\f009"}.fa-th-list:before{content:"\f00b"}.fa-the-red-yeti:before{content:"\f69d"}.fa-theater-masks:before{content:"\f630"}.fa-themeco:before{content:"\f5c6"}.fa-themeisle:before{content:"\f2b2"}.fa-thermometer:before{content:"\f491"}.fa-thermometer-empty:before{content:"\f2cb"}.fa-thermometer-full:before{content:"\f2c7"}.fa-thermometer-half:before{content:"\f2c9"}.fa-thermometer-quarter:before{content:"\f2ca"}.fa-thermometer-three-quarters:before{content:"\f2c8"}.fa-think-peaks:before{content:"\f731"}.fa-thumbs-down:before{content:"\f165"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbtack:before{content:"\f08d"}.fa-ticket-alt:before{content:"\f3ff"}.fa-tiktok:before{content:"\e07b"}.fa-times:before{content:"\f00d"}.fa-times-circle:before{content:"\f057"}.fa-tint:before{content:"\f043"}.fa-tint-slash:before{content:"\f5c7"}.fa-tired:before{content:"\f5c8"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-toilet:before{content:"\f7d8"}.fa-toilet-paper:before{content:"\f71e"}.fa-toilet-paper-slash:before{content:"\e072"}.fa-toolbox:before{content:"\f552"}.fa-tools:before{content:"\f7d9"}.fa-tooth:before{content:"\f5c9"}.fa-torah:before{content:"\f6a0"}.fa-torii-gate:before{content:"\f6a1"}.fa-tractor:before{content:"\f722"}.fa-trade-federation:before{content:"\f513"}.fa-trademark:before{content:"\f25c"}.fa-traffic-light:before{content:"\f637"}.fa-trailer:before{content:"\e041"}.fa-train:before{content:"\f238"}.fa-tram:before{content:"\f7da"}.fa-transgender:before{content:"\f224"}.fa-transgender-alt:before{content:"\f225"}.fa-trash:before{content:"\f1f8"}.fa-trash-alt:before{content:"\f2ed"}.fa-trash-restore:before{content:"\f829"}.fa-trash-restore-alt:before{content:"\f82a"}.fa-tree:before{content:"\f1bb"}.fa-trello:before{content:"\f181"}.fa-trophy:before{content:"\f091"}.fa-truck:before{content:"\f0d1"}.fa-truck-loading:before{content:"\f4de"}.fa-truck-monster:before{content:"\f63b"}.fa-truck-moving:before{content:"\f4df"}.fa-truck-pickup:before{content:"\f63c"}.fa-tshirt:before{content:"\f553"}.fa-tty:before{content:"\f1e4"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-tv:before{content:"\f26c"}.fa-twitch:before{content:"\f1e8"}.fa-twitter:before{content:"\f099"}.fa-twitter-square:before{content:"\f081"}.fa-typo3:before{content:"\f42b"}.fa-uber:before{content:"\f402"}.fa-ubuntu:before{content:"\f7df"}.fa-uikit:before{content:"\f403"}.fa-umbraco:before{content:"\f8e8"}.fa-umbrella:before{content:"\f0e9"}.fa-umbrella-beach:before{content:"\f5ca"}.fa-uncharted:before{content:"\e084"}.fa-underline:before{content:"\f0cd"}.fa-undo:before{content:"\f0e2"}.fa-undo-alt:before{content:"\f2ea"}.fa-uniregistry:before{content:"\f404"}.fa-unity:before{content:"\e049"}.fa-universal-access:before{content:"\f29a"}.fa-university:before{content:"\f19c"}.fa-unlink:before{content:"\f127"}.fa-unlock:before{content:"\f09c"}.fa-unlock-alt:before{content:"\f13e"}.fa-unsplash:before{content:"\e07c"}.fa-untappd:before{content:"\f405"}.fa-upload:before{content:"\f093"}.fa-ups:before{content:"\f7e0"}.fa-usb:before{content:"\f287"}.fa-user:before{content:"\f007"}.fa-user-alt:before{content:"\f406"}.fa-user-alt-slash:before{content:"\f4fa"}.fa-user-astronaut:before{content:"\f4fb"}.fa-user-check:before{content:"\f4fc"}.fa-user-circle:before{content:"\f2bd"}.fa-user-clock:before{content:"\f4fd"}.fa-user-cog:before{content:"\f4fe"}.fa-user-edit:before{content:"\f4ff"}.fa-user-friends:before{content:"\f500"}.fa-user-graduate:before{content:"\f501"}.fa-user-injured:before{content:"\f728"}.fa-user-lock:before{content:"\f502"}.fa-user-md:before{content:"\f0f0"}.fa-user-minus:before{content:"\f503"}.fa-user-ninja:before{content:"\f504"}.fa-user-nurse:before{content:"\f82f"}.fa-user-plus:before{content:"\f234"}.fa-user-secret:before{content:"\f21b"}.fa-user-shield:before{content:"\f505"}.fa-user-slash:before{content:"\f506"}.fa-user-tag:before{content:"\f507"}.fa-user-tie:before{content:"\f508"}.fa-user-times:before{content:"\f235"}.fa-users:before{content:"\f0c0"}.fa-users-cog:before{content:"\f509"}.fa-users-slash:before{content:"\e073"}.fa-usps:before{content:"\f7e1"}.fa-ussunnah:before{content:"\f407"}.fa-utensil-spoon:before{content:"\f2e5"}.fa-utensils:before{content:"\f2e7"}.fa-vaadin:before{content:"\f408"}.fa-vector-square:before{content:"\f5cb"}.fa-venus:before{content:"\f221"}.fa-venus-double:before{content:"\f226"}.fa-venus-mars:before{content:"\f228"}.fa-vest:before{content:"\e085"}.fa-vest-patches:before{content:"\e086"}.fa-viacoin:before{content:"\f237"}.fa-viadeo:before{content:"\f2a9"}.fa-viadeo-square:before{content:"\f2aa"}.fa-vial:before{content:"\f492"}.fa-vials:before{content:"\f493"}.fa-viber:before{content:"\f409"}.fa-video:before{content:"\f03d"}.fa-video-slash:before{content:"\f4e2"}.fa-vihara:before{content:"\f6a7"}.fa-vimeo:before{content:"\f40a"}.fa-vimeo-square:before{content:"\f194"}.fa-vimeo-v:before{content:"\f27d"}.fa-vine:before{content:"\f1ca"}.fa-virus:before{content:"\e074"}.fa-virus-slash:before{content:"\e075"}.fa-viruses:before{content:"\e076"}.fa-vk:before{content:"\f189"}.fa-vnv:before{content:"\f40b"}.fa-voicemail:before{content:"\f897"}.fa-volleyball-ball:before{content:"\f45f"}.fa-volume-down:before{content:"\f027"}.fa-volume-mute:before{content:"\f6a9"}.fa-volume-off:before{content:"\f026"}.fa-volume-up:before{content:"\f028"}.fa-vote-yea:before{content:"\f772"}.fa-vr-cardboard:before{content:"\f729"}.fa-vuejs:before{content:"\f41f"}.fa-walking:before{content:"\f554"}.fa-wallet:before{content:"\f555"}.fa-warehouse:before{content:"\f494"}.fa-watchman-monitoring:before{content:"\e087"}.fa-water:before{content:"\f773"}.fa-wave-square:before{content:"\f83e"}.fa-waze:before{content:"\f83f"}.fa-weebly:before{content:"\f5cc"}.fa-weibo:before{content:"\f18a"}.fa-weight:before{content:"\f496"}.fa-weight-hanging:before{content:"\f5cd"}.fa-weixin:before{content:"\f1d7"}.fa-whatsapp:before{content:"\f232"}.fa-whatsapp-square:before{content:"\f40c"}.fa-wheelchair:before{content:"\f193"}.fa-whmcs:before{content:"\f40d"}.fa-wifi:before{content:"\f1eb"}.fa-wikipedia-w:before{content:"\f266"}.fa-wind:before{content:"\f72e"}.fa-window-close:before{content:"\f410"}.fa-window-maximize:before{content:"\f2d0"}.fa-window-minimize:before{content:"\f2d1"}.fa-window-restore:before{content:"\f2d2"}.fa-windows:before{content:"\f17a"}.fa-wine-bottle:before{content:"\f72f"}.fa-wine-glass:before{content:"\f4e3"}.fa-wine-glass-alt:before{content:"\f5ce"}.fa-wix:before{content:"\f5cf"}.fa-wizards-of-the-coast:before{content:"\f730"}.fa-wodu:before{content:"\e088"}.fa-wolf-pack-battalion:before{content:"\f514"}.fa-won-sign:before{content:"\f159"}.fa-wordpress:before{content:"\f19a"}.fa-wordpress-simple:before{content:"\f411"}.fa-wpbeginner:before{content:"\f297"}.fa-wpexplorer:before{content:"\f2de"}.fa-wpforms:before{content:"\f298"}.fa-wpressr:before{content:"\f3e4"}.fa-wrench:before{content:"\f0ad"}.fa-x-ray:before{content:"\f497"}.fa-xbox:before{content:"\f412"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-y-combinator:before{content:"\f23b"}.fa-yahoo:before{content:"\f19e"}.fa-yammer:before{content:"\f840"}.fa-yandex:before{content:"\f413"}.fa-yandex-international:before{content:"\f414"}.fa-yarn:before{content:"\f7e3"}.fa-yelp:before{content:"\f1e9"}.fa-yen-sign:before{content:"\f157"}.fa-yin-yang:before{content:"\f6ad"}.fa-yoast:before{content:"\f2b1"}.fa-youtube:before{content:"\f167"}.fa-youtube-square:before{content:"\f431"}.fa-zhihu:before{content:"\f63f"}.sr-only{border:0;clip:rect(0,0,0,0);height:1px;margin:-1px;overflow:hidden;padding:0;position:absolute;width:1px}.sr-only-focusable:active,.sr-only-focusable:focus{clip:auto;height:auto;margin:0;overflow:visible;position:static;width:auto}@font-face{font-family:"Font Awesome 5 Brands";font-style:normal;font-weight:400;font-display:block;src:url(fa-brands-400.eot);src:url(fa-brands-400.eot?#iefix) format("embedded-opentype"),url(fa-brands-400.woff2) format("woff2"),url(fa-brands-400.woff) format("woff"),url(fa-brands-400.ttf) format("truetype"),url(fa-brands-400.svg#fontawesome) format("svg")}.fab{font-family:"Font Awesome 5 Brands"}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:400;font-display:block;src:url(fa-regular-400.eot);src:url(fa-regular-400.eot?#iefix) format("embedded-opentype"),url(fa-regular-400.woff2) format("woff2"),url(fa-regular-400.woff) format("woff"),url(fa-regular-400.ttf) format("truetype"),url(fa-regular-400.svg#fontawesome) format("svg")}.fab,.far{font-weight:400}@font-face{font-family:"Font Awesome 5 Free";font-style:normal;font-weight:900;font-display:block;src:url(fa-solid-900.eot);src:url(fa-solid-900.eot?#iefix) format("embedded-opentype"),url(fa-solid-900.woff2) format("woff2"),url(fa-solid-900.woff) format("woff"),url(fa-solid-900.ttf) format("truetype"),url(fa-solid-900.svg#fontawesome) format("svg")}.fa,.far,.fas{font-family:"Font Awesome 5 Free"}.fa,.fas{font-weight:900}
diff --git a/html/font-awesome/css/v4-shims.min.css b/html/font-awesome/css/v4-shims.min.css
index 5f3fdc598c8..21a0708aafa 100644
--- a/html/font-awesome/css/v4-shims.min.css
+++ b/html/font-awesome/css/v4-shims.min.css
@@ -1,5 +1,5 @@
/*!
- * Font Awesome Free 5.9.0 by @fontawesome - https://fontawesome.com
+ * Font Awesome Free 5.15.4 by @fontawesome - https://fontawesome.com
* License - https://fontawesome.com/license/free (Icons: CC BY 4.0, Fonts: SIL OFL 1.1, Code: MIT License)
*/
-.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f15e"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f161"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f163"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-cab:before{content:"\f1ba"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-spotify,.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}
\ No newline at end of file
+.fa.fa-glass:before{content:"\f000"}.fa.fa-meetup{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-star-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-o:before{content:"\f005"}.fa.fa-close:before,.fa.fa-remove:before{content:"\f00d"}.fa.fa-gear:before{content:"\f013"}.fa.fa-trash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-trash-o:before{content:"\f2ed"}.fa.fa-file-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-o:before{content:"\f15b"}.fa.fa-clock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-clock-o:before{content:"\f017"}.fa.fa-arrow-circle-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-down:before{content:"\f358"}.fa.fa-arrow-circle-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-up:before{content:"\f35b"}.fa.fa-play-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-play-circle-o:before{content:"\f144"}.fa.fa-repeat:before,.fa.fa-rotate-right:before{content:"\f01e"}.fa.fa-refresh:before{content:"\f021"}.fa.fa-list-alt{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dedent:before{content:"\f03b"}.fa.fa-video-camera:before{content:"\f03d"}.fa.fa-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-picture-o:before{content:"\f03e"}.fa.fa-photo{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-photo:before{content:"\f03e"}.fa.fa-image{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-image:before{content:"\f03e"}.fa.fa-pencil:before{content:"\f303"}.fa.fa-map-marker:before{content:"\f3c5"}.fa.fa-pencil-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pencil-square-o:before{content:"\f044"}.fa.fa-share-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-share-square-o:before{content:"\f14d"}.fa.fa-check-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-square-o:before{content:"\f14a"}.fa.fa-arrows:before{content:"\f0b2"}.fa.fa-times-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-circle-o:before{content:"\f057"}.fa.fa-check-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-check-circle-o:before{content:"\f058"}.fa.fa-mail-forward:before{content:"\f064"}.fa.fa-expand:before{content:"\f424"}.fa.fa-compress:before{content:"\f422"}.fa.fa-eye,.fa.fa-eye-slash{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-warning:before{content:"\f071"}.fa.fa-calendar:before{content:"\f073"}.fa.fa-arrows-v:before{content:"\f338"}.fa.fa-arrows-h:before{content:"\f337"}.fa.fa-bar-chart{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart:before{content:"\f080"}.fa.fa-bar-chart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bar-chart-o:before{content:"\f080"}.fa.fa-facebook-square,.fa.fa-twitter-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gears:before{content:"\f085"}.fa.fa-thumbs-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-up:before{content:"\f164"}.fa.fa-thumbs-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-thumbs-o-down:before{content:"\f165"}.fa.fa-heart-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-heart-o:before{content:"\f004"}.fa.fa-sign-out:before{content:"\f2f5"}.fa.fa-linkedin-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin-square:before{content:"\f08c"}.fa.fa-thumb-tack:before{content:"\f08d"}.fa.fa-external-link:before{content:"\f35d"}.fa.fa-sign-in:before{content:"\f2f6"}.fa.fa-github-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-lemon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lemon-o:before{content:"\f094"}.fa.fa-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-square-o:before{content:"\f0c8"}.fa.fa-bookmark-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bookmark-o:before{content:"\f02e"}.fa.fa-facebook,.fa.fa-twitter{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook:before{content:"\f39e"}.fa.fa-facebook-f{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-f:before{content:"\f39e"}.fa.fa-github{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-feed:before{content:"\f09e"}.fa.fa-hdd-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hdd-o:before{content:"\f0a0"}.fa.fa-hand-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-right:before{content:"\f0a4"}.fa.fa-hand-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-left:before{content:"\f0a5"}.fa.fa-hand-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-up:before{content:"\f0a6"}.fa.fa-hand-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-o-down:before{content:"\f0a7"}.fa.fa-arrows-alt:before{content:"\f31e"}.fa.fa-group:before{content:"\f0c0"}.fa.fa-chain:before{content:"\f0c1"}.fa.fa-scissors:before{content:"\f0c4"}.fa.fa-files-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-files-o:before{content:"\f0c5"}.fa.fa-floppy-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-floppy-o:before{content:"\f0c7"}.fa.fa-navicon:before,.fa.fa-reorder:before{content:"\f0c9"}.fa.fa-google-plus,.fa.fa-google-plus-square,.fa.fa-pinterest,.fa.fa-pinterest-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus:before{content:"\f0d5"}.fa.fa-money{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-money:before{content:"\f3d1"}.fa.fa-unsorted:before{content:"\f0dc"}.fa.fa-sort-desc:before{content:"\f0dd"}.fa.fa-sort-asc:before{content:"\f0de"}.fa.fa-linkedin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-linkedin:before{content:"\f0e1"}.fa.fa-rotate-left:before{content:"\f0e2"}.fa.fa-legal:before{content:"\f0e3"}.fa.fa-dashboard:before,.fa.fa-tachometer:before{content:"\f3fd"}.fa.fa-comment-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comment-o:before{content:"\f075"}.fa.fa-comments-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-comments-o:before{content:"\f086"}.fa.fa-flash:before{content:"\f0e7"}.fa.fa-clipboard,.fa.fa-paste{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paste:before{content:"\f328"}.fa.fa-lightbulb-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-lightbulb-o:before{content:"\f0eb"}.fa.fa-exchange:before{content:"\f362"}.fa.fa-cloud-download:before{content:"\f381"}.fa.fa-cloud-upload:before{content:"\f382"}.fa.fa-bell-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-o:before{content:"\f0f3"}.fa.fa-cutlery:before{content:"\f2e7"}.fa.fa-file-text-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-text-o:before{content:"\f15c"}.fa.fa-building-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-building-o:before{content:"\f1ad"}.fa.fa-hospital-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hospital-o:before{content:"\f0f8"}.fa.fa-tablet:before{content:"\f3fa"}.fa.fa-mobile-phone:before,.fa.fa-mobile:before{content:"\f3cd"}.fa.fa-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-o:before{content:"\f111"}.fa.fa-mail-reply:before{content:"\f3e5"}.fa.fa-github-alt{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-folder-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-o:before{content:"\f07b"}.fa.fa-folder-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-folder-open-o:before{content:"\f07c"}.fa.fa-smile-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-smile-o:before{content:"\f118"}.fa.fa-frown-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-frown-o:before{content:"\f119"}.fa.fa-meh-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-meh-o:before{content:"\f11a"}.fa.fa-keyboard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-keyboard-o:before{content:"\f11c"}.fa.fa-flag-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-flag-o:before{content:"\f024"}.fa.fa-mail-reply-all:before{content:"\f122"}.fa.fa-star-half-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-o:before{content:"\f089"}.fa.fa-star-half-empty{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-empty:before{content:"\f089"}.fa.fa-star-half-full{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-star-half-full:before{content:"\f089"}.fa.fa-code-fork:before{content:"\f126"}.fa.fa-chain-broken:before{content:"\f127"}.fa.fa-shield:before{content:"\f3ed"}.fa.fa-calendar-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-o:before{content:"\f133"}.fa.fa-css3,.fa.fa-html5,.fa.fa-maxcdn{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ticket:before{content:"\f3ff"}.fa.fa-minus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-minus-square-o:before{content:"\f146"}.fa.fa-level-up:before{content:"\f3bf"}.fa.fa-level-down:before{content:"\f3be"}.fa.fa-pencil-square:before{content:"\f14b"}.fa.fa-external-link-square:before{content:"\f360"}.fa.fa-compass{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-down:before{content:"\f150"}.fa.fa-toggle-down{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-down:before{content:"\f150"}.fa.fa-caret-square-o-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-up:before{content:"\f151"}.fa.fa-toggle-up{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-up:before{content:"\f151"}.fa.fa-caret-square-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-right:before{content:"\f152"}.fa.fa-toggle-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-right:before{content:"\f152"}.fa.fa-eur:before,.fa.fa-euro:before{content:"\f153"}.fa.fa-gbp:before{content:"\f154"}.fa.fa-dollar:before,.fa.fa-usd:before{content:"\f155"}.fa.fa-inr:before,.fa.fa-rupee:before{content:"\f156"}.fa.fa-cny:before,.fa.fa-jpy:before,.fa.fa-rmb:before,.fa.fa-yen:before{content:"\f157"}.fa.fa-rouble:before,.fa.fa-rub:before,.fa.fa-ruble:before{content:"\f158"}.fa.fa-krw:before,.fa.fa-won:before{content:"\f159"}.fa.fa-bitcoin,.fa.fa-btc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitcoin:before{content:"\f15a"}.fa.fa-file-text:before{content:"\f15c"}.fa.fa-sort-alpha-asc:before{content:"\f15d"}.fa.fa-sort-alpha-desc:before{content:"\f881"}.fa.fa-sort-amount-asc:before{content:"\f160"}.fa.fa-sort-amount-desc:before{content:"\f884"}.fa.fa-sort-numeric-asc:before{content:"\f162"}.fa.fa-sort-numeric-desc:before{content:"\f886"}.fa.fa-xing,.fa.fa-xing-square,.fa.fa-youtube,.fa.fa-youtube-play,.fa.fa-youtube-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-youtube-play:before{content:"\f167"}.fa.fa-adn,.fa.fa-bitbucket,.fa.fa-bitbucket-square,.fa.fa-dropbox,.fa.fa-flickr,.fa.fa-instagram,.fa.fa-stack-overflow{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bitbucket-square:before{content:"\f171"}.fa.fa-tumblr,.fa.fa-tumblr-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-long-arrow-down:before{content:"\f309"}.fa.fa-long-arrow-up:before{content:"\f30c"}.fa.fa-long-arrow-left:before{content:"\f30a"}.fa.fa-long-arrow-right:before{content:"\f30b"}.fa.fa-android,.fa.fa-apple,.fa.fa-dribbble,.fa.fa-foursquare,.fa.fa-gittip,.fa.fa-gratipay,.fa.fa-linux,.fa.fa-skype,.fa.fa-trello,.fa.fa-windows{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-gittip:before{content:"\f184"}.fa.fa-sun-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sun-o:before{content:"\f185"}.fa.fa-moon-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-moon-o:before{content:"\f186"}.fa.fa-pagelines,.fa.fa-renren,.fa.fa-stack-exchange,.fa.fa-vk,.fa.fa-weibo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-arrow-circle-o-right{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-right:before{content:"\f35a"}.fa.fa-arrow-circle-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-arrow-circle-o-left:before{content:"\f359"}.fa.fa-caret-square-o-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-caret-square-o-left:before{content:"\f191"}.fa.fa-toggle-left{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-toggle-left:before{content:"\f191"}.fa.fa-dot-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-dot-circle-o:before{content:"\f192"}.fa.fa-vimeo-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-try:before,.fa.fa-turkish-lira:before{content:"\f195"}.fa.fa-plus-square-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-plus-square-o:before{content:"\f0fe"}.fa.fa-openid,.fa.fa-slack,.fa.fa-wordpress{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bank:before,.fa.fa-institution:before{content:"\f19c"}.fa.fa-mortar-board:before{content:"\f19d"}.fa.fa-delicious,.fa.fa-digg,.fa.fa-drupal,.fa.fa-google,.fa.fa-joomla,.fa.fa-pied-piper-alt,.fa.fa-pied-piper-pp,.fa.fa-reddit,.fa.fa-reddit-square,.fa.fa-stumbleupon,.fa.fa-stumbleupon-circle,.fa.fa-yahoo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-spoon:before{content:"\f2e5"}.fa.fa-behance,.fa.fa-behance-square,.fa.fa-steam,.fa.fa-steam-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-automobile:before{content:"\f1b9"}.fa.fa-envelope-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-o:before{content:"\f0e0"}.fa.fa-deviantart,.fa.fa-soundcloud,.fa.fa-spotify{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-file-pdf-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-pdf-o:before{content:"\f1c1"}.fa.fa-file-word-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-word-o:before{content:"\f1c2"}.fa.fa-file-excel-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-excel-o:before{content:"\f1c3"}.fa.fa-file-powerpoint-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-powerpoint-o:before{content:"\f1c4"}.fa.fa-file-image-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-image-o:before{content:"\f1c5"}.fa.fa-file-photo-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-photo-o:before{content:"\f1c5"}.fa.fa-file-picture-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-picture-o:before{content:"\f1c5"}.fa.fa-file-archive-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-archive-o:before{content:"\f1c6"}.fa.fa-file-zip-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-zip-o:before{content:"\f1c6"}.fa.fa-file-audio-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-audio-o:before{content:"\f1c7"}.fa.fa-file-sound-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-sound-o:before{content:"\f1c7"}.fa.fa-file-video-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-video-o:before{content:"\f1c8"}.fa.fa-file-movie-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-movie-o:before{content:"\f1c8"}.fa.fa-file-code-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-file-code-o:before{content:"\f1c9"}.fa.fa-codepen,.fa.fa-jsfiddle,.fa.fa-vine{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-life-bouy,.fa.fa-life-ring{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-bouy:before{content:"\f1cd"}.fa.fa-life-buoy{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-buoy:before{content:"\f1cd"}.fa.fa-life-saver{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-life-saver:before{content:"\f1cd"}.fa.fa-support{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-support:before{content:"\f1cd"}.fa.fa-circle-o-notch:before{content:"\f1ce"}.fa.fa-ra,.fa.fa-rebel{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ra:before{content:"\f1d0"}.fa.fa-resistance{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-resistance:before{content:"\f1d0"}.fa.fa-empire,.fa.fa-ge{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-ge:before{content:"\f1d1"}.fa.fa-git,.fa.fa-git-square,.fa.fa-hacker-news,.fa.fa-y-combinator-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-y-combinator-square:before{content:"\f1d4"}.fa.fa-yc-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc-square:before{content:"\f1d4"}.fa.fa-qq,.fa.fa-tencent-weibo,.fa.fa-wechat,.fa.fa-weixin{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wechat:before{content:"\f1d7"}.fa.fa-send:before{content:"\f1d8"}.fa.fa-paper-plane-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-paper-plane-o:before{content:"\f1d8"}.fa.fa-send-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-send-o:before{content:"\f1d8"}.fa.fa-circle-thin{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-circle-thin:before{content:"\f111"}.fa.fa-header:before{content:"\f1dc"}.fa.fa-sliders:before{content:"\f1de"}.fa.fa-futbol-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-futbol-o:before{content:"\f1e3"}.fa.fa-soccer-ball-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-soccer-ball-o:before{content:"\f1e3"}.fa.fa-slideshare,.fa.fa-twitch,.fa.fa-yelp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-newspaper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-newspaper-o:before{content:"\f1ea"}.fa.fa-cc-amex,.fa.fa-cc-discover,.fa.fa-cc-mastercard,.fa.fa-cc-paypal,.fa.fa-cc-stripe,.fa.fa-cc-visa,.fa.fa-google-wallet,.fa.fa-paypal{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-bell-slash-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-bell-slash-o:before{content:"\f1f6"}.fa.fa-trash:before{content:"\f2ed"}.fa.fa-copyright{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-eyedropper:before{content:"\f1fb"}.fa.fa-area-chart:before{content:"\f1fe"}.fa.fa-pie-chart:before{content:"\f200"}.fa.fa-line-chart:before{content:"\f201"}.fa.fa-angellist,.fa.fa-ioxhost,.fa.fa-lastfm,.fa.fa-lastfm-square{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cc{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-cc:before{content:"\f20a"}.fa.fa-ils:before,.fa.fa-shekel:before,.fa.fa-sheqel:before{content:"\f20b"}.fa.fa-meanpath{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-meanpath:before{content:"\f2b4"}.fa.fa-buysellads,.fa.fa-connectdevelop,.fa.fa-dashcube,.fa.fa-forumbee,.fa.fa-leanpub,.fa.fa-sellsy,.fa.fa-shirtsinbulk,.fa.fa-simplybuilt,.fa.fa-skyatlas{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-diamond{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-diamond:before{content:"\f3a5"}.fa.fa-intersex:before{content:"\f224"}.fa.fa-facebook-official{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-facebook-official:before{content:"\f09a"}.fa.fa-pinterest-p,.fa.fa-whatsapp{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-hotel:before{content:"\f236"}.fa.fa-medium,.fa.fa-viacoin,.fa.fa-y-combinator,.fa.fa-yc{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-yc:before{content:"\f23b"}.fa.fa-expeditedssl,.fa.fa-opencart,.fa.fa-optin-monster{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-battery-4:before,.fa.fa-battery:before{content:"\f240"}.fa.fa-battery-3:before{content:"\f241"}.fa.fa-battery-2:before{content:"\f242"}.fa.fa-battery-1:before{content:"\f243"}.fa.fa-battery-0:before{content:"\f244"}.fa.fa-object-group,.fa.fa-object-ungroup,.fa.fa-sticky-note-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-sticky-note-o:before{content:"\f249"}.fa.fa-cc-diners-club,.fa.fa-cc-jcb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-clone,.fa.fa-hourglass-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hourglass-o:before{content:"\f254"}.fa.fa-hourglass-1:before{content:"\f251"}.fa.fa-hourglass-2:before{content:"\f252"}.fa.fa-hourglass-3:before{content:"\f253"}.fa.fa-hand-rock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-rock-o:before{content:"\f255"}.fa.fa-hand-grab-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-grab-o:before{content:"\f255"}.fa.fa-hand-paper-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-paper-o:before{content:"\f256"}.fa.fa-hand-stop-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-stop-o:before{content:"\f256"}.fa.fa-hand-scissors-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-scissors-o:before{content:"\f257"}.fa.fa-hand-lizard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-lizard-o:before{content:"\f258"}.fa.fa-hand-spock-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-spock-o:before{content:"\f259"}.fa.fa-hand-pointer-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-pointer-o:before{content:"\f25a"}.fa.fa-hand-peace-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-hand-peace-o:before{content:"\f25b"}.fa.fa-registered{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-chrome,.fa.fa-creative-commons,.fa.fa-firefox,.fa.fa-get-pocket,.fa.fa-gg,.fa.fa-gg-circle,.fa.fa-internet-explorer,.fa.fa-odnoklassniki,.fa.fa-odnoklassniki-square,.fa.fa-opera,.fa.fa-safari,.fa.fa-tripadvisor,.fa.fa-wikipedia-w{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-television:before{content:"\f26c"}.fa.fa-500px,.fa.fa-amazon,.fa.fa-contao{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-calendar-plus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-plus-o:before{content:"\f271"}.fa.fa-calendar-minus-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-minus-o:before{content:"\f272"}.fa.fa-calendar-times-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-times-o:before{content:"\f273"}.fa.fa-calendar-check-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-calendar-check-o:before{content:"\f274"}.fa.fa-map-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-map-o:before{content:"\f279"}.fa.fa-commenting:before{content:"\f4ad"}.fa.fa-commenting-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-commenting-o:before{content:"\f4ad"}.fa.fa-houzz,.fa.fa-vimeo{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-vimeo:before{content:"\f27d"}.fa.fa-black-tie,.fa.fa-edge,.fa.fa-fonticons,.fa.fa-reddit-alien{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-credit-card-alt:before{content:"\f09d"}.fa.fa-codiepie,.fa.fa-fort-awesome,.fa.fa-mixcloud,.fa.fa-modx,.fa.fa-product-hunt,.fa.fa-scribd,.fa.fa-usb{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-pause-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-pause-circle-o:before{content:"\f28b"}.fa.fa-stop-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-stop-circle-o:before{content:"\f28d"}.fa.fa-bluetooth,.fa.fa-bluetooth-b,.fa.fa-envira,.fa.fa-gitlab,.fa.fa-wheelchair-alt,.fa.fa-wpbeginner,.fa.fa-wpforms{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-wheelchair-alt:before{content:"\f368"}.fa.fa-question-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-question-circle-o:before{content:"\f059"}.fa.fa-volume-control-phone:before{content:"\f2a0"}.fa.fa-asl-interpreting:before{content:"\f2a3"}.fa.fa-deafness:before,.fa.fa-hard-of-hearing:before{content:"\f2a4"}.fa.fa-glide,.fa.fa-glide-g{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-signing:before{content:"\f2a7"}.fa.fa-first-order,.fa.fa-google-plus-official,.fa.fa-pied-piper,.fa.fa-snapchat,.fa.fa-snapchat-ghost,.fa.fa-snapchat-square,.fa.fa-themeisle,.fa.fa-viadeo,.fa.fa-viadeo-square,.fa.fa-yoast{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-official:before{content:"\f2b3"}.fa.fa-google-plus-circle{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-google-plus-circle:before{content:"\f2b3"}.fa.fa-fa,.fa.fa-font-awesome{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-fa:before{content:"\f2b4"}.fa.fa-handshake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-handshake-o:before{content:"\f2b5"}.fa.fa-envelope-open-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-envelope-open-o:before{content:"\f2b6"}.fa.fa-linode{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-address-book-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-book-o:before{content:"\f2b9"}.fa.fa-vcard:before{content:"\f2bb"}.fa.fa-address-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-address-card-o:before{content:"\f2bb"}.fa.fa-vcard-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-vcard-o:before{content:"\f2bb"}.fa.fa-user-circle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-circle-o:before{content:"\f2bd"}.fa.fa-user-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-user-o:before{content:"\f007"}.fa.fa-id-badge{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license:before{content:"\f2c2"}.fa.fa-id-card-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-id-card-o:before{content:"\f2c2"}.fa.fa-drivers-license-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-drivers-license-o:before{content:"\f2c2"}.fa.fa-free-code-camp,.fa.fa-quora,.fa.fa-telegram{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-thermometer-4:before,.fa.fa-thermometer:before{content:"\f2c7"}.fa.fa-thermometer-3:before{content:"\f2c8"}.fa.fa-thermometer-2:before{content:"\f2c9"}.fa.fa-thermometer-1:before{content:"\f2ca"}.fa.fa-thermometer-0:before{content:"\f2cb"}.fa.fa-bathtub:before,.fa.fa-s15:before{content:"\f2cd"}.fa.fa-window-maximize,.fa.fa-window-restore{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle:before{content:"\f410"}.fa.fa-window-close-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-window-close-o:before{content:"\f410"}.fa.fa-times-rectangle-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-times-rectangle-o:before{content:"\f410"}.fa.fa-bandcamp,.fa.fa-eercast,.fa.fa-etsy,.fa.fa-grav,.fa.fa-imdb,.fa.fa-ravelry{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-eercast:before{content:"\f2da"}.fa.fa-snowflake-o{font-family:"Font Awesome 5 Free";font-weight:400}.fa.fa-snowflake-o:before{content:"\f2dc"}.fa.fa-superpowers,.fa.fa-wpexplorer{font-family:"Font Awesome 5 Brands";font-weight:400}.fa.fa-cab:before{content:"\f1ba"}
\ No newline at end of file
diff --git a/html/font-awesome/webfonts/fa-regular-400.eot b/html/font-awesome/webfonts/fa-regular-400.eot
index d62be2fad88..a4e598936b3 100644
Binary files a/html/font-awesome/webfonts/fa-regular-400.eot and b/html/font-awesome/webfonts/fa-regular-400.eot differ
diff --git a/html/font-awesome/webfonts/fa-regular-400.woff b/html/font-awesome/webfonts/fa-regular-400.woff
index 43b1a9ae49d..ad077c6bec7 100644
Binary files a/html/font-awesome/webfonts/fa-regular-400.woff and b/html/font-awesome/webfonts/fa-regular-400.woff differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.eot b/html/font-awesome/webfonts/fa-solid-900.eot
index c77baa8d46a..e99417197e4 100644
Binary files a/html/font-awesome/webfonts/fa-solid-900.eot and b/html/font-awesome/webfonts/fa-solid-900.eot differ
diff --git a/html/font-awesome/webfonts/fa-solid-900.woff b/html/font-awesome/webfonts/fa-solid-900.woff
index 77c1786227f..23ee663443a 100644
Binary files a/html/font-awesome/webfonts/fa-solid-900.woff and b/html/font-awesome/webfonts/fa-solid-900.woff differ
diff --git a/icons/_nanomaps/Cyberiad_nanomap_z1.png b/icons/_nanomaps/Cyberiad_nanomap_z1.png
index 5ce736d1576..390f6653a8b 100644
Binary files a/icons/_nanomaps/Cyberiad_nanomap_z1.png and b/icons/_nanomaps/Cyberiad_nanomap_z1.png differ
diff --git a/icons/_nanomaps/Delta_nanomap_z1.png b/icons/_nanomaps/Delta_nanomap_z1.png
index 6a160deb363..6c22286a0f3 100644
Binary files a/icons/_nanomaps/Delta_nanomap_z1.png and b/icons/_nanomaps/Delta_nanomap_z1.png differ
diff --git a/icons/effects/effects.dmi b/icons/effects/effects.dmi
index a386dc0e9e0..37295319bb3 100644
Binary files a/icons/effects/effects.dmi and b/icons/effects/effects.dmi differ
diff --git a/icons/effects/species.dmi b/icons/effects/species.dmi
index b11a2ac75fd..8c837b0e546 100644
Binary files a/icons/effects/species.dmi and b/icons/effects/species.dmi differ
diff --git a/icons/mob/actions/actions.dmi b/icons/mob/actions/actions.dmi
index d0439308691..8e29f8ee12e 100644
Binary files a/icons/mob/actions/actions.dmi and b/icons/mob/actions/actions.dmi differ
diff --git a/icons/mob/clothing/eyes.dmi b/icons/mob/clothing/eyes.dmi
index d64644b0d50..b554c709f92 100644
Binary files a/icons/mob/clothing/eyes.dmi and b/icons/mob/clothing/eyes.dmi differ
diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi
index 1a63f700907..a54246cc501 100644
Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ
diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi
index 62d862d5092..c2c47492f6b 100644
Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ
diff --git a/icons/mob/clothing/species/drask/eyes.dmi b/icons/mob/clothing/species/drask/eyes.dmi
index 7fbe4aced2f..355f5e2cf51 100644
Binary files a/icons/mob/clothing/species/drask/eyes.dmi and b/icons/mob/clothing/species/drask/eyes.dmi differ
diff --git a/icons/mob/clothing/species/drask/head.dmi b/icons/mob/clothing/species/drask/head.dmi
index ed7fcb3538b..6d02bb20fe6 100644
Binary files a/icons/mob/clothing/species/drask/head.dmi and b/icons/mob/clothing/species/drask/head.dmi differ
diff --git a/icons/mob/clothing/species/drask/helmet.dmi b/icons/mob/clothing/species/drask/helmet.dmi
index 0ab58369a0f..b0c49b3c419 100644
Binary files a/icons/mob/clothing/species/drask/helmet.dmi and b/icons/mob/clothing/species/drask/helmet.dmi differ
diff --git a/icons/mob/clothing/species/drask/mask.dmi b/icons/mob/clothing/species/drask/mask.dmi
index 807cec3cdea..db26ee4b53f 100644
Binary files a/icons/mob/clothing/species/drask/mask.dmi and b/icons/mob/clothing/species/drask/mask.dmi differ
diff --git a/icons/mob/clothing/species/drask/suit.dmi b/icons/mob/clothing/species/drask/suit.dmi
index 83b1cbc29d6..4f725b4ecf8 100644
Binary files a/icons/mob/clothing/species/drask/suit.dmi and b/icons/mob/clothing/species/drask/suit.dmi differ
diff --git a/icons/mob/clothing/species/drask/uniform.dmi b/icons/mob/clothing/species/drask/uniform.dmi
index ff952b86509..123d948dd41 100644
Binary files a/icons/mob/clothing/species/drask/uniform.dmi and b/icons/mob/clothing/species/drask/uniform.dmi differ
diff --git a/icons/mob/clothing/species/grey/eyes.dmi b/icons/mob/clothing/species/grey/eyes.dmi
index acff6dee4b9..8d1ae19391c 100644
Binary files a/icons/mob/clothing/species/grey/eyes.dmi and b/icons/mob/clothing/species/grey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/grey/helmet.dmi b/icons/mob/clothing/species/grey/helmet.dmi
index 4f8bfc79a7b..5c0010c30c9 100644
Binary files a/icons/mob/clothing/species/grey/helmet.dmi and b/icons/mob/clothing/species/grey/helmet.dmi differ
diff --git a/icons/mob/clothing/species/grey/mask.dmi b/icons/mob/clothing/species/grey/mask.dmi
index d85ea5dce21..82c9d36ff3b 100644
Binary files a/icons/mob/clothing/species/grey/mask.dmi and b/icons/mob/clothing/species/grey/mask.dmi differ
diff --git a/icons/mob/clothing/species/grey/uniform.dmi b/icons/mob/clothing/species/grey/uniform.dmi
index 755c331c8b9..41ebec1c8a1 100644
Binary files a/icons/mob/clothing/species/grey/uniform.dmi and b/icons/mob/clothing/species/grey/uniform.dmi differ
diff --git a/icons/mob/clothing/species/monkey/eyes.dmi b/icons/mob/clothing/species/monkey/eyes.dmi
index b430e2e5020..7e0e44e270f 100644
Binary files a/icons/mob/clothing/species/monkey/eyes.dmi and b/icons/mob/clothing/species/monkey/eyes.dmi differ
diff --git a/icons/mob/clothing/species/monkey/head.dmi b/icons/mob/clothing/species/monkey/head.dmi
index 055216eaed9..95c06af67bc 100644
Binary files a/icons/mob/clothing/species/monkey/head.dmi and b/icons/mob/clothing/species/monkey/head.dmi differ
diff --git a/icons/mob/clothing/species/monkey/mask.dmi b/icons/mob/clothing/species/monkey/mask.dmi
index bbc13fc65d7..c37c41b35a1 100644
Binary files a/icons/mob/clothing/species/monkey/mask.dmi and b/icons/mob/clothing/species/monkey/mask.dmi differ
diff --git a/icons/mob/clothing/species/monkey/uniform.dmi b/icons/mob/clothing/species/monkey/uniform.dmi
index aa7ffea3268..cb8e3d0dd85 100644
Binary files a/icons/mob/clothing/species/monkey/uniform.dmi and b/icons/mob/clothing/species/monkey/uniform.dmi differ
diff --git a/icons/mob/clothing/species/plasmaman/mask.dmi b/icons/mob/clothing/species/plasmaman/mask.dmi
index 374c4c25aa6..0d28762d032 100644
Binary files a/icons/mob/clothing/species/plasmaman/mask.dmi and b/icons/mob/clothing/species/plasmaman/mask.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/head.dmi b/icons/mob/clothing/species/tajaran/head.dmi
index b9e3090c037..8fb90a451d2 100644
Binary files a/icons/mob/clothing/species/tajaran/head.dmi and b/icons/mob/clothing/species/tajaran/head.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/helmet.dmi b/icons/mob/clothing/species/tajaran/helmet.dmi
index 48521b0bfda..7340c8c9db1 100644
Binary files a/icons/mob/clothing/species/tajaran/helmet.dmi and b/icons/mob/clothing/species/tajaran/helmet.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/mask.dmi b/icons/mob/clothing/species/tajaran/mask.dmi
index a433e44f240..90b55d2fb79 100644
Binary files a/icons/mob/clothing/species/tajaran/mask.dmi and b/icons/mob/clothing/species/tajaran/mask.dmi differ
diff --git a/icons/mob/clothing/species/tajaran/suit.dmi b/icons/mob/clothing/species/tajaran/suit.dmi
index 6bbc8c52e0e..05cb40b48f5 100644
Binary files a/icons/mob/clothing/species/tajaran/suit.dmi and b/icons/mob/clothing/species/tajaran/suit.dmi differ
diff --git a/icons/mob/clothing/species/unathi/head.dmi b/icons/mob/clothing/species/unathi/head.dmi
index 3c7a9aee3c3..bc7498ef90f 100644
Binary files a/icons/mob/clothing/species/unathi/head.dmi and b/icons/mob/clothing/species/unathi/head.dmi differ
diff --git a/icons/mob/clothing/species/unathi/helmet.dmi b/icons/mob/clothing/species/unathi/helmet.dmi
index 8ddf7d08395..13ffdaab528 100644
Binary files a/icons/mob/clothing/species/unathi/helmet.dmi and b/icons/mob/clothing/species/unathi/helmet.dmi differ
diff --git a/icons/mob/clothing/species/unathi/mask.dmi b/icons/mob/clothing/species/unathi/mask.dmi
index f76cae2d357..9802caa3ac1 100644
Binary files a/icons/mob/clothing/species/unathi/mask.dmi and b/icons/mob/clothing/species/unathi/mask.dmi differ
diff --git a/icons/mob/clothing/species/unathi/suit.dmi b/icons/mob/clothing/species/unathi/suit.dmi
index 9c34852f8ce..edecf31cba7 100644
Binary files a/icons/mob/clothing/species/unathi/suit.dmi and b/icons/mob/clothing/species/unathi/suit.dmi differ
diff --git a/icons/mob/clothing/species/unathi/uniform.dmi b/icons/mob/clothing/species/unathi/uniform.dmi
index ed9232aa63c..7756dbf128a 100644
Binary files a/icons/mob/clothing/species/unathi/uniform.dmi and b/icons/mob/clothing/species/unathi/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vox/eyes.dmi b/icons/mob/clothing/species/vox/eyes.dmi
index d39ec8fadae..482199a45f4 100644
Binary files a/icons/mob/clothing/species/vox/eyes.dmi and b/icons/mob/clothing/species/vox/eyes.dmi differ
diff --git a/icons/mob/clothing/species/vox/head.dmi b/icons/mob/clothing/species/vox/head.dmi
index 0300c275c49..53e1be9486b 100644
Binary files a/icons/mob/clothing/species/vox/head.dmi and b/icons/mob/clothing/species/vox/head.dmi differ
diff --git a/icons/mob/clothing/species/vox/helmet.dmi b/icons/mob/clothing/species/vox/helmet.dmi
index 321a41a2cc5..c34f0f63950 100644
Binary files a/icons/mob/clothing/species/vox/helmet.dmi and b/icons/mob/clothing/species/vox/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vox/mask.dmi b/icons/mob/clothing/species/vox/mask.dmi
index a23a8637fbe..173b80e41df 100644
Binary files a/icons/mob/clothing/species/vox/mask.dmi and b/icons/mob/clothing/species/vox/mask.dmi differ
diff --git a/icons/mob/clothing/species/vox/suit.dmi b/icons/mob/clothing/species/vox/suit.dmi
index 441cbf306d0..76a40146137 100644
Binary files a/icons/mob/clothing/species/vox/suit.dmi and b/icons/mob/clothing/species/vox/suit.dmi differ
diff --git a/icons/mob/clothing/species/vox/uniform.dmi b/icons/mob/clothing/species/vox/uniform.dmi
index aa7cf2c899e..911a291a18b 100644
Binary files a/icons/mob/clothing/species/vox/uniform.dmi and b/icons/mob/clothing/species/vox/uniform.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/head.dmi b/icons/mob/clothing/species/vulpkanin/head.dmi
index 7273ff2892f..0296d04a8e4 100644
Binary files a/icons/mob/clothing/species/vulpkanin/head.dmi and b/icons/mob/clothing/species/vulpkanin/head.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/helmet.dmi b/icons/mob/clothing/species/vulpkanin/helmet.dmi
index 23fd7e15162..14113ae663e 100644
Binary files a/icons/mob/clothing/species/vulpkanin/helmet.dmi and b/icons/mob/clothing/species/vulpkanin/helmet.dmi differ
diff --git a/icons/mob/clothing/species/vulpkanin/mask.dmi b/icons/mob/clothing/species/vulpkanin/mask.dmi
index 83c3999a622..802d3b337a5 100644
Binary files a/icons/mob/clothing/species/vulpkanin/mask.dmi and b/icons/mob/clothing/species/vulpkanin/mask.dmi differ
diff --git a/icons/mob/clothing/suit.dmi b/icons/mob/clothing/suit.dmi
index d307193378e..539a5a9a6c8 100644
Binary files a/icons/mob/clothing/suit.dmi and b/icons/mob/clothing/suit.dmi differ
diff --git a/icons/mob/clothing/ties.dmi b/icons/mob/clothing/ties.dmi
index 671083841eb..62ac2879d78 100644
Binary files a/icons/mob/clothing/ties.dmi and b/icons/mob/clothing/ties.dmi differ
diff --git a/icons/mob/clothing/uniform.dmi b/icons/mob/clothing/uniform.dmi
index 73426a9361f..f748c37e23f 100644
Binary files a/icons/mob/clothing/uniform.dmi and b/icons/mob/clothing/uniform.dmi differ
diff --git a/icons/mob/human_races/monkeys/r_stok.dmi b/icons/mob/human_races/monkeys/r_stok.dmi
index 69c6c3538d6..d844e1d2439 100644
Binary files a/icons/mob/human_races/monkeys/r_stok.dmi and b/icons/mob/human_races/monkeys/r_stok.dmi differ
diff --git a/icons/mob/human_races/monkeys/r_stok_old.dmi b/icons/mob/human_races/monkeys/r_stok_old.dmi
new file mode 100644
index 00000000000..69c6c3538d6
Binary files /dev/null and b/icons/mob/human_races/monkeys/r_stok_old.dmi differ
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
index f03dc3a3c93..969efe2a696 100644
Binary files a/icons/mob/inhands/clothing_lefthand.dmi and b/icons/mob/inhands/clothing_lefthand.dmi differ
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
index 6c31d017974..1fcce3b1128 100644
Binary files a/icons/mob/inhands/clothing_righthand.dmi and b/icons/mob/inhands/clothing_righthand.dmi differ
diff --git a/icons/mob/inhands/guns_lefthand.dmi b/icons/mob/inhands/guns_lefthand.dmi
index b233633759c..be360ac2613 100644
Binary files a/icons/mob/inhands/guns_lefthand.dmi and b/icons/mob/inhands/guns_lefthand.dmi differ
diff --git a/icons/mob/inhands/guns_righthand.dmi b/icons/mob/inhands/guns_righthand.dmi
index 8c24a10827d..1f606ac529c 100644
Binary files a/icons/mob/inhands/guns_righthand.dmi and b/icons/mob/inhands/guns_righthand.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 71186ba1370..73edd66b4c3 100755
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index 481a0213806..a2e82d6bd2e 100755
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi
index 438b8e20018..7017d61798b 100644
Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ
diff --git a/icons/obj/candle.dmi b/icons/obj/candle.dmi
index eac8464b282..cf79a083197 100644
Binary files a/icons/obj/candle.dmi and b/icons/obj/candle.dmi differ
diff --git a/icons/obj/chairs.dmi b/icons/obj/chairs.dmi
index cf27889017c..4d790c73929 100644
Binary files a/icons/obj/chairs.dmi and b/icons/obj/chairs.dmi differ
diff --git a/icons/obj/closet.dmi b/icons/obj/closet.dmi
index 686c80ddbed..5aa7095a37b 100644
Binary files a/icons/obj/closet.dmi and b/icons/obj/closet.dmi differ
diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi
index 0564edd3a27..b2ee708721d 100644
Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ
diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi
index 62e8ecf7ac1..4d8bd11d56e 100644
Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ
diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi
index 3d7a16a75aa..1aed2bdf3c1 100644
Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ
diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi
index 774e3bd2e6a..8682da10e4a 100644
Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ
diff --git a/icons/obj/clothing/ties_overlay.dmi b/icons/obj/clothing/ties_overlay.dmi
index 91cd0410475..67271752f82 100644
Binary files a/icons/obj/clothing/ties_overlay.dmi and b/icons/obj/clothing/ties_overlay.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 72347f30963..6675b289799 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/decals.dmi b/icons/obj/decals.dmi
index a99b07743d7..284415e32b2 100644
Binary files a/icons/obj/decals.dmi and b/icons/obj/decals.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 4673770391d..f6287575a15 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/drinks.dmi b/icons/obj/drinks.dmi
index 189df1f4852..f1c80e3c584 100644
Binary files a/icons/obj/drinks.dmi and b/icons/obj/drinks.dmi differ
diff --git a/icons/obj/engines_and_power/power.dmi b/icons/obj/engines_and_power/power.dmi
index 69ed1d29db8..79af17d1e89 100644
Binary files a/icons/obj/engines_and_power/power.dmi and b/icons/obj/engines_and_power/power.dmi differ
diff --git a/icons/obj/food/food.dmi b/icons/obj/food/food.dmi
index 1917b2ce215..a3b3ada8e00 100644
Binary files a/icons/obj/food/food.dmi and b/icons/obj/food/food.dmi differ
diff --git a/icons/obj/guncabinet.dmi b/icons/obj/guncabinet.dmi
index 977a03e63b7..4ef6077b690 100644
Binary files a/icons/obj/guncabinet.dmi and b/icons/obj/guncabinet.dmi differ
diff --git a/icons/obj/hydroponics/equipment.dmi b/icons/obj/hydroponics/equipment.dmi
index 10809b14177..be50ea56c49 100644
Binary files a/icons/obj/hydroponics/equipment.dmi and b/icons/obj/hydroponics/equipment.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 41ac5232d52..ce029b72ac6 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/lavaland/artefacts.dmi b/icons/obj/lavaland/artefacts.dmi
index c90fe002a7a..178610b7424 100644
Binary files a/icons/obj/lavaland/artefacts.dmi and b/icons/obj/lavaland/artefacts.dmi differ
diff --git a/icons/obj/lighting.dmi b/icons/obj/lighting.dmi
index 01274806dec..eaa9c366fc2 100644
Binary files a/icons/obj/lighting.dmi and b/icons/obj/lighting.dmi differ
diff --git a/icons/obj/machines/vending.dmi b/icons/obj/machines/vending.dmi
index 34a31642bc3..62cb9f08817 100644
Binary files a/icons/obj/machines/vending.dmi and b/icons/obj/machines/vending.dmi differ
diff --git a/icons/obj/mecha/lockermech.dmi b/icons/obj/mecha/lockermech.dmi
index ac7688d5ce4..ea99827ee41 100644
Binary files a/icons/obj/mecha/lockermech.dmi and b/icons/obj/mecha/lockermech.dmi differ
diff --git a/icons/obj/mecha/mecha.dmi b/icons/obj/mecha/mecha.dmi
index 582b559b043..1eff9ee63d0 100644
Binary files a/icons/obj/mecha/mecha.dmi and b/icons/obj/mecha/mecha.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 4b6e186348d..ce6fb34a070 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/paintkit.dmi b/icons/obj/paintkit.dmi
index 8f7e2048e2f..3b24583010d 100644
Binary files a/icons/obj/paintkit.dmi and b/icons/obj/paintkit.dmi differ
diff --git a/icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi b/icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi
index bdb1608a313..aca65d502fd 100644
Binary files a/icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi and b/icons/obj/pipes_and_stuff/not_atmos/transit_tube.dmi differ
diff --git a/icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi b/icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi
index 86070b8ce59..a0bdb36ec22 100644
Binary files a/icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi and b/icons/obj/pipes_and_stuff/not_atmos/transit_tube_pod.dmi differ
diff --git a/icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi b/icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi
index 6f59f5e0084..348f6d29561 100644
Binary files a/icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi and b/icons/obj/pipes_and_stuff/not_atmos/transit_tube_station.dmi differ
diff --git a/icons/obj/radio.dmi b/icons/obj/radio.dmi
index 728e109587b..5e0abf22d74 100644
Binary files a/icons/obj/radio.dmi and b/icons/obj/radio.dmi differ
diff --git a/icons/obj/reagentfillings.dmi b/icons/obj/reagentfillings.dmi
index 4158ae4087b..8904316e1e4 100644
Binary files a/icons/obj/reagentfillings.dmi and b/icons/obj/reagentfillings.dmi differ
diff --git a/icons/obj/stationobjs.dmi b/icons/obj/stationobjs.dmi
index dd368906187..df063d05152 100644
Binary files a/icons/obj/stationobjs.dmi and b/icons/obj/stationobjs.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index f21a36b69c0..32136d7295c 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/telescience.dmi b/icons/obj/telescience.dmi
index bfbd41bc081..81471202dc2 100644
Binary files a/icons/obj/telescience.dmi and b/icons/obj/telescience.dmi differ
diff --git a/icons/obj/walllocker.dmi b/icons/obj/walllocker.dmi
index 8495e00ff83..1b133f04ad3 100644
Binary files a/icons/obj/walllocker.dmi and b/icons/obj/walllocker.dmi differ
diff --git a/icons/obj/weapons/energy.dmi b/icons/obj/weapons/energy.dmi
index 10b9725b96f..e198fb60ac3 100644
Binary files a/icons/obj/weapons/energy.dmi and b/icons/obj/weapons/energy.dmi differ
diff --git a/icons/obj/weapons/projectile.dmi b/icons/obj/weapons/projectile.dmi
index 72887c007d2..dec468709ff 100644
Binary files a/icons/obj/weapons/projectile.dmi and b/icons/obj/weapons/projectile.dmi differ
diff --git a/icons/turf/floors.dmi b/icons/turf/floors.dmi
index 2a99ddbb4c2..421506da67e 100644
Binary files a/icons/turf/floors.dmi and b/icons/turf/floors.dmi differ
diff --git a/interface/skin.dmf b/interface/skin.dmf
index 4d4e6e833ca..dde8b2cf92c 100644
--- a/interface/skin.dmf
+++ b/interface/skin.dmf
@@ -191,44 +191,42 @@ window "outputwindow"
elem "outputwindow"
type = MAIN
pos = 0,0
- size = 640x500
+ size = 637x480
anchor1 = 0,0
anchor2 = 100,100
is-pane = true
elem "input"
type = INPUT
- pos = 0,480
- size = 539x18
+ pos = 3,456
+ size = 467x20
anchor1 = 0,100
anchor2 = 100,100
background-color = #d3b5b5
is-default = true
- border = sunken
+ border = line
saved-params = "command"
elem "saybutton"
type = BUTTON
- pos = 541,480
- size = 48x16
+ pos = 474,456
+ size = 80x20
anchor1 = 100,100
anchor2 = -1,-1
- background-color = #d4d4d4
text = "Say"
command = ".winset \"saybutton.is-checked=true?input.command=\"!say \\\"\" macrobutton.is-checked=false:input.command=\"\"saybutton.is-checked=true?mebutton.is-checked=false\""
button-type = pushbox
elem "mebutton"
type = BUTTON
- pos = 590,480
- size = 48x16
+ pos = 553,456
+ size = 80x20
anchor1 = 100,100
anchor2 = -1,-1
- background-color = #d4d4d4
text = "Me"
command = ".winset \"mebutton.is-checked=true ? input.command=\"!me \\\"\" : input.command=\"\"mebutton.is-checked=true ? saybutton.is-checked=false\"\"mebutton.is-checked=true ? oocbutton.is-checked=false\""
button-type = pushbox
elem "browseroutput"
type = BROWSER
pos = 0,0
- size = 638x479
+ size = 633x452
anchor1 = 0,0
anchor2 = 100,100
background-color = #ffffff
diff --git a/paradise.dme b/paradise.dme
index 87a975dc8d1..7762078dc70 100644
--- a/paradise.dme
+++ b/paradise.dme
@@ -44,6 +44,7 @@
#include "code\__DEFINES\crafting.dm"
#include "code\__DEFINES\criminal_status.dm"
#include "code\__DEFINES\cult.dm"
+#include "code\__DEFINES\directions.dm"
#include "code\__DEFINES\diseases.dm"
#include "code\__DEFINES\dmjit.dm"
#include "code\__DEFINES\dna.dm"
@@ -326,6 +327,7 @@
#include "code\controllers\subsystem\processing\obj.dm"
#include "code\controllers\subsystem\processing\processing.dm"
#include "code\controllers\subsystem\processing\projectiles.dm"
+#include "code\controllers\subsystem\processing\transittube.dm"
#include "code\controllers\subsystem\tickets\mentor_tickets.dm"
#include "code\controllers\subsystem\tickets\tickets.dm"
#include "code\datums\action.dm"
@@ -1230,6 +1232,7 @@
#include "code\game\objects\items\weapons\implants\implant_krav_maga.dm"
#include "code\game\objects\items\weapons\implants\implant_mindshield.dm"
#include "code\game\objects\items\weapons\implants\implant_sad_trombone.dm"
+#include "code\game\objects\items\weapons\implants\implant_second_chance.dm"
#include "code\game\objects\items\weapons\implants\implant_stealth.dm"
#include "code\game\objects\items\weapons\implants\implant_storage.dm"
#include "code\game\objects\items\weapons\implants\implant_supercharge.dm"
@@ -1753,7 +1756,6 @@
#include "code\modules\clothing\suits\labcoat.dm"
#include "code\modules\clothing\suits\miscellaneous.dm"
#include "code\modules\clothing\suits\storage.dm"
-#include "code\modules\clothing\suits\toggles.dm"
#include "code\modules\clothing\suits\utility.dm"
#include "code\modules\clothing\suits\wiz_robe.dm"
#include "code\modules\clothing\under\color.dm"
diff --git a/tgui/packages/tgui/interfaces/CargoConsole.js b/tgui/packages/tgui/interfaces/CargoConsole.js
index 8e95b3a0722..bd7a2e5fbd9 100644
--- a/tgui/packages/tgui/interfaces/CargoConsole.js
+++ b/tgui/packages/tgui/interfaces/CargoConsole.js
@@ -67,6 +67,7 @@ const StatusPane = (_properties, context) => {
const {
is_public,
points,
+ credits,
timeleft,
moving,
at_station,
@@ -98,6 +99,9 @@ const StatusPane = (_properties, context) => {
{points}
+
+ {credits}
+
{statusText}
@@ -181,7 +185,7 @@ const CataloguePane = (_properties, context) => {
{cratesToShow.map(c => (
- {c.name} ({c.cost} Points)
+ {c.name} {c.cost ? c.cost+" Points" : ""} {c.creditsCost ? c.creditsCost+" Credits" : ""}
"
P.update_icon()
P.faxmachineid = fax.UID()
@@ -2408,7 +2408,7 @@
if(!P.ico)
P.ico = new
P.ico += "paper_stamp-[stampvalue]"
- P.overlays += stampoverlay
+ P.stamp_overlays += stampoverlay
P.stamps += "
"
var/image/stampoverlay = image('icons/obj/bureaucracy.dmi')
@@ -501,9 +563,13 @@
if(!stamped)
stamped = new
stamped += S.type
- overlays += stampoverlay
+ stamp_overlays += stampoverlay
+ update_icon(UPDATE_OVERLAYS)
+
+
+/obj/item/paper/update_overlays()
+ return stamp_overlays
- playsound(S, pick(S.stamp_sounds), 35, 1, -1)
/*
* Premade paper
@@ -550,8 +616,10 @@
name = "paper scrap"
icon_state = "scrap"
-/obj/item/paper/crumpled/update_icon()
- return
+
+/obj/item/paper/crumpled/update_icon_state()
+ if(info)
+ icon_state = "scrap_words"
/obj/item/paper/crumpled/bloody
icon_state = "scrap_bloodied"
@@ -567,9 +635,10 @@
info = "