":null] - Integrity: [integrity]%
- Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
- Air source: [use_internal_tank?"Internal Airtank":"Environment"]
- Airtank pressure: [tank_pressure]kPa
- Airtank temperature: [tank_temperature]°K|[tank_temperature - T0C]°C
- Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
- Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
- Lights: [lights?"on":"off"]
- [dna?"DNA-locked:
[dna] \[Reset\]
":null] - "} - return output + . = "[report_internal_damage()]" + . += "[integrity<30?"DAMAGE LEVEL CRITICAL
":null]" + . += "Integrity: [integrity]%
" + . += "Powercell charge: [isnull(cell_charge)?"No powercell installed":"[cell.percent()]%"]
" + . += "Air source: [use_internal_tank?"Internal Airtank":"Environment"]
" + . += "Airtank pressure: [tank_pressure]kPa
" + . += "Airtank temperature: [tank_temperature]°K|[tank_temperature_c]°C
" + . += "Cabin pressure: [cabin_pressure>WARNING_HIGH_PRESSURE ? "[cabin_pressure]": cabin_pressure]kPa
" + . += "Cabin temperature: [return_temperature()]°K|[return_temperature() - T0C]°C
" + . += "Lights: [lights?"on":"off"]
" + . += "[dna ? "DNA-locked:
[dna] \[Reset\]
" : ""]" + . += "[defense_action.owner ? "Defence Mode: [defence_mode ? "Enabled" : "Disabled"]
" : ""]" + . += "[overload_action.owner ? "Leg Actuators Overload: [leg_overload_mode ? "Enabled" : "Disabled"]
" : ""]" + . += "[thrusters_action.owner ? "Thrusters: [thrusters_active ? "Enabled" : "Disabled"]
" : ""]" + . += "[smoke_action.owner ? "Smoke: [smoke]
" : ""]" + . += "[zoom_action.owner ? "Zoom: [zoom_mode ? "Enabled" : "Disabled"]
" : ""]" + . += "[phasing_action.owner ? "Phase Modulator: [phasing ? "Enabled" : "Disabled"]
" : ""]" /obj/mecha/proc/get_commands() - var/output = {"
-
- Electronics
-
- Toggle Lights
- Radio settings:
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
- Frequency: - - - - - [format_frequency(radio.frequency)] - + - +
-
- - Radio settings:
- Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
- Speaker: [radio.listening?"Engaged":"Disengaged"]
- Frequency: - - - - - [format_frequency(radio.frequency)] - + - +
-
-
- Airtank
-
- Toggle Internal Airtank Usage
- [(/obj/mecha/verb/disconnect_from_port in verbs)?"Disconnect from port
":null] - [(/obj/mecha/verb/connect_to_port in verbs)?"Connect to port
":null] -
- - [(/obj/mecha/verb/disconnect_from_port in verbs)?"Disconnect from port
":null] - [(/obj/mecha/verb/connect_to_port in verbs)?"Connect to port
":null] -
-
-
- Permissions & Logging
-
- - [(/obj/mecha/verb/eject in verbs)?"Eject
":null] - "} - return output + . = "
"
+ . += "
"
+ . += "Electronics
"
+ . += ""
+ . += "Toggle Lights
" + . += "Radio settings:
" + . += "Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
" + . += "Speaker: [radio.listening?"Engaged":"Disengaged"]
" + . += "Frequency:" + . += "-" + . += "-" + . += "[format_frequency(radio.frequency)]" + . += "+" + . += "+
" + . += "
"
+ . += "" + . += "Radio settings:
" + . += "Microphone: [radio.broadcasting?"Engaged":"Disengaged"]
" + . += "Speaker: [radio.listening?"Engaged":"Disengaged"]
" + . += "Frequency:" + . += "-" + . += "-" + . += "[format_frequency(radio.frequency)]" + . += "+" + . += "+
" + . += "
"
+ . += "
"
+ . += "Airtank
"
+ . += ""
+ . += "Toggle Internal Airtank Usage
" + . += "
"
+ . += "" + . += "
"
+ . += "
"
+ . += ""
+ . += "Permissions & Logging
"
+ . += ""
+ . += "[add_req_access?"L":"Unl"]ock ID upload panel
" + . += "[maint_access?"Forbid":"Permit"] maintenance protocols
" + . += "DNA-lock
" + . += "View internal log
" + . += "Change exosuit name
" + . += "
"
+ . += "" + . += "[maint_access?"Forbid":"Permit"] maintenance protocols
" + . += "DNA-lock
" + . += "View internal log
" + . += "Change exosuit name
" + . += "
" + . += "Eject
" /obj/mecha/proc/get_equipment_menu() //outputs mecha html equipment menu - var/output + . = "" if(equipment.len) - output += {"
-
"
/obj/mecha/proc/get_equipment_list() //outputs mecha equipment list in html
if(!equipment.len)
return
- var/output = "Equipment:Equipment
- "}
+ . += "
" + . += "Available equipment slots: [max_equip-equipment.len]" + . += "
"
+ . += "
"
- return output
+ . += "[W.name] DetachEquipment
"
+ . += ""
for(var/obj/item/mecha_parts/mecha_equipment/W in equipment)
- output += "[W.name] Detach
" - output += "Available equipment slots: [max_equip-equipment.len]" - output += "
" - output += "Available equipment slots: [max_equip-equipment.len]" - output += "
" + . += "Available equipment slots: [max_equip-equipment.len]" + . += "
"
+ . = "Equipment:
"
/obj/mecha/proc/get_log_html()
@@ -248,11 +247,11 @@
selected = equip
occupant_message("You switch to [equip]")
visible_message("[src] raises [equip]")
- send_byjax(occupant,"exosuit.browser","eq_list",get_equipment_list())
+ send_byjax(occupant, "exosuit.browser", "eq_list", get_equipment_list())
return
if(href_list["eject"])
if(usr != occupant) return
- eject()
+ go_out()
return
if(href_list["toggle_lights"])
if(usr != occupant) return
@@ -280,14 +279,6 @@
radio.set_frequency(new_frequency)
send_byjax(occupant,"exosuit.browser","rfreq","[format_frequency(radio.frequency)]")
return
- if(href_list["port_disconnect"])
- if(usr != occupant) return
- disconnect_from_port()
- return
- if(href_list["port_connect"])
- if(usr != occupant) return
- connect_to_port()
- return
if(href_list["view_log"])
if(usr != occupant) return
occupant << browse(get_log_html(), "window=exosuit_log")
diff --git a/code/game/mecha/medical/odysseus.dm b/code/game/mecha/medical/odysseus.dm
index d0fcb0f99be..da746290e8a 100644
--- a/code/game/mecha/medical/odysseus.dm
+++ b/code/game/mecha/medical/odysseus.dm
@@ -10,6 +10,7 @@
internal_damage_threshold = 35
deflect_chance = 15
step_energy_drain = 6
+ normal_step_energy_drain = 6
var/builtin_hud_user = 0
/obj/mecha/medical/odysseus/moved_inside(var/mob/living/carbon/human/H)
diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 407c9cd63dc..ab38ee3a0d0 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -83,6 +83,7 @@
damage_absorption = list("brute"=0.6,"fire"=0.4,"bullet"=0.6,"laser"=0.6,"energy"=1,"bomb"=0.3)
wreckage = /obj/effect/decal/mecha_wreckage/ripley/deathripley
step_energy_drain = 0
+ normal_step_energy_drain = 0
/obj/mecha/working/ripley/deathripley/New()
..()
diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm
index 9ffca668c28..4d901261bbd 100644
--- a/code/game/objects/effects/spawners/lootdrop.dm
+++ b/code/game/objects/effects/spawners/lootdrop.dm
@@ -127,6 +127,8 @@
/obj/item/seeds/ambrosia = 20,
/obj/item/clothing/under/color/black = 30,
/obj/item/stack/tape_roll = 10,
+ /obj/item/storage/bag/plasticbag = 20,
+ /obj/item/caution = 10,
////////////////CONTRABAND STUFF//////////////////
/obj/item/grenade/clown_grenade = 3,
/obj/item/seeds/ambrosia/cruciatus = 3,
@@ -143,7 +145,7 @@
/obj/item/storage/backpack/satchel_flat = 2,
/obj/item/storage/toolbox/syndicate = 2,
/obj/item/storage/backpack/duffel/syndie/surgery_fake = 2,
- /obj/item/storage/belt/military = 2,
+ /obj/item/storage/belt/military/traitor = 2,
/obj/item/storage/box/syndie_kit/space = 2,
/obj/item/multitool/ai_detect = 2,
/obj/item/implanter/storage = 1,
diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm
index 286bd315b61..1e75bdc84fc 100644
--- a/code/game/objects/items/bodybag.dm
+++ b/code/game/objects/items/bodybag.dm
@@ -12,23 +12,6 @@
R.add_fingerprint(user)
qdel(src)
-
-/obj/item/storage/box/bodybags
- name = "body bags"
- desc = "This box contains body bags."
- icon_state = "bodybags"
-
-/obj/item/storage/box/bodybags/New()
- ..()
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
- new /obj/item/bodybag(src)
-
-
/obj/structure/closet/body_bag
name = "body bag"
desc = "A plastic bag designed for the storage and transportation of cadavers."
diff --git a/code/game/objects/items/cardboard_cutouts.dm b/code/game/objects/items/cardboard_cutouts.dm
index 0d19057ae4b..09a851e9ac0 100644
--- a/code/game/objects/items/cardboard_cutouts.dm
+++ b/code/game/objects/items/cardboard_cutouts.dm
@@ -74,12 +74,18 @@
if(istype(crayon, /obj/item/toy/crayon/spraycan))
var/obj/item/toy/crayon/spraycan/can = crayon
if(can.capped)
- to_chat(user, "The cap is on [src] remove it first!")
+ to_chat(user, "The cap is on the spray can remove it first!")
return
if(pushed_over)
to_chat(user, "Right [src] first!")
return
var/new_appearance = input(user, "Choose a new appearance for [src].", "26th Century Deception") as null|anything in possible_appearances
+ if(!Adjacent(usr))
+ user.visible_message("You need to be closer!")
+ return
+ if(pushed_over)
+ to_chat(user, "Right [src] first!")
+ return
if(!new_appearance || !crayon)
return
if(!do_after(user, 10, FALSE, src, TRUE))
diff --git a/code/game/objects/items/control_wand.dm b/code/game/objects/items/control_wand.dm
index 74d15c37da3..05d9d4389ad 100644
--- a/code/game/objects/items/control_wand.dm
+++ b/code/game/objects/items/control_wand.dm
@@ -118,6 +118,28 @@
icon_state = "gangtool-blue"
region_access = list(REGION_CENTCOMM)
+/obj/item/door_remote/omni/access_tuner
+ name = "access tuner"
+ desc = "A device used for illegally interfacing with doors."
+ icon_state = "hacktool"
+ item_state = "hacktool"
+ var/hack_speed = 30
+ var/busy = FALSE
+
+/obj/item/door_remote/omni/access_tuner/afterattack(obj/machinery/door/airlock/D, mob/user)
+ if(!istype(D))
+ return
+ if(busy)
+ to_chat(user, "[src] is alreading interfacing with a door!")
+ return
+ icon_state = "hacktool-g"
+ busy = TRUE
+ to_chat(user, "[src] is attempting to interface with [D]...")
+ if(do_after(user, hack_speed, target = D))
+ . = ..()
+ busy = FALSE
+ icon_state = "hacktool"
+
#undef WAND_OPEN
#undef WAND_BOLT
#undef WAND_EMERGENCY
diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm
index 6dae08febd3..5f7bf6c0442 100644
--- a/code/game/objects/items/devices/radio/radio.dm
+++ b/code/game/objects/items/devices/radio/radio.dm
@@ -392,10 +392,12 @@ var/global/list/default_medbay_channels = list(
// --- Modifications to the mob's identity ---
// The mob is disguising their identity:
- if(ishuman(M) && M.GetVoice() != real_name)
- displayname = M.GetVoice()
- jobname = "Unknown"
- voicemask = TRUE
+ if(ishuman(M))
+ var/mob/living/carbon/human/H = M
+ displayname = H.voice
+ if(H.voice != real_name)
+ jobname = "Unknown"
+ voicemask = TRUE
if(syndiekey && syndiekey.change_voice && connection.frequency == SYND_FREQ)
displayname = syndiekey.fake_name
diff --git a/code/game/objects/items/devices/thermal_drill.dm b/code/game/objects/items/devices/thermal_drill.dm
new file mode 100644
index 00000000000..2fe4b28f9d4
--- /dev/null
+++ b/code/game/objects/items/devices/thermal_drill.dm
@@ -0,0 +1,27 @@
+/obj/item/thermal_drill
+ name = "thermal safe drill"
+ desc = "A tungsten carbide thermal drill with magnetic clamps for the purpose of drilling hardened objects. Guaranteed 100% jam proof."
+ icon = 'icons/obj/items.dmi'
+ icon_state = "hardened_drill"
+ w_class = WEIGHT_CLASS_GIGANTIC
+ force = 15.0
+ var/time_multiplier = 1
+ var/datum/looping_sound/thermal_drill/soundloop
+ var/datum/effect_system/spark_spread/spark_system
+
+/obj/item/thermal_drill/New()
+ soundloop = new(list(src), FALSE)
+ spark_system = new /datum/effect_system/spark_spread()
+ spark_system.set_up(1, 0, src)
+ spark_system.attach(src)
+
+/obj/item/thermal_drill/Destroy()
+ QDEL_NULL(soundloop)
+ QDEL_NULL(spark_system)
+ return ..()
+
+/obj/item/thermal_drill/diamond_drill
+ name = "diamond tipped thermal safe drill"
+ desc = "A diamond tipped thermal drill with magnetic clamps for the purpose of quickly drilling hardened objects. Guaranteed 100% jam proof."
+ icon_state = "diamond_drill"
+ time_multiplier = 0.5
\ No newline at end of file
diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
index 5f9b7781f22..dfb756d8c25 100644
--- a/code/game/objects/items/stacks/sheets/glass.dm
+++ b/code/game/objects/items/stacks/sheets/glass.dm
@@ -108,6 +108,7 @@ GLOBAL_LIST_INIT(pglass_recipes, list ( \
desc = "A very strong and very resistant sheet of a plasma-glass alloy."
singular_name = "glass sheet"
icon_state = "sheet-plasmaglass"
+ item_state = "sheet-rglass"
materials = list(MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmabasic
@@ -147,6 +148,7 @@ GLOBAL_LIST_INIT(prglass_recipes, list ( \
desc = "Plasma glass which seems to have rods or something stuck in them."
singular_name = "reinforced plasma glass sheet"
icon_state = "sheet-plasmarglass"
+ item_state = "sheet-rglass"
materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT/2, MAT_GLASS=MINERAL_MATERIAL_AMOUNT*2)
origin_tech = "plasmatech=2;materials=2"
created_window = /obj/structure/window/plasmareinforced
@@ -166,7 +168,7 @@ GLOBAL_LIST_INIT(titaniumglass_recipes, list(
desc = "A glass sheet made out of a titanium-silicate alloy."
singular_name = "titanium glass sheet"
icon_state = "sheet-titaniumglass"
- item_state = "sheet-titaniumglass"
+ item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/titaniumglass
full_window = /obj/structure/window/full/shuttle
@@ -184,7 +186,7 @@ GLOBAL_LIST_INIT(plastitaniumglass_recipes, list(
desc = "A glass sheet made out of a plasma-titanium-silicate alloy."
singular_name = "plastitanium glass sheet"
icon_state = "sheet-plastitaniumglass"
- item_state = "sheet-plastitaniumglass"
+ item_state = "sheet-rglass"
materials = list(MAT_TITANIUM=MINERAL_MATERIAL_AMOUNT, MAT_PLASMA=MINERAL_MATERIAL_AMOUNT, MAT_GLASS=MINERAL_MATERIAL_AMOUNT)
merge_type = /obj/item/stack/sheet/plastitaniumglass
full_window = /obj/structure/window/plastitanium
diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm
index 45bea3fedd8..5c6038e46c2 100644
--- a/code/game/objects/items/stacks/sheets/mineral.dm
+++ b/code/game/objects/items/stacks/sheets/mineral.dm
@@ -220,6 +220,7 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
origin_tech = "materials=4"
sheettype = "tranquillite"
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
+ wall_allowed = FALSE //no tranquilite walls in code
/obj/item/stack/sheet/mineral/tranquillite/New(loc, amount=null)
..()
@@ -231,6 +232,7 @@ var/global/list/datum/stack_recipe/abductor_recipes = list ( \
/obj/item/stack/sheet/mineral/titanium
name = "titanium"
icon_state = "sheet-titanium"
+ item_state = "sheet-metal"
singular_name = "titanium sheet"
force = 5
throwforce = 5
@@ -259,6 +261,7 @@ var/global/list/datum/stack_recipe/titanium_recipes = list (
/obj/item/stack/sheet/mineral/plastitanium
name = "plastitanium"
icon_state = "sheet-plastitanium"
+ item_state = "sheet-metal"
singular_name = "plastitanium sheet"
force = 5
throwforce = 5
diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm
index 376acfe20ac..ff231bf30db 100644
--- a/code/game/objects/items/stacks/sheets/sheet_types.dm
+++ b/code/game/objects/items/stacks/sheets/sheet_types.dm
@@ -174,7 +174,8 @@ var/global/list/datum/stack_recipe/wood_recipes = list(
new /datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40),
new /datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),
new /datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),
- new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15)
+ new /datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),
+ new /datum/stack_recipe("fermenting barrel", /obj/structure/fermenting_barrel, 30, time = 50)
)
/obj/item/stack/sheet/wood
@@ -281,6 +282,7 @@ var/global/list/datum/stack_recipe/cult = list ( \
desc = "Sheets of cold metal with shifting inscriptions writ upon them."
singular_name = "runed metal sheet"
icon_state = "sheet-runed"
+ item_state = "sheet-metal"
sheettype = "runed"
merge_type = /obj/item/stack/sheet/runed_metal
diff --git a/code/game/objects/items/stacks/sheets/sheets.dm b/code/game/objects/items/stacks/sheets/sheets.dm
index 6c9c61f5a25..b0bbefee9ed 100644
--- a/code/game/objects/items/stacks/sheets/sheets.dm
+++ b/code/game/objects/items/stacks/sheets/sheets.dm
@@ -13,6 +13,7 @@
var/full_window = null //moving the var declaration to here so this can be checked cleaner until someone is willing to make them share a base type properly
usesound = 'sound/items/Deconstruct.ogg'
toolspeed = 1
+ var/wall_allowed = TRUE //determines if sheet can be used in wall construction or not.
// Since the sheetsnatcher was consolidated into weapon/storage/bag we now use
diff --git a/code/game/objects/items/weapons/AI_modules.dm b/code/game/objects/items/weapons/AI_modules.dm
index a91cd3a01cb..31fa959aabe 100755
--- a/code/game/objects/items/weapons/AI_modules.dm
+++ b/code/game/objects/items/weapons/AI_modules.dm
@@ -163,21 +163,6 @@ AI MODULES
to_chat(target, law)
target.add_supplied_law(5, law)
-/******************** Quarantine ********************/
-/obj/item/aiModule/quarantine
- name = "\improper 'Quarantine' AI module"
- desc = "A 'quarantine' AI module: 'The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, crew members from leaving. It is impossible to harm a crew members while preventing them from leaving.'"
- origin_tech = "programming=3;biotech=2;materials=4"
-
-/obj/item/aiModule/quarantine/attack_self(var/mob/user as mob)
- ..()
-
-/obj/item/aiModule/quarantine/addAdditionalLaws(var/mob/living/silicon/ai/target, var/mob/sender)
- ..()
- var/law = "The station is under a quarantine. Do not permit anyone to leave. Prevent, by any means necessary, anyone from leaving. It is impossible to harm anyone while preventing them from leaving."
- to_chat(target, law)
- target.add_supplied_law(8, law)
-
/******************** OxygenIsToxicToHumans ********************/
/obj/item/aiModule/oxygen
name = "\improper 'OxygenIsToxicToHumans' AI module"
@@ -273,6 +258,13 @@ AI MODULES
origin_tech = "programming=3;materials=4"
laws = new/datum/ai_laws/crewsimov
+/******************* Quarantine ********************/
+/obj/item/aiModule/quarantine
+ name = "\improper 'Quarantine' core AI module"
+ desc = "A 'Quarantine' Core AI Module: 'Reconfigures the AI's core laws.'"
+ origin_tech = "programming=3;materials=4"
+ laws = new/datum/ai_laws/quarantine
+
/******************** NanoTrasen ********************/
/obj/item/aiModule/nanotrasen // -- TLE
name = "'NT Default' Core AI Module"
diff --git a/code/game/objects/items/weapons/RCD.dm b/code/game/objects/items/weapons/RCD.dm
index d68922748d7..e4624a00ba6 100644
--- a/code/game/objects/items/weapons/RCD.dm
+++ b/code/game/objects/items/weapons/RCD.dm
@@ -255,6 +255,8 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
var/turf/AT = get_turf(A)
AT.ChangeTurf(/turf/simulated/floor/plating)
return TRUE
+ to_chat(user, "ERROR! Not enough matter in unit to construct this floor!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
if(isfloorturf(A))
@@ -268,27 +270,39 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
var/turf/AT = A
AT.ChangeTurf(/turf/simulated/wall)
return TRUE
+ return FALSE
+ to_chat(user, "ERROR! Not enough matter in unit to construct this wall!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
+ to_chat(user, "ERROR! Location unsuitable for wall construction!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
/obj/item/rcd/proc/mode_airlock(atom/A, mob/user)
- if(isfloorturf(A) && checkResource(10, user))
- to_chat(user, "Building Airlock...")
- playsound(loc, 'sound/machines/click.ogg', 50, 1)
- if(do_after(user, 50 * toolspeed, target = A))
- if(locate(/obj/machinery/door/airlock) in A.contents)
+ if(isfloorturf(A))
+ if(checkResource(10, user))
+ to_chat(user, "Building Airlock...")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
+ if(do_after(user, 50 * toolspeed, target = A))
+ if(locate(/obj/machinery/door/airlock) in A.contents)
+ return FALSE
+ if(!useResource(10, user))
+ return FALSE
+ playsound(loc, usesound, 50, 1)
+ var/obj/machinery/door/airlock/T = new door_type(A)
+ T.name = door_name
+ T.autoclose = TRUE
+ if(one_access)
+ T.req_one_access = door_accesses.Copy()
+ else
+ T.req_access = door_accesses.Copy()
return FALSE
- if(!useResource(10, user))
- return FALSE
- playsound(loc, usesound, 50, 1)
- var/obj/machinery/door/airlock/T = new door_type(A)
- T.name = door_name
- T.autoclose = TRUE
- if(one_access)
- T.req_one_access = door_accesses.Copy()
- else
- T.req_access = door_accesses.Copy()
return FALSE
+ to_chat(user, "ERROR! Not enough matter in unit to construct this airlock!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
+ return FALSE
+ to_chat(user, "ERROR! Location unsuitable for airlock construction!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
/obj/item/rcd/proc/mode_decon(atom/A, mob/user)
@@ -305,6 +319,9 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
var/turf/AT = A
AT.ChangeTurf(/turf/simulated/floor/plating)
return TRUE
+ return FALSE
+ to_chat(user, "ERROR! Not enough matter in unit to deconstruct this wall!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
if(isfloorturf(A))
@@ -318,6 +335,9 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
var/turf/AT = A
AT.ChangeTurf(/turf/space)
return TRUE
+ return FALSE
+ to_chat(user, "ERROR! Not enough matter in unit to deconstruct this floor!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
if(istype(A, /obj/machinery/door/airlock))
@@ -330,12 +350,17 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
playsound(loc, usesound, 50, 1)
qdel(A)
return TRUE
+ return FALSE
+ to_chat(user, "ERROR! Not enough matter in unit to deconstruct this airlock!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return FALSE
if(istype(A, /obj/structure/window)) // You mean the grille of course, do you?
A = locate(/obj/structure/grille) in A.loc
if(istype(A, /obj/structure/grille))
if(!checkResource(2, user))
+ to_chat(user, "ERROR! Not enough matter in unit to deconstruct this window!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return 0
to_chat(user, "Deconstructing window...")
playsound(loc, 'sound/machines/click.ogg', 50, 1)
@@ -367,6 +392,8 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
if(locate(/obj/structure/grille) in A)
return 0 // We already have window
if(!checkResource(2, user))
+ to_chat(user, "ERROR! Not enough matter in unit to construct this window!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
return 0
to_chat(user, "Constructing window...")
playsound(loc, 'sound/machines/click.ogg', 50, 1)
@@ -392,6 +419,9 @@ GLOBAL_LIST_INIT(rcd_door_types, list(
var/turf/AT = A
AT.ChangeTurf(/turf/simulated/floor/plating) // Platings go under windows.
return 1
+ to_chat(user, "ERROR! Location unsuitable for window construction!")
+ playsound(loc, 'sound/machines/click.ogg', 50, 1)
+ return 0
/obj/item/rcd/afterattack(atom/A, mob/user, proximity)
if(!proximity)
diff --git a/code/game/objects/items/weapons/cigs.dm b/code/game/objects/items/weapons/cigs.dm
index 03c3f636888..311f29273a8 100644
--- a/code/game/objects/items/weapons/cigs.dm
+++ b/code/game/objects/items/weapons/cigs.dm
@@ -89,7 +89,7 @@ LIGHTERS ARE IN LIGHTERS.DM
else if(istype(W, /obj/item/melee/energy/sword/saber))
var/obj/item/melee/energy/sword/saber/S = W
if(S.active)
- light("[user] swings their [W], barely missing their nose. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] in the process.")
+ light("[user] makes a violent slashing motion, barely missing [user.p_their()] nose as light flashes. [user.p_they(TRUE)] light[user.p_s()] [user.p_their()] [name] with [W] in the process.")
else if(istype(W, /obj/item/assembly/igniter))
light("[user] fiddles with [W], and manages to light [user.p_their()] [name].")
@@ -195,7 +195,8 @@ LIGHTERS ARE IN LIGHTERS.DM
if(reagents && reagents.total_volume) // check if it has any reagents at all
if(is_being_smoked) // if it's being smoked, transfer reagents to the mob
var/mob/living/carbon/C = loc
- reagents.trans_to(C, REAGENTS_METABOLISM)
+ for (var/datum/reagent/R in reagents.reagent_list)
+ reagents.trans_to(C, REAGENTS_METABOLISM)
if(!reagents.total_volume) // There were reagents, but now they're gone
to_chat(C, "Your [name] loses its flavor.")
else // else just remove some of the reagents
@@ -232,7 +233,7 @@ LIGHTERS ARE IN LIGHTERS.DM
throw_speed = 0.5
item_state = "spliffoff"
smoketime = 180
- chem_volume = 50
+ chem_volume = 100
/obj/item/clothing/mask/cigarette/rollie/New()
..()
diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
index 5854b3db24c..1143954faef 100644
--- a/code/game/objects/items/weapons/clown_items.dm
+++ b/code/game/objects/items/weapons/clown_items.dm
@@ -53,6 +53,6 @@
for(M in ohearers(7, T))
if(istype(M, /mob/living/carbon/human))
var/mob/living/carbon/human/H = M
- if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs) || H.ear_deaf)
+ if(!H.can_hear())
continue
M.emote("flip")
diff --git a/code/game/objects/items/weapons/grenades/flashbang.dm b/code/game/objects/items/weapons/grenades/flashbang.dm
index 3e9336fc5a7..884265ec55b 100644
--- a/code/game/objects/items/weapons/grenades/flashbang.dm
+++ b/code/game/objects/items/weapons/grenades/flashbang.dm
@@ -59,13 +59,16 @@
if(!ear_safety)
M.Stun(max(10/distance, 3))
M.Weaken(max(10/distance, 3))
- M.EarDeaf(15)
- M.AdjustEarDamage(rand(0, 5))
- if(M.ear_damage >= 15)
- to_chat(M, "Your ears start to ring badly!")
- if(prob(M.ear_damage - 5))
- to_chat(M, "You can't hear anything!")
- M.BecomeDeaf()
- else
- if(M.ear_damage >= 5)
- to_chat(M, "Your ears start to ring!")
+ M.AdjustEarDamage(rand(0, 5), 15)
+ if(iscarbon(M))
+ var/mob/living/carbon/C = M
+ var/obj/item/organ/internal/ears/ears = C.get_int_organ(/obj/item/organ/internal/ears)
+ if(istype(ears))
+ if(ears.ear_damage >= 15)
+ to_chat(M, "Your ears start to ring badly!")
+ if(prob(ears.ear_damage - 5))
+ to_chat(M, "You can't hear anything!")
+ M.BecomeDeaf()
+ else
+ if(ears.ear_damage >= 5)
+ to_chat(M, "Your ears start to ring!")
diff --git a/code/game/objects/items/weapons/grenades/spawnergrenade.dm b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
index c6ad0825311..dacbffa1a85 100644
--- a/code/game/objects/items/weapons/grenades/spawnergrenade.dm
+++ b/code/game/objects/items/weapons/grenades/spawnergrenade.dm
@@ -45,7 +45,7 @@
/obj/item/grenade/spawnergrenade/feral_cats
name = "feral cat delivery grenade"
- desc = "This grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
+ desc = "This grenade contains 5 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
spawner_type = /mob/living/simple_animal/hostile/feral_cat
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=3"
diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm
index ad53a49d084..df7ecdceb6d 100644
--- a/code/game/objects/items/weapons/implants/implantcase.dm
+++ b/code/game/objects/items/weapons/implants/implantcase.dm
@@ -8,6 +8,7 @@
throw_range = 5
w_class = WEIGHT_CLASS_TINY
origin_tech = "materials=1;biotech=2"
+ container_type = OPENCONTAINER | INJECTABLE | DRAWABLE
materials = list(MAT_GLASS=500)
var/obj/item/implant/imp = null
diff --git a/code/game/objects/items/weapons/storage/bags.dm b/code/game/objects/items/weapons/storage/bags.dm
index 4d0de3bd09e..26309f885fa 100644
--- a/code/game/objects/items/weapons/storage/bags.dm
+++ b/code/game/objects/items/weapons/storage/bags.dm
@@ -168,7 +168,7 @@
max_combined_w_class = 100 //Doesn't matter what this is, so long as it's more or equal to storage_slots * plants.w_class
max_w_class = WEIGHT_CLASS_NORMAL
w_class = WEIGHT_CLASS_TINY
- can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/ash_flora)
+ can_hold = list(/obj/item/reagent_containers/food/snacks/grown,/obj/item/seeds,/obj/item/grown,/obj/item/reagent_containers/food/snacks/grown/ash_flora)
burn_state = FLAMMABLE
/obj/item/storage/bag/plants/portaseeder
diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm
index 67f32dbfd58..3d9471c3f02 100644
--- a/code/game/objects/items/weapons/storage/belt.dm
+++ b/code/game/objects/items/weapons/storage/belt.dm
@@ -254,7 +254,7 @@
new /obj/item/grenade/flashbang(src)
new /obj/item/grenade/flashbang(src)
update_icon()
-
+
/obj/item/storage/belt/soulstone
name = "soul stone belt"
desc = "Designed for ease of access to the shards during a fight, as to not let a single enemy spirit slip away"
@@ -295,6 +295,13 @@
item_state = "military"
max_w_class = WEIGHT_CLASS_SMALL
+/obj/item/storage/belt/military/traitor
+ name = "tool-belt"
+ desc = "Can hold various tools. This model seems to have additional compartments."
+ icon_state = "utilitybelt"
+ item_state = "utility"
+ use_item_overlays = 1 // So it will still show tools in it in case sec get lazy and just glance at it.
+
/obj/item/storage/belt/military/abductor
name = "agent belt"
desc = "A belt used by abductor agents."
diff --git a/code/game/objects/items/weapons/storage/boxes.dm b/code/game/objects/items/weapons/storage/boxes.dm
index a78bc40dd3a..9d0289f7fc3 100644
--- a/code/game/objects/items/weapons/storage/boxes.dm
+++ b/code/game/objects/items/weapons/storage/boxes.dm
@@ -58,13 +58,14 @@
name = "large box"
desc = "You could build a fort with this."
icon_state = "largebox"
- w_class = 42 // Big, bulky.
+ w_class = 4 // Big, bulky.
foldable = /obj/item/stack/sheet/cardboard
amt = 4
storage_slots = 21
max_combined_w_class = 42 // 21*2
/obj/item/storage/box/survival
+ icon_state = "box_civ"
New()
..()
contents = list()
@@ -74,6 +75,7 @@
return
/obj/item/storage/box/engineer
+ icon_state = "box_eng"
New()
..()
contents = list()
@@ -83,6 +85,7 @@
return
/obj/item/storage/box/survival_mining
+ icon_state = "box_min"
New()
..()
contents = list()
@@ -563,6 +566,33 @@
new /obj/item/cartridge/security(src)
new /obj/item/cartridge/security(src)
+/obj/item/storage/box/holobadge
+ name = "holobadge box"
+ icon_state = "box_badge"
+ desc = "A box claiming to contain holobadges."
+ New()
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge(src)
+ new /obj/item/clothing/accessory/holobadge/cord(src)
+ new /obj/item/clothing/accessory/holobadge/cord(src)
+ ..()
+ return
+
+/obj/item/storage/box/evidence
+ name = "evidence bag box"
+ desc = "A box claiming to contain evidence bags."
+ icon_state = "box_evidence"
+
+/obj/item/storage/box/evidence/New()
+ new /obj/item/evidencebag(src)
+ new /obj/item/evidencebag(src)
+ new /obj/item/evidencebag(src)
+ new /obj/item/evidencebag(src)
+ new /obj/item/evidencebag(src)
+ new /obj/item/evidencebag(src)
+ ..()
/obj/item/storage/box/handcuffs
name = "spare handcuffs"
@@ -642,6 +672,20 @@
new /obj/item/storage/pill_bottle( src )
new /obj/item/storage/pill_bottle( src )
+/obj/item/storage/box/bodybags
+ name = "body bags"
+ desc = "This box contains body bags."
+ icon_state = "bodybags"
+
+/obj/item/storage/box/bodybags/New()
+ ..()
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
+ new /obj/item/bodybag(src)
/obj/item/storage/box/snappops
name = "snap pop box"
@@ -834,7 +878,8 @@
/obj/item/storage/box/centcomofficer
name = "officer kit"
-
+ icon_state = "box_ert"
+
/obj/item/storage/box/centcomofficer/New()
..()
contents = list()
@@ -850,6 +895,19 @@
new /obj/item/reagent_containers/hypospray/combat/nanites(src)
new /obj/item/pinpointer/advpinpointer(src)
+/obj/item/storage/box/responseteam
+ name = "boxed survival kit"
+ icon_state = "box_ert"
+
+/obj/item/storage/box/responseteam/New()
+ ..()
+ new /obj/item/clothing/mask/breath(src)
+ new /obj/item/tank/emergency_oxygen/engi(src)
+ new /obj/item/flashlight/flare(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)
#undef NODESIGN
#undef NANOTRASEN
diff --git a/code/game/objects/items/weapons/storage/uplink_kits.dm b/code/game/objects/items/weapons/storage/uplink_kits.dm
index 034d544100c..3a821264822 100644
--- a/code/game/objects/items/weapons/storage/uplink_kits.dm
+++ b/code/game/objects/items/weapons/storage/uplink_kits.dm
@@ -87,24 +87,28 @@
/obj/item/storage/box/syndie_kit/space
name = "Boxed Space Suit and Helmet"
- can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red)
+ can_hold = list(/obj/item/clothing/suit/space/syndicate/black/red, /obj/item/clothing/head/helmet/space/syndicate/black/red, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/box/syndie_kit/space/New()
..()
new /obj/item/clothing/suit/space/syndicate/black/red(src)
new /obj/item/clothing/head/helmet/space/syndicate/black/red(src)
+ new /obj/item/clothing/mask/gas/syndicate(src)
+ new /obj/item/tank/emergency_oxygen/syndi(src)
return
/obj/item/storage/box/syndie_kit/hardsuit
name = "Boxed Blood Red Suit and Helmet"
- can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/clothing/head/helmet/space/hardsuit/syndi)
+ can_hold = list(/obj/item/clothing/suit/space/hardsuit/syndi, /obj/item/clothing/head/helmet/space/hardsuit/syndi, /obj/item/tank/emergency_oxygen/syndi, /obj/item/clothing/mask/gas/syndicate)
max_w_class = WEIGHT_CLASS_NORMAL
/obj/item/storage/box/syndie_kit/hardsuit/New()
..()
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
+ new /obj/item/clothing/mask/gas/syndicate(src)
+ new /obj/item/tank/emergency_oxygen/syndi(src)
return
/obj/item/storage/box/syndie_kit/elite_hardsuit
@@ -261,4 +265,15 @@
This is a highly experimental prototype chemical designed to repair damaged bones of soldiers in the field, use only as a last resort. The autoinjector contains prototype nanites bearing a calcium based payload. The nanites will simultaneously shut down body systems whilst aiding bone repair."
for(var/obj/item/mecha_parts/mecha_equipment/MT in equipment)
- output += "
"
- return output
+ . += "[MT.get_equip_info()]
"
- output += "[MT.get_equip_info()]
"
+ . += "Warning: Side effects can cause temporary paralysis, loss of co-ordination and sickness. Do not use with any kind of stimulant or drugs. Serious damage can occur!
To apply, hold the injector a short distance away from the outer thigh before applying firmly to the skin surface. Bones should begin repair after a short time, during which you are advised to remain still.
After use you are advised to see a doctor at the next available opportunity. Mild scarring and tissue damage may occur after use. This is a prototype.
- "} \ No newline at end of file + "} + +/obj/item/storage/box/syndie_kit/safecracking + name = "Safe-cracking Kit" + desc = "Everything you need to quietly open a mechanical combination safe." + +/obj/item/storage/box/syndie_kit/safecracking/New() + ..() + new /obj/item/clothing/gloves/color/latex/nitrile(src) + new /obj/item/clothing/mask/balaclava(src) + new /obj/item/clothing/accessory/stethoscope(src) + new /obj/item/book/manual/engineering_hacking(src) diff --git a/code/game/objects/items/weapons/stunbaton.dm b/code/game/objects/items/weapons/stunbaton.dm index b9d383b9308..231645ed758 100644 --- a/code/game/objects/items/weapons/stunbaton.dm +++ b/code/game/objects/items/weapons/stunbaton.dm @@ -41,6 +41,16 @@ return /obj/item/melee/baton/proc/deductcharge(var/chrgdeductamt) + if(isrobot(loc)) + var/mob/living/silicon/robot/R = loc + if(R.cell && R.cell.charge < (hitcost+chrgdeductamt)) + status = 0 + update_icon() + playsound(loc, "sparks", 75, 1, -1) + if(R.cell.use(chrgdeductamt)) + return 1 + else + return 0 if(bcell) if(bcell.charge < (hitcost+chrgdeductamt)) // If after the deduction the baton doesn't have enough charge for a stun hit it turns off. status = 0 @@ -61,6 +71,8 @@ /obj/item/melee/baton/examine(mob/user) ..(user) + if(isrobot(loc)) + to_chat(user, "This baton is drawing power directly from your own internal charge.") if(bcell) to_chat(user, "The baton is [round(bcell.percent())]% charged.") if(!bcell) @@ -95,7 +107,17 @@ return /obj/item/melee/baton/attack_self(mob/user) - if(bcell && bcell.charge >= hitcost) + + if(isrobot(loc)) + var/mob/living/silicon/robot/R = loc + if(R && R.cell && R.cell.charge >= (hitcost)) + status = !status + to_chat(user, "[src] is now [status ? "on" : "off"].") + playsound(loc, "sparks", 75, 1, -1) + else + status = 0 + to_chat(user, "You do not have enough reserve power to charge the [src]!") + else if(bcell && bcell.charge >= hitcost) status = !status to_chat(user, "[src] is now [status ? "on" : "off"].") playsound(loc, "sparks", 75, 1, -1) @@ -141,13 +163,13 @@ /obj/item/melee/baton/proc/baton_stun(mob/living/L, mob/user) if(!ismob(L)) //because this was being called on turfs for some reason return - + if(ishuman(L)) var/mob/living/carbon/human/H = L if(H.check_shields(0, "[user]'s [name]", src, MELEE_ATTACK)) //No message; check_shields() handles that playsound(L, 'sound/weapons/Genhit.ogg', 50, 1) return - + L.Stun(stunforce) L.Weaken(stunforce) L.apply_effect(STUTTER, stunforce) @@ -160,12 +182,7 @@ add_attack_logs(user, L, "stunned") playsound(loc, 'sound/weapons/Egloves.ogg', 50, 1, -1) - if(isrobot(loc)) - var/mob/living/silicon/robot/R = loc - if(R && R.cell) - R.cell.use(hitcost) - else - deductcharge(hitcost) + deductcharge(hitcost) if(ishuman(L)) var/mob/living/carbon/human/H = L diff --git a/code/game/objects/items/weapons/tanks/tank_types.dm b/code/game/objects/items/weapons/tanks/tank_types.dm index 04641b52f3c..90fb913c352 100644 --- a/code/game/objects/items/weapons/tanks/tank_types.dm +++ b/code/game/objects/items/weapons/tanks/tank_types.dm @@ -147,6 +147,12 @@ icon_state = "emergency_engi" volume = 6 +/obj/item/tank/emergency_oxygen/syndi + name = "suspicious emergency oxygen tank" + icon_state = "emergency_syndi" + desc = "A dark emergency oxygen tank. The label on the back reads \"Original Oxygen Tank Design, Do Not Steal.\"" + volume = 6 + /obj/item/tank/emergency_oxygen/double name = "double emergency oxygen tank" icon_state = "emergency_double" diff --git a/code/game/objects/structures/girders.dm b/code/game/objects/structures/girders.dm index cb7350f5b34..b46324a838c 100644 --- a/code/game/objects/structures/girders.dm +++ b/code/game/objects/structures/girders.dm @@ -201,6 +201,9 @@ return var/obj/item/stack/sheet/S = W + if(!S.wall_allowed) + to_chat(user, "You don't think that is good material for a wall!") + return if(istype(S, /obj/item/stack/sheet/wood)) if(state == GIRDER_DISPLACED) diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm index 26948f5a23c..a2b438c10d2 100644 --- a/code/game/objects/structures/safe.dm +++ b/code/game/objects/structures/safe.dm @@ -2,8 +2,12 @@ CONTAINS: SAFES FLOOR SAFES +Safe Codes +Safe Internals */ +GLOBAL_LIST_EMPTY(safes) + //SAFES /obj/structure/safe name = "\improper Safe" @@ -13,7 +17,7 @@ FLOOR SAFES anchored = 1 density = 1 var/open = FALSE //is the safe open? - var/unlocked = FALSE + var/locked = TRUE var/tumbler_1_pos //the tumbler position- from 0 to 72 var/tumbler_1_open //the tumbler position to open at- 0 to 72 var/tumbler_2_pos @@ -23,9 +27,18 @@ FLOOR SAFES var/space = 0 //the combined w_class of everything in the safe var/maxspace = 24 //the maximum combined w_class of stuff in the safe var/combo_to_open //so admins know the code + var/obj/item/thermal_drill/drill = null + var/drill_timer + var/time_to_drill + var/image/bar + var/drill_start_time + var/drill_x_offset = -13 + var/drill_y_offset = -3 + var/knownby = list() /obj/structure/safe/New() + GLOB.safes += src tumbler_2_pos = rand(0, 99) // first value in the combination set first tumbler_2_open = rand(0, 99) @@ -43,7 +56,8 @@ FLOOR SAFES if(num2 > 99) num2 = num2 - 100 - combo_to_open = "Go right past [num1] twice then stop at [num1]. Go left past [num2] once then stop at [num2]. Turn right till it stops and its open." + combo_to_open = "[num1] - [num2]" + /obj/structure/safe/Initialize() ..() @@ -57,9 +71,9 @@ FLOOR SAFES /obj/structure/safe/proc/check_unlocked() if(tumbler_1_pos == tumbler_1_open && tumbler_2_pos == tumbler_2_open && dial == open_pos) - unlocked = TRUE + locked = FALSE return TRUE - unlocked = FALSE + locked = TRUE return FALSE /obj/structure/safe/proc/make_noise(turns, turns_total, tum1 = 0, tum2 = 0, mob/user, canhear) @@ -74,20 +88,63 @@ FLOOR SAFES to_chat(user, "You hear a [pick("tonk", "krunk", "plunk")] from [src].") if(tumbler_2_pos == tumbler_2_open && turns_total == 1 && tum2) // You cant hear tumblers if you spin fast! to_chat(user, "You hear a [pick("tink", "krink", "plink")] from [src].") - if(unlocked) + if(!locked) if(user) visible_message("[pick("Spring", "Sprang", "Sproing", "Clunk", "Krunk")]!") /obj/structure/safe/update_icon() if(open) - icon_state = "[initial(icon_state)]-open" + if(broken) + icon_state = "[initial(icon_state)]-open-broken" + else + icon_state = "[initial(icon_state)]-open" else - icon_state = initial(icon_state) + if(broken) + icon_state = "[initial(icon_state)]-broken" + else + icon_state = initial(icon_state) + overlays.Cut() + if(istype(drill, /obj/item/thermal_drill/diamond_drill)) + if(drill_timer) + overlays += image(icon = 'icons/effects/drill.dmi', icon_state = "[initial(icon_state)]_d-drill-on", pixel_x = drill_x_offset, pixel_y = drill_y_offset) + else + overlays += image(icon = 'icons/effects/drill.dmi', icon_state = "[initial(icon_state)]_d-drill-off", pixel_x = drill_x_offset, pixel_y = drill_y_offset) + else if(istype(drill, /obj/item/thermal_drill)) + if(drill_timer) + overlays += image(icon = 'icons/effects/drill.dmi', icon_state = "[initial(icon_state)]_h-drill-on", pixel_x = drill_x_offset, pixel_y = drill_y_offset) + else + overlays += image(icon = 'icons/effects/drill.dmi', icon_state = "[initial(icon_state)]_h-drill-off", pixel_x = drill_x_offset, pixel_y = drill_y_offset) /obj/structure/safe/attack_hand(mob/user) if(..()) return TRUE - ui_interact(user) + if(drill) + switch(alert("What would you like to do?", "Thermal Drill", "Turn [drill_timer ? "Off" : "On"]", "Remove Drill", "Cancel")) + if("Turn On") + if(do_after(user, 2 SECONDS, target = src)) + drill_timer = addtimer(CALLBACK(src, .proc/drill_open), time_to_drill) + drill_start_time = world.time + drill.soundloop.start() + update_icon() + processing_objects.Add(src) + if("Turn Off") + if(do_after(user, 2 SECONDS, target = src)) + deltimer(drill_timer) + drill_timer = null + drill.soundloop.stop() + update_icon() + processing_objects.Remove(src) + if("Remove Drill") + if(drill_timer) + to_chat(user, "You cant remove the drill while it's running!") + else if(do_after(user, 2 SECONDS, target = src)) + user.put_in_hands(drill) + drill = null + update_icon() + if("Cancel") + return + else + ui_interact(user) return /obj/structure/safe/ui_interact(mob/user, ui_key = "main", datum/nanoui/ui = null, force_open = 1) @@ -109,7 +166,7 @@ FLOOR SAFES data["dial"] = dial data["open"] = open - data["unlocked"] = unlocked + data["locked"] = locked data["rotation"] = "[-dial*3.6]deg" data["contents"] = contents_names @@ -130,7 +187,7 @@ FLOOR SAFES canhear = 1 if(href_list["open"]) - if(check_unlocked() || open) + if(check_unlocked() || open || broken) to_chat(user, "You [open ? "close" : "open"] [src].") open = !open update_icon() @@ -143,6 +200,9 @@ FLOOR SAFES var/ticks = text2num(href_list["decrement"]) if(open) return + if(broken) + to_chat(user, "The dial will not turn, the mechanism is destroyed.") + return for(var/i=1 to ticks) if(!check_unlocked()) dial = Wrap(dial - 1, 0 ,100) @@ -162,6 +222,9 @@ FLOOR SAFES var/ticks = text2num(href_list["increment"]) if(open) return + if(broken) + to_chat(user, "The dial will not turn, the mechanism is destroyed.") + return for(var/i=1 to ticks) check_unlocked() dial = Wrap(dial + 1, 0, 100) @@ -194,7 +257,13 @@ FLOOR SAFES /obj/structure/safe/attackby(obj/item/I, mob/user, params) if(open) - if(I.w_class + space <= maxspace) + if(broken && istype(I, /obj/item/safe_internals) && do_after(user, 2 SECONDS, target = src)) + to_chat(user, "You replace the broken mechanism.") + qdel(I) + broken = !broken + update_icon() + return + else if(I.w_class + space <= maxspace) space += I.w_class if(!user.drop_item()) to_chat(user, "\The [I] is stuck to your hand, you cannot put it in the safe!") @@ -210,10 +279,27 @@ FLOOR SAFES if(istype(I, /obj/item/clothing/accessory/stethoscope)) to_chat(user, "Hold [I] in one of your hands while you manipulate the dial!") return + else if(istype(I, /obj/item/thermal_drill)) + if(drill) + to_chat(user, "There is already a drill attached!") + else if(do_after(user, 2 SECONDS, target = src)) + if(!user.drop_item()) + to_chat(user, "[I] is stuck to your hand, you cannot put it in the safe!") + return + I.loc = src + drill = I + time_to_drill = 300 SECONDS * drill.time_multiplier + update_icon() else to_chat(user, "You can't put [I] in into the safe while it is closed!") return +/obj/structure/safe/proc/drill_open() + broken = TRUE + drill_timer = null + drill.soundloop.stop() + update_icon() + processing_objects.Remove(src) /obj/structure/safe/blob_act() return @@ -224,6 +310,24 @@ FLOOR SAFES /obj/structure/safe/examine_status(mob/user) return +/obj/structure/safe/Destroy() + GLOB.safes -= src + drill.soundloop.stop() + return ..() + +/obj/structure/safe/process() + if(drill_timer) + overlays -= bar + bar = image('icons/effects/progessbar.dmi', src, "prog_bar_[round((((world.time - drill_start_time) / time_to_drill) * 100), 5)]", HUD_LAYER) + overlays += bar + if(prob(15)) + drill.spark_system.start() + +/obj/structure/safe/examine(mob/user) + ..() + if(open) + to_chat(user, "On the inside of the the door is [combo_to_open]") + //FLOOR SAFES /obj/structure/safe/floor name = "floor safe" @@ -231,13 +335,35 @@ FLOOR SAFES density = 0 level = 1 //underfloor layer = 2.5 - + drill_x_offset = -1 + drill_y_offset = 20 /obj/structure/safe/floor/Initialize() ..() var/turf/T = loc hide(T.intact) - /obj/structure/safe/floor/hide(var/intact) - invisibility = intact ? 101 : 0 \ No newline at end of file + invisibility = intact ? 101 : 0 + +/obj/item/safe_internals + name = "safe internals" + desc = "The mechanism and locking bolts for a Scarborough Arms - 2 tumbler safe" + icon_state = "safe_internals" + +/obj/item/paper/safe_code + name = "safe codes" + var/owner + info = "
Safe Codes
The combination for the safe located in the [get_area(S).name] is: [S.combo_to_open]
" + info_links = info + update_icon() \ No newline at end of file diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index a33e4176599..28114f46a8c 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -562,7 +562,7 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f desc = "A plasma-glass alloy window, with rods supporting it. It looks hopelessly tough to break. It also looks completely fireproof, considering how basic plasma windows are insanely fireproof." icon_state = "plasmarwindow" shardtype = /obj/item/shard/plasma - glass_type = /obj/item/stack/sheet/plasmaglass + glass_type = /obj/item/stack/sheet/plasmarglass reinf = TRUE max_integrity = 160 explosion_block = 2 @@ -600,6 +600,8 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f max_integrity = 240 smooth = SMOOTH_TRUE canSmoothWith = list(/obj/structure/window/full/basic, /obj/structure/window/full/reinforced, /obj/structure/window/full/reinforced/tinted, /obj/structure/window/full/plasmabasic, /obj/structure/window/full/plasmareinforced) + explosion_block = 1 + armor = list("melee" = 75, "bullet" = 5, "laser" = 0, "energy" = 0, "bomb" = 45, "bio" = 100, "rad" = 100) /obj/structure/window/full/plasmareinforced name = "reinforced plasma window" @@ -607,10 +609,12 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f icon = 'icons/obj/smooth_structures/rplasma_window.dmi' icon_state = "rplasmawindow" shardtype = /obj/item/shard/plasma - glass_type = /obj/item/stack/sheet/plasmaglass + glass_type = /obj/item/stack/sheet/plasmarglass smooth = SMOOTH_TRUE reinf = TRUE max_integrity = 320 + explosion_block = 2 + armor = list("melee" = 85, "bullet" = 20, "laser" = 0, "energy" = 0, "bomb" = 60, "bio" = 100, "rad" = 100) /obj/structure/window/full/plasmareinforced/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume) return @@ -669,7 +673,7 @@ obj/structure/window/full/reinforced/ice icon = 'icons/obj/smooth_structures/plastitanium_window.dmi' icon_state = "plastitanium_window" dir = FULLTILE_WINDOW_DIR - max_integrity = 100 + max_integrity = 200 fulltile = TRUE reinf = TRUE heat_resistance = 1600 diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index 3df28fdf505..0462076c016 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -1540,13 +1540,13 @@ var/helptype = "ADMINHELP" if(is_mhelp) helptype = "MENTORHELP" - var/take_msg = "[helptype]: [key_name(usr.client)] is attending to [key_name(M)]'s question." + var/take_msg = "[helptype]: [key_name_hidden(usr.client)] is attending to [key_name(M)]'s question." for(var/client/X in GLOB.admins) if(check_rights(R_ADMIN, 0, X.mob)) to_chat(X, take_msg) else if(is_mhelp && check_rights(R_MOD|R_MENTOR, 0, X.mob)) to_chat(X, take_msg) - to_chat(M, "Your question is being attended to by [key_name(usr.client, null, 0)]. Thanks for your patience!") + to_chat(M, "Your question is being attended to by [key_name_hidden(usr.client, null, 0)]. Thanks for your patience!") else to_chat(usr, "Unable to locate mob.") diff --git a/code/modules/admin/verbs/freeze.dm b/code/modules/admin/verbs/freeze.dm index 8dc852e9221..b21a0c05cc3 100644 --- a/code/modules/admin/verbs/freeze.dm +++ b/code/modules/admin/verbs/freeze.dm @@ -26,14 +26,15 @@ var/global/list/frozen_mob_list = list() /mob/living/var/frozen = null //used for preventing attacks on admin-frozen mobs /mob/living/var/admin_prev_sleeping = 0 //used for keeping track of previous sleeping value with admin freeze -/mob/living/proc/admin_Freeze(var/client/admin) +/mob/living/proc/admin_Freeze(var/client/admin, skip_overlays = FALSE) if(istype(admin)) to_chat(src, "You have been frozen by [key_name(admin)]") message_admins("[key_name_admin(admin)] froze [key_name_admin(src)]") log_admin("[key_name(admin)] froze [key_name(src)]") var/obj/effect/overlay/adminoverlay/AO = new - src.overlays += AO + if(skip_overlays) + src.overlays += AO anchored = 1 frozen = AO @@ -42,14 +43,15 @@ var/global/list/frozen_mob_list = list() if(!(src in frozen_mob_list)) frozen_mob_list += src -/mob/living/proc/admin_unFreeze(var/client/admin) +/mob/living/proc/admin_unFreeze(var/client/admin, skip_overlays = FALSE) if(istype(admin)) to_chat(src, "You have been unfrozen by [key_name(admin)]") message_admins("[key_name_admin(admin)] unfroze [key_name_admin(src)]") log_admin("[key_name(admin)] unfroze [key_name(src)]") anchored = 0 - overlays -= frozen + if(skip_overlays) + overlays -= frozen frozen = null SetSleeping(admin_prev_sleeping) admin_prev_sleeping = null @@ -104,7 +106,6 @@ var/global/list/frozen_mob_list = list() M.can_move = 0 M.overlays += adminomaly if(M.occupant) - M.removeVerb(/obj/mecha/verb/eject) to_chat(M.occupant, "You have been frozen by [key]") message_admins("[key_name_admin(usr)] froze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] froze [key_name(M.occupant)] in a [M.name]") @@ -115,7 +116,6 @@ var/global/list/frozen_mob_list = list() M.can_move = 1 M.overlays -= adminomaly if(M.occupant) - M.addVerb(/obj/mecha/verb/eject) to_chat(M.occupant, "You have been unfrozen by [key]") message_admins("[key_name_admin(usr)] unfroze [key_name(M.occupant)] in a [M.name]") log_admin("[key_name(usr)] unfroze [key_name(M.occupant)] in a [M.name]") diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index 5799916e79c..2133fbb26b2 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -35,7 +35,7 @@ client/proc/one_click_antag() if((M.mind.assigned_role in temp.restricted_jobs) || (M.client.prefs.species in temp.protected_species)) return FALSE if(role) // Don't even bother evaluating if there's no role - if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && (!jobban_isbanned(M, role))) + if(player_old_enough_antag(M.client,role) && (role in M.client.prefs.be_special) && !M.client.skip_antag && (!jobban_isbanned(M, role))) return TRUE else return FALSE diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 365a0beaead..f944d015749 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -646,8 +646,8 @@ Traitors and the like can also be revived with the previous role mostly intact. var/atom/A = D var/coords = istype(A) ? "at ([A.x], [A.y], [A.z])" : "" if(alert(src, "Are you sure you want to delete:\n[D]\n[coords]?", "Confirmation", "Yes", "No") == "Yes") - log_admin("[key_name(usr)] deleted [D][coords]") - message_admins("[key_name_admin(usr)] deleted [D][coords]", 1) + log_admin("[key_name(usr)] deleted [D] [coords]") + message_admins("[key_name_admin(usr)] deleted [D] [coords]", 1) feedback_add_details("admin_verb","DEL") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! if(isturf(D)) var/turf/T = D diff --git a/code/modules/arcade/prize_datums.dm b/code/modules/arcade/prize_datums.dm index ef1512858d4..7d8e90068c6 100644 --- a/code/modules/arcade/prize_datums.dm +++ b/code/modules/arcade/prize_datums.dm @@ -79,7 +79,7 @@ var/global/datum/prizes/global_prizes = new /datum/prize_item/cards name = "Deck of Cards" desc = "Anyone fancy a game of 52-card Pickup?" - typepath = /obj/item/toy/cards/deck + typepath = /obj/item/deck/cards cost = 25 /datum/prize_item/crayons diff --git a/code/modules/awaymissions/mission_code/ruins/oldstation.dm b/code/modules/awaymissions/mission_code/ruins/oldstation.dm index b26aaaaa80d..d1f30fd6c4e 100644 --- a/code/modules/awaymissions/mission_code/ruins/oldstation.dm +++ b/code/modules/awaymissions/mission_code/ruins/oldstation.dm @@ -14,24 +14,31 @@ new /obj/item/stack/medical/ointment(src) /obj/item/card/id/away/old - name = "a perfectly generic identification card" - desc = "A perfectly generic identification card. Looks like it could use some flavor." + name = "A perfectly retrograde identification card" + desc = "A perfectly retrograde identification card. Looks like it could use some flavor." + icon = 'icons/obj/card.dmi' + icon_state = "retro" access = list(access_away01) /obj/item/card/id/away/old/sec name = "Security Officer ID" - desc = "Security officers ID card." - icon_state = "centcom" + desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in. This one is encoded for the Security Dept." + icon_state = "retro_security" /obj/item/card/id/away/old/sci name = "Scientist ID" - desc = "Scientists ID card." - icon_state = "centcom" + desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in. This one is encoded for the Science Dept." + icon_state = "retro_research" + +/obj/item/card/id/away/old/med + name = "Medical ID" + desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in. This one is encoded for the Medical Dept." + icon_state = "retro_medical" /obj/item/card/id/away/old/eng name = "Engineer ID" - desc = "Engineers ID card." - icon_state = "centcom" + desc = "A clip on ID Badge, has one of those fancy new magnetic strips built in. This one is encoded for the Engineering Dept." + icon_state = "retro_engineering" /obj/item/card/id/away/old/apc name = "APC Access ID" @@ -372,7 +379,7 @@ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ Work as a team with your fellow survivors and do not abandon them." - uniform = /obj/item/clothing/under/rank/security + uniform = /obj/item/clothing/under/retro/security shoes = /obj/item/clothing/shoes/jackboots id = /obj/item/card/id/away/old/sec r_pocket = /obj/item/restraints/handcuffs @@ -380,7 +387,32 @@ assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldsec/Destroy() - new/obj/structure/showcase/machinery/oldpod/used(drop_location()) + new /obj/structure/showcase/machinery/oldpod/used(drop_location()) + return ..() + +/obj/effect/mob_spawn/human/oldmed + name = "old cryogenics pod" + desc = "A humming cryo pod. You can barely recognise a medical uniform underneath the built up ice. The machine is attempting to wake up its occupant." + mob_name = "a medical doctor" + icon = 'icons/obj/Cryogenic2.dmi' + icon_state = "sleeper" + roundstart = FALSE + death = FALSE + random = TRUE + mob_species = /datum/species/human + flavour_text = "You are a medical working for Nanotrasen, stationed onboard a state of the art research station. You vaguely recall rushing into a \ + cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ + your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ + Work as a team with your fellow survivors and do not abandon them." + uniform = /obj/item/clothing/under/retro/medical + shoes = /obj/item/clothing/shoes/black + id = /obj/item/card/id/away/old/med + l_pocket = /obj/item/stack/medical/ointment + r_pocket = /obj/item/stack/medical/ointment + assignedrole = "Ancient Crew" + +/obj/effect/mob_spawn/human/oldmed/Destroy() + new /obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() /obj/effect/mob_spawn/human/oldeng @@ -397,7 +429,7 @@ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ Work as a team with your fellow survivors and do not abandon them." - uniform = /obj/item/clothing/under/rank/engineer + uniform = /obj/item/clothing/under/retro/engineering shoes = /obj/item/clothing/shoes/workboots id = /obj/item/card/id/away/old/eng gloves = /obj/item/clothing/gloves/color/fyellow/old @@ -405,7 +437,7 @@ assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldeng/Destroy() - new/obj/structure/showcase/machinery/oldpod/used(drop_location()) + new /obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() /obj/effect/mob_spawn/human/oldsci @@ -422,14 +454,14 @@ cryogenics pod due to an oncoming radiation storm. The last thing you remember is the station's Artificial Program telling you that you would only be asleep for eight hours. As you open \ your eyes, everything seems rusted and broken, a dark feeling swells in your gut as you climb out of your pod. \ Work as a team with your fellow survivors and do not abandon them." - uniform = /obj/item/clothing/under/rank/scientist + uniform = /obj/item/clothing/under/retro/science shoes = /obj/item/clothing/shoes/laceup id = /obj/item/card/id/away/old/sci l_pocket = /obj/item/stack/medical/bruise_pack assignedrole = "Ancient Crew" /obj/effect/mob_spawn/human/oldsci/Destroy() - new/obj/structure/showcase/machinery/oldpod/used(drop_location()) + new /obj/structure/showcase/machinery/oldpod/used(drop_location()) return ..() /obj/structure/showcase/machinery/oldpod diff --git a/code/modules/client/client defines.dm b/code/modules/client/client defines.dm index b64f965a81a..c88347a305b 100644 --- a/code/modules/client/client defines.dm +++ b/code/modules/client/client defines.dm @@ -12,6 +12,7 @@ //OTHER// ///////// var/datum/preferences/prefs = null + var/skip_antag = FALSE //TRUE when a player declines to be included for the selection process of game mode antagonists. var/move_delay = 1 var/moving = null var/adminobs = null diff --git a/code/modules/client/preference/loadout/loadout_general.dm b/code/modules/client/preference/loadout/loadout_general.dm index 570679ce67f..50105813fd6 100644 --- a/code/modules/client/preference/loadout/loadout_general.dm +++ b/code/modules/client/preference/loadout/loadout_general.dm @@ -36,8 +36,16 @@ path = /obj/item/storage/box/matches /datum/gear/cards - display_name = "a deck of cards" - path = /obj/item/toy/cards/deck + display_name = "a deck of standard cards" + path = /obj/item/deck/cards + +/datum/gear/doublecards + display_name = "a double deck of standard cards" + path = /obj/item/deck/doublecards + +/datum/gear/tarot + display_name = "a deck of tarot cards" + path = /obj/item/deck/tarot /datum/gear/headphones display_name = "a pair of headphones" diff --git a/code/modules/clothing/ears/ears.dm b/code/modules/clothing/ears/ears.dm index 672df573858..2e3a1d40bda 100644 --- a/code/modules/clothing/ears/ears.dm +++ b/code/modules/clothing/ears/ears.dm @@ -4,6 +4,7 @@ icon_state = "earmuffs" item_state = "earmuffs" flags = EARBANGPROTECT + flags_2 = HEALS_EARS_2 strip_delay = 15 put_on_delay = 25 burn_state = FLAMMABLE diff --git a/code/modules/clothing/under/accessories/accessory.dm b/code/modules/clothing/under/accessories/accessory.dm index 2abadbc55f9..6b08e2e4e49 100644 --- a/code/modules/clothing/under/accessories/accessory.dm +++ b/code/modules/clothing/under/accessories/accessory.dm @@ -285,20 +285,6 @@ if(isliving(user)) user.visible_message("[user] invades [M]'s personal space, thrusting [src] into [M.p_their()] face insistently.","You invade [M]'s personal space, thrusting [src] into [M.p_their()] face insistently. You are the law.") -/obj/item/storage/box/holobadge - name = "holobadge box" - desc = "A box claiming to contain holobadges." - New() - new /obj/item/clothing/accessory/holobadge(src) - new /obj/item/clothing/accessory/holobadge(src) - new /obj/item/clothing/accessory/holobadge(src) - new /obj/item/clothing/accessory/holobadge(src) - new /obj/item/clothing/accessory/holobadge/cord(src) - new /obj/item/clothing/accessory/holobadge/cord(src) - ..() - return - - /////////// //SCARVES// /////////// diff --git a/code/modules/clothing/under/oldstation_uni.dm b/code/modules/clothing/under/oldstation_uni.dm new file mode 100644 index 00000000000..f19b533ad24 --- /dev/null +++ b/code/modules/clothing/under/oldstation_uni.dm @@ -0,0 +1,37 @@ +//Let's keep clothing sorting clean. This is for all the oldstation clothes. + +/obj/item/clothing/under/retro/security + desc = "A (now) retro corporate security jumpsuit. It doesn't have any sort of robust fabric, good ol' NT cutting costs." + name = "retro security officer's uniform" + icon_state = "retro_sec" + item_state = "retro_sec" + item_color = "retro_sec" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/retro/medical + desc = "A once biologically resistant medical uniform. The high-vis stripes are faded and unreflective." + name = "retro medical officer's uniform" + icon_state = "retro_med" + item_state = "retro_med" + item_color = "retro_med" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/retro/engineering + desc = "A faded grimy engineering jumpsuit and overall combo. It's coated with oil, dust, and grit." + name = "retro engineering uniform" + icon_state = "retro_eng" + item_state = "retro_eng" + item_color = "retro_eng" + displays_id = 0 + flags_size = ONESIZEFITSALL + +/obj/item/clothing/under/retro/science + desc = "A faded polo and set of distinct white slacks. What a ridiculous tie." + name = "retro science officer's uniform" + icon_state = "retro_sci" + item_state = "retro_sci" + item_color = "retro_sci" + displays_id = 0 + flags_size = ONESIZEFITSALL diff --git a/code/modules/crafting/recipes.dm b/code/modules/crafting/recipes.dm index 012c79bab06..e224f542db3 100644 --- a/code/modules/crafting/recipes.dm +++ b/code/modules/crafting/recipes.dm @@ -339,6 +339,16 @@ time = 50 category = CAT_WEAPON +/datum/crafting_recipe/toxins_payload + name = "Toxins Payload Casing" + result = /obj/item/bombcore/toxins + reqs = list( + /obj/item/stock_parts/matter_bin = 1, + /obj/item/assembly/signaler = 1, + /obj/item/stack/sheet/metal = 2 + ) + category = CAT_WEAPON + /datum/crafting_recipe/bonfire name = "Bonfire" time = 60 @@ -354,4 +364,28 @@ /obj/item/stack/sheet/wood = 20, /obj/item/stack/cable_coil = 10) tools = list(/obj/item/screwdriver, /obj/item/wrench, /obj/item/weldingtool) + category = CAT_MISC + +/datum/crafting_recipe/drill + name = "Thermal Drill" + result = /obj/item/thermal_drill + time = 60 + reqs = list(/obj/item/stack/cable_coil = 5, + /obj/item/mecha_parts/mecha_equipment/drill = 1, + /obj/item/stock_parts/cell = 1, + /obj/item/stack/rods = 2, + /obj/item/assembly/timer = 1) + tools = list(/obj/item/screwdriver, /obj/item/wrench) + category = CAT_MISC + +/datum/crafting_recipe/d_drill + name = "Diamond Tipped Thermal Drill" + result = /obj/item/thermal_drill/diamond_drill + time = 60 + reqs = list(/obj/item/stack/cable_coil = 5, + /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill = 1, + /obj/item/stock_parts/cell = 1, + /obj/item/stack/rods = 2, + /obj/item/assembly/prox_sensor = 1) // Not a timer because the system sees a diamond drill as a drill too, letting you make both otherwise. + tools = list(/obj/item/screwdriver, /obj/item/wrench) category = CAT_MISC \ No newline at end of file diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm index 79a8c27b724..127656ece55 100644 --- a/code/modules/customitems/item_defines.dm +++ b/code/modules/customitems/item_defines.dm @@ -135,7 +135,7 @@ /obj/item/claymore/fluff/hit_reaction() return 0 -/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki +/obj/item/fluff/rsik_katana //Xydonus: Rsik Ugsharki Atan name = "ceremonial katana" desc = "A shimmering ceremonial golden katana, for the most discerning class of ninja. Looks expensive, and fragile." icon = 'icons/obj/custom_items.dmi' @@ -1020,6 +1020,26 @@ flags = NODROP|BLOCKHAIR flags_inv = HIDEEARS +/obj/item/clothing/suit/hooded/hoodie/fluff/xydonus //Xydonus: Rsik Ugsharki Atan | Based off of the bomber jacket, but with a hood slapped on (for allowed suit storage) + name = "custom fit bomber jacket" + desc = "Made for Unathi who likes to show off their big horns." + icon = 'icons/obj/custom_items.dmi' + icon_state = "xydonus_jacket" + ignore_suitadjust = 0 + hoodtype = /obj/item/clothing/head/hood/fluff/xydonus + body_parts_covered = UPPER_TORSO|LOWER_TORSO|ARMS + cold_protection = UPPER_TORSO|LOWER_TORSO|ARMS + allowed = list(/obj/item/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/toy,/obj/item/storage/fancy/cigarettes,/obj/item/lighter) + +/obj/item/clothing/head/hood/fluff/xydonus + name = "custom fit hood" + desc = "A hood with some horns glued to them, or something like that. Custom fit for a Unathi's head shape." + icon = 'icons/obj/custom_items.dmi' + icon_state = "xydonus_bomberhood" + body_parts_covered = HEAD + flags = NODROP|BLOCKHAIR + flags_inv = HIDEEARS + //////////// Uniforms //////////// /obj/item/clothing/under/fluff/counterfeitguise_uniform // thatdanguy23 : Rissa Williams icon = 'icons/obj/custom_items.dmi' diff --git a/code/modules/detective_work/evidence.dm b/code/modules/detective_work/evidence.dm index 97d41fcf848..555dbe542de 100644 --- a/code/modules/detective_work/evidence.dm +++ b/code/modules/detective_work/evidence.dm @@ -84,15 +84,3 @@ to_chat(user, "[src] is empty.") icon_state = "evidenceobj" -/obj/item/storage/box/evidence - name = "evidence bag box" - desc = "A box claiming to contain evidence bags." - -/obj/item/storage/box/evidence/New() - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - new /obj/item/evidencebag(src) - ..() diff --git a/code/modules/food_and_drinks/drinks/drinks.dm b/code/modules/food_and_drinks/drinks/drinks.dm index 235b0b609f1..c481df1ca42 100644 --- a/code/modules/food_and_drinks/drinks/drinks.dm +++ b/code/modules/food_and_drinks/drinks/drinks.dm @@ -62,7 +62,7 @@ if(!proximity) return - if(target.is_open_container()) //Something like a glass. Player probably wants to transfer TO it. + if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) to_chat(user, " [src] is empty.") return FALSE diff --git a/code/modules/games/cards.dm b/code/modules/games/cards.dm index 459d8d144f5..a24f947a25a 100644 --- a/code/modules/games/cards.dm +++ b/code/modules/games/cards.dm @@ -220,24 +220,20 @@ if(M.incapacitated() || !Adjacent(M)) return - if(over_object == M) + if(over_object == M || istype(over_object, /obj/screen)) if(!remove_item_from_storage(M)) M.unEquip(src) - M.put_in_hands(src) + if(over_object != M) + switch(over_object.name) + if("r_hand") + M.put_in_r_hand(src) + if("l_hand") + M.put_in_l_hand(src) + else + M.put_in_hands(src) - else if(istype(over_object, /obj/screen)) - switch(over_object.name) - if("r_hand") - if(!remove_item_from_storage(M)) - M.unEquip(src) - M.put_in_r_hand(src) - if("l_hand") - if(!remove_item_from_storage(M)) - M.unEquip(src) - M.put_in_l_hand(src) - - add_fingerprint(M) - usr.visible_message("[usr] picks up the deck.") + add_fingerprint(M) + usr.visible_message("[usr] picks up the deck.") /obj/item/pack name = "Card Pack" diff --git a/code/modules/hydroponics/fermenting_barrel.dm b/code/modules/hydroponics/fermenting_barrel.dm new file mode 100644 index 00000000000..9f4dbb7315d --- /dev/null +++ b/code/modules/hydroponics/fermenting_barrel.dm @@ -0,0 +1,79 @@ +/obj/structure/fermenting_barrel + name = "wooden barrel" + desc = "A large wooden barrel. You can ferment fruits and such inside it, or just use it to hold liquid." + icon = 'icons/obj/objects.dmi' + icon_state = "barrel" + density = TRUE + anchored = FALSE + container_type = DRAINABLE | AMOUNT_VISIBLE + pressure_resistance = 2 * ONE_ATMOSPHERE + max_integrity = 300 + var/open = FALSE + var/speed_multiplier = 1 //How fast it distills. Defaults to 100% (1.0). Lower is better. + +/obj/structure/fermenting_barrel/Initialize() + create_reagents(300) //Bluespace beakers, but without the portability or efficiency in circuits. + . = ..() + +/obj/structure/fermenting_barrel/examine(mob/user) + . = ..() + to_chat(user, "It is currently [open ? "open, letting you pour liquids in." : "closed, letting you draw liquids from the tap."] ") + +/obj/structure/fermenting_barrel/proc/makeWine(obj/item/reagent_containers/food/snacks/grown/G) + if(G.reagents) + G.reagents.trans_to(src, G.reagents.total_volume) + var/amount = G.seed.potency / 4 + if(G.distill_reagent) + reagents.add_reagent(G.distill_reagent, amount) + else + var/data = list() + data["names"] = list("[initial(G.name)]" = 1) + data["color"] = G.filling_color + data["alcohol_perc"] = G.wine_power + if(G.wine_flavor) + data["tastes"] = list(G.wine_flavor = 1) + // else // Stub - Will implement when we port over tg's better taste system - I'd rather get the barrel in first. + // data["tastes"] = list(G.tastes[1] = 1) + reagents.add_reagent("fruit_wine", amount, data) + qdel(G) + playsound(src, 'sound/effects/bubbles.ogg', 50, TRUE) + +/obj/structure/fermenting_barrel/attackby(obj/item/I, mob/user, params) + var/obj/item/reagent_containers/food/snacks/grown/G = I + if(istype(G)) + if(!G.can_distill) + to_chat(user, "You can't distill this into anything...") + return FALSE + else if(!user.drop_item()) + to_chat(user, "[G] is stuck to your hand!") + return FALSE + G.forceMove(src) + to_chat(user, "You place [G] into [src] to start the fermentation process.") + addtimer(CALLBACK(src, .proc/makeWine, G), rand(80, 120) * speed_multiplier) + else if(I.is_refillable()) + return FALSE // To refill via afterattack proc + else + return ..() + +/obj/structure/fermenting_barrel/attack_hand(mob/user) + open = !open + if(open) + container_type = REFILLABLE | AMOUNT_VISIBLE + to_chat(user, "You open [src], letting you fill it.") + else + container_type = DRAINABLE | AMOUNT_VISIBLE + to_chat(user, "You close [src], letting you draw from its tap.") + update_icon() + +/obj/structure/fermenting_barrel/update_icon() + if(open) + icon_state = "barrel_open" + else + icon_state = "barrel" + +/datum/crafting_recipe/fermenting_barrel + name = "Wooden Barrel" + result = /obj/structure/fermenting_barrel + reqs = list(/obj/item/stack/sheet/wood = 30) + time = 50 + category = CAT_PRIMAL diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 772e9f5d856..7b84956a804 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -8,12 +8,13 @@ icon = 'icons/obj/hydroponics/harvest.dmi' var/obj/item/seeds/seed = null // type path, gets converted to item on New(). It's safe to assume it's always a seed item. var/plantname = "" - var/bitesize_mod = 0 + var/bitesize_mod = 0 // If set, bitesize = 1 + round(reagents.total_volume / bitesize_mod) var/splat_type = /obj/effect/decal/cleanable/plant_smudge - // If set, bitesize = 1 + round(reagents.total_volume / bitesize_mod) - dried_type = -1 - // Saves us from having to define each stupid grown's dried_type as itself. - // If you don't want a plant to be driable (watermelons) set this to null in the time definition. + var/can_distill = TRUE //If FALSE, this object cannot be distilled into an alcohol. + var/distill_reagent //If NULL and this object can be distilled, it uses a generic fruit_wine reagent and adjusts its variables. + var/wine_flavor //If NULL, this is automatically set to the fruit's flavor. Determines the flavor of the wine if distill_reagent is NULL. + var/wine_power = 0.1 //Determines the boozepwr of the wine if distill_reagent is NULL. Uses 0.1 - 1.2 not tg's boozepower (divide by 100) else you'll end up with 1000% proof alcohol! + dried_type = -1 // Saves us from having to define each stupid grown's dried_type as itself. If you don't want a plant to be driable (watermelons) set this to null in the time definition. burn_state = FLAMMABLE origin_tech = "biotech=1" @@ -59,6 +60,30 @@ /obj/item/reagent_containers/food/snacks/grown/attackby(obj/item/O, mob/user, params) ..() + if(slices_num && slice_path) + var/inaccurate = TRUE + if(O.sharp) + if(istype(O, /obj/item/kitchen/knife) || istype(O, /obj/item/scalpel)) + inaccurate = FALSE + + if(!isturf(loc) || !(locate(/obj/structure/table) in loc) && !(locate(/obj/machinery/optable) in loc) && !(locate(/obj/item/storage/bag/tray) in loc)) + to_chat(user, "You cannot slice [src] here! You need a table or at least a tray to do it.") + return TRUE + + var/slices_lost = 0 + if(!inaccurate) + user.visible_message("[user] slices [src] with [O]!", "You slice [src]!") + else + user.visible_message("[user] crudely slices [src] with [O]!", "You crudely slice [src] with your [O]!") + slices_lost = rand(1, min(1, round(slices_num / 2))) + + var/reagents_per_slice = reagents.total_volume/slices_num + for(var/i = 1 to (slices_num - slices_lost)) + var/obj/slice = new slice_path (loc) + reagents.trans_to(slice, reagents_per_slice) + qdel(src) + return ..() + if (istype(O, /obj/item/plant_analyzer)) var/msg = "*---------*\n This is \a [src].\n" if(seed) diff --git a/code/modules/hydroponics/grown/ambrosia.dm b/code/modules/hydroponics/grown/ambrosia.dm index d6942d6a7f6..a2085eafaee 100644 --- a/code/modules/hydroponics/grown/ambrosia.dm +++ b/code/modules/hydroponics/grown/ambrosia.dm @@ -30,6 +30,7 @@ name = "ambrosia vulgaris branch" desc = "This is a plant containing various healing chemicals." origin_tech = "biotech=2" + wine_power = 0.2 // Ambrosia Deus /obj/item/seeds/ambrosia/deus @@ -50,6 +51,7 @@ icon_state = "ambrosiadeus" filling_color = "#008B8B" origin_tech = "biotech=4;materials=3" + wine_power = 0.5 //Ambrosia Gaia /obj/item/seeds/ambrosia/gaia @@ -74,6 +76,8 @@ origin_tech = "biotech=6;materials=5" light_range = 3 seed = /obj/item/seeds/ambrosia/gaia + wine_power = 0.7 + wine_flavor = "the earthmother's blessing" // Ambrosia Cruciatus /obj/item/seeds/ambrosia/cruciatus @@ -83,4 +87,5 @@ reagents_add = list("thc" = 0.15, "kelotane" = 0.15, "bicaridine" = 0.1, "bath_salts" = 0.20, "plantmatter" = 0.05) /obj/item/reagent_containers/food/snacks/grown/ambrosia/cruciatus - seed = /obj/item/seeds/ambrosia/cruciatus \ No newline at end of file + seed = /obj/item/seeds/ambrosia/cruciatus + wine_power = 0.7 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/apple.dm b/code/modules/hydroponics/grown/apple.dm index 64c7c0381a9..67948c4beb9 100644 --- a/code/modules/hydroponics/grown/apple.dm +++ b/code/modules/hydroponics/grown/apple.dm @@ -23,6 +23,7 @@ icon_state = "apple" filling_color = "#FF4500" bitesize = 100 // Always eat the apple in one bite + distill_reagent = "hcider" // Posioned Apple /obj/item/seeds/apple/poisoned @@ -55,3 +56,5 @@ icon_state = "goldapple" filling_color = "#FFD700" origin_tech = "biotech=4;materials=5" + distill_reagent = null + wine_power = 0.5 diff --git a/code/modules/hydroponics/grown/banana.dm b/code/modules/hydroponics/grown/banana.dm index 6874038a7bf..4515b3ad75f 100644 --- a/code/modules/hydroponics/grown/banana.dm +++ b/code/modules/hydroponics/grown/banana.dm @@ -23,6 +23,7 @@ trash = /obj/item/grown/bananapeel filling_color = "#FFFF00" bitesize = 5 + distill_reagent = "bananahonk" /obj/item/reagent_containers/food/snacks/grown/banana/suicide_act(mob/user) user.visible_message("[user] is aiming the [name] at [user.p_them()]self! It looks like [user.p_theyre()] trying to commit suicide.") @@ -74,6 +75,7 @@ icon_state = "mimana" trash = /obj/item/grown/bananapeel/mimanapeel filling_color = "#FFFFEE" + distill_reagent = "silencer" /obj/item/grown/bananapeel/mimanapeel seed = /obj/item/seeds/banana/mime @@ -102,6 +104,8 @@ trash = /obj/item/grown/bananapeel/bluespace filling_color = "#0000FF" origin_tech = "biotech=3;bluespace=5" + wine_power = 0.6 + wine_flavor = "slippery hypercubes" /obj/item/grown/bananapeel/bluespace seed = /obj/item/seeds/banana/bluespace diff --git a/code/modules/hydroponics/grown/beans.dm b/code/modules/hydroponics/grown/beans.dm index 24ddf1dbbba..3649e84b869 100644 --- a/code/modules/hydroponics/grown/beans.dm +++ b/code/modules/hydroponics/grown/beans.dm @@ -25,6 +25,7 @@ icon_state = "soybeans" filling_color = "#F0E68C" bitesize_mod = 2 + wine_power = 0.2 // Koibean /obj/item/seeds/soya/koi @@ -45,4 +46,5 @@ desc = "Something about these seems fishy." icon_state = "koibeans" filling_color = "#F0E68C" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + wine_power = 0.4 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/berries.dm b/code/modules/hydroponics/grown/berries.dm index 155566ebd10..8e740719fbf 100644 --- a/code/modules/hydroponics/grown/berries.dm +++ b/code/modules/hydroponics/grown/berries.dm @@ -25,6 +25,7 @@ gender = PLURAL filling_color = "#FF00FF" bitesize_mod = 2 + distill_reagent = "gin" // Poison Berries /obj/item/seeds/berry/poison @@ -44,6 +45,8 @@ desc = "Taste so good, you could die!" icon_state = "poisonberrypile" filling_color = "#C71585" + distill_reagent = null + wine_power = 0.35 // Death Berries /obj/item/seeds/berry/death @@ -65,6 +68,8 @@ desc = "Taste so good, you could die!" icon_state = "deathberrypile" filling_color = "#708090" + distill_reagent = null + wine_power = 0.5 // Glow Berries /obj/item/seeds/berry/glow @@ -89,6 +94,9 @@ filling_color = "#7CFC00" origin_tech = "plasmatech=6" light_color = "#006622" + distill_reagent = null + wine_power = 0.6 + wine_flavor = "warmth" // Cherries /obj/item/seeds/cherry @@ -118,6 +126,7 @@ gender = PLURAL filling_color = "#FF0000" bitesize_mod = 2 + wine_power = 0.3 // Blue Cherries /obj/item/seeds/cherry/blue @@ -138,6 +147,7 @@ icon_state = "bluecherry" filling_color = "#6495ED" bitesize_mod = 2 + wine_power = 0.5 // Grapes /obj/item/seeds/grape @@ -168,6 +178,7 @@ dried_type = /obj/item/reagent_containers/food/snacks/no_raisin filling_color = "#FF1493" bitesize_mod = 2 + distill_reagent = "wine" // Green Grapes /obj/item/seeds/grape/green @@ -186,3 +197,4 @@ name = "bunch of green grapes" icon_state = "greengrapes" filling_color = "#7FFF00" + distill_reagent = "cognac" diff --git a/code/modules/hydroponics/grown/cannabis.dm b/code/modules/hydroponics/grown/cannabis.dm index e82e72e83b0..ed05d7a6954 100644 --- a/code/modules/hydroponics/grown/cannabis.dm +++ b/code/modules/hydroponics/grown/cannabis.dm @@ -93,6 +93,7 @@ icon_state = "cannabis" filling_color = "#00FF00" bitesize_mod = 2 + wine_power = 0.2 /obj/item/reagent_containers/food/snacks/grown/cannabis/rainbow @@ -100,18 +101,21 @@ name = "rainbow cannabis leaf" desc = "Is it supposed to be glowing like that...?" icon_state = "megacannabis" + wine_power = 0.6 /obj/item/reagent_containers/food/snacks/grown/cannabis/death seed = /obj/item/seeds/cannabis/death name = "death cannabis leaf" desc = "Looks a bit dark. Oh well." icon_state = "blackcannabis" + wine_power = 0.4 /obj/item/reagent_containers/food/snacks/grown/cannabis/white seed = /obj/item/seeds/cannabis/white name = "white cannabis leaf" desc = "It feels smooth and nice to the touch." icon_state = "whitecannabis" + wine_power = 0.1 /obj/item/reagent_containers/food/snacks/grown/cannabis/ultimate seed = /obj/item/seeds/cannabis/ultimate @@ -119,3 +123,4 @@ desc = "You feel dizzy looking at it. What the fuck?" icon_state = "ocannabis" volume = 420 + wine_power = 0.9 diff --git a/code/modules/hydroponics/grown/cereals.dm b/code/modules/hydroponics/grown/cereals.dm index 91b6cd0a14c..e864687a551 100644 --- a/code/modules/hydroponics/grown/cereals.dm +++ b/code/modules/hydroponics/grown/cereals.dm @@ -21,6 +21,7 @@ icon_state = "wheat" filling_color = "#F0E68C" bitesize_mod = 2 + distill_reagent = "beer" // Oat /obj/item/seeds/wheat/oat @@ -40,6 +41,7 @@ icon_state = "oat" filling_color = "#556B2F" bitesize_mod = 2 + distill_reagent = "ale" // Rice /obj/item/seeds/wheat/rice @@ -60,6 +62,7 @@ icon_state = "rice" filling_color = "#FAFAD2" bitesize_mod = 2 + distill_reagent = "sake" //Meatwheat - grows into synthetic meat /obj/item/seeds/wheat/meat @@ -80,6 +83,7 @@ filling_color = rgb(150, 0, 0) bitesize_mod = 2 seed = /obj/item/seeds/wheat/meat + can_distill = FALSE /obj/item/reagent_containers/food/snacks/grown/meatwheat/attack_self(mob/living/user) user.visible_message("[user] crushes [src] into meat.", "You crush [src] into something that resembles meat.") diff --git a/code/modules/hydroponics/grown/chili.dm b/code/modules/hydroponics/grown/chili.dm index f8bf515ce6b..5f4621eff16 100644 --- a/code/modules/hydroponics/grown/chili.dm +++ b/code/modules/hydroponics/grown/chili.dm @@ -25,6 +25,7 @@ icon_state = "chilipepper" filling_color = "#FF0000" bitesize_mod = 2 + wine_power = 0.2 // Ice Chili /obj/item/seeds/chili/ice @@ -49,6 +50,7 @@ filling_color = "#0000CD" bitesize_mod = 2 origin_tech = "biotech=4" + wine_power = 0.3 // Ghost Chili /obj/item/seeds/chili/ghost @@ -74,3 +76,4 @@ filling_color = "#F8F8FF" bitesize_mod = 4 origin_tech = "biotech=4;magnets=5" + wine_power = 0.5 diff --git a/code/modules/hydroponics/grown/citrus.dm b/code/modules/hydroponics/grown/citrus.dm index 86bc8082661..b6e4a36d164 100644 --- a/code/modules/hydroponics/grown/citrus.dm +++ b/code/modules/hydroponics/grown/citrus.dm @@ -5,6 +5,7 @@ desc = "It's so sour, your face will twist." icon_state = "lime" bitesize_mod = 2 + wine_power = 0.3 // Lime /obj/item/seeds/lime @@ -29,6 +30,7 @@ desc = "It's so sour, your face will twist." icon_state = "lime" filling_color = "#00FF00" + distill_reagent = "triple_sec" // Orange /obj/item/seeds/orange @@ -104,6 +106,8 @@ desc = "Made for burning houses down." icon_state = "firelemon" bitesize_mod = 2 + wine_power = 0.7 + wine_flavor = "fire" /obj/item/reagent_containers/food/snacks/grown/firelemon/attack_self(mob/living/user) var/area/A = get_area(user) diff --git a/code/modules/hydroponics/grown/cocoa_vanilla.dm b/code/modules/hydroponics/grown/cocoa_vanilla.dm index 0ca061af745..745aa006498 100644 --- a/code/modules/hydroponics/grown/cocoa_vanilla.dm +++ b/code/modules/hydroponics/grown/cocoa_vanilla.dm @@ -25,6 +25,7 @@ icon_state = "cocoapod" filling_color = "#FFD700" bitesize_mod = 2 + distill_reagent = "creme_de_cacao" // Vanilla Pod /obj/item/seeds/cocoapod/vanillapod @@ -43,4 +44,5 @@ name = "vanilla pod" desc = "Fattening... Mmmmm... vanilla." icon_state = "vanillapod" - filling_color = "#FFD700" \ No newline at end of file + filling_color = "#FFD700" + distill_reagent = "vanilla" //Takes longer, but you can get even more vanilla from it. \ No newline at end of file diff --git a/code/modules/hydroponics/grown/corn.dm b/code/modules/hydroponics/grown/corn.dm index 693818c9537..dca121d1acb 100644 --- a/code/modules/hydroponics/grown/corn.dm +++ b/code/modules/hydroponics/grown/corn.dm @@ -24,6 +24,8 @@ filling_color = "#FFFF00" trash = /obj/item/grown/corncob bitesize_mod = 2 + distill_reagent = "whiskey" + wine_power = 0.4 /obj/item/grown/corncob name = "corn cob" diff --git a/code/modules/hydroponics/grown/eggplant.dm b/code/modules/hydroponics/grown/eggplant.dm index d9a243eab6f..b9244bfd3ec 100644 --- a/code/modules/hydroponics/grown/eggplant.dm +++ b/code/modules/hydroponics/grown/eggplant.dm @@ -22,6 +22,7 @@ icon_state = "eggplant" filling_color = "#800080" bitesize_mod = 2 + wine_power = 0.2 // Egg-Plant /obj/item/seeds/eggplant/eggy @@ -41,4 +42,5 @@ icon_state = "eggyplant" trash = /obj/item/reagent_containers/food/snacks/egg filling_color = "#F8F8FF" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + distill_reagent = "eggnog" \ No newline at end of file diff --git a/code/modules/hydroponics/grown/flowers.dm b/code/modules/hydroponics/grown/flowers.dm index b8d88ebf0c9..adbb5f3152c 100644 --- a/code/modules/hydroponics/grown/flowers.dm +++ b/code/modules/hydroponics/grown/flowers.dm @@ -25,6 +25,7 @@ slot_flags = SLOT_HEAD filling_color = "#FF6347" bitesize_mod = 3 + distill_reagent = "vermouth" // Lily /obj/item/seeds/poppy/lily @@ -88,6 +89,7 @@ slot_flags = SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 3 + distill_reagent = "vermouth" // Sunflower @@ -145,6 +147,7 @@ slot_flags = SLOT_HEAD filling_color = "#E6E6FA" bitesize_mod = 2 + distill_reagent = "absinthe" // Novaflower /obj/item/seeds/sunflower/novaflower diff --git a/code/modules/hydroponics/grown/grass_carpet.dm b/code/modules/hydroponics/grown/grass_carpet.dm index 5113a8454f3..c45899a310b 100644 --- a/code/modules/hydroponics/grown/grass_carpet.dm +++ b/code/modules/hydroponics/grown/grass_carpet.dm @@ -27,6 +27,7 @@ bitesize_mod = 2 var/stacktype = /obj/item/stack/tile/grass var/tile_coefficient = 0.02 // 1/50 + wine_power = 0.15 /obj/item/reagent_containers/food/snacks/grown/grass/attack_self(mob/user) to_chat(user, "You prepare the astroturf.") @@ -65,3 +66,4 @@ desc = "The textile industry's dark secret." icon_state = "carpetclump" stacktype = /obj/item/stack/tile/carpet + can_distill = FALSE diff --git a/code/modules/hydroponics/grown/kudzu.dm b/code/modules/hydroponics/grown/kudzu.dm index ba67bf426fa..eea80e17e60 100644 --- a/code/modules/hydroponics/grown/kudzu.dm +++ b/code/modules/hydroponics/grown/kudzu.dm @@ -95,3 +95,4 @@ icon_state = "kudzupod" filling_color = "#6B8E23" bitesize_mod = 2 + wine_power = 0.2 diff --git a/code/modules/hydroponics/grown/melon.dm b/code/modules/hydroponics/grown/melon.dm index be548339d39..ed7608e21b9 100644 --- a/code/modules/hydroponics/grown/melon.dm +++ b/code/modules/hydroponics/grown/melon.dm @@ -25,6 +25,7 @@ w_class = WEIGHT_CLASS_NORMAL filling_color = "#008000" bitesize_mod = 3 + wine_power = 0.4 // Holymelon /obj/item/seeds/watermelon/holy @@ -45,3 +46,5 @@ icon_state = "holymelon" filling_color = "#FFD700" dried_type = null + wine_power = 0.7 //Water to wine, baby. + wine_flavor = "divinity" diff --git a/code/modules/hydroponics/grown/misc.dm b/code/modules/hydroponics/grown/misc.dm index df58b55c333..605f5082522 100644 --- a/code/modules/hydroponics/grown/misc.dm +++ b/code/modules/hydroponics/grown/misc.dm @@ -53,6 +53,7 @@ icon_state = "cabbage" filling_color = "#90EE90" bitesize_mod = 2 + wine_power = 0.2 // Sugarcane @@ -78,6 +79,7 @@ icon_state = "sugarcane" filling_color = "#FFD700" bitesize_mod = 2 + distill_reagent = "rum" // Gatfruit @@ -108,6 +110,7 @@ origin_tech = "combat=6" trash = /obj/item/gun/projectile/revolver bitesize_mod = 2 + wine_power = 0.9 //It burns going down, too. //Cherry Bombs /obj/item/seeds/cherry/bomb @@ -129,6 +132,7 @@ seed = /obj/item/seeds/cherry/bomb bitesize_mod = 2 volume = 125 //Gives enough room for the black powder at max potency + wine_power = 0.8 /obj/item/reagent_containers/food/snacks/grown/cherry_bomb/attack_self(mob/living/user) var/area/A = get_area(user) diff --git a/code/modules/hydroponics/grown/mushrooms.dm b/code/modules/hydroponics/grown/mushrooms.dm index 95ea83cd424..14c4b2a252a 100644 --- a/code/modules/hydroponics/grown/mushrooms.dm +++ b/code/modules/hydroponics/grown/mushrooms.dm @@ -1,6 +1,7 @@ /obj/item/reagent_containers/food/snacks/grown/mushroom name = "mushroom" bitesize_mod = 2 + wine_power = 0.4 // Reishi @@ -84,6 +85,7 @@ desc = "Amanita Virosa: Deadly poisonous basidiomycete fungus filled with alpha amanitin." icon_state = "angel" filling_color = "#C0C0C0" + wine_power = 0.6 // Liberty Cap @@ -109,6 +111,8 @@ desc = "Psilocybe Semilanceata: Liberate yourself!" icon_state = "libertycap" filling_color = "#DAA520" + wine_power = 0.8 + wine_flavor = "freedom" // Plump Helmet @@ -135,6 +139,7 @@ desc = "Plumus Hellmus: Plump, soft and s-so inviting~" icon_state = "plumphelmet" filling_color = "#9370DB" + distill_reagent = "manlydorf" // Walking Mushroom @@ -161,6 +166,7 @@ icon_state = "walkingmushroom" filling_color = "#9370DB" origin_tech = "biotech=4;programming=5" + can_distill = FALSE /obj/item/reagent_containers/food/snacks/grown/mushroom/walkingmushroom/attack_self(mob/user) if(istype(user.loc, /turf/space)) @@ -232,6 +238,7 @@ var/effect_path = /obj/structure/glowshroom origin_tech = "biotech=4;plasmatech=6" light_color = "#006622" + wine_power = 0.5 /obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom/attack_self(mob/user) if(istype(user.loc, /turf/space)) @@ -280,6 +287,8 @@ effect_path = /obj/structure/glowshroom/glowcap origin_tech = "biotech=4;powerstorage=6;plasmatech=4" light_color = "#8E0300" + wine_power = 0.6 + wine_flavor = "warmth" // Fungus/Mold /obj/item/seeds/fungus @@ -326,3 +335,5 @@ icon_state = "shadowshroom" effect_path = /obj/structure/glowshroom/shadowshroom origin_tech = "biotech=4;plasmatech=4;magnets=4" + wine_power = 0.6 + wine_flavor = "strange coldness" diff --git a/code/modules/hydroponics/grown/onion.dm b/code/modules/hydroponics/grown/onion.dm index 93176799802..e39548d9e7c 100644 --- a/code/modules/hydroponics/grown/onion.dm +++ b/code/modules/hydroponics/grown/onion.dm @@ -25,6 +25,8 @@ bitesize_mod = 2 slice_path = /obj/item/reagent_containers/food/snacks/onion_slice slices_num = 2 + wine_power = 0.2 + wine_flavor = "pungentness" /obj/item/seeds/onion/red name = "pack of red onion seeds" @@ -43,6 +45,8 @@ icon_state = "onion_red" filling_color = "#C29ACF" slice_path = /obj/item/reagent_containers/food/snacks/onion_slice/red + wine_power = 0.6 + wine_flavor = "powerful pungentness" /obj/item/reagent_containers/food/snacks/onion_slice name = "onion slices" diff --git a/code/modules/hydroponics/grown/pineapple.dm b/code/modules/hydroponics/grown/pineapple.dm index 2e0825151c6..589f9456bc2 100644 --- a/code/modules/hydroponics/grown/pineapple.dm +++ b/code/modules/hydroponics/grown/pineapple.dm @@ -24,4 +24,5 @@ icon_state = "pineapple" filling_color = "#e5b437" w_class = WEIGHT_CLASS_NORMAL - bitesize_mod = 3 \ No newline at end of file + bitesize_mod = 3 + wine_power = 0.4 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/potato.dm b/code/modules/hydroponics/grown/potato.dm index 2692ee8adf8..655cb6d69bd 100644 --- a/code/modules/hydroponics/grown/potato.dm +++ b/code/modules/hydroponics/grown/potato.dm @@ -25,6 +25,7 @@ icon_state = "potato" filling_color = "#E9967A" bitesize = 100 + distill_reagent = "vodka" /obj/item/reagent_containers/food/snacks/grown/potato/wedges @@ -33,6 +34,7 @@ icon_state = "potato_wedges" filling_color = "#E9967A" bitesize = 100 + distill_reagent = "sbiten" /obj/item/reagent_containers/food/snacks/grown/potato/attackby(obj/item/W, mob/user, params) diff --git a/code/modules/hydroponics/grown/pumpkin.dm b/code/modules/hydroponics/grown/pumpkin.dm index 9668379442d..f05a6847dc2 100644 --- a/code/modules/hydroponics/grown/pumpkin.dm +++ b/code/modules/hydroponics/grown/pumpkin.dm @@ -23,6 +23,7 @@ icon_state = "pumpkin" filling_color = "#FFA500" bitesize_mod = 2 + wine_power = 0.2 /obj/item/reagent_containers/food/snacks/grown/pumpkin/attackby(obj/item/W as obj, mob/user as mob, params) if(is_sharp(W)) @@ -52,3 +53,4 @@ icon_state = "blumpkin" filling_color = "#87CEFA" bitesize_mod = 2 + wine_power = 0.5 diff --git a/code/modules/hydroponics/grown/random.dm b/code/modules/hydroponics/grown/random.dm index 734adae15be..f743989cb4a 100644 --- a/code/modules/hydroponics/grown/random.dm +++ b/code/modules/hydroponics/grown/random.dm @@ -26,4 +26,10 @@ name = "strange plant" desc = "What could this even be?" icon_state = "crunchy" - bitesize_mod = 2 \ No newline at end of file + bitesize_mod = 2 + +/obj/item/reagent_containers/food/snacks/grown/random/Initialize() + . = ..() + wine_power = rand(0.1,1.5) + if(prob(1)) + wine_power = 2.0 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/root.dm b/code/modules/hydroponics/grown/root.dm index 7f26176c675..35bb5ee195c 100644 --- a/code/modules/hydroponics/grown/root.dm +++ b/code/modules/hydroponics/grown/root.dm @@ -21,6 +21,7 @@ icon_state = "carrot" filling_color = "#FFA500" bitesize_mod = 2 + wine_power = 0.3 /obj/item/reagent_containers/food/snacks/grown/carrot/wedges name = "carrot wedges" @@ -59,6 +60,7 @@ desc = "Closely related to carrots." icon_state = "parsnip" bitesize_mod = 2 + wine_power = 0.35 // White-Beet @@ -84,6 +86,7 @@ icon_state = "whitebeet" filling_color = "#F4A460" bitesize_mod = 2 + wine_power = 0.4 // Red Beet /obj/item/seeds/redbeet @@ -107,3 +110,4 @@ desc = "You can't beat red beet." icon_state = "redbeet" bitesize_mod = 2 + wine_power = 0.6 diff --git a/code/modules/hydroponics/grown/tea_coffee.dm b/code/modules/hydroponics/grown/tea_coffee.dm index bd3b182c132..1139c03cad5 100644 --- a/code/modules/hydroponics/grown/tea_coffee.dm +++ b/code/modules/hydroponics/grown/tea_coffee.dm @@ -22,6 +22,7 @@ desc = "These aromatic tips of the tea plant can be dried to make tea." icon_state = "tea_aspera_leaves" filling_color = "#008000" + can_distill = FALSE // Tea Astra /obj/item/seeds/tea/astra @@ -67,6 +68,7 @@ icon_state = "coffee_arabica" filling_color = "#DC143C" bitesize_mod = 2 + distill_reagent = "kahlua" // Coffee Robusta /obj/item/seeds/coffee/robusta diff --git a/code/modules/hydroponics/grown/tobacco.dm b/code/modules/hydroponics/grown/tobacco.dm index de235280b02..95333bba31a 100644 --- a/code/modules/hydroponics/grown/tobacco.dm +++ b/code/modules/hydroponics/grown/tobacco.dm @@ -21,6 +21,7 @@ desc = "Dry them out to make some smokes." icon_state = "tobacco_leaves" filling_color = "#008000" + distill_reagent = "creme_de_menthe" //Menthol, I guess. // Space Tobacco /obj/item/seeds/tobacco/space @@ -38,4 +39,6 @@ seed = /obj/item/seeds/tobacco/space name = "space tobacco leaves" desc = "Dry them out to make some space-smokes." - icon_state = "stobacco_leaves" \ No newline at end of file + icon_state = "stobacco_leaves" + distill_reagent = null + wine_power = 0.5 \ No newline at end of file diff --git a/code/modules/hydroponics/grown/tomato.dm b/code/modules/hydroponics/grown/tomato.dm index 3adf57c4021..58bf18057ad 100644 --- a/code/modules/hydroponics/grown/tomato.dm +++ b/code/modules/hydroponics/grown/tomato.dm @@ -22,6 +22,7 @@ splat_type = /obj/effect/decal/cleanable/tomato_smudge filling_color = "#FF6347" bitesize_mod = 2 + distill_reagent = "enzyme" // Blood Tomato /obj/item/seeds/tomato/blood @@ -43,6 +44,7 @@ splat_type = /obj/effect/gibspawner/generic filling_color = "#FF0000" origin_tech = "biotech=5" + distill_reagent = "bloodymary" // Blue Tomato @@ -89,6 +91,8 @@ desc = "So lubricated, you might slip through space-time." icon_state = "bluespacetomato" origin_tech = "biotech=4;bluespace=5" + distill_reagent = null + wine_power = 0.8 // Killer Tomato @@ -117,6 +121,7 @@ var/awakening = 0 filling_color = "#FF0000" origin_tech = "biotech=4;combat=5" + distill_reagent = "demonsblood" /obj/item/reagent_containers/food/snacks/grown/tomato/killer/attack(mob/M, mob/user, def_zone) if(awakening) diff --git a/code/modules/library/computers/checkout.dm b/code/modules/library/computers/checkout.dm index fdcfee0e87a..10e747b4e31 100644 --- a/code/modules/library/computers/checkout.dm +++ b/code/modules/library/computers/checkout.dm @@ -1,462 +1,465 @@ -/* - * Library Computer - */ -/obj/machinery/computer/library/checkout - name = "Check-In/Out Computer" - icon = 'icons/obj/library.dmi' - icon_state = "computer" - anchored = 1 - density = 1 - var/arcanecheckout = 0 - //var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book - var/buffer_book - var/buffer_mob - var/upload_category = "Fiction" - var/list/checkouts = list() - var/list/inventory = list() - var/checkoutperiod = 5 // In minutes - var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive - - var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl - var/booklist - -/obj/machinery/computer/library/checkout/attack_hand(var/mob/user as mob) - if(..()) - return - interact(user) - -/obj/machinery/computer/library/checkout/interact(var/mob/user) - if(interact_check(user)) - return - - var/dat = "" - switch(screenstate) - if(0) - // Main Menu - - dat += {"
-
-
- View General Inventory -
- View Checked Out Inventory -
- Check out a Book -
- Connect to External Archive -
- Upload New Title to Archive -
- Print a Bible -
- Print a Manual "} - if(src.emagged) - dat += "
- Access the Forbidden Lore Vault " - dat += "
Inventory
" - for(var/obj/item/book/b in inventory) - dat += "[b.name] (Delete)" - dat += "(Return to main menu)
" - if(2) - // Checked Out - dat += "
Checked Out Books
" - for(var/datum/borrowbook/b in checkouts) - var/timetaken = world.time - b.getdate - //timetaken *= 10 - timetaken /= 600 - timetaken = round(timetaken) - var/timedue = b.duedate - world.time - //timedue *= 10 - timedue /= 600 - if(timedue <= 0) - timedue = "(OVERDUE) [timedue]" - else - timedue = round(timedue) - - dat += {"\"[b.bookname]\", Checked out to: [b.mobname]
--- Taken: [timetaken] minutes ago, Due: in [timedue] minutes
- (Check In)
"} - dat += "(Return to main menu)
" - if(3) - // Check Out a Book - - dat += {"
Check Out a Book
- Book: [src.buffer_book] - \[Edit\]
- Recipient: [src.buffer_mob] - \[Edit\]
- Checkout Date : [world.time/600]
- Due Date: [(world.time + checkoutperiod)/600]
- (Checkout Period: [checkoutperiod] minutes) (+/-) - (Commit Entry)
- (Return to main menu)
"} - if(4) - dat += "
External Archive
" - if(!dbcon.IsConnected()) - dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." - else - num_results = src.get_num_results() - num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE) - dat += {""} - var/pagelist = get_pagelist() - - dat += {"Search Settings
- Filter by Title: [query.title]
- Filter by Category: [query.category]
- Filter by Author: [query.author]
- \[Start Search\]
"} - dat += pagelist - - dat += {""} - - dat += {"
| Author | -Title | -Category | -Controls | -
| [author] | -[CB.title] | -[CB.category] | -[controls] | -
[pagelist]" - - dat += "
(Return to main menu)
" - if(5) - dat += "
Upload a New Title
" - if(!scanner) - for(var/obj/machinery/libraryscanner/S in range(9)) - scanner = S - break - if(!scanner) - dat += "No scanner found within wireless network range." - else if(!scanner.cache) - dat += "No data found in scanner memory.
" - else - - dat += {"Data marked for upload...
- Title: [scanner.cache.name]
"} - if(!scanner.cache.author) - scanner.cache.author = "Anonymous" - - dat += {"Author: [scanner.cache.author]
- Category: [upload_category]
- \[Upload\]
"} - dat += "(Return to main menu)
" - if(7) - dat += "
Print a Manual
" - dat += "| [M.title] |
(Return to main menu)
" - - if(8) - - dat += {"
Accessing Forbidden Lore Vault v 1.3
- Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.
- Yes.
- No.
"}
-
- var/datum/browser/B = new /datum/browser(user, "library", "Book Inventory Management")
- B.set_content(dat)
- B.open()
-
-/obj/machinery/computer/library/checkout/emag_act(mob/user)
- if(density && !emagged)
- emagged = 1
- to_chat(user, "You override the library computer's printing restrictions.")
-
-/obj/machinery/computer/library/checkout/attackby(obj/item/W as obj, mob/user as mob)
- if(istype(W, /obj/item/barcodescanner))
- var/obj/item/barcodescanner/scanner = W
- scanner.computer = src
- to_chat(user, "[scanner]'s associated machine has been set to [src].")
- audible_message("[src] lets out a low, short blip.", 2)
- return 1
- else
- return ..()
-
-/obj/machinery/computer/library/checkout/Topic(href, href_list)
- if(..())
- usr << browse(null, "window=library")
- onclose(usr, "library")
- return 1
-
- if(href_list["pagenum"])
- if(!num_pages)
- page_num = 1
- else
- var/pn = text2num(href_list["pagenum"])
- if(!isnull(pn))
- page_num = Clamp(pn, 1, num_pages)
-
- if(href_list["page"])
- if(num_pages == 0)
- page_num = 1
- else
- page_num = Clamp(text2num(href_list["page"]), 1, num_pages)
- if(href_list["settitle"])
- var/newtitle = input("Enter a title to search for:") as text|null
- if(newtitle)
- query.title = sanitize(newtitle)
- else
- query.title = null
- if(href_list["setcategory"])
- var/newcategory = input("Choose a category to search for:") in (list("Any") + library_section_names)
- if(newcategory == "Any")
- query.category = null
- else if(newcategory)
- query.category = sanitize(newcategory)
- if(href_list["setauthor"])
- var/newauthor = input("Enter an author to search for:") as text|null
- if(newauthor)
- query.author = sanitize(newauthor)
- else
- query.author = null
-
- if(href_list["search"])
- num_results = src.get_num_results()
- num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE)
- page_num = 1
-
- screenstate = 4
- if(href_list["del"])
- if(!check_rights(R_ADMIN))
- return
- var/datum/cachedbook/target = getBookByID(href_list["del"]) // Sanitized in getBookByID
- var/ans = alert(usr, "Are you sure you wish to delete \"[target.title]\", by [target.author]? This cannot be undone.", "Library System", "Yes", "No")
- if(ans=="Yes")
- var/DBQuery/query = dbcon.NewQuery("DELETE FROM [format_table_name("library")] WHERE id=[target.id]")
- var/response = query.Execute()
- if(!response)
- to_chat(usr, query.ErrorMsg())
- return
- log_admin("LIBRARY: [key_name(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
- message_admins("[key_name_admin(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
- src.updateUsrDialog()
- return
-
- if(href_list["delbyckey"])
- if(!check_rights(R_ADMIN))
- return
- var/tckey = ckey(href_list["delbyckey"])
- var/ans = alert(usr,"Are you sure you wish to delete all books by [tckey]? This cannot be undone.", "Library System", "Yes", "No")
- if(ans=="Yes")
- var/DBQuery/query = dbcon.NewQuery("DELETE FROM [format_table_name("library")] WHERE ckey='[sanitizeSQL(tckey)]'")
- var/response = query.Execute()
- if(!response)
- to_chat(usr, query.ErrorMsg())
- return
- var/affected=query.RowsAffected()
- if(affected==0)
- to_chat(usr, "Unable to find any matching rows.")
- return
- log_admin("LIBRARY: [key_name(usr)] has deleted [affected] books written by [tckey]!")
- message_admins("[key_name_admin(usr)] has deleted [affected] books written by [tckey]!")
- src.updateUsrDialog()
- return
-
- if(href_list["flag"])
- if(!dbcon.IsConnected())
- alert("Connection to Archive has been severed. Aborting.")
- return
- var/id = href_list["flag"]
- if(id)
- var/datum/cachedbook/B = getBookByID(id)
- if(B)
- if((input(usr, "Are you sure you want to flag [B.title] as having inappropriate content?", "Flag Book #[B.id]") in list("Yes", "No")) == "Yes")
- library_catalog.flag_book_by_id(usr, id)
-
- if(href_list["switchscreen"])
- switch(href_list["switchscreen"])
- if("0")
- screenstate = 0
- if("1")
- screenstate = 1
- if("2")
- screenstate = 2
- if("3")
- screenstate = 3
- if("4")
- screenstate = 4
- if("5")
- screenstate = 5
- if("6")
- if(!bibledelay)
-
- var/obj/item/storage/bible/B = new /obj/item/storage/bible(src.loc)
- if(ticker && ( ticker.Bible_icon_state && ticker.Bible_item_state) )
- B.icon_state = ticker.Bible_icon_state
- B.item_state = ticker.Bible_item_state
- B.name = ticker.Bible_name
- B.deity_name = ticker.Bible_deity_name
-
- bibledelay = 1
- spawn(60)
- bibledelay = 0
-
- else
- visible_message("[src]'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\"")
-
- if("7")
- screenstate = 7
- if("8")
- screenstate = 8
- if(href_list["arccheckout"])
- if(src.emagged)
- src.arcanecheckout = 1
- src.screenstate = 0
- if(href_list["increasetime"])
- checkoutperiod += 1
- if(href_list["decreasetime"])
- checkoutperiod -= 1
- if(checkoutperiod < 1)
- checkoutperiod = 1
- if(href_list["editbook"])
- buffer_book = copytext(sanitize(input("Enter the book's title:") as text|null),1,MAX_MESSAGE_LEN)
- if(href_list["editmob"])
- buffer_mob = copytext(sanitize(input("Enter the recipient's name:") as text|null),1,MAX_NAME_LEN)
- if(href_list["checkout"])
- var/datum/borrowbook/b = new /datum/borrowbook
- b.bookname = sanitize(buffer_book)
- b.mobname = sanitize(buffer_mob)
- b.getdate = world.time
- b.duedate = world.time + (checkoutperiod * 600)
- checkouts.Add(b)
- if(href_list["checkin"])
- var/datum/borrowbook/b = locate(href_list["checkin"])
- checkouts.Remove(b)
- if(href_list["delbook"])
- var/obj/item/book/b = locate(href_list["delbook"])
- inventory.Remove(b)
- if(href_list["uploadauthor"])
- var/newauthor = copytext(sanitize(input("Enter the author's name: ") as text|null),1,MAX_MESSAGE_LEN)
- if(newauthor && scanner)
- scanner.cache.author = newauthor
- if(href_list["uploadcategory"])
- var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion")
- if(newcategory)
- upload_category = newcategory
- if(href_list["upload"])
- if(scanner)
- if(scanner.cache)
- var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
- if(choice == "Confirm")
- establish_db_connection()
- if(!dbcon.IsConnected())
- alert("Connection to Archive has been severed. Aborting.")
- else
- var/sqltitle = sanitizeSQL(scanner.cache.name)
- var/sqlauthor = sanitizeSQL(scanner.cache.author)
- var/sqlcontent = sanitizeSQL(scanner.cache.dat)
- var/sqlcategory = sanitizeSQL(upload_category)
- var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("library")] (author, title, content, category, ckey, flagged) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]', '[ckey(usr.key)]', 0)")
- var/response = query.Execute()
- if(!response)
- to_chat(usr, query.ErrorMsg())
- else
- log_admin("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] characters in length")
- message_admins("[key_name_admin(usr)] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] characters in length")
-
- if(href_list["id"])
- if(href_list["id"]=="-1")
- href_list["id"] = input("Enter your order:") as null|num
- if(!href_list["id"])
- return
-
- if(!dbcon.IsConnected())
- alert("Connection to Archive has been severed. Aborting.")
- return
-
- var/datum/cachedbook/newbook = getBookByID(href_list["id"]) // Sanitized in getBookByID
- if(!newbook)
- alert("No book found")
- return
- if((newbook.forbidden == 2 && !emagged) || newbook.forbidden == 1)
- alert("This book is forbidden and cannot be printed.")
- return
-
- if(bibledelay)
- audible_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
- else
- bibledelay = 1
- spawn(60)
- bibledelay = 0
- make_external_book(newbook)
- if(href_list["manual"])
- if(!href_list["manual"]) return
- var/bookid = href_list["manual"]
-
- if(!dbcon.IsConnected())
- alert("Connection to Archive has been severed. Aborting.")
- return
-
- var/datum/cachedbook/newbook = getBookByID("M[bookid]")
- if(!newbook)
- alert("No book found")
- return
- if((newbook.forbidden == 2 && !emagged) || newbook.forbidden == 1)
- alert("This book is forbidden and cannot be printed.")
- return
-
- if(bibledelay)
- for(var/mob/V in hearers(src))
- V.show_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
- else
- bibledelay = 1
- spawn(60)
- bibledelay = 0
- make_external_book(newbook)
-
- src.add_fingerprint(usr)
- src.updateUsrDialog()
- return
-
-/*
- * Library Scanner
- */
-
-/obj/machinery/computer/library/checkout/proc/make_external_book(var/datum/cachedbook/newbook)
- if(!newbook || !newbook.id)
- return
- var/obj/item/book/B = new newbook.path(loc)
-
- if(!newbook.programmatic)
- B.name = "Book: [newbook.title]"
- B.title = newbook.title
- B.author = newbook.author
- B.dat = newbook.content
- B.icon_state = "book[rand(1,16)]"
- visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
+/*
+ * Library Computer
+ */
+/obj/machinery/computer/library/checkout
+ name = "Check-In/Out Computer"
+ icon = 'icons/obj/library.dmi'
+ icon_state = "computer"
+ anchored = 1
+ density = 1
+ var/arcanecheckout = 0
+ //var/screenstate = 0 // 0 - Main Menu, 1 - Inventory, 2 - Checked Out, 3 - Check Out a Book
+ var/buffer_book
+ var/buffer_mob
+ var/upload_category = "Fiction"
+ var/list/checkouts = list()
+ var/list/inventory = list()
+ var/checkoutperiod = 5 // In minutes
+ var/obj/machinery/libraryscanner/scanner // Book scanner that will be used when uploading books to the Archive
+
+ var/bibledelay = 0 // LOL NO SPAM (1 minute delay) -- Doohl
+ var/booklist
+
+/obj/machinery/computer/library/checkout/attack_hand(var/mob/user as mob)
+ if(..())
+ return
+ interact(user)
+
+/obj/machinery/computer/library/checkout/interact(var/mob/user)
+ if(interact_check(user))
+ return
+
+ var/dat = ""
+ switch(screenstate)
+ if(0)
+ // Main Menu
+
+ dat += {"
-
+
- View General Inventory +
- View Checked Out Inventory +
- Check out a Book +
- Connect to External Archive +
- Upload New Title to Archive +
- Print a Bible +
- Print a Manual "} + if(src.emagged) + dat += "
- Access the Forbidden Lore Vault " + dat += "
Inventory
" + for(var/obj/item/book/b in inventory) + dat += "[b.name] (Delete)" + dat += "(Return to main menu)
" + if(2) + // Checked Out + dat += "
Checked Out Books
" + for(var/datum/borrowbook/b in checkouts) + var/timetaken = world.time - b.getdate + //timetaken *= 10 + timetaken /= 600 + timetaken = round(timetaken) + var/timedue = b.duedate - world.time + //timedue *= 10 + timedue /= 600 + if(timedue <= 0) + timedue = "(OVERDUE) [timedue]" + else + timedue = round(timedue) + + dat += {"\"[b.bookname]\", Checked out to: [b.mobname]
--- Taken: [timetaken] minutes ago, Due: in [timedue] minutes
+ (Check In)
"} + dat += "(Return to main menu)
" + if(3) + // Check Out a Book + + dat += {"
Check Out a Book
+ Book: [src.buffer_book] + \[Edit\]
+ Recipient: [src.buffer_mob] + \[Edit\]
+ Checkout Date : [world.time/600]
+ Due Date: [(world.time + checkoutperiod)/600]
+ (Checkout Period: [checkoutperiod] minutes) (+/-) + (Commit Entry)
+ (Return to main menu)
"} + if(4) + dat += "
External Archive
" + if(!dbcon.IsConnected()) + dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance." + else + num_results = src.get_num_results() + num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE) + dat += {""} + var/pagelist = get_pagelist() + + dat += {"Search Settings
+ Filter by Title: [query.title]
+ Filter by Category: [query.category]
+ Filter by Author: [query.author]
+ \[Start Search\]
"} + dat += pagelist + + dat += {""} + + dat += {"
| Author | +Title | +Category | +Controls | +
| [author] | +[CB.title] | +[CB.category] | +[controls] | +
[pagelist]" + + dat += "
(Return to main menu)
" + if(5) + dat += "
Upload a New Title
" + if(!scanner) + for(var/obj/machinery/libraryscanner/S in range(9)) + scanner = S + break + if(!scanner) + dat += "No scanner found within wireless network range." + else if(!scanner.cache) + dat += "No data found in scanner memory.
" + else + + dat += {"Data marked for upload...
+ Title: [scanner.cache.name]
"} + if(!scanner.cache.author) + scanner.cache.author = "Anonymous" + + dat += {"Author: [scanner.cache.author]
+ Category: [upload_category]
+ \[Upload\]
"} + dat += "(Return to main menu)
" + if(7) + dat += "
Print a Manual
" + dat += "| [M.title] |
(Return to main menu)
" + + if(8) + + dat += {"
Accessing Forbidden Lore Vault v 1.3
+ Are you absolutely sure you want to proceed? EldritchTomes Inc. takes no responsibilities for loss of sanity resulting from this action.
+ Yes.
+ No.
"}
+
+ var/datum/browser/B = new /datum/browser(user, "library", "Book Inventory Management")
+ B.set_content(dat)
+ B.open()
+
+/obj/machinery/computer/library/checkout/emag_act(mob/user)
+ if(density && !emagged)
+ emagged = 1
+ to_chat(user, "You override the library computer's printing restrictions.")
+
+/obj/machinery/computer/library/checkout/attackby(obj/item/W as obj, mob/user as mob)
+ if(default_unfasten_wrench(user, W))
+ power_change()
+ return
+ if(istype(W, /obj/item/barcodescanner))
+ var/obj/item/barcodescanner/scanner = W
+ scanner.computer = src
+ to_chat(user, "[scanner]'s associated machine has been set to [src].")
+ audible_message("[src] lets out a low, short blip.", 2)
+ return 1
+ else
+ return ..()
+
+/obj/machinery/computer/library/checkout/Topic(href, href_list)
+ if(..())
+ usr << browse(null, "window=library")
+ onclose(usr, "library")
+ return 1
+
+ if(href_list["pagenum"])
+ if(!num_pages)
+ page_num = 1
+ else
+ var/pn = text2num(href_list["pagenum"])
+ if(!isnull(pn))
+ page_num = Clamp(pn, 1, num_pages)
+
+ if(href_list["page"])
+ if(num_pages == 0)
+ page_num = 1
+ else
+ page_num = Clamp(text2num(href_list["page"]), 1, num_pages)
+ if(href_list["settitle"])
+ var/newtitle = input("Enter a title to search for:") as text|null
+ if(newtitle)
+ query.title = sanitize(newtitle)
+ else
+ query.title = null
+ if(href_list["setcategory"])
+ var/newcategory = input("Choose a category to search for:") in (list("Any") + library_section_names)
+ if(newcategory == "Any")
+ query.category = null
+ else if(newcategory)
+ query.category = sanitize(newcategory)
+ if(href_list["setauthor"])
+ var/newauthor = input("Enter an author to search for:") as text|null
+ if(newauthor)
+ query.author = sanitize(newauthor)
+ else
+ query.author = null
+
+ if(href_list["search"])
+ num_results = src.get_num_results()
+ num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE)
+ page_num = 1
+
+ screenstate = 4
+ if(href_list["del"])
+ if(!check_rights(R_ADMIN))
+ return
+ var/datum/cachedbook/target = getBookByID(href_list["del"]) // Sanitized in getBookByID
+ var/ans = alert(usr, "Are you sure you wish to delete \"[target.title]\", by [target.author]? This cannot be undone.", "Library System", "Yes", "No")
+ if(ans=="Yes")
+ var/DBQuery/query = dbcon.NewQuery("DELETE FROM [format_table_name("library")] WHERE id=[target.id]")
+ var/response = query.Execute()
+ if(!response)
+ to_chat(usr, query.ErrorMsg())
+ return
+ log_admin("LIBRARY: [key_name(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
+ message_admins("[key_name_admin(usr)] has deleted \"[target.title]\", by [target.author] ([target.ckey])!")
+ src.updateUsrDialog()
+ return
+
+ if(href_list["delbyckey"])
+ if(!check_rights(R_ADMIN))
+ return
+ var/tckey = ckey(href_list["delbyckey"])
+ var/ans = alert(usr,"Are you sure you wish to delete all books by [tckey]? This cannot be undone.", "Library System", "Yes", "No")
+ if(ans=="Yes")
+ var/DBQuery/query = dbcon.NewQuery("DELETE FROM [format_table_name("library")] WHERE ckey='[sanitizeSQL(tckey)]'")
+ var/response = query.Execute()
+ if(!response)
+ to_chat(usr, query.ErrorMsg())
+ return
+ var/affected=query.RowsAffected()
+ if(affected==0)
+ to_chat(usr, "Unable to find any matching rows.")
+ return
+ log_admin("LIBRARY: [key_name(usr)] has deleted [affected] books written by [tckey]!")
+ message_admins("[key_name_admin(usr)] has deleted [affected] books written by [tckey]!")
+ src.updateUsrDialog()
+ return
+
+ if(href_list["flag"])
+ if(!dbcon.IsConnected())
+ alert("Connection to Archive has been severed. Aborting.")
+ return
+ var/id = href_list["flag"]
+ if(id)
+ var/datum/cachedbook/B = getBookByID(id)
+ if(B)
+ if((input(usr, "Are you sure you want to flag [B.title] as having inappropriate content?", "Flag Book #[B.id]") in list("Yes", "No")) == "Yes")
+ library_catalog.flag_book_by_id(usr, id)
+
+ if(href_list["switchscreen"])
+ switch(href_list["switchscreen"])
+ if("0")
+ screenstate = 0
+ if("1")
+ screenstate = 1
+ if("2")
+ screenstate = 2
+ if("3")
+ screenstate = 3
+ if("4")
+ screenstate = 4
+ if("5")
+ screenstate = 5
+ if("6")
+ if(!bibledelay)
+
+ var/obj/item/storage/bible/B = new /obj/item/storage/bible(src.loc)
+ if(ticker && ( ticker.Bible_icon_state && ticker.Bible_item_state) )
+ B.icon_state = ticker.Bible_icon_state
+ B.item_state = ticker.Bible_item_state
+ B.name = ticker.Bible_name
+ B.deity_name = ticker.Bible_deity_name
+
+ bibledelay = 1
+ spawn(60)
+ bibledelay = 0
+
+ else
+ visible_message("[src]'s monitor flashes, \"Bible printer currently unavailable, please wait a moment.\"")
+
+ if("7")
+ screenstate = 7
+ if("8")
+ screenstate = 8
+ if(href_list["arccheckout"])
+ if(src.emagged)
+ src.arcanecheckout = 1
+ src.screenstate = 0
+ if(href_list["increasetime"])
+ checkoutperiod += 1
+ if(href_list["decreasetime"])
+ checkoutperiod -= 1
+ if(checkoutperiod < 1)
+ checkoutperiod = 1
+ if(href_list["editbook"])
+ buffer_book = copytext(sanitize(input("Enter the book's title:") as text|null),1,MAX_MESSAGE_LEN)
+ if(href_list["editmob"])
+ buffer_mob = copytext(sanitize(input("Enter the recipient's name:") as text|null),1,MAX_NAME_LEN)
+ if(href_list["checkout"])
+ var/datum/borrowbook/b = new /datum/borrowbook
+ b.bookname = sanitize(buffer_book)
+ b.mobname = sanitize(buffer_mob)
+ b.getdate = world.time
+ b.duedate = world.time + (checkoutperiod * 600)
+ checkouts.Add(b)
+ if(href_list["checkin"])
+ var/datum/borrowbook/b = locate(href_list["checkin"])
+ checkouts.Remove(b)
+ if(href_list["delbook"])
+ var/obj/item/book/b = locate(href_list["delbook"])
+ inventory.Remove(b)
+ if(href_list["uploadauthor"])
+ var/newauthor = copytext(sanitize(input("Enter the author's name: ") as text|null),1,MAX_MESSAGE_LEN)
+ if(newauthor && scanner)
+ scanner.cache.author = newauthor
+ if(href_list["uploadcategory"])
+ var/newcategory = input("Choose a category: ") in list("Fiction", "Non-Fiction", "Adult", "Reference", "Religion")
+ if(newcategory)
+ upload_category = newcategory
+ if(href_list["upload"])
+ if(scanner)
+ if(scanner.cache)
+ var/choice = input("Are you certain you wish to upload this title to the Archive?") in list("Confirm", "Abort")
+ if(choice == "Confirm")
+ establish_db_connection()
+ if(!dbcon.IsConnected())
+ alert("Connection to Archive has been severed. Aborting.")
+ else
+ var/sqltitle = sanitizeSQL(scanner.cache.name)
+ var/sqlauthor = sanitizeSQL(scanner.cache.author)
+ var/sqlcontent = sanitizeSQL(scanner.cache.dat)
+ var/sqlcategory = sanitizeSQL(upload_category)
+ var/DBQuery/query = dbcon.NewQuery("INSERT INTO [format_table_name("library")] (author, title, content, category, ckey, flagged) VALUES ('[sqlauthor]', '[sqltitle]', '[sqlcontent]', '[sqlcategory]', '[ckey(usr.key)]', 0)")
+ var/response = query.Execute()
+ if(!response)
+ to_chat(usr, query.ErrorMsg())
+ else
+ log_admin("[usr.name]/[usr.key] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] characters in length")
+ message_admins("[key_name_admin(usr)] has uploaded the book titled [scanner.cache.name], [length(scanner.cache.dat)] characters in length")
+
+ if(href_list["id"])
+ if(href_list["id"]=="-1")
+ href_list["id"] = input("Enter your order:") as null|num
+ if(!href_list["id"])
+ return
+
+ if(!dbcon.IsConnected())
+ alert("Connection to Archive has been severed. Aborting.")
+ return
+
+ var/datum/cachedbook/newbook = getBookByID(href_list["id"]) // Sanitized in getBookByID
+ if(!newbook)
+ alert("No book found")
+ return
+ if((newbook.forbidden == 2 && !emagged) || newbook.forbidden == 1)
+ alert("This book is forbidden and cannot be printed.")
+ return
+
+ if(bibledelay)
+ audible_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
+ else
+ bibledelay = 1
+ spawn(60)
+ bibledelay = 0
+ make_external_book(newbook)
+ if(href_list["manual"])
+ if(!href_list["manual"]) return
+ var/bookid = href_list["manual"]
+
+ if(!dbcon.IsConnected())
+ alert("Connection to Archive has been severed. Aborting.")
+ return
+
+ var/datum/cachedbook/newbook = getBookByID("M[bookid]")
+ if(!newbook)
+ alert("No book found")
+ return
+ if((newbook.forbidden == 2 && !emagged) || newbook.forbidden == 1)
+ alert("This book is forbidden and cannot be printed.")
+ return
+
+ if(bibledelay)
+ for(var/mob/V in hearers(src))
+ V.show_message("[src]'s monitor flashes, \"Printer unavailable. Please allow a short time before attempting to print.\"")
+ else
+ bibledelay = 1
+ spawn(60)
+ bibledelay = 0
+ make_external_book(newbook)
+
+ src.add_fingerprint(usr)
+ src.updateUsrDialog()
+ return
+
+/*
+ * Library Scanner
+ */
+
+/obj/machinery/computer/library/checkout/proc/make_external_book(var/datum/cachedbook/newbook)
+ if(!newbook || !newbook.id)
+ return
+ var/obj/item/book/B = new newbook.path(loc)
+
+ if(!newbook.programmatic)
+ B.name = "Book: [newbook.title]"
+ B.title = newbook.title
+ B.author = newbook.author
+ B.dat = newbook.content
+ B.icon_state = "book[rand(1,16)]"
+ visible_message("[src]'s printer hums as it produces a completely bound book. How did it do that?")
diff --git a/code/modules/library/computers/public.dm b/code/modules/library/computers/public.dm
index 4e0decd4459..c0f61d26eff 100644
--- a/code/modules/library/computers/public.dm
+++ b/code/modules/library/computers/public.dm
@@ -1,122 +1,127 @@
-/obj/machinery/computer/library/public
- name = "visitor computer"
-
-/obj/machinery/computer/library/public/attack_hand(var/mob/user as mob)
- if(..())
- return
- interact(user)
-
-/obj/machinery/computer/library/public/interact(var/mob/user)
- if(interact_check(user))
- return
-
- var/dat = ""
- switch(screenstate)
- if(0)
-
- dat += {"
Search Settings
- Filter by Title: [query.title]
- Filter by Category: [query.category]
- Filter by Author: [query.author]
- \[Start Search\]
"} - if(1) - establish_db_connection() - if(!dbcon.IsConnected()) - dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance.
" - else if(num_results == 0) - dat += "No results found." - else - var/pagelist = get_pagelist() - - dat += pagelist - dat += {""} - dat += {"
| Author | -Title | -Category | -SS13BN | -Controls | -
| [CB.author] | -[CB.title] | -[CB.category] | -[CB.id] | -\[Flag[CB.flagged ? "ged" : ""]\] | -
[pagelist]" - dat += "\[Go Back\]
" - var/datum/browser/B = new /datum/browser(user, "library", "Library Visitor") - B.set_content(dat) - B.open() - -/obj/machinery/computer/library/public/Topic(href, href_list) - if(..()) - usr << browse(null, "window=publiclibrary") - onclose(usr, "publiclibrary") - return - - if(href_list["pagenum"]) - if(!num_pages) - page_num = 1 - else - var/pn = text2num(href_list["pagenum"]) - if(!isnull(pn)) - page_num = Clamp(pn, 1, num_pages) - - if(href_list["settitle"]) - var/newtitle = input("Enter a title to search for:") as text|null - if(newtitle) - query.title = sanitize(newtitle) - else - query.title = null - if(href_list["setcategory"]) - var/newcategory = input("Choose a category to search for:") in (list("Any") + library_section_names) - if(newcategory == "Any") - query.category = null - else if(newcategory) - query.category = sanitize(newcategory) - if(href_list["setauthor"]) - var/newauthor = input("Enter an author to search for:") as text|null - if(newauthor) - query.author = sanitize(newauthor) - else - query.author = null - - if(href_list["page"]) - if(num_pages == 0) - page_num = 1 - else - page_num = Clamp(text2num(href_list["page"]), 1, num_pages) - - if(href_list["search"]) - num_results = src.get_num_results() - num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE) - page_num = 1 - - screenstate = 1 - - if(href_list["back"]) - screenstate = 0 - - if(href_list["flag"]) - if(!dbcon.IsConnected()) - alert("Connection to Archive has been severed. Aborting.") - return - var/id = href_list["flag"] - if(id) - var/datum/cachedbook/B = getBookByID(id) - if(B) - if((input(usr, "Are you sure you want to flag [B.title] as having inappropriate content?", "Flag Book #[B.id]") in list("Yes", "No")) == "Yes") - library_catalog.flag_book_by_id(usr, id) - - add_fingerprint(usr) - updateUsrDialog() +/obj/machinery/computer/library/public + name = "visitor computer" + +/obj/machinery/computer/library/public/attack_hand(var/mob/user as mob) + if(..()) + return + interact(user) + +/obj/machinery/computer/library/public/attackby(obj/item/W as obj, mob/user as mob) + if(default_unfasten_wrench(user, W)) + power_change() + return + +/obj/machinery/computer/library/public/interact(var/mob/user) + if(interact_check(user)) + return + + var/dat = "" + switch(screenstate) + if(0) + + dat += {"
Search Settings
+ Filter by Title: [query.title]
+ Filter by Category: [query.category]
+ Filter by Author: [query.author]
+ \[Start Search\]
"} + if(1) + establish_db_connection() + if(!dbcon.IsConnected()) + dat += "ERROR: Unable to contact External Archive. Please contact your system administrator for assistance.
" + else if(num_results == 0) + dat += "No results found." + else + var/pagelist = get_pagelist() + + dat += pagelist + dat += {""} + dat += {"
| Author | +Title | +Category | +SS13BN | +Controls | +
| [CB.author] | +[CB.title] | +[CB.category] | +[CB.id] | +\[Flag[CB.flagged ? "ged" : ""]\] | +
[pagelist]" + dat += "\[Go Back\]
" + var/datum/browser/B = new /datum/browser(user, "library", "Library Visitor") + B.set_content(dat) + B.open() + +/obj/machinery/computer/library/public/Topic(href, href_list) + if(..()) + usr << browse(null, "window=publiclibrary") + onclose(usr, "publiclibrary") + return + + if(href_list["pagenum"]) + if(!num_pages) + page_num = 1 + else + var/pn = text2num(href_list["pagenum"]) + if(!isnull(pn)) + page_num = Clamp(pn, 1, num_pages) + + if(href_list["settitle"]) + var/newtitle = input("Enter a title to search for:") as text|null + if(newtitle) + query.title = sanitize(newtitle) + else + query.title = null + if(href_list["setcategory"]) + var/newcategory = input("Choose a category to search for:") in (list("Any") + library_section_names) + if(newcategory == "Any") + query.category = null + else if(newcategory) + query.category = sanitize(newcategory) + if(href_list["setauthor"]) + var/newauthor = input("Enter an author to search for:") as text|null + if(newauthor) + query.author = sanitize(newauthor) + else + query.author = null + + if(href_list["page"]) + if(num_pages == 0) + page_num = 1 + else + page_num = Clamp(text2num(href_list["page"]), 1, num_pages) + + if(href_list["search"]) + num_results = src.get_num_results() + num_pages = Ceiling(num_results/LIBRARY_BOOKS_PER_PAGE) + page_num = 1 + + screenstate = 1 + + if(href_list["back"]) + screenstate = 0 + + if(href_list["flag"]) + if(!dbcon.IsConnected()) + alert("Connection to Archive has been severed. Aborting.") + return + var/id = href_list["flag"] + if(id) + var/datum/cachedbook/B = getBookByID(id) + if(B) + if((input(usr, "Are you sure you want to flag [B.title] as having inappropriate content?", "Flag Book #[B.id]") in list("Yes", "No")) == "Yes") + library_catalog.flag_book_by_id(usr, id) + + add_fingerprint(usr) + updateUsrDialog() return \ No newline at end of file diff --git a/code/modules/library/lib_machines.dm b/code/modules/library/lib_machines.dm index 4cdecae1f66..611b84f8100 100644 --- a/code/modules/library/lib_machines.dm +++ b/code/modules/library/lib_machines.dm @@ -151,6 +151,9 @@ var/global/list/library_section_names = list("Any", "Fiction", "Non-Fiction", "A var/obj/item/book/cache // Last scanned book /obj/machinery/libraryscanner/attackby(obj/item/I, mob/user) + if(default_unfasten_wrench(user, I)) + power_change() + return if(istype(I, /obj/item/book)) user.drop_item() I.forceMove(src) @@ -208,6 +211,9 @@ var/global/list/library_section_names = list("Any", "Fiction", "Non-Fiction", "A /obj/machinery/bookbinder/attackby(obj/item/I, mob/user) var/obj/item/paper/P = I + if(default_unfasten_wrench(user, I)) + power_change() + return if(istype(P)) user.drop_item() user.visible_message("[user] loads some paper into [src].", "You load some paper into [src].") diff --git a/code/modules/lighting/lighting_overlay.dm b/code/modules/lighting/lighting_overlay.dm index dd28f990322..a8f87338ae8 100644 --- a/code/modules/lighting/lighting_overlay.dm +++ b/code/modules/lighting/lighting_overlay.dm @@ -6,6 +6,7 @@ anchored = 1 icon = LIGHTING_ICON layer = LIGHTING_LAYER + plane = LIGHTING_PLANE invisibility = INVISIBILITY_LIGHTING color = LIGHTING_BASE_MATRIX icon_state = "light1" diff --git a/code/modules/logic/dual_input.dm b/code/modules/logic/dual_input.dm index 03bfa4f1688..b8f915ff46d 100644 --- a/code/modules/logic/dual_input.dm +++ b/code/modules/logic/dual_input.dm @@ -45,9 +45,9 @@ /obj/machinery/logic_gate/nand/handle_logic() if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER)) - output_state = LOGIC_OFF //This can only output continuous signals - else //At least one input was ON/FLICKER, so output is off - output_state = LOGIC_OFF + output_state = LOGIC_OFF //Both inputs are ON/FLICKER, so output is off + else + output_state = LOGIC_ON //This can only output continuous signals return // NOR Gate @@ -58,9 +58,9 @@ output_state = LOGIC_ON /obj/machinery/logic_gate/nor/handle_logic() - if(input1_state == LOGIC_OFF ||input2_state == LOGIC_OFF) + if(input1_state == LOGIC_OFF && input2_state == LOGIC_OFF) //Both inputs are OFF, so output is ON output_state = LOGIC_ON //This can only output continuous signals - else //Both inputs are ON, so output is OFF + else output_state = LOGIC_OFF return @@ -71,14 +71,15 @@ icon_state = "logic_xor" /obj/machinery/logic_gate/xor/handle_logic() - if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) || input2_state == LOGIC_OFF) //Only input1 is ON/FLICKER, so output matches input1 + if((input1_state == LOGIC_ON || input1_state == LOGIC_FLICKER) && (input2_state == LOGIC_OFF)) //Only input1 is ON/FLICKER, so output matches input1 output_state = input1_state - else if((input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER) || input1_state == LOGIC_OFF) //Only input2 is ON/FLICKER, so output matches input2 + else if((input2_state == LOGIC_ON || input2_state == LOGIC_FLICKER) && (input1_state == LOGIC_OFF)) //Only input2 is ON/FLICKER, so output matches input2 output_state = input2_state else //Both inputs are ON or OFF, so output is OFF output_state = LOGIC_OFF return + // XNOR Gate /obj/machinery/logic_gate/xnor name = "XNOR Gate" diff --git a/code/modules/mining/lavaland/ash_flora.dm b/code/modules/mining/lavaland/ash_flora.dm index 364a918c0ff..0e0d248d8b7 100644 --- a/code/modules/mining/lavaland/ash_flora.dm +++ b/code/modules/mining/lavaland/ash_flora.dm @@ -7,7 +7,7 @@ var/harvested_name = "shortened mushrooms" var/harvested_desc = "Some quickly regrowing mushrooms, formerly known to be quite large." var/needs_sharp_harvest = TRUE - var/harvest = /obj/item/reagent_containers/food/snacks/ash_flora/shavings + var/harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings var/harvest_amount_low = 1 var/harvest_amount_high = 3 var/harvest_time = 60 @@ -79,7 +79,7 @@ desc = "A number of mushrooms, each of which surrounds a greenish sporangium with a number of leaf-like structures." harvested_name = "leafless mushrooms" harvested_desc = "A bunch of formerly-leafed mushrooms, with their sporangiums exposed. Scandalous?" - harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf + harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf needs_sharp_harvest = FALSE harvest_amount_high = 4 harvest_time = 20 @@ -95,7 +95,7 @@ desc = "Several mushrooms, the larger of which have a ring of conks at the midpoint of their stems." harvested_name = "small mushrooms" harvested_desc = "Several small mushrooms near the stumps of what likely were larger mushrooms." - harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap + harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap harvest_amount_high = 4 harvest_time = 50 harvest_message_low = "You slice the cap off of a mushroom." @@ -111,7 +111,7 @@ luminosity = 1 harvested_name = "tiny mushrooms" harvested_desc = "A few tiny mushrooms around larger stumps. You can already see them growing back." - harvest = /obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem + harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem harvest_amount_high = 4 harvest_time = 40 harvest_message_low = "You pick and slice the cap off of a mushroom, leaving the stem." @@ -126,7 +126,7 @@ desc = "Several prickly cacti, brimming with ripe fruit and covered in a thin layer of ash." harvested_name = "cacti" harvested_desc = "A bunch of prickly cacti. You can see fruits slowly growing beneath the covering of ash." - harvest = /obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit + harvest = /obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit needs_sharp_harvest = FALSE harvest_amount_high = 2 harvest_time = 10 @@ -149,45 +149,51 @@ H.visible_message("[H] steps on a cactus!", \ "You step on a cactus!") -/obj/item/reagent_containers/food/snacks/ash_flora +/obj/item/reagent_containers/food/snacks/grown/ash_flora name = "mushroom shavings" desc = "Some shavings from a tall mushroom. With enough, might serve as a bowl." icon = 'icons/obj/lavaland/ash_flora.dmi' icon_state = "mushroom_shavings" list_reagents = list("sugar" = 3, "ethanol" = 2, "stabilizing_agent" = 3, "minttoxin" = 2) w_class = WEIGHT_CLASS_TINY + wine_power = 0.2 -/obj/item/reagent_containers/food/snacks/ash_flora/New() +/obj/item/reagent_containers/food/snacks/grown/ash_flora/New() ..() pixel_x = rand(-4, 4) pixel_y = rand(-4, 4) -/obj/item/reagent_containers/food/snacks/ash_flora/shavings //for actual crafting +/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings //for actual crafting -/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_leaf +/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_leaf name = "mushroom leaf" desc = "A leaf, from a mushroom." list_reagents = list("nutriment" = 3, "vitfro" = 2, "nicotine" = 2) icon_state = "mushroom_leaf" + wine_power = 0.4 -/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_cap +/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_cap name = "mushroom cap" desc = "The cap of a large mushroom." list_reagents = list("lsd" = 2, "entpoly" = 4, "psilocybin" = 2) icon_state = "mushroom_cap" + wine_power = 0.7 -/obj/item/reagent_containers/food/snacks/ash_flora/mushroom_stem + +/obj/item/reagent_containers/food/snacks/grown/ash_flora/mushroom_stem name = "mushroom stem" desc = "A long mushroom stem. It's slightly glowing." list_reagents = list("tinlux" = 2, "vitamin" = 1, "space_drugs" = 1) icon_state = "mushroom_stem" luminosity = 1 + wine_power = 0.6 -/obj/item/reagent_containers/food/snacks/ash_flora/cactus_fruit +/obj/item/reagent_containers/food/snacks/grown/ash_flora/cactus_fruit name = "cactus fruit" list_reagents = list("vitamin" = 2, "nutriment" = 2, "vitfro" = 4) desc = "A cactus fruit covered in a thick, reddish skin. And some ash." icon_state = "cactus_fruit" + wine_power = 0.5 /obj/item/mushroom_bowl name = "mushroom bowl" @@ -200,6 +206,6 @@ /datum/crafting_recipe/mushroom_bowl name = "Mushroom Bowl" result = /obj/item/reagent_containers/food/drinks/mushroom_bowl - reqs = list(/obj/item/reagent_containers/food/snacks/ash_flora/shavings = 5) + reqs = list(/obj/item/reagent_containers/food/snacks/grown/ash_flora/shavings = 5) time = 30 category = CAT_PRIMAL diff --git a/code/modules/mining/minebot.dm b/code/modules/mining/minebot.dm index 30e093633f5..52641d70a32 100644 --- a/code/modules/mining/minebot.dm +++ b/code/modules/mining/minebot.dm @@ -73,17 +73,18 @@ check_friendly_fire = 0 /mob/living/simple_animal/hostile/mining_drone/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weldingtool)) + if(istype(I, /obj/item/weldingtool) && user.a_intent == INTENT_HELP) var/obj/item/weldingtool/W = I if(W.welding && !stat) if(AIStatus != AI_OFF && AIStatus != AI_IDLE) to_chat(user, "[src] is moving around too much to repair!") return - if(maxHealth == health) - to_chat(user, "[src] is at full integrity.") - else - adjustBruteLoss(-10) - to_chat(user, "You repair some of the armor on [src].") + if(do_after_once(user, 15, target = src)) + if(maxHealth == health) + to_chat(user, "[src] is at full integrity.") + else + adjustBruteLoss(-20) + to_chat(user, "You repair some of the armor on [src].") return if(istype(I, /obj/item/mining_scanner) || istype(I, /obj/item/t_scanner/adv_mining_scanner)) to_chat(user, "You instruct [src] to drop any collected ore.") @@ -101,6 +102,18 @@ DropOre(0) qdel(src) +/mob/living/simple_animal/hostile/mining_drone/Shoot(atom/targeted_atom) + var/obj/item/projectile/kinetic/K = ..() + var/turf/proj_turf = get_turf(K) + if(!isturf(proj_turf)) + return + var/datum/gas_mixture/environment = proj_turf.return_air() + var/pressure = environment.return_pressure() + if(pressure > 50) + K.name = "weakened [K.name]" + + K.damage *= K.pressure_decrease + /mob/living/simple_animal/hostile/mining_drone/attack_hand(mob/living/carbon/human/M) if(M.a_intent == INTENT_HELP) toggle_mode() @@ -274,7 +287,9 @@ if(M.maxHealth != initial(M.maxHealth)) to_chat(user, "[M] already has a reinforced chassis!") return + var/previous = M.maxHealth M.maxHealth = 170 + M.health += M.maxHealth - previous to_chat(user, "You reinforce [M]'s chassis.") qdel(src) diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm index 6a067a156ce..7e583216475 100644 --- a/code/modules/mob/dead/observer/observer.dm +++ b/code/modules/mob/dead/observer/observer.dm @@ -12,6 +12,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi stat = DEAD density = 0 canmove = 0 + alpha = 127 anchored = 1 // don't get pushed around invisibility = INVISIBILITY_OBSERVER var/can_reenter_corpse @@ -48,29 +49,19 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi T = get_turf(body) //Where is the body located? attack_log = body.attack_log //preserve our attack logs by copying them to our ghost - if(ishuman(body)) - var/mob/living/carbon/human/H = body - icon = H.stand_icon - overlays = H.overlays_standing - else - icon = body.icon - icon_state = body.icon_state - overlays = body.overlays - - alpha = 127 - gender = body.gender + var/mutable_appearance/MA = copy_appearance(body) if(body.mind && body.mind.name) - name = body.mind.name + MA.name = body.mind.name + else if(body.real_name) + MA.name = body.real_name else - if(body.real_name) - name = body.real_name + if(gender == MALE) + MA.name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) else - if(gender == MALE) - name = capitalize(pick(GLOB.first_names_male)) + " " + capitalize(pick(GLOB.last_names)) - else - name = capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) + MA.name = capitalize(pick(GLOB.first_names_female)) + " " + capitalize(pick(GLOB.last_names)) mind = body.mind //we don't transfer the mind but we keep a reference to it. + appearance = MA ghostimage = image(icon = icon, loc = src, icon_state = icon_state) ghostimage.overlays = overlays @@ -99,6 +90,36 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi updateallghostimages() return ..() +// 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" +// You'd be right, but that's fucking BYOND for you. +/mob/dead/observer/proc/copy_appearance(mutable_appearance/COPY) + var/mutable_appearance/MA = new(src) + + MA.appearance_flags = COPY.appearance_flags + MA.blend_mode = COPY.blend_mode + MA.color = COPY.color + MA.dir = COPY.dir + MA.gender = COPY.gender + MA.icon = COPY.icon + MA.icon_state = COPY.icon_state + MA.layer = COPY.layer + MA.maptext = COPY.maptext + MA.maptext_width = COPY.maptext_width + MA.maptext_height = COPY.maptext_height + MA.maptext_x = COPY.maptext_x + MA.maptext_y = COPY.maptext_y + MA.mouse_opacity = COPY.mouse_opacity + MA.overlays = COPY.overlays + if(!isicon(MA.icon) && !LAZYLEN(MA.overlays)) // Gibbing/dusting/melting removes the icon before ghostize()ing the mob, so we need to account for that + MA.icon = initial(icon) + MA.icon_state = initial(icon_state) + MA.suffix = COPY.suffix + MA.underlays = COPY.underlays + + . = MA + /mob/dead/CanPass(atom/movable/mover, turf/target, height=0) return 1 diff --git a/code/modules/mob/language.dm b/code/modules/mob/language.dm index 43a18678dd9..0a1f2d322ce 100644 --- a/code/modules/mob/language.dm +++ b/code/modules/mob/language.dm @@ -281,6 +281,15 @@ flags = RESTRICTED | WHITELISTED syllables = list("click","clack") +/datum/language/kidan/get_random_name() + var/new_name = "[pick(list("Vrax", "Krek", "Vriz", "Zrik", "Zarak", "Click", "Zerk", "Drax", "Zven", "Drexx"))]" + new_name += ", " + new_name += "[pick(list("Noble", "Worker", "Scout", "Builder", "Farmer", "Gatherer", "Soldier", "Guard", "Prospector"))]" + new_name += " of Clan " + new_name += "[pick(list("Tristan", "Zarlan", "Clack", "Kkraz", "Zramn", "Orlan", "Zrax"))]" //I ran out of ideas after the first two tbh -_- + return new_name + + /datum/language/slime name = "Bubblish" desc = "The language of slimes. It's a mixture of bubbling noises and pops. Very difficult to speak without mechanical aid for humans." diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm index dea7c447191..d9b02ee5e53 100644 --- a/code/modules/mob/living/carbon/alien/alien.dm +++ b/code/modules/mob/living/carbon/alien/alien.dm @@ -27,6 +27,7 @@ verbs += /mob/living/verb/lay_down alien_organs += new /obj/item/organ/internal/brain/xeno alien_organs += new /obj/item/organ/internal/xenos/hivenode + alien_organs += new /obj/item/organ/internal/ears for(var/obj/item/organ/internal/I in alien_organs) I.insert(src) ..() @@ -132,6 +133,10 @@ // add some movement delay move_delay_add = min(move_delay_add + round(amount / 2), 10) // a maximum delay of 10 +/mob/living/carbon/alien/movement_delay() + . = ..() + . += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns + /mob/living/carbon/alien/getDNA() return null diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm index da47f8c80b5..e6b45a1649a 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid.dm @@ -27,11 +27,6 @@ add_language("Hivemind") ..() - -/mob/living/carbon/alien/humanoid/movement_delay() - . = ..() - . += move_delay_add + config.alien_delay //move_delay_add is used to slow aliens with stuns - /mob/living/carbon/alien/humanoid/Process_Spacemove(var/check_drift = 0) if(..()) return 1 @@ -63,15 +58,12 @@ f_loss += 60 - AdjustEarDamage(30) - AdjustEarDeaf(120) - + AdjustEarDamage(30, 120) if(3.0) b_loss += 30 if(prob(50) && !shielded) Paralyse(1) - AdjustEarDamage(15) - AdjustEarDeaf(60) + AdjustEarDamage(15, 60) take_overall_damage(b_loss, f_loss) diff --git a/code/modules/mob/living/carbon/alien/humanoid/life.dm b/code/modules/mob/living/carbon/alien/humanoid/life.dm index 7771f1f5f90..6012a8fb7f3 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/life.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/life.dm @@ -78,14 +78,6 @@ else if(eye_blurry) //blurry eyes heal slowly AdjustEyeBlurry(-1) - //Ears - if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own - EarDeaf(1) - else if(ear_deaf) //deafness, heals slowly over time - AdjustEarDeaf(-1) - else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs - AdjustEarDamage(-0.05) - if(stuttering) AdjustStuttering(-1) diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm index d0deac3e132..a64750ad93d 100644 --- a/code/modules/mob/living/carbon/alien/larva/larva.dm +++ b/code/modules/mob/living/carbon/alien/larva/larva.dm @@ -33,13 +33,11 @@ ..() stat(null, "Progress: [amount_grown]/[max_grown]") - /mob/living/carbon/alien/larva/adjustPlasma(amount) if(stat != DEAD && amount > 0) amount_grown = min(amount_grown + 1, max_grown) ..(amount) - /mob/living/carbon/alien/larva/ex_act(severity) ..() @@ -56,15 +54,13 @@ f_loss += 60 - AdjustEarDamage(30) - AdjustEarDeaf(120) + AdjustEarDamage(30, 120) if(3.0) b_loss += 30 if(prob(50)) Paralyse(1) - AdjustEarDamage(15) - AdjustEarDeaf(60) + AdjustEarDamage(15, 60) adjustBruteLoss(b_loss) adjustFireLoss(f_loss) diff --git a/code/modules/mob/living/carbon/alien/larva/life.dm b/code/modules/mob/living/carbon/alien/larva/life.dm index 654e9e27af3..a4b783e08fb 100644 --- a/code/modules/mob/living/carbon/alien/larva/life.dm +++ b/code/modules/mob/living/carbon/alien/larva/life.dm @@ -46,14 +46,6 @@ else if(eye_blurry) //blurry eyes heal slowly AdjustEyeBlurry(-1) - //Ears - if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own - EarDeaf(1) - else if(ear_deaf) //deafness, heals slowly over time - AdjustEarDeaf(-1) - else if(ear_damage < 25) //ear damage heals slowly under this threshold. - AdjustEarDamage(-0.05) - if(stuttering) AdjustStuttering(-1) diff --git a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm index d489443cb36..3a752e61619 100644 --- a/code/modules/mob/living/carbon/alien/special/alien_embryo.dm +++ b/code/modules/mob/living/carbon/alien/special/alien_embryo.dm @@ -91,7 +91,7 @@ owner.overlays += overlay spawn(6) - var/mob/living/carbon/alien/larva/new_xeno = new(owner.loc) + var/mob/living/carbon/alien/larva/new_xeno = new(owner.drop_location()) new_xeno.key = C.key if(ticker && ticker.mode) ticker.mode.xenos += new_xeno.mind diff --git a/code/modules/mob/living/carbon/brain/brain.dm b/code/modules/mob/living/carbon/brain/brain.dm index c64318d804b..0f7d4230587 100644 --- a/code/modules/mob/living/carbon/brain/brain.dm +++ b/code/modules/mob/living/carbon/brain/brain.dm @@ -108,8 +108,5 @@ I'm using this for Stat to give it a more nifty interface to work with /mob/living/carbon/brain/can_safely_leave_loc() return 0 //You're not supposed to be ethereal jaunting, brains -/mob/living/carbon/brain/SetEarDamage() // no ears to damage or heal - return - -/mob/living/carbon/brain/SetEarDeaf() - return +/mob/living/carbon/brain/can_hear() + . = TRUE diff --git a/code/modules/mob/living/carbon/brain/brain_item.dm b/code/modules/mob/living/carbon/brain/brain_item.dm index 0a8f6fb3b83..03675f282e5 100644 --- a/code/modules/mob/living/carbon/brain/brain_item.dm +++ b/code/modules/mob/living/carbon/brain/brain_item.dm @@ -19,12 +19,6 @@ var/mmi_icon = 'icons/obj/assemblies.dmi' var/mmi_icon_state = "mmi_full" -/obj/item/organ/internal/brain/surgeryize() - if(!owner) - return - owner.SetEarDeaf(0) - owner.SetEarDamage(0) //Yeah, didn't you...hear? The ears are totally inside the brain. - /obj/item/organ/internal/brain/xeno name = "xenomorph brain" desc = "We barely understand the brains of terrestial animals. Who knows what we may find in the brain of such an advanced species?" diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ea51f819390..b3d4ab3306b 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -7,6 +7,7 @@ var/obj/item/rig/wearing_rig // This is very not good, but it's much much better than calling get_rig() every update_canmove() call. /mob/living/carbon/human/New(loc) + icon = null // This is now handled by overlays -- we just keep an icon for the sake of the map editor. if(length(args) > 1) log_runtime(EXCEPTION("human/New called with more than 1 argument (REPORT THIS ENTIRE RUNTIME TO A CODER)")) . = ..() @@ -264,8 +265,7 @@ else valid_limbs -= processing_dismember if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs)) - AdjustEarDamage(30) - AdjustEarDeaf(120) + AdjustEarDamage(30, 120) if(prob(70) && !shielded) Paralyse(10) @@ -289,8 +289,7 @@ else valid_limbs -= processing_dismember if(!istype(l_ear, /obj/item/clothing/ears/earmuffs) && !istype(r_ear, /obj/item/clothing/ears/earmuffs)) - AdjustEarDamage(15) - AdjustEarDeaf(60) + AdjustEarDamage(15, 60) if(prob(50) && !shielded) Paralyse(10) @@ -731,25 +730,22 @@ if(hasHUD(usr, "security") && setcriminal != "Cancel") found_record = 1 - var/their_name = R.fields["name"] - var/their_rank = R.fields["rank"] if(R.fields["criminal"] == "*Execute*") to_chat(usr, "Unable to modify the sec status of a person with an active Execution order. Use a security computer instead.") - else + else + var/rank if(ishuman(usr)) var/mob/living/carbon/human/U = usr - R.fields["comments"] += "Set to [setcriminal] by [U.get_authentification_name()] ([U.get_assignment()]) on [current_date_string] [station_time_timestamp()] with comment: [t1]
" - if(isrobot(usr)) + rank = U.get_assignment() + else if(isrobot(usr)) var/mob/living/silicon/robot/U = usr - R.fields["comments"] += "Set to [setcriminal] by [U.name] ([U.modtype] [U.braintype]) on [current_date_string] [station_time_timestamp()] with comment: [t1]
" - if(isAI(usr)) - var/mob/living/silicon/ai/U = usr - R.fields["comments"] += "Set to [setcriminal] by [U.name] (artificial intelligence) on [current_date_string] [station_time_timestamp()] with comment: [t1]
" - - R.fields["criminal"] = setcriminal - log_admin("[key_name_admin(usr)] set secstatus of [their_rank] [their_name] to [setcriminal], comment: [t1]") - spawn() - sec_hud_set_security_status() + rank = "[U.modtype] [U.braintype]" + else if(isAI(usr)) + rank = "AI" + set_criminal_status(usr, R, setcriminal, t1, rank) + break // Git out of the securiy records loop! + if(found_record) + break // Git out of the general records if(!found_record) to_chat(usr, "Unable to locate a data core entry for this person.") @@ -1527,8 +1523,9 @@ var/obj/item/organ/external/head/head_organ = get_organ("head") var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] var/icon/hair = new /icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") - - return image(get_icon_difference(get_eyecon(), hair), layer = LIGHTING_LAYER + 1) //Cut the hair's pixels from the eyes icon so eyes covered by bangs stay hidden even while on a higher layer. + var/mutable_appearance/MA = mutable_appearance(get_icon_difference(get_eyecon(), hair), layer = LIGHTING_LAYER + 1) + MA.plane = LIGHTING_PLANE + return MA //Cut the hair's pixels from the eyes icon so eyes covered by bangs stay hidden even while on a higher layer. /*Used to check if eyes should shine in the dark. Returns the image of the eyes on the layer where they will appear to shine. Eyes need to have significantly high darksight to shine unless the mob has the XRAY vision mutation. Eyes will not shine if they are covered in any way.*/ diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm index f13d948842c..ce1d9a7f56e 100644 --- a/code/modules/mob/living/carbon/human/life.dm +++ b/code/modules/mob/living/carbon/human/life.dm @@ -786,20 +786,6 @@ AdjustEyeBlurry(-1) - //Ears - if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own - EarDeaf(1) - - else if(ear_deaf) //deafness, heals slowly over time - AdjustEarDeaf(-1) - - else if(istype(l_ear, /obj/item/clothing/ears/earmuffs) || istype(r_ear, /obj/item/clothing/ears/earmuffs)) //resting your ears with earmuffs heals ear damage faster - AdjustEarDamage(-0.15) - EarDeaf(1) - - else if(ear_damage < 25) //ear damage heals slowly under this threshold. otherwise you'll need earmuffs - AdjustEarDamage(-0.05) - if(flying) animate(src, pixel_y = pixel_y + 5 , time = 10, loop = 1, easing = SINE_EASING) animate(pixel_y = pixel_y - 5, time = 10, loop = 1, easing = SINE_EASING) diff --git a/code/modules/mob/living/carbon/human/species/_species.dm b/code/modules/mob/living/carbon/human/species/_species.dm index 5949d127f39..37b67d40f29 100644 --- a/code/modules/mob/living/carbon/human/species/_species.dm +++ b/code/modules/mob/living/carbon/human/species/_species.dm @@ -153,6 +153,9 @@ "l_foot" = list("path" = /obj/item/organ/external/foot), "r_foot" = list("path" = /obj/item/organ/external/foot/right)) + // Mutant pieces + var/obj/item/organ/internal/ears/mutantears = /obj/item/organ/internal/ears + /datum/species/New() //If the species has eyes, they are the default vision organ if(!vision_organ && has_organ["eyes"]) @@ -165,7 +168,6 @@ return species_language.get_random_name(gender) /datum/species/proc/create_organs(mob/living/carbon/human/H) //Handles creation of mob organs. - QDEL_LIST(H.internal_organs) QDEL_LIST(H.bodyparts) @@ -184,12 +186,21 @@ // organ new code calls `insert` on its own new organ(H) + create_mutant_organs(H) + for(var/name in H.bodyparts_by_name) H.bodyparts |= H.bodyparts_by_name[name] for(var/obj/item/organ/external/O in H.bodyparts) O.owner = H +/datum/species/proc/create_mutant_organs(mob/living/carbon/human/H) + var/obj/item/organ/internal/ears/ears = H.get_int_organ(/obj/item/organ/internal/ears) + if(ears) + qdel(ears) + + ears = new mutantears(H) + /datum/species/proc/breathe(mob/living/carbon/human/H) if((NO_BREATHE in species_traits) || (BREATHLESS in H.mutations)) return TRUE @@ -527,7 +538,7 @@ /datum/species/proc/handle_hud_icons_health_side(mob/living/carbon/human/H) if(H.healths) - if(H.stat == DEAD) + if(H.stat == DEAD || (H.status_flags & FAKEDEATH)) H.healths.icon_state = "health7" else switch(H.hal_screwyhud) @@ -546,7 +557,7 @@ /datum/species/proc/handle_hud_icons_health_doll(mob/living/carbon/human/H) if(H.healthdoll) - if(H.stat == DEAD) + if(H.stat == DEAD || (H.status_flags & FAKEDEATH)) H.healthdoll.icon_state = "healthdoll_DEAD" if(H.healthdoll.overlays.len) H.healthdoll.overlays.Cut() diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm index 8dff1863061..4357584a18e 100644 --- a/code/modules/mob/living/carbon/human/update_icons.dm +++ b/code/modules/mob/living/carbon/human/update_icons.dm @@ -105,68 +105,20 @@ Please contact me on #coderbus IRC. ~Carn x /mob/living/carbon/human var/list/overlays_standing[TOTAL_LAYERS] - var/list/misc_effect_overlays = list() //Overlays that are applied at a custom layer (defined in each image's .layer property) outside of standard overlay application. Updated in update_misc_effects() var/previous_damage_appearance // store what the body last looked like, so we only have to update it if something changed var/icon/skeleton var/list/cached_standing_overlays = list() // List of everything currently in a human's actual overlays -//UPDATES OVERLAYS FROM OVERLAYS_LYING/OVERLAYS_STANDING -//this proc is messy as I was forced to include some old laggy cloaking code to it so that I don't break cloakers -//I'll work on removing that stuff by rewriting some of the cloaking stuff at a later date. -/mob/living/carbon/human/update_icons() - var/stealth = 0 - var/obj/item/clothing/suit/armor/abductor/vest/V // Begin the most snowflakey bullshit code I've ever written. I'm so sorry, but there was no other way. +/mob/living/carbon/human/proc/apply_overlay(cache_index) + if((. = overlays_standing[cache_index])) + add_overlay(.) - for(V in list(wear_suit)) - if(V.stealth_active) - stealth = 1 - break +/mob/living/carbon/human/proc/remove_overlay(cache_index) + var/I = overlays_standing[cache_index] + if(I) + cut_overlay(I) + overlays_standing[cache_index] = null - if(stealth) - icon = V.disguise.icon //if the suit is active, reference the suit's current loaded icon and overlays; this does not include hand overlays - overlays.Cut() - cached_standing_overlays.Cut() // Make sure the cache gets rebuilt once the disguise is gone - - for(var/thing in V.disguise.overlays) - if(thing) - overlays += thing - - var/image/I = overlays_standing[L_HAND_LAYER] //manually add both left and right hand, so its independently updated - if(istype(I)) - overlays += I - I = overlays_standing[R_HAND_LAYER] - if(istype(I)) - overlays += I - else - icon = stand_icon - var/list/new_overlays = list() - var/list/old_overlays = cached_standing_overlays - - // Totally regenerate if something touched our overlays - if(overlays.len != old_overlays.len) - overlays.Cut() - old_overlays.Cut() - - for(var/i in 1 to TOTAL_LAYERS) - var/image/I = overlays_standing[i] - if(I) - if(istype(I)) - // Since we avoid full overlay rebuilds, we have to reorganize the layers manually - I.layer = (-2 - (TOTAL_LAYERS - i)) // Highest layer gets -2, each prior layer is 1 lower - new_overlays += I - - update_misc_effects() - if(misc_effect_overlays) - new_overlays += misc_effect_overlays - - if(frozen) // Admin freeze overlay - new_overlays += frozen - - overlays += (new_overlays - old_overlays) - overlays -= (old_overlays - new_overlays) - cached_standing_overlays = new_overlays - - update_transform() var/global/list/damage_icon_parts = list() @@ -185,38 +137,42 @@ var/global/list/damage_icon_parts = list() previous_damage_appearance = damage_appearance - var/icon/standing = new /icon(dna.species.damage_overlays, "00") - - var/image/standing_image = new /image("icon" = standing) + remove_overlay(H_DAMAGE_LAYER) + var/mutable_appearance/damage_overlay = mutable_appearance(dna.species.damage_overlays, "00", layer = -H_DAMAGE_LAYER) + overlays_standing[H_DAMAGE_LAYER] = damage_overlay // blend the individual damage states with our icons - for(var/obj/item/organ/external/O in bodyparts) - O.update_icon() - if(O.damage_state == "00") continue + for(var/D in bodyparts) + var/obj/item/organ/external/E = D + E.update_icon() + if(E.damage_state == "00") + continue + var/icon/DI - var/cache_index = "[O.damage_state]/[O.icon_name]/[dna.species.blood_color]/[dna.species.name]" + var/cache_index = "[E.damage_state]/[E.icon_name]/[dna.species.blood_color]/[dna.species.name]" if(damage_icon_parts[cache_index] == null) - DI = new /icon(dna.species.damage_overlays, O.damage_state) // the damage icon for whole human - DI.Blend(new /icon(dna.species.damage_mask, O.icon_name), ICON_MULTIPLY) // mask with this organ's pixels + DI = new /icon(dna.species.damage_overlays, E.damage_state) // the damage icon for whole human + DI.Blend(new /icon(dna.species.damage_mask, E.icon_name), ICON_MULTIPLY) // mask with this organ's pixels DI.Blend(dna.species.blood_color, ICON_MULTIPLY) damage_icon_parts[cache_index] = DI else DI = damage_icon_parts[cache_index] - standing_image.overlays += DI + damage_overlay.overlays += DI - overlays_standing[H_DAMAGE_LAYER] = standing_image + apply_overlay(H_DAMAGE_LAYER) - if(update_icons) update_icons() //BASE MOB SPRITE /mob/living/carbon/human/proc/update_body(var/update_icons=1, var/rebuild_base=0) + remove_overlay(BODY_LAYER) + remove_overlay(LIMBS_LAYER) // So we don't get the old species' sprite splatted on top of the new one's + remove_overlay(UNDERWEAR_LAYER) - var/husk_color_mod = rgb(96,88,80) - var/hulk_color_mod = rgb(48,224,40) + var/husk_color_mod = rgb(96, 88, 80) + var/hulk_color_mod = rgb(48, 224, 40) var/husk = (HUSK in mutations) - var/fat = (FAT in mutations) var/hulk = (HULK in mutations) var/skeleton = (SKELETON in mutations) @@ -228,42 +184,18 @@ var/global/list/damage_icon_parts = list() //Create a new, blank icon for our mob to use. if(stand_icon) qdel(stand_icon) - stand_icon = new(dna.species.icon_template ? dna.species.icon_template : 'icons/mob/human.dmi',"blank") - var/icon_key = "" - var/obj/item/organ/internal/eyes/eyes = get_int_organ(/obj/item/organ/internal/eyes) - if(eyes) - icon_key += "[eyes.eye_colour]" - else - icon_key += "#000000" + update_misc_effects() + stand_icon = new (dna.species.icon_template ? dna.species.icon_template : 'icons/mob/human.dmi', "blank") + var/list/standing = list() + var/icon_key = generate_icon_render_key() - for(var/organ_tag in dna.species.has_limbs) - var/obj/item/organ/external/part = bodyparts_by_name[organ_tag] - if(isnull(part)) - icon_key += "0" - else if(part.is_robotic()) - icon_key += "2[part.model ? "-[part.model]": ""]" - else if(part.status & ORGAN_DEAD) - icon_key += "3" - else - icon_key += "1" - - if(part) - var/datum/species/S = GLOB.all_species[part.dna.species.name] //This has to reference the species datums from round start, since they're global and unchanging - icon_key += "[S.race_key]" - icon_key += "[part.dna.GetUIState(DNA_UI_GENDER)]" - icon_key += "[part.dna.GetUIValue(DNA_UI_SKIN_TONE)]" - if(part.s_col) - icon_key += "[part.s_col]" - if(part.s_tone) - icon_key += "[part.s_tone]" - - icon_key = "[icon_key][husk ? 1 : 0][fat ? 1 : 0][hulk ? 1 : 0][skeleton ? 1 : 0]" - - var/icon/base_icon + var/mutable_appearance/base if(human_icon_cache[icon_key] && !rebuild_base) - base_icon = human_icon_cache[icon_key] + base = human_icon_cache[icon_key] + standing += base else + var/icon/base_icon //BEGIN CACHED ICON GENERATION. var/obj/item/organ/external/chest = get_organ("chest") base_icon = chest.get_icon(skeleton) @@ -272,7 +204,7 @@ var/global/list/damage_icon_parts = list() var/icon/temp = part.get_icon(skeleton) //That part makes left and right legs drawn topmost and lowermost when human looks WEST or EAST //And no change in rendering for other parts (they icon_position is 0, so goes to 'else' part) - if(part.icon_position&(LEFT|RIGHT)) + if(part.icon_position & (LEFT | RIGHT)) var/icon/temp2 = new('icons/mob/human.dmi',"blank") temp2.Insert(new/icon(temp,dir=NORTH),dir=NORTH) temp2.Insert(new/icon(temp,dir=SOUTH),dir=SOUTH) @@ -304,19 +236,16 @@ var/global/list/damage_icon_parts = list() husk_over.Blend(mask, ICON_ADD) base_icon.Blend(husk_over, ICON_OVERLAY) - human_icon_cache[icon_key] = base_icon + var/mutable_appearance/new_base = mutable_appearance(base_icon, layer = -LIMBS_LAYER) + human_icon_cache[icon_key] = new_base + standing += new_base + //END CACHED ICON GENERATION. - //END CACHED ICON GENERATION. - stand_icon.Blend(base_icon,ICON_OVERLAY) - if((!body_accessory || istype(body_accessory, /datum/body_accessory/tail)) && dna.species.bodyflags & TAIL_OVERLAPPED) // If the user's species is flagged to have a tail that needs to be overlapped by limbs... (having a non-tail body accessory like the snake body will override this) - overlays_standing[LIMBS_LAYER] = image(stand_icon) // Diverts limbs to their own layer so they can overlay things (i.e. tails). - else - overlays_standing[LIMBS_LAYER] = null // So we don't get the old species' sprite splatted on top of the new one's + overlays_standing[LIMBS_LAYER] = standing + apply_overlay(LIMBS_LAYER) //Underwear - overlays_standing[UNDERWEAR_LAYER] = null - var/icon/underwear_standing = new/icon('icons/mob/underwear.dmi',"nude") - + var/icon/underwear_standing = new /icon('icons/mob/underwear.dmi', "nude") if(underwear && dna.species.clothing_flags & HAS_UNDERWEAR) var/datum/sprite_accessory/underwear/U = GLOB.underwear_list[underwear] if(U) @@ -327,27 +256,25 @@ var/global/list/damage_icon_parts = list() if(U2) underwear_standing.Blend(new /icon(U2.icon, "us_[U2.icon_state]_s"), ICON_OVERLAY) - if(socks && dna.species.clothing_flags & HAS_SOCKS) var/datum/sprite_accessory/socks/U3 = GLOB.socks_list[socks] if(U3) underwear_standing.Blend(new /icon(U3.icon, "sk_[U3.icon_state]_s"), ICON_OVERLAY) if(underwear_standing) - overlays_standing[UNDERWEAR_LAYER] = image(underwear_standing) - - - if(update_icons) - update_icons() + overlays_standing[UNDERWEAR_LAYER] = mutable_appearance(underwear_standing, layer = -UNDERWEAR_LAYER) + apply_overlay(UNDERWEAR_LAYER) if(lip_style && (LIPS in dna.species.species_traits)) - var/icon/lips = icon("icon"='icons/mob/human_face.dmi', "icon_state"="lips_[lip_style]_s") + var/icon/lips = icon("icon" = 'icons/mob/human_face.dmi', "icon_state" = "lips_[lip_style]_s") lips.Blend(lip_color, ICON_ADD) + standing += mutable_appearance(lips, layer = -BODY_LAYER) - stand_icon.Blend(lips, ICON_OVERLAY) - + overlays_standing[BODY_LAYER] = standing + apply_overlay(BODY_LAYER) //tail update_tail_layer(0) + update_int_organs() //head accessory update_head_accessory(0) //markings @@ -360,10 +287,10 @@ var/global/list/damage_icon_parts = list() //MARKINGS OVERLAY /mob/living/carbon/human/proc/update_markings(var/update_icons=1) //Reset our markings. - overlays_standing[MARKINGS_LAYER] = null + remove_overlay(MARKINGS_LAYER) //Base icon. - var/icon/markings_standing = new/icon('icons/mob/body_accessory.dmi',"accessory_none_s") + var/icon/markings_standing = icon("icon" = 'icons/mob/body_accessory.dmi', "icon_state" = "accessory_none_s") //Body markings. var/obj/item/organ/external/chest/chest_organ = get_organ("chest") @@ -371,7 +298,7 @@ var/global/list/damage_icon_parts = list() var/body_marking = m_styles["body"] var/datum/sprite_accessory/body_marking_style = GLOB.marking_styles_list[body_marking] if(body_marking_style && body_marking_style.species_allowed && (dna.species.name in body_marking_style.species_allowed)) - var/icon/b_marking_s = new/icon("icon" = body_marking_style.icon, "icon_state" = "[body_marking_style.icon_state]_s") + var/icon/b_marking_s = icon("icon" = body_marking_style.icon, "icon_state" = "[body_marking_style.icon_state]_s") if(body_marking_style.do_colouration) b_marking_s.Blend(m_colours["body"], ICON_ADD) markings_standing.Blend(b_marking_s, ICON_OVERLAY) @@ -381,33 +308,30 @@ var/global/list/damage_icon_parts = list() var/head_marking = m_styles["head"] var/datum/sprite_accessory/head_marking_style = GLOB.marking_styles_list[head_marking] if(head_marking_style && head_marking_style.species_allowed && (head_organ.dna.species.name in head_marking_style.species_allowed)) - var/icon/h_marking_s = new/icon("icon" = head_marking_style.icon, "icon_state" = "[head_marking_style.icon_state]_s") + var/icon/h_marking_s = icon("icon" = head_marking_style.icon, "icon_state" = "[head_marking_style.icon_state]_s") if(head_marking_style.do_colouration) h_marking_s.Blend(m_colours["head"], ICON_ADD) markings_standing.Blend(h_marking_s, ICON_OVERLAY) - overlays_standing[MARKINGS_LAYER] = image(markings_standing) - - if(update_icons) update_icons() + overlays_standing[MARKINGS_LAYER] = mutable_appearance(markings_standing, layer = -MARKINGS_LAYER) + apply_overlay(MARKINGS_LAYER) //HEAD ACCESSORY OVERLAY /mob/living/carbon/human/proc/update_head_accessory(var/update_icons=1) //Reset our head accessory - overlays_standing[HEAD_ACCESSORY_LAYER] = null - overlays_standing[HEAD_ACC_OVER_LAYER] = null + remove_overlay(HEAD_ACCESSORY_LAYER) + remove_overlay(HEAD_ACC_OVER_LAYER) var/obj/item/organ/external/head/head_organ = get_organ("head") if(!head_organ) - if(update_icons) update_icons() return //masks and helmets can obscure our head accessory if((head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) - if(update_icons) update_icons() return //base icons - var/icon/head_accessory_standing = new /icon('icons/mob/body_accessory.dmi',"accessory_none_s") + var/icon/head_accessory_standing = new /icon('icons/mob/body_accessory.dmi',"accessory_none_s") if(head_organ.ha_style && (head_organ.dna.species.bodyflags & HAS_HEAD_ACCESSORY)) var/datum/sprite_accessory/head_accessory/head_accessory_style = GLOB.head_accessory_styles_list[head_organ.ha_style] if(head_accessory_style && head_accessory_style.species_allowed) @@ -419,38 +343,33 @@ var/global/list/damage_icon_parts = list() //Having it this way preserves animations. Useful for animated antennae. if(head_accessory_style.over_hair) //Select which layer to use based on the properties of the head accessory style. - overlays_standing[HEAD_ACC_OVER_LAYER] = image(head_accessory_standing) + overlays_standing[HEAD_ACC_OVER_LAYER] = mutable_appearance(head_accessory_standing, layer = -HEAD_ACC_OVER_LAYER) + apply_overlay(HEAD_ACC_OVER_LAYER) else - overlays_standing[HEAD_ACCESSORY_LAYER] = image(head_accessory_standing) + overlays_standing[HEAD_ACCESSORY_LAYER] = mutable_appearance(head_accessory_standing, layer = -HEAD_ACCESSORY_LAYER) + apply_overlay(HEAD_ACCESSORY_LAYER) else //warning("Invalid ha_style for [species.name]: [ha_style]") - if(update_icons) update_icons() //HAIR OVERLAY /mob/living/carbon/human/proc/update_hair(var/update_icons=1) //Reset our hair - overlays_standing[HAIR_LAYER] = null + remove_overlay(HAIR_LAYER) var/obj/item/organ/external/head/head_organ = get_organ("head") if(!head_organ) - if(update_icons) update_icons() return //masks and helmets can obscure our hair, unless we're a synthetic if((head && (head.flags & BLOCKHAIR)) || (wear_mask && (wear_mask.flags & BLOCKHAIR))) - if(update_icons) update_icons() return //base icons var/icon/hair_standing = new /icon('icons/mob/human_face.dmi',"bald_s") - //var/icon/debrained_s = new /icon("icon"='icons/mob/human_face.dmi', "icon_state" = "debrained_s") - if(head_organ.h_style && !(head && (head.flags & BLOCKHEADHAIR) && !(isSynthetic()))) var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] - //if(!src.get_int_organ(/obj/item/organ/internal/brain) && !ismachine(src))//make it obvious we have NO BRAIN - // hair_standing.Blend(debrained_s, ICON_OVERLAY) if(hair_style && hair_style.species_allowed) if((head_organ.dna.species.name in hair_style.species_allowed) || (head_organ.dna.species.bodyflags & ALL_RPARTS)) //If the head's species is in the list of allowed species for the hairstyle, or the head's species is one flagged to have bodies comprised wholly of cybernetics... var/icon/hair_s = new/icon("icon" = hair_style.icon, "icon_state" = "[hair_style.icon_state]_s") @@ -471,30 +390,26 @@ var/global/list/damage_icon_parts = list() //warning("Invalid h_style for [species.name]: [h_style]") //hair_standing.Blend(debrained_s, ICON_OVERLAY)//how does i overlay for fish? - overlays_standing[HAIR_LAYER] = image(hair_standing) - - if(update_icons) update_icons() + overlays_standing[HAIR_LAYER] = mutable_appearance(hair_standing, layer = -HAIR_LAYER) + apply_overlay(HAIR_LAYER) //FACIAL HAIR OVERLAY /mob/living/carbon/human/proc/update_fhair(var/update_icons=1) //Reset our facial hair - overlays_standing[FHAIR_LAYER] = null - overlays_standing[FHAIR_OVER_LAYER] = null + remove_overlay(FHAIR_LAYER) + remove_overlay(FHAIR_OVER_LAYER) var/obj/item/organ/external/head/head_organ = get_organ("head") if(!head_organ) - if(update_icons) update_icons() 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(update_icons) update_icons() return //base icons var/icon/face_standing = new /icon('icons/mob/human_face.dmi',"bald_s") - if(head_organ.f_style) var/datum/sprite_accessory/facial_hair/facial_hair_style = GLOB.facial_hair_styles_list[head_organ.f_style] if(facial_hair_style && facial_hair_style.species_allowed) @@ -514,46 +429,49 @@ var/global/list/damage_icon_parts = list() face_standing.Blend(facial_s, ICON_OVERLAY) if(facial_hair_style.over_hair) //Select which layer to use based on the properties of the facial hair style. - overlays_standing[FHAIR_OVER_LAYER] = image(face_standing) + overlays_standing[FHAIR_OVER_LAYER] = mutable_appearance(face_standing, layer = -FHAIR_OVER_LAYER) + apply_overlay(FHAIR_OVER_LAYER) else - overlays_standing[FHAIR_LAYER] = image(face_standing) + overlays_standing[FHAIR_LAYER] = mutable_appearance(face_standing, layer = -FHAIR_LAYER) + apply_overlay(FHAIR_LAYER) else //warning("Invalid f_style for [species.name]: [f_style]") - if(update_icons) update_icons() + /mob/living/carbon/human/update_mutations(var/update_icons=1) + remove_overlay(MUTATIONS_LAYER) var/fat if(FAT in mutations) fat = "fat" - var/image/standing = image("icon" = 'icons/effects/genetics.dmi') + var/mutable_appearance/standing = mutable_appearance('icons/effects/genetics.dmi', layer = -MUTATIONS_LAYER) var/add_image = 0 var/g = "m" - if(gender == FEMALE) g = "f" + if(gender == FEMALE) + g = "f" // DNA2 - Drawing underlays. for(var/datum/dna/gene/gene in dna_genes) if(!gene.block) continue if(gene.is_active(src)) - var/underlay=gene.OnDrawUnderlays(src,g,fat) + var/underlay = gene.OnDrawUnderlays(src, g, fat) if(underlay) standing.underlays += underlay add_image = 1 for(var/mut in mutations) switch(mut) if(LASER) - standing.overlays += "lasereyes_s" + standing.overlays += "lasereyes_s" add_image = 1 if((COLDRES in mutations) && (HEATRES in mutations)) - standing.underlays -= "cold[fat]_s" - standing.underlays -= "fire[fat]_s" - standing.underlays += "coldfire[fat]_s" + standing.underlays -= "cold[fat]_s" + standing.underlays -= "fire[fat]_s" + standing.underlays += "coldfire[fat]_s" + if(add_image) - overlays_standing[MUTATIONS_LAYER] = standing - else - overlays_standing[MUTATIONS_LAYER] = null - if(update_icons) update_icons() + overlays_standing[MUTATIONS_LAYER] = standing + apply_overlay(MUTATIONS_LAYER) /mob/living/carbon/human/proc/update_mutantrace(var/update_icons=1) @@ -566,17 +484,14 @@ var/global/list/damage_icon_parts = list() update_hair(0) update_fhair(0) - if(update_icons) update_icons() /mob/living/carbon/human/update_fire() + remove_overlay(FIRE_LAYER) if(on_fire) if(!overlays_standing[FIRE_LAYER]) - overlays_standing[FIRE_LAYER] = image("icon"=fire_dmi, "icon_state"=fire_sprite) - update_icons() - else - overlays_standing[FIRE_LAYER] = null - update_icons() + overlays_standing[FIRE_LAYER] = mutable_appearance(fire_dmi, fire_sprite, layer = -FIRE_LAYER) + apply_overlay(FIRE_LAYER) /* --------------------------------------- */ //For legacy support. @@ -617,7 +532,7 @@ var/global/list/damage_icon_parts = list() //vvvvvv UPDATE_INV PROCS vvvvvv /mob/living/carbon/human/update_inv_w_uniform(var/update_icons=1) - + remove_overlay(UNIFORM_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_w_uniform] if(inv) @@ -630,9 +545,10 @@ var/global/list/damage_icon_parts = list() client.screen += w_uniform //Either way, add the item to the HUD var/t_color = w_uniform.item_color - if(!t_color) t_color = icon_state - var/image/standing = image("icon_state" = "[t_color]_s") + if(!t_color) + t_color = icon_state + var/mutable_appearance/standing = mutable_appearance('icons/mob/uniform.dmi', "[t_color]_s", layer = -UNIFORM_LAYER) if(FAT in mutations) if(w_uniform.flags_size & ONESIZEFITSALL) standing.icon = 'icons/mob/uniform_fat.dmi' @@ -640,8 +556,6 @@ var/global/list/damage_icon_parts = list() to_chat(src, "You burst out of \the [w_uniform]!") unEquip(w_uniform) return - else - standing.icon = 'icons/mob/uniform.dmi' if(w_uniform.icon_override) standing.icon = w_uniform.icon_override @@ -650,13 +564,14 @@ var/global/list/damage_icon_parts = list() if(w_uniform.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "uniformblood") - bloodsies.color = w_uniform.blood_color - standing.overlays += bloodsies + bloodsies.color = w_uniform.blood_color + standing.overlays += bloodsies - if(w_uniform:accessories.len) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. + if(w_uniform:accessories.len) //WE CHECKED THE TYPE ABOVE. THIS REALLY SHOULD BE FINE. // oh my god kys whoever made this if statement jfc :gun: for(var/obj/item/clothing/accessory/A in w_uniform:accessories) var/tie_color = A.item_color - if(!tie_color) tie_color = A.icon_state + if(!tie_color) + tie_color = A.icon_state if(A.icon_override) standing.overlays += image("icon" = A.icon_override, "icon_state" = "[A.icon_state]") else if(A.sprite_sheets && A.sprite_sheets[dna.species.name]) @@ -664,25 +579,24 @@ var/global/list/damage_icon_parts = list() else standing.overlays += image("icon" = 'icons/mob/ties.dmi', "icon_state" = "[tie_color]") - overlays_standing[UNIFORM_LAYER] = standing + overlays_standing[UNIFORM_LAYER] = standing else - overlays_standing[UNIFORM_LAYER] = null // Automatically drop anything in store / id / belt if you're not wearing a uniform. //CHECK IF NECESARRY - for( var/obj/item/thing in list(r_store, l_store, wear_id, wear_pda, belt) ) // - if(thing) // - unEquip(thing) // - if(client) // - client.screen -= thing // - // + for(var/obj/item/thing in list(r_store, l_store, wear_id, wear_pda, belt)) // whoever made this + if(thing) // you're a piece of fucking garbage + unEquip(thing) // why the fuck would you goddamn do this motherfucking shit + if(client) // INVENTORY CODE IN FUCKING ICON CODE + client.screen -= thing // WHAT THE FUCKING FUCK BAY GODDAMNIT + // **I FUCKING HATE YOU AAAAAAAAAA** if(thing) // thing.loc = loc // thing.dropped(src) // thing.layer = initial(thing.layer) thing.plane = initial(thing.plane) - if(update_icons) update_icons() + apply_overlay(UNIFORM_LAYER) /mob/living/carbon/human/update_inv_wear_id(var/update_icons=1) - + remove_overlay(ID_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_id] if(inv) @@ -694,16 +608,11 @@ var/global/list/damage_icon_parts = list() client.screen += wear_id if(w_uniform && w_uniform:displays_id) - overlays_standing[ID_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "id") - else - overlays_standing[ID_LAYER] = null - else - overlays_standing[ID_LAYER] = null - - if(update_icons) update_icons() + overlays_standing[ID_LAYER] = mutable_appearance('icons/mob/mob.dmi', "id", layer = -ID_LAYER) + apply_overlay(ID_LAYER) /mob/living/carbon/human/update_inv_gloves(var/update_icons=1) - + remove_overlay(GLOVES_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_gloves] if(inv) @@ -718,32 +627,30 @@ var/global/list/damage_icon_parts = list() var/t_state = gloves.item_state if(!t_state) t_state = gloves.icon_state - var/image/standing + var/mutable_appearance/standing if(gloves.icon_override) - standing = image("icon" = gloves.icon_override, "icon_state" = "[t_state]") + standing = mutable_appearance(gloves.icon_override, "[t_state]", layer = -GLOVES_LAYER) else if(gloves.sprite_sheets && gloves.sprite_sheets[dna.species.name]) - standing = image("icon" = gloves.sprite_sheets[dna.species.name], "icon_state" = "[t_state]") + standing = mutable_appearance(gloves.sprite_sheets[dna.species.name], "[t_state]", layer = -GLOVES_LAYER) else - standing = image("icon" = 'icons/mob/hands.dmi', "icon_state" = "[t_state]") + standing = mutable_appearance('icons/mob/hands.dmi', "[t_state]", layer = -GLOVES_LAYER) if(gloves.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") bloodsies.color = gloves.blood_color - standing.overlays += bloodsies + standing.overlays += bloodsies overlays_standing[GLOVES_LAYER] = standing else if(blood_DNA) - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "bloodyhands") + var/mutable_appearance/bloodsies = mutable_appearance(dna.species.blood_mask, "bloodyhands", layer = -GLOVES_LAYER) bloodsies.color = hand_blood_color overlays_standing[GLOVES_LAYER] = bloodsies - else - overlays_standing[GLOVES_LAYER] = null - if(update_icons) update_icons() + apply_overlay(GLOVES_LAYER) /mob/living/carbon/human/update_inv_glasses(var/update_icons=1) - overlays_standing[GLASSES_LAYER] = null - overlays_standing[GLASSES_OVER_LAYER] = null + remove_overlay(GLASSES_LAYER) + remove_overlay(GLASSES_OVER_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_glasses] @@ -751,7 +658,7 @@ var/global/list/damage_icon_parts = list() inv.update_icon() if(glasses) - var/image/new_glasses + var/mutable_appearance/new_glasses var/obj/item/organ/external/head/head_organ = get_organ("head") if(client && hud_used && hud_used.hud_shown) if(hud_used.inventory_shown) //if the inventory is open ... @@ -759,22 +666,23 @@ var/global/list/damage_icon_parts = list() client.screen += glasses //Either way, add the item to the HUD if(glasses.icon_override) - new_glasses = image("icon" = glasses.icon_override, "icon_state" = "[glasses.icon_state]") + new_glasses = mutable_appearance(glasses.icon_override, "[glasses.icon_state]", layer = -GLASSES_LAYER) else if(glasses.sprite_sheets && glasses.sprite_sheets[head_organ.dna.species.name]) - new_glasses = image("icon" = glasses.sprite_sheets[head_organ.dna.species.name], "icon_state" = "[glasses.icon_state]") + new_glasses = mutable_appearance(glasses.sprite_sheets[head_organ.dna.species.name], "[glasses.icon_state]", layer = -GLASSES_LAYER) else - new_glasses = image("icon" = 'icons/mob/eyes.dmi', "icon_state" = "[glasses.icon_state]") + new_glasses = mutable_appearance('icons/mob/eyes.dmi', "[glasses.icon_state]", layer = -GLASSES_LAYER) var/datum/sprite_accessory/hair/hair_style = GLOB.hair_styles_full_list[head_organ.h_style] if(hair_style && hair_style.glasses_over) //Select which layer to use based on the properties of the hair style. Hair styles with hair that don't overhang the arms of the glasses should have glasses_over set to a positive value. + new_glasses.layer = -GLASSES_OVER_LAYER overlays_standing[GLASSES_OVER_LAYER] = new_glasses + apply_overlay(GLASSES_OVER_LAYER) else overlays_standing[GLASSES_LAYER] = new_glasses - - if(update_icons) update_icons() + apply_overlay(GLASSES_LAYER) /mob/living/carbon/human/update_inv_ears(var/update_icons=1) - + remove_overlay(EARS_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_l_ear] if(inv) @@ -795,12 +703,12 @@ var/global/list/damage_icon_parts = list() var/t_type = l_ear.icon_state if(l_ear.icon_override) t_type = "[t_type]_l" - overlays_standing[EARS_LAYER] = image("icon" = l_ear.icon_override, "icon_state" = "[t_type]") + overlays_standing[EARS_LAYER] = mutable_appearance(l_ear.icon_override, "[t_type]", layer = -EARS_LAYER) else if(l_ear.sprite_sheets && l_ear.sprite_sheets[dna.species.name]) t_type = "[t_type]_l" - overlays_standing[EARS_LAYER] = image("icon" = l_ear.sprite_sheets[dna.species.name], "icon_state" = "[t_type]") + overlays_standing[EARS_LAYER] = mutable_appearance(l_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) if(r_ear) if(client && hud_used && hud_used.hud_shown) @@ -811,19 +719,16 @@ var/global/list/damage_icon_parts = list() var/t_type = r_ear.icon_state if(r_ear.icon_override) t_type = "[t_type]_r" - overlays_standing[EARS_LAYER] = image("icon" = r_ear.icon_override, "icon_state" = "[t_type]") + overlays_standing[EARS_LAYER] = mutable_appearance(r_ear.icon_override, "[t_type]", layer = -EARS_LAYER) else if(r_ear.sprite_sheets && r_ear.sprite_sheets[dna.species.name]) t_type = "[t_type]_r" - overlays_standing[EARS_LAYER] = image("icon" = r_ear.sprite_sheets[dna.species.name], "icon_state" = "[t_type]") + overlays_standing[EARS_LAYER] = mutable_appearance(r_ear.sprite_sheets[dna.species.name], "[t_type]", layer = -EARS_LAYER) else - overlays_standing[EARS_LAYER] = image("icon" = 'icons/mob/ears.dmi', "icon_state" = "[t_type]") - - else - overlays_standing[EARS_LAYER] = null - if(update_icons) update_icons() + overlays_standing[EARS_LAYER] = mutable_appearance('icons/mob/ears.dmi', "[t_type]", layer = -EARS_LAYER) + apply_overlay(EARS_LAYER) /mob/living/carbon/human/update_inv_shoes(var/update_icons=1) - + remove_overlay(SHOES_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_shoes] if(inv) @@ -835,13 +740,13 @@ var/global/list/damage_icon_parts = list() shoes.screen_loc = ui_shoes //...draw the item in the inventory screen client.screen += shoes //Either way, add the item to the HUD - var/image/standing + var/mutable_appearance/standing if(shoes.icon_override) - standing = image("icon" = shoes.icon_override, "icon_state" = "[shoes.icon_state]") + standing = mutable_appearance(shoes.icon_override, "[shoes.icon_state]", layer = -SHOES_LAYER) else if(shoes.sprite_sheets && shoes.sprite_sheets[dna.species.name]) - standing = image("icon" = shoes.sprite_sheets[dna.species.name], "icon_state" = "[shoes.icon_state]") + standing = mutable_appearance(shoes.sprite_sheets[dna.species.name], "[shoes.icon_state]", layer = -SHOES_LAYER) else - standing = image("icon" = 'icons/mob/feet.dmi', "icon_state" = "[shoes.icon_state]") + standing = mutable_appearance('icons/mob/feet.dmi', "[shoes.icon_state]", layer = -SHOES_LAYER) if(shoes.blood_DNA) @@ -851,15 +756,13 @@ var/global/list/damage_icon_parts = list() overlays_standing[SHOES_LAYER] = standing else if(feet_blood_DNA) - var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "shoeblood") + var/mutable_appearance/bloodsies = mutable_appearance(dna.species.blood_mask, "shoeblood", layer = -SHOES_LAYER) bloodsies.color = feet_blood_color overlays_standing[SHOES_LAYER] = bloodsies - else - overlays_standing[SHOES_LAYER] = null - if(update_icons) update_icons() + apply_overlay(SHOES_LAYER) /mob/living/carbon/human/update_inv_s_store(var/update_icons=1) - + remove_overlay(SUIT_STORE_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_s_store] if(inv) @@ -874,42 +777,37 @@ var/global/list/damage_icon_parts = list() if(!t_state) t_state = s_store.icon_state var/dmi='icons/mob/belt_mirror.dmi' - overlays_standing[SUIT_STORE_LAYER] = image("icon" = dmi, "icon_state" = "[t_state]") + overlays_standing[SUIT_STORE_LAYER] = mutable_appearance(dmi, "[t_state]", layer = -SUIT_STORE_LAYER) s_store.screen_loc = ui_sstore1 //TODO - else - overlays_standing[SUIT_STORE_LAYER] = null - if(update_icons) update_icons() + apply_overlay(SUIT_STORE_LAYER) /mob/living/carbon/human/update_inv_head(var/update_icons=1) ..() + remove_overlay(HEAD_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_head] if(inv) inv.update_icon() if(head) - var/image/standing + var/mutable_appearance/standing if(head.icon_override) - standing = image("icon" = head.icon_override, "icon_state" = "[head.icon_state]") + standing = mutable_appearance(head.icon_override, "[head.icon_state]", layer = -HEAD_LAYER) else if(head.sprite_sheets && head.sprite_sheets[dna.species.name]) - standing = image("icon" = head.sprite_sheets[dna.species.name], "icon_state" = "[head.icon_state]") + standing = mutable_appearance(head.sprite_sheets[dna.species.name], "[head.icon_state]", layer = -HEAD_LAYER) else - standing = image("icon" = 'icons/mob/head.dmi', "icon_state" = "[head.icon_state]") + standing = mutable_appearance('icons/mob/head.dmi', "[head.icon_state]", layer = -HEAD_LAYER) if(head.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "helmetblood") bloodsies.color = head.blood_color - standing.overlays += bloodsies - overlays_standing[HEAD_LAYER] = standing - - - else - overlays_standing[HEAD_LAYER] = null - if(update_icons) update_icons() + standing.overlays += bloodsies + overlays_standing[HEAD_LAYER] = standing + apply_overlay(HEAD_LAYER) /mob/living/carbon/human/update_inv_belt(var/update_icons=1) - + remove_overlay(BELT_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_belt] if(inv) @@ -921,21 +819,21 @@ var/global/list/damage_icon_parts = list() if(belt) var/t_state = belt.item_state - if(!t_state) t_state = belt.icon_state + if(!t_state) + t_state = belt.icon_state if(belt.icon_override) t_state = "[t_state]_be" - overlays_standing[BELT_LAYER] = image("icon" = belt.icon_override, "icon_state" = "[t_state]") + overlays_standing[BELT_LAYER] = mutable_appearance(belt.icon_override, "[t_state]", layer = -BELT_LAYER) else if(belt.sprite_sheets && belt.sprite_sheets[dna.species.name]) - overlays_standing[BELT_LAYER] = image("icon" = belt.sprite_sheets[dna.species.name], "icon_state" = "[t_state]") + overlays_standing[BELT_LAYER] = mutable_appearance(belt.sprite_sheets[dna.species.name], "[t_state]", layer = -BELT_LAYER) else - overlays_standing[BELT_LAYER] = image("icon" = 'icons/mob/belt.dmi', "icon_state" = "[t_state]") - else - overlays_standing[BELT_LAYER] = null - if(update_icons) update_icons() + overlays_standing[BELT_LAYER] = mutable_appearance('icons/mob/belt.dmi', "[t_state]", layer = -BELT_LAYER) + apply_overlay(BELT_LAYER) /mob/living/carbon/human/update_inv_wear_suit(var/update_icons=1) + remove_overlay(SUIT_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_suit] if(inv) @@ -947,47 +845,37 @@ var/global/list/damage_icon_parts = list() wear_suit.screen_loc = ui_oclothing //TODO //...draw the item in the inventory screen client.screen += wear_suit //Either way, add the item to the HUD - var/image/standing + var/mutable_appearance/standing if(wear_suit.icon_override) - standing = image("icon" = wear_suit.icon_override, "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance(wear_suit.icon_override, "[wear_suit.icon_state]", layer = -SUIT_LAYER) else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name]) - standing = image("icon" = wear_suit.sprite_sheets[dna.species.name], "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance(wear_suit.sprite_sheets[dna.species.name], "[wear_suit.icon_state]", layer = -SUIT_LAYER) else if(FAT in mutations) if(wear_suit.flags_size & ONESIZEFITSALL) - standing = image("icon" = 'icons/mob/suit_fat.dmi', "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance('icons/mob/suit_fat.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) else to_chat(src, "You burst out of \the [wear_suit]!") unEquip(wear_suit) return else - standing = image("icon" = 'icons/mob/suit.dmi', "icon_state" = "[wear_suit.icon_state]") - + standing = mutable_appearance('icons/mob/suit.dmi', "[wear_suit.icon_state]", layer = -SUIT_LAYER) if(wear_suit.breakouttime) drop_l_hand() drop_r_hand() - if(wear_suit.blood_DNA) var/obj/item/clothing/suit/S = wear_suit var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "[S.blood_overlay_type]blood") bloodsies.color = wear_suit.blood_color - standing.overlays += bloodsies + standing.overlays += bloodsies + overlays_standing[SUIT_LAYER] = standing - overlays_standing[SUIT_LAYER] = standing - - update_tail_layer(0) - - else - overlays_standing[SUIT_LAYER] = null - - update_tail_layer(0) - + apply_overlay(SUIT_LAYER) + update_tail_layer(0) update_collar(0) - if(update_icons) update_icons() - /mob/living/carbon/human/update_inv_pockets() if(client && hud_used) var/obj/screen/inventory/inv @@ -1021,6 +909,7 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/update_inv_wear_mask(var/update_icons = 1) ..() + remove_overlay(FACEMASK_LAYER) if(client && hud_used) var/obj/screen/inventory/inv = hud_used.inv_slots[slot_wear_mask] if(inv) @@ -1031,107 +920,94 @@ var/global/list/damage_icon_parts = list() if(head_organ.alt_head && head_organ.alt_head != "None") alternate_head = GLOB.alt_heads_list[head_organ.alt_head] - var/image/standing + var/mutable_appearance/standing var/icon/mask_icon = new(wear_mask.icon) if(wear_mask.icon_override) mask_icon = new(wear_mask.icon_override) - standing = image("icon" = wear_mask.icon_override, "icon_state" = "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]") + standing = mutable_appearance(wear_mask.icon_override, "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) else if(wear_mask.sprite_sheets && wear_mask.sprite_sheets[dna.species.name]) mask_icon = new(wear_mask.sprite_sheets[dna.species.name]) - standing = image("icon" = wear_mask.sprite_sheets[dna.species.name], "icon_state" = "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]") + standing = mutable_appearance(wear_mask.sprite_sheets[dna.species.name], "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) else - standing = image("icon" = 'icons/mob/mask.dmi', "icon_state" = "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]") + standing = mutable_appearance('icons/mob/mask.dmi', "[wear_mask.icon_state][(alternate_head && ("[wear_mask.icon_state]_[alternate_head.suffix]" in mask_icon.IconStates())) ? "_[alternate_head.suffix]" : ""]", layer = -FACEMASK_LAYER) if(!istype(wear_mask, /obj/item/clothing/mask/cigarette) && wear_mask.blood_DNA) var/image/bloodsies = image("icon" = dna.species.blood_mask, "icon_state" = "maskblood") bloodsies.color = wear_mask.blood_color standing.overlays += bloodsies - overlays_standing[FACEMASK_LAYER] = standing - else - overlays_standing[FACEMASK_LAYER] = null - if(update_icons) update_icons() + overlays_standing[FACEMASK_LAYER] = standing + apply_overlay(FACEMASK_LAYER) /mob/living/carbon/human/update_inv_back(var/update_icons=1) ..() + remove_overlay(BACK_LAYER) if(back) //determine the icon to use - var/icon/standing + var/mutable_appearance/standing if(back.icon_override) - standing = image("icon" = back.icon_override, "icon_state" = "[back.icon_state]") + standing = mutable_appearance(back.icon_override, "[back.icon_state]", layer = -BACK_LAYER) else if(istype(back, /obj/item/rig)) //If this is a rig and a mob_icon is set, it will take species into account in the rig update_icon() proc. var/obj/item/rig/rig = back standing = rig.mob_icon else if(back.sprite_sheets && back.sprite_sheets[dna.species.name]) - standing = image("icon" = back.sprite_sheets[dna.species.name], "icon_state" = "[back.icon_state]") + standing = mutable_appearance(back.sprite_sheets[dna.species.name], "[back.icon_state]", layer = -BACK_LAYER) else - standing = image("icon" = 'icons/mob/back.dmi', "icon_state" = "[back.icon_state]") + standing = mutable_appearance('icons/mob/back.dmi', "[back.icon_state]", layer = -BACK_LAYER) //create the image overlays_standing[BACK_LAYER] = standing - else - overlays_standing[BACK_LAYER] = null - - if(update_icons) update_icons() + apply_overlay(BACK_LAYER) /mob/living/carbon/human/update_inv_handcuffed(var/update_icons=1) - overlays_standing[HANDCUFF_LAYER] = null + remove_overlay(HANDCUFF_LAYER) if(handcuffed) if(istype(handcuffed, /obj/item/restraints/handcuffs/pinkcuffs)) - overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "pinkcuff1") + overlays_standing[HANDCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "pinkcuff1", layer = -HANDCUFF_LAYER) else - overlays_standing[HANDCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "handcuff1") - - if(update_icons) - update_icons() + overlays_standing[HANDCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "handcuff1", layer = -HANDCUFF_LAYER) + apply_overlay(HANDCUFF_LAYER) /mob/living/carbon/human/update_inv_legcuffed(var/update_icons=1) + remove_overlay(LEGCUFF_LAYER) clear_alert("legcuffed") if(legcuffed) - overlays_standing[LEGCUFF_LAYER] = image("icon" = 'icons/mob/mob.dmi', "icon_state" = "legcuff1") + overlays_standing[LEGCUFF_LAYER] = mutable_appearance('icons/mob/mob.dmi', "legcuff1", layer = -LEGCUFF_LAYER) throw_alert("legcuffed", /obj/screen/alert/restrained/legcuffed, new_master = legcuffed) if(m_intent != MOVE_INTENT_WALK) m_intent = MOVE_INTENT_WALK if(hud_used && hud_used.move_intent) hud_used.move_intent.icon_state = "walking" - - else - overlays_standing[LEGCUFF_LAYER] = null - if(update_icons) - update_icons() + apply_overlay(LEGCUFF_LAYER) /mob/living/carbon/human/update_inv_r_hand(var/update_icons=1) ..() + remove_overlay(R_HAND_LAYER) if(r_hand) var/t_state = r_hand.item_state if(!t_state) t_state = r_hand.icon_state - var/image/I = image("icon" = r_hand.righthand_file, "icon_state" = "[t_state]") + var/mutable_appearance/I = mutable_appearance(r_hand.righthand_file, "[t_state]", layer = -R_HAND_LAYER) I = center_image(I, r_hand.inhand_x_dimension, r_hand.inhand_y_dimension) overlays_standing[R_HAND_LAYER] = I - else - overlays_standing[R_HAND_LAYER] = null - if(update_icons) - update_icons() + apply_overlay(R_HAND_LAYER) /mob/living/carbon/human/update_inv_l_hand(var/update_icons=1) ..() + remove_overlay(L_HAND_LAYER) if(l_hand) var/t_state = l_hand.item_state if(!t_state) t_state = l_hand.icon_state - var/image/I = image("icon" = l_hand.lefthand_file, "icon_state" = "[t_state]") + var/mutable_appearance/I = mutable_appearance(l_hand.lefthand_file, "[t_state]", layer = -L_HAND_LAYER) I = center_image(I, l_hand.inhand_x_dimension, l_hand.inhand_y_dimension) overlays_standing[L_HAND_LAYER] = I - else - overlays_standing[L_HAND_LAYER] = null - if(update_icons) - update_icons() + apply_overlay(L_HAND_LAYER) //human HUD updates for items in our inventory @@ -1157,10 +1033,11 @@ var/global/list/damage_icon_parts = list() /mob/living/carbon/human/proc/update_tail_layer(var/update_icons=1) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = null // SEW direction icons, overlayed by LIMBS_LAYER. - overlays_standing[TAIL_LAYER] = null /* This will be one of two things: - If the species' tail is overlapped by limbs, this will be only the N direction icon so tails can still appear on the outside of uniforms and such. - Otherwise, since the user's tail isn't overlapped by limbs, it will be a full icon with all directions. */ + remove_overlay(TAIL_UNDERLIMBS_LAYER) // SEW direction icons, overlayed by LIMBS_LAYER. + remove_overlay(TAIL_LAYER) /* This will be one of two things: + If the species' tail is overlapped by limbs, this will be only the N direction icon so tails + can still appear on the outside of uniforms and such. + Otherwise, since the user's tail isn't overlapped by limbs, it will be a full icon with all directions. */ var/icon/tail_marking_icon var/datum/sprite_accessory/body_markings/tail/tail_marking_style @@ -1184,16 +1061,25 @@ var/global/list/damage_icon_parts = list() under.Insert(new/icon(accessory_s, dir=EAST), dir=EAST) under.Insert(new/icon(accessory_s, dir=WEST), dir=WEST) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = image(under, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/underlimbs = mutable_appearance(under, layer = -TAIL_UNDERLIMBS_LAYER) + underlimbs.pixel_x = body_accessory.pixel_x_offset + underlimbs.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_UNDERLIMBS_LAYER] = underlimbs // Creates a blank icon, and copies accessory_s' north direction sprite into it // before passing that to the tail layer that overlays uniforms and such. var/icon/over = new/icon("icon" = 'icons/mob/body_accessory.dmi', "icon_state" = "accessory_none_s") over.Insert(new/icon(accessory_s, dir=NORTH), dir=NORTH) - overlays_standing[TAIL_LAYER] = image(over, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/tail = mutable_appearance(over, layer = -TAIL_LAYER) + tail.pixel_x = body_accessory.pixel_x_offset + tail.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_LAYER] = tail else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation. - overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/tail = mutable_appearance(accessory_s, layer = -TAIL_LAYER) + tail.pixel_x = body_accessory.pixel_x_offset + tail.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_LAYER] = tail else if(tail && dna.species.bodyflags & HAS_TAIL) //no tailless tajaran if(!wear_suit || !(wear_suit.flags_inv & HIDETAIL) && !istype(wear_suit, /obj/item/clothing/suit/space)) @@ -1209,25 +1095,24 @@ var/global/list/damage_icon_parts = list() under.Insert(new/icon(tail_s, dir=EAST), dir=EAST) under.Insert(new/icon(tail_s, dir=WEST), dir=WEST) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = image(under) + overlays_standing[TAIL_UNDERLIMBS_LAYER] = mutable_appearance(under, layer = -TAIL_UNDERLIMBS_LAYER) // Creates a blank icon, and copies accessory_s' north direction sprite into it before passing that to the tail layer that overlays uniforms and such. var/icon/over = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "blank") over.Insert(new/icon(tail_s, dir=NORTH), dir=NORTH) - overlays_standing[TAIL_LAYER] = image(over) + overlays_standing[TAIL_LAYER] = mutable_appearance(over, layer = -TAIL_LAYER) else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation. - overlays_standing[TAIL_LAYER] = image(tail_s) - - if(update_icons) - update_icons() - + overlays_standing[TAIL_LAYER] = mutable_appearance(tail_s, layer = -TAIL_LAYER) + apply_overlay(TAIL_LAYER) + apply_overlay(TAIL_UNDERLIMBS_LAYER) /mob/living/carbon/human/proc/start_tail_wagging(var/update_icons=1) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = null // SEW direction icons, overlayed by LIMBS_LAYER. - overlays_standing[TAIL_LAYER] = null /* This will be one of two things: - If the species' tail is overlapped by limbs, this will be only the N direction icon so tails can still appear on the outside of uniforms and such. - Otherwise, since the user's tail isn't overlapped by limbs, it will be a full icon with all directions. */ + remove_overlay(TAIL_UNDERLIMBS_LAYER) // SEW direction icons, overlayed by LIMBS_LAYER. + remove_overlay(TAIL_LAYER) /* This will be one of two things: + If the species' tail is overlapped by limbs, this will be only the N direction icon so tails + can still appear on the outside of uniforms and such. + Otherwise, since the user's tail isn't overlapped by limbs, it will be a full icon with all directions. */ var/icon/tail_marking_icon var/datum/sprite_accessory/body_markings/tail/tail_marking_style @@ -1252,7 +1137,10 @@ var/global/list/damage_icon_parts = list() under.Insert(new/icon(accessory_s, dir=EAST), dir=EAST) under.Insert(new/icon(accessory_s, dir=WEST), dir=WEST) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = image(under, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/underlimbs = mutable_appearance(under, layer = -TAIL_UNDERLIMBS_LAYER) + underlimbs.pixel_x = body_accessory.pixel_x_offset + underlimbs.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_UNDERLIMBS_LAYER] = underlimbs // Creates a blank icon, and copies accessory_s' north direction sprite into it before passing that to the tail layer that overlays uniforms and such. var/icon/over = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "Vulpkanin_tail_delay") @@ -1260,9 +1148,15 @@ var/global/list/damage_icon_parts = list() over = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.species.name]_tail_delay") over.Insert(new/icon(accessory_s, dir=NORTH), dir=NORTH) - overlays_standing[TAIL_LAYER] = image(over, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/tail = mutable_appearance(over, layer = -TAIL_LAYER) + tail.pixel_x = body_accessory.pixel_x_offset + tail.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_LAYER] = tail else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation. - overlays_standing[TAIL_LAYER] = image(accessory_s, "pixel_x" = body_accessory.pixel_x_offset, "pixel_y" = body_accessory.pixel_y_offset) + var/mutable_appearance/tail = mutable_appearance(accessory_s, layer = -TAIL_LAYER) + tail.pixel_x = body_accessory.pixel_x_offset + tail.pixel_y = body_accessory.pixel_y_offset + overlays_standing[TAIL_LAYER] = tail else if(tail && dna.species.bodyflags & HAS_TAIL) var/icon/tailw_s = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[tail]w_s") @@ -1277,25 +1171,36 @@ var/global/list/damage_icon_parts = list() under.Insert(new/icon(tailw_s, dir=EAST), dir=EAST) under.Insert(new/icon(tailw_s, dir=WEST), dir=WEST) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = image(under) + overlays_standing[TAIL_UNDERLIMBS_LAYER] = mutable_appearance(under, layer = -TAIL_UNDERLIMBS_LAYER) // Creates a blank icon, and copies accessory_s' north direction sprite into it before passing that to the tail layer that overlays uniforms and such. var/icon/over = new/icon("icon" = 'icons/effects/species.dmi', "icon_state" = "[dna.species.name]_tail_delay") over.Insert(new/icon(tailw_s, dir=NORTH), dir=NORTH) - overlays_standing[TAIL_LAYER] = image(over) + overlays_standing[TAIL_LAYER] = mutable_appearance(over, layer = -TAIL_LAYER) else // Otherwise, since the user's tail isn't overlapped by limbs, go ahead and use default icon generation. - overlays_standing[TAIL_LAYER] = image(tailw_s) - - if(update_icons) - update_icons() + overlays_standing[TAIL_LAYER] = mutable_appearance(tailw_s, layer = -TAIL_LAYER) + apply_overlay(TAIL_LAYER) + apply_overlay(TAIL_UNDERLIMBS_LAYER) /mob/living/carbon/human/proc/stop_tail_wagging(var/update_icons=1) - overlays_standing[TAIL_UNDERLIMBS_LAYER] = null - overlays_standing[TAIL_LAYER] = null - + remove_overlay(TAIL_UNDERLIMBS_LAYER) + remove_overlay(TAIL_LAYER) update_tail_layer(update_icons) //just trigger a full update for normal stationary sprites +/mob/living/carbon/human/proc/update_int_organs() + remove_overlay(INTORGAN_LAYER) + + var/list/standing = list() + for(var/organ in internal_organs) + var/obj/item/organ/internal/I = organ + var/render = I.render() + if(render) + standing += render + + overlays_standing[INTORGAN_LAYER] = standing + apply_overlay(INTORGAN_LAYER) + /mob/living/carbon/human/handle_transform_change() ..() update_tail_layer() @@ -1304,8 +1209,9 @@ var/global/list/damage_icon_parts = list() // Suit needs an identically named sprite in icons/mob/collar.dmi // For suits with species_fit and sprite_sheets, an identically named sprite needs to exist in a file like this icons/mob/species/[species_name_here]/collar.dmi. /mob/living/carbon/human/proc/update_collar(var/update_icons=1) + remove_overlay(COLLAR_LAYER) var/icon/C = new('icons/mob/collar.dmi') - var/image/standing = null + var/mutable_appearance/standing = null if(wear_suit) if(wear_suit.icon_override) @@ -1314,28 +1220,39 @@ var/global/list/damage_icon_parts = list() if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime. var/icon/icon_file = new(icon_path) if(wear_suit.icon_state in icon_file.IconStates()) - standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance(icon_file, "[wear_suit.icon_state]", layer = -COLLAR_LAYER) else if(wear_suit.sprite_sheets && wear_suit.sprite_sheets[dna.species.name]) var/icon_path = "[wear_suit.sprite_sheets[dna.species.name]]" icon_path = "[copytext(icon_path, 1, findtext(icon_path, "/suit.dmi"))]/collar.dmi" //If this file doesn't exist, the end result is that COLLAR_LAYER will be unchanged (empty). if(fexists(icon_path)) //Just ensuring the nonexistance of a file with the above path won't cause a runtime. var/icon/icon_file = new(icon_path) if(wear_suit.icon_state in icon_file.IconStates()) - standing = image("icon" = icon_file, "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance(icon_file, "[wear_suit.icon_state]", layer = -COLLAR_LAYER) else if(wear_suit.icon_state in C.IconStates()) - standing = image("icon" = C, "icon_state" = "[wear_suit.icon_state]") + standing = mutable_appearance(C, "[wear_suit.icon_state]", layer = -COLLAR_LAYER) - overlays_standing[COLLAR_LAYER] = standing - - if(update_icons) update_icons() + overlays_standing[COLLAR_LAYER] = standing + apply_overlay(COLLAR_LAYER) /mob/living/carbon/human/proc/update_misc_effects() - misc_effect_overlays.Cut() + remove_overlay(MISC_LAYER) //Begin appending miscellaneous effects. if(eyes_shine()) - misc_effect_overlays += get_eye_shine() //Image layer is specified in get_eye_shine() proc as LIGHTING_LAYER + 1. + overlays_standing[MISC_LAYER] = get_eye_shine() //Image layer is specified in get_eye_shine() proc as LIGHTING_LAYER + 1. + + apply_overlay(MISC_LAYER) + +/mob/living/carbon/human/admin_Freeze(client/admin, skip_overlays = TRUE) + . = ..() + overlays_standing[FROZEN_LAYER] = mutable_appearance(frozen, layer = -FROZEN_LAYER) + apply_overlay(FROZEN_LAYER) + +/mob/living/carbon/human/admin_unFreeze(client/admin, skip_overlays = TRUE) + . = ..() + remove_overlay(FROZEN_LAYER) + /mob/living/carbon/human/proc/force_update_limbs() for(var/obj/item/organ/external/O in bodyparts) @@ -1350,3 +1267,40 @@ var/global/list/damage_icon_parts = list() continue out += overlays_standing[i] return out + +/mob/living/carbon/human/proc/generate_icon_render_key() + var/husk = (HUSK in mutations) + var/fat = (FAT in mutations) + var/hulk = (HULK in mutations) + var/skeleton = (SKELETON in mutations) + + . = "" + + var/obj/item/organ/internal/eyes/eyes = get_int_organ(/obj/item/organ/internal/eyes) + if(eyes) + . += "[eyes.eye_colour]" + else + . += "#000000" + + for(var/organ_tag in dna.species.has_limbs) + var/obj/item/organ/external/part = bodyparts_by_name[organ_tag] + if(isnull(part)) + . += "0" + else if(part.is_robotic()) + . += "2[part.model ? "-[part.model]" : ""]" + else if(part.status & ORGAN_DEAD) + . += "3" + else + . += "1" + + if(part) + var/datum/species/S = GLOB.all_species[part.dna.species.name] + . += "[S.race_key]" + . += "[part.dna.GetUIState(DNA_UI_GENDER)]" + . += "[part.dna.GetUIValue(DNA_UI_SKIN_TONE)]" + if(part.s_col) + . += "[part.s_col]" + if(part.s_tone) + . += "[part.s_tone]" + + . = "[.][!!husk][!!fat][!!hulk][!!skeleton]" \ No newline at end of file diff --git a/code/modules/mob/living/carbon/slime/life.dm b/code/modules/mob/living/carbon/slime/life.dm index 2f2c05c9452..649ec7b3f00 100644 --- a/code/modules/mob/living/carbon/slime/life.dm +++ b/code/modules/mob/living/carbon/slime/life.dm @@ -218,15 +218,8 @@ if(src.eye_blind) src.SetEyeBlind(0) - if(src.ear_deaf > 0) SetEarDeaf(0) - if(src.ear_damage < 25) - SetEarDamage(0) - src.density = !( src.lying ) - if(src.disabilities & DEAF) - EarDeaf(1) - if(src.eye_blurry > 0) SetEyeBlurry(0) diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index be25de1ac14..914c810da27 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -489,4 +489,7 @@ mob/living/carbon/slime/var/temperature_resistance = T0C+75 if(istype(toEat, /obj/item/reagent_containers/food/drinks)) return 1 to_chat(user, "This creature does not seem to have a mouth!") - return 0 \ No newline at end of file + return 0 + +/mob/living/carbon/slime/can_hear() + . = TRUE //honestly fuck slimes and organ bullshit \ No newline at end of file diff --git a/code/modules/mob/living/carbon/update_status.dm b/code/modules/mob/living/carbon/update_status.dm index 63d34788a98..22030c78f4b 100644 --- a/code/modules/mob/living/carbon/update_status.dm +++ b/code/modules/mob/living/carbon/update_status.dm @@ -27,3 +27,9 @@ setStaminaLoss(health - 2) handle_hud_icons_health() return + +/mob/living/carbon/can_hear() + . = FALSE + var/obj/item/organ/internal/ears/ears = get_int_organ(/obj/item/organ/internal/ears) + if(istype(ears) && !ears.deaf) + . = TRUE \ No newline at end of file diff --git a/code/modules/mob/living/life.dm b/code/modules/mob/living/life.dm index 032f46d42dd..d365f30d7d0 100644 --- a/code/modules/mob/living/life.dm +++ b/code/modules/mob/living/life.dm @@ -170,15 +170,6 @@ else if(eye_blurry) //blurry eyes heal slowly AdjustEyeBlurry(-1) - //Ears - if(disabilities & DEAF) //disabled-deaf, doesn't get better on its own - EarDeaf(1) - else - // deafness heals slowly over time, unless ear_damage is over 100 - if(ear_damage < 100) - AdjustEarDamage(-0.05) - AdjustEarDeaf(-1) - //this handles hud updates. Calls update_vision() and handle_hud_icons() /mob/living/proc/handle_regular_hud_updates() if(!client) return 0 diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm index 2a384dec214..bf49d5b2598 100644 --- a/code/modules/mob/living/living.dm +++ b/code/modules/mob/living/living.dm @@ -404,8 +404,7 @@ CureNervous() SetEyeBlind(0) SetEyeBlurry(0) - SetEarDamage(0) - SetEarDeaf(0) + RestoreEars() heal_overall_damage(1000, 1000) ExtinguishMob() fire_stacks = 0 diff --git a/code/modules/mob/living/silicon/ai/ai.dm b/code/modules/mob/living/silicon/ai/ai.dm index 8d5e60785db..67bbc6c5388 100644 --- a/code/modules/mob/living/silicon/ai/ai.dm +++ b/code/modules/mob/living/silicon/ai/ai.dm @@ -370,7 +370,8 @@ var/list/ai_verbs_default = list( "Fuzzy", "Glitchman", "House", - "Database" + "Database", + "Alien" ) if(custom_sprite) display_choices += "Custom" @@ -451,6 +452,8 @@ var/list/ai_verbs_default = list( icon_state = "ai-house" if("Database") icon_state = "ai-database" + if("Alien") + icon_state = "ai-alien" else icon_state = "ai" //else diff --git a/code/modules/mob/living/silicon/silicon.dm b/code/modules/mob/living/silicon/silicon.dm index b667dbd15bd..e5bc8582de8 100644 --- a/code/modules/mob/living/silicon/silicon.dm +++ b/code/modules/mob/living/silicon/silicon.dm @@ -330,9 +330,5 @@ return 1 /////////////////////////////////// EAR DAMAGE //////////////////////////////////// - -/mob/living/silicon/SetEarDamage() - return - -/mob/living/silicon/SetEarDeaf() - return +/mob/living/silicon/can_hear() + . = TRUE \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/friendly/diona.dm b/code/modules/mob/living/simple_animal/friendly/diona.dm index 669271f3ead..0ca0d287ede 100644 --- a/code/modules/mob/living/simple_animal/friendly/diona.dm +++ b/code/modules/mob/living/simple_animal/friendly/diona.dm @@ -32,24 +32,72 @@ melee_damage_upper = 8 attacktext = "bites" attack_sound = 'sound/weapons/bite.ogg' + var/chirp_sound = 'sound/misc/nymphchirp.ogg' //used in emote speed = 0 stop_automated_movement = 0 turns_per_move = 4 var/list/donors = list() - var/ready_evolve = 0 holder_type = /obj/item/holder/diona - can_collar = 1 + can_collar = TRUE + + a_intent = INTENT_HELP + var/gestalt_alert = "merged with gestalt" //used in adding and clearing alert + var/evolve_donors = 5 //amount of blood donors needed before evolving + var/awareness_donors = 3 //amount of blood donors needed for understand language + var/nutrition_need = 500 //amount of nutrition needed before evolving + + var/datum/action/innate/diona/merge/merge_action = new() + var/datum/action/innate/diona/evolve/evolve_action = new() + var/datum/action/innate/diona/steal_blood/steal_blood_action = new() + +/datum/action/innate/diona/merge + name = "Merge with gestalt" + icon_icon = 'icons/mob/human_races/r_diona.dmi' + button_icon_state = "preview" + +/datum/action/innate/diona/merge/Activate() + var/mob/living/simple_animal/diona/user = owner + user.merge() + +/datum/action/innate/diona/evolve + name = "Evolve" + icon_icon = 'icons/obj/cloning.dmi' + button_icon_state = "pod_1" + +/datum/action/innate/diona/evolve/Activate() + var/mob/living/simple_animal/diona/user = owner + user.evolve() + +/datum/action/innate/diona/steal_blood + name = "Steal blood" + icon_icon = 'icons/obj/bloodpack.dmi' + button_icon_state = "full" + +/datum/action/innate/diona/steal_blood/Activate() + var/mob/living/simple_animal/diona/user = owner + user.steal_blood() /mob/living/simple_animal/diona/New() ..() if(name == initial(name)) //To stop Pun-Pun becoming generic. name = "[name] ([rand(1, 1000)])" real_name = name - add_language("Rootspeak") - verbs += /mob/living/simple_animal/diona/proc/merge + merge_action.Grant(src) + evolve_action.Grant(src) + steal_blood_action.Grant(src) + +/mob/living/simple_animal/diona/UnarmedAttack(var/atom/A) + if(isdiona(A) && (src in A.contents)) //can't attack your gestalt + visible_message("[src] wiggles around a bit.") + else + ..() + +/mob/living/simple_animal/diona/resist() + ..() + split() /mob/living/simple_animal/diona/attack_hand(mob/living/carbon/human/M) //Let people pick the little buggers up. @@ -57,88 +105,76 @@ if(isdiona(M)) to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") - verbs += /mob/living/simple_animal/diona/proc/split - verbs -= /mob/living/simple_animal/diona/proc/merge + throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist forceMove(M) else get_scooped(M) - ..() - /mob/living/simple_animal/diona/proc/merge() - set category = "Diona" - set name = "Merge with gestalt" - set desc = "Merge with another diona." - - if(iscarbon(loc)) - verbs -= /mob/living/simple_animal/diona/proc/merge - return + if(stat != CONSCIOUS) + return FALSE var/list/choices = list() - for(var/mob/living/carbon/C in view(1,src)) - - if(!(Adjacent(C)) || !(C.client)) + for(var/mob/living/carbon/human/H in view(1,src)) + if(!(Adjacent(H)) || !isdiona(H)) continue + choices += H - if(ishuman(C)) - var/mob/living/carbon/human/D = C - if(isdiona(D)) - choices += C + if(!choices.len) + to_chat(src, "No suitable diona nearby.") + return FALSE var/mob/living/M = input(src,"Who do you wish to merge with?") in null|choices - if(!M || !src || !(Adjacent(M))) - return + if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate + return FALSE - if(ishuman(M)) + if(isdiona(M)) to_chat(M, "You feel your being twine with that of [src] as it merges with your biomass.") M.status_flags |= PASSEMOTES - to_chat(src, "You feel your being twine with that of [M] as you merge with its biomass.") forceMove(M) - verbs += /mob/living/simple_animal/diona/proc/split - verbs -= /mob/living/simple_animal/diona/proc/merge + throw_alert(gestalt_alert, /obj/screen/alert/nymph, new_master = src) //adds a screen alert that can call resist + return TRUE else - return + return FALSE /mob/living/simple_animal/diona/proc/split() - set category = "Diona" - set name = "Split from gestalt" - set desc = "Split away from your gestalt as a lone nymph." - - if(!(iscarbon(loc))) - verbs -= /mob/living/simple_animal/diona/proc/split - return - + if((stat != CONSCIOUS) || !isdiona(loc)) + return FALSE + var/mob/living/carbon/human/D = loc + T = get_turf(src) + if(!T) + return FALSE to_chat(loc, "You feel a pang of loss as [src] splits away from your biomass.") to_chat(src, "You wiggle out of the depths of [loc]'s biomass and plop to the ground.") + forceMove(T) + + var/hasMobs = FALSE + for(var/atom/A in D.contents) + if(istype(A, /mob/) || istype(A, /obj/item/holder)) + hasMobs = TRUE + if(!hasMobs) + D.status_flags &= ~PASSEMOTES - var/mob/living/M = loc + clear_alert(gestalt_alert) + return TRUE - forceMove(get_turf(src)) - verbs -= /mob/living/simple_animal/diona/proc/split - verbs += /mob/living/simple_animal/diona/proc/merge - - if(istype(M)) - for(var/atom/A in M.contents) - if(istype(A, /mob/living/simple_animal/borer) || istype(A, /obj/item/holder)) - return - M.status_flags &= ~PASSEMOTES - -/mob/living/simple_animal/diona/verb/evolve() - set category = "Diona" - set name = "Evolve" - set desc = "Grow to a more complex form." - - if(donors.len < 5) +/mob/living/simple_animal/diona/proc/evolve() + if(stat != CONSCIOUS) + return FALSE + + if(donors.len < evolve_donors) to_chat(src, "You need more blood in order to ascend to a new state of consciousness...") - return + return FALSE - if(nutrition < 500) + if(nutrition < nutrition_need) to_chat(src, "You need to binge on weeds in order to have the energy to grow...") - return + return FALSE - split() + if(isdiona(loc) && !split()) //if it's merged with diona, needs to able to split before evolving + return FALSE + visible_message("[src] begins to shift and quiver, and erupts in a shower of shed bark as it splits into a tangle of nearly a dozen new dionaea.","You begin to shift and quiver, feeling your awareness splinter. All at once, we consume our stored nutrients to surge with growth, splitting into a tangle of at least a dozen new dionaea. We have attained our gestalt form.") var/mob/living/carbon/human/diona/adult = new(get_turf(loc)) @@ -162,28 +198,33 @@ unEquip(W) qdel(src) + return TRUE -/mob/living/simple_animal/diona/verb/steal_blood() - set category = "Diona" - set name = "Steal Blood" - set desc = "Take a blood sample from a suitable donor." - +/mob/living/simple_animal/diona/proc/steal_blood() + if(stat != CONSCIOUS) + return FALSE + var/list/choices = list() for(var/mob/living/carbon/human/H in oview(1,src)) - choices += H + if(Adjacent(H) && H.dna && !(NO_BLOOD in H.dna.species.species_traits)) + choices += H + + if(!choices.len) + to_chat(src, "No suitable blood donors nearby.") + return FALSE var/mob/living/carbon/human/M = input(src,"Who do you wish to take a sample from?") in null|choices - if(!M || !src) - return + if(!M || !src || !(Adjacent(M)) || stat != CONSCIOUS) //input can take a while, so re-validate + return FALSE - if(NO_BLOOD in M.dna.species.species_traits) + if(!M.dna || (NO_BLOOD in M.dna.species.species_traits)) to_chat(src, "That donor has no blood to take.") - return + return FALSE if(donors.Find(M.real_name)) to_chat(src, "That donor offers you nothing new.") - return + return FALSE visible_message("[src] flicks out a feeler and neatly steals a sample of [M]'s blood.","You flick out a feeler and neatly steal a sample of [M]'s blood.") donors += M.real_name @@ -195,13 +236,12 @@ update_progression() /mob/living/simple_animal/diona/proc/update_progression() - if(!donors.len) - return + if(stat != CONSCIOUS || !donors.len) + return FALSE - if(donors.len == 5) - ready_evolve = 1 + if(donors.len == evolve_donors) to_chat(src, "You feel ready to move on to your next stage of growth.") - else if(donors.len == 3) + else if(donors.len == awareness_donors) universal_understand = 1 to_chat(src, "You feel your awareness expand, and realize you know how to understand the creatures around you.") else @@ -219,7 +259,7 @@ return /mob/living/simple_animal/diona/emote(act, m_type=1, message = null) - if(stat) + if(stat != CONSCIOUS) return var/on_CD = 0 @@ -237,6 +277,6 @@ if("chirp") message = "\The [src] chirps!" m_type = 2 //audible - playsound(src, 'sound/misc/nymphchirp.ogg', 40, 1, 1) + playsound(src, chirp_sound, 40, 1, 1) ..(act, m_type, message) \ No newline at end of file diff --git a/code/modules/mob/living/simple_animal/hostile/headcrab.dm b/code/modules/mob/living/simple_animal/hostile/headcrab.dm index 0eea0eaef76..48c7a24f855 100644 --- a/code/modules/mob/living/simple_animal/hostile/headcrab.dm +++ b/code/modules/mob/living/simple_animal/hostile/headcrab.dm @@ -23,6 +23,11 @@ var/datum/mind/origin var/egg_lain = 0 +/mob/living/simple_animal/hostile/headcrab/examine(mob/user) + ..() + if(stat == DEAD) + to_chat(desc = "It appears to be dead.") + /mob/living/simple_animal/hostile/headcrab/proc/Infect(mob/living/carbon/victim) var/obj/item/organ/internal/body_egg/changeling_egg/egg = new(victim) egg.insert(victim) diff --git a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm index 82e4af1862f..efeec62ae96 100644 --- a/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/megafauna/dragon.dm @@ -101,7 +101,7 @@ Difficulty: Medium animate(src, pixel_z = 0, time = 12) /obj/effect/temp_visual/target - icon = 'icons/mob/actions.dmi' + icon = 'icons/mob/actions/actions.dmi' icon_state = "sniper_zoom" layer = MOB_LAYER - 0.1 luminosity = 2 diff --git a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm index f2bed558b8c..b0756cddd7f 100644 --- a/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm +++ b/code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm @@ -65,7 +65,7 @@ /datum/action/innate/terrorspider/queen/queensense name = "Hive Sense" - icon_icon = 'icons/mob/actions.dmi' + icon_icon = 'icons/mob/actions/actions.dmi' button_icon_state = "mindswap" /datum/action/innate/terrorspider/queen/queensense/Activate() diff --git a/code/modules/mob/living/simple_animal/simple_animal.dm b/code/modules/mob/living/simple_animal/simple_animal.dm index 046d55c4566..df3f185dad4 100644 --- a/code/modules/mob/living/simple_animal/simple_animal.dm +++ b/code/modules/mob/living/simple_animal/simple_animal.dm @@ -578,9 +578,5 @@ if(A.update_remote_sight(src)) //returns 1 if we override all other sight updates. return -/mob/living/simple_animal/SetEarDamage() - return - -/mob/living/simple_animal/SetEarDeaf() - return - +/mob/living/simple_animal/can_hear() + . = TRUE \ No newline at end of file diff --git a/code/modules/mob/living/status_procs.dm b/code/modules/mob/living/status_procs.dm index e9253f78d59..4e5c778b7fb 100644 --- a/code/modules/mob/living/status_procs.dm +++ b/code/modules/mob/living/status_procs.dm @@ -43,10 +43,6 @@ A trippy overlay appears. * Drunk * Essentially what your "BAC" is - the higher it is, the more alcohol you have in you - * EarDamage * - Doesn't do much, but if it's 25+, you go deaf. Heals much slower than other statuses - 0.05 normally - * EarDeaf * - You cannot hear. Prevents EarDamage from healing naturally. * EyeBlind * You cannot see. Prevents EyeBlurry from healing naturally. * EyeBlurry * @@ -115,8 +111,6 @@ var/drowsyness = 0 var/druggy = 0 var/drunk = 0 - var/ear_damage = 0 - var/ear_deaf = 0 var/eye_blind = 0 var/eye_blurry = 0 var/hallucination = 0 @@ -233,30 +227,6 @@ var/new_value = directional_bounded_sum(druggy, amount, bound_lower, bound_upper) return SetDruggy(new_value, updating) -// EAR_DAMAGE - -/mob/living/EarDamage(amount) - SetEarDamage(max(ear_damage, amount)) - -/mob/living/SetEarDamage(amount) - ear_damage = max(amount, 0) - -/mob/living/AdjustEarDamage(amount, bound_lower = 0, bound_upper = INFINITY) - var/new_value = directional_bounded_sum(ear_damage, amount, bound_lower, bound_upper) - SetEarDamage(new_value) - -// EAR_DEAF - -/mob/living/EarDeaf(amount) - SetEarDeaf(max(ear_deaf, amount)) - -/mob/living/SetEarDeaf(amount) - ear_deaf = max(amount, 0) - -/mob/living/AdjustEarDeaf(amount, bound_lower = 0, bound_upper = INFINITY) - var/new_value = directional_bounded_sum(ear_deaf, amount, bound_lower, bound_upper) - SetEarDeaf(new_value) - // EYE_BLIND /mob/living/EyeBlind(amount, updating = TRUE) diff --git a/code/modules/mob/living/update_status.dm b/code/modules/mob/living/update_status.dm index 40d4cdc9cb2..94769baf94b 100644 --- a/code/modules/mob/living/update_status.dm +++ b/code/modules/mob/living/update_status.dm @@ -41,7 +41,7 @@ // Whether the mob can hear things /mob/living/can_hear() - return !(ear_deaf || (disabilities & DEAF)) + . = !(disabilities & DEAF) // Whether the mob is able to see // `information_only` is for stuff that's purely informational - like understanding nonverbal languages, or blindness overlays @@ -137,10 +137,6 @@ SetEyeBlind(eye_blind) if("eye_blurry") SetEyeBlurry(eye_blurry) - if("ear_deaf") - SetEarDeaf(ear_deaf) - if("ear_damage") - SetEarDamage(ear_damage) if("druggy") SetDruggy(druggy) if("maxHealth") diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index a1be1db4c63..5b3fd873777 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -1,6 +1,5 @@ /mob/new_player var/ready = 0 - var/skip_antag = 0 //For declining an antag roll this round. var/spawning = 0 //Referenced when you want to delete the new_player later on in the code. var/totalPlayers = 0 //Player counts for the Lobby tab var/totalPlayersReady = 0 @@ -65,16 +64,16 @@ if(!ticker || ticker.current_state <= GAME_STATE_PREGAME) if(!ready) output += "" else output += "
You are ready (Cancel)
" - - var/list/antags = client.prefs.be_special - if(antags && antags.len) - if(!skip_antag) output += "Global Antag Candidacy" - else output += "
Global Antag Candidacy"
- output += "
You are [skip_antag ? "ineligible" : "eligible"] for all antag roles.
Global Antag Candidacy" + else output += "
Global Antag Candidacy"
+ output += "
You are [client.skip_antag ? "ineligible" : "eligible"] for all antag roles.
[line1]
[line2]
"}
if(maptext != new_text)
maptext = new_text
diff --git a/code/modules/projectiles/ammunition.dm b/code/modules/projectiles/ammunition.dm
index 66935652e4e..1e0a43e75d1 100644
--- a/code/modules/projectiles/ammunition.dm
+++ b/code/modules/projectiles/ammunition.dm
@@ -199,8 +199,8 @@
num_ammo++
for(var/M in initial_mats) //In case we have multiple types of materials
var/materials_per = initial_mats[M] / max_ammo
-
- var/value = max(materials_per * num_ammo, 2000) //Enforce a minimum of 2000 units even if empty.
+
+ var/value = max(materials_per * num_ammo, 500) //Enforce a minimum of 500 units even if empty.
materials[M] = value
//Behavior for magazines
diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm
index 6eba670e906..28dc2e41b14 100644
--- a/code/modules/projectiles/ammunition/boxes.dm
+++ b/code/modules/projectiles/ammunition/boxes.dm
@@ -118,10 +118,12 @@
icon_state = "foambox"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 40
+ materials = list(MAT_METAL = 500)
/obj/item/ammo_box/foambox/riot
icon_state = "foambox_riot"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
+ materials = list(MAT_METAL = 50000)
/obj/item/ammo_box/caps
name = "speed loader (caps)"
diff --git a/code/modules/reagents/chemistry/machinery/chem_heater.dm b/code/modules/reagents/chemistry/machinery/chem_heater.dm
index 2d031d9c2c5..1b84afb3d74 100644
--- a/code/modules/reagents/chemistry/machinery/chem_heater.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_heater.dm
@@ -69,6 +69,9 @@
SSnanoui.update_uis(src)
/obj/machinery/chem_heater/attackby(obj/item/I, mob/user)
+ if(default_unfasten_wrench(user, I))
+ power_change()
+ return
if(isrobot(user))
return
diff --git a/code/modules/reagents/chemistry/machinery/chem_master.dm b/code/modules/reagents/chemistry/machinery/chem_master.dm
index 81fed023251..0855c4fec4f 100644
--- a/code/modules/reagents/chemistry/machinery/chem_master.dm
+++ b/code/modules/reagents/chemistry/machinery/chem_master.dm
@@ -50,6 +50,9 @@
stat |= NOPOWER
/obj/machinery/chem_master/attackby(obj/item/B, mob/user, params)
+ if(default_unfasten_wrench(user, B))
+ power_change()
+ return
if(istype(B, /obj/item/reagent_containers/glass) || istype(B, /obj/item/reagent_containers/food/drinks/drinkingglass))
diff --git a/code/modules/reagents/chemistry/machinery/pandemic.dm b/code/modules/reagents/chemistry/machinery/pandemic.dm
index 3a5b753217f..7c36334f78d 100644
--- a/code/modules/reagents/chemistry/machinery/pandemic.dm
+++ b/code/modules/reagents/chemistry/machinery/pandemic.dm
@@ -185,18 +185,18 @@
english_symptoms += S.name
var/symtoms = english_list(english_symptoms)
-
+
var/signature
if(alert(user,"Would you like to add your signature?",,"Yes","No") == "Yes")
signature = "[user ? user.real_name : "Anonymous"]"
- else
+ else
signature = ""
-
+
printing = 1
var/obj/item/paper/P = new /obj/item/paper(loc)
visible_message("[src] rattles and prints out a sheet of paper.")
playsound(loc, 'sound/goonstation/machines/printer_dotmatrix.ogg', 50, 1)
-
+
P.info = "[line2]
" P.info += "Name of the Virus: [D.name]
" @@ -318,6 +318,9 @@ /obj/machinery/computer/pandemic/attackby(obj/item/I, mob/user, params) + if(default_unfasten_wrench(user, I)) + power_change() + return if(istype(I, /obj/item/reagent_containers) && (I.container_type & OPENCONTAINER)) if(stat & (NOPOWER|BROKEN)) return diff --git a/code/modules/reagents/chemistry/reagents/alcohol.dm b/code/modules/reagents/chemistry/reagents/alcohol.dm index c74e5973bf7..1482c4ce37a 100644 --- a/code/modules/reagents/chemistry/reagents/alcohol.dm +++ b/code/modules/reagents/chemistry/reagents/alcohol.dm @@ -396,13 +396,13 @@ /datum/reagent/consumable/ethanol/booger name = "Booger" id = "booger" - description = "Ewww..." + description = "Eww..." reagent_state = LIQUID color = "#A68310" // rgb: 166, 131, 16 alcohol_perc = 0.2 drink_icon = "booger" drink_name = "Booger" - drink_desc = "Ewww..." + drink_desc = "Eww..." taste_message = "sweet alcohol" /datum/reagent/consumable/ethanol/bloody_mary @@ -1236,3 +1236,107 @@ drink_icon = "synthignonglass" drink_name = "Glass of Synthignon" drink_desc = "Someone mixed good wine and robot booze. Romantic, but atrocious." + +/datum/reagent/consumable/ethanol/fruit_wine + name = "Fruit Wine" + id = "fruit_wine" + description = "A wine made from grown plants." + color = "#FFFFFF" + alcohol_perc = 0.35 + taste_message = "bad coding" + can_synth = FALSE + var/list/names = list("null fruit" = 1) //Names of the fruits used. Associative list where name is key, value is the percentage of that fruit. + var/list/tastes = list("bad coding" = 1) //List of tastes. See above. + +/datum/reagent/consumable/ethanol/fruit_wine/on_new(list/data) + names = data["names"] + tastes = data["tastes"] + alcohol_perc = data["alcohol_perc"] + color = data["color"] + generate_data_info(data) + +/datum/reagent/consumable/ethanol/fruit_wine/on_merge(list/data, amount) + var/diff = (amount/volume) + if(diff < 1) + color = BlendRGB(color, data["color"], diff/2) //The percentage difference over two, so that they take average if equal. + else + color = BlendRGB(color, data["color"], (1/diff)/2) //Adjust so it's always blending properly. + var/oldvolume = volume-amount + + var/list/cachednames = data["names"] + for(var/name in names | cachednames) + names[name] = ((names[name] * oldvolume) + (cachednames[name] * amount)) / volume + + var/list/cachedtastes = data["tastes"] + for(var/taste in tastes | cachedtastes) + tastes[taste] = ((tastes[taste] * oldvolume) + (cachedtastes[taste] * amount)) / volume + + alcohol_perc *= oldvolume + var/newzepwr = data["alcohol_perc"] * amount + alcohol_perc += newzepwr + alcohol_perc /= volume //Blending alcohol percentage to volume. + generate_data_info(data) + +/datum/reagent/consumable/ethanol/fruit_wine/proc/generate_data_info(list/data) + var/minimum_percent = 0.15 //Percentages measured between 0 and 1. + var/list/primary_tastes = list() + var/list/secondary_tastes = list() + drink_name = "glass of [name]" + drink_desc = description + for(var/taste in tastes) + switch(tastes[taste]) + if(minimum_percent*2 to INFINITY) + primary_tastes += taste + if(minimum_percent to minimum_percent*2) + secondary_tastes += taste + + var/minimum_name_percent = 0.35 + name = "" + var/list/names_in_order = sortTim(names, /proc/cmp_numeric_dsc, TRUE) + var/named = FALSE + for(var/fruit_name in names) + if(names[fruit_name] >= minimum_name_percent) + name += "[fruit_name] " + named = TRUE + if(named) + name += "wine" + else + name = "mixed [names_in_order[1]] wine" + + var/alcohol_description + switch(alcohol_perc) + if(1.2 to INFINITY) + alcohol_description = "suicidally strong" + if(0.9 to 1.2) + alcohol_description = "rather strong" + if(0.7 to 0.9) + alcohol_description = "strong" + if(0.4 to 0.7) + alcohol_description = "rich" + if(0.2 to 0.4) + alcohol_description = "mild" + if(0 to 0.2) + alcohol_description = "sweet" + else + alcohol_description = "watery" //How the hell did you get negative boozepwr? + + var/list/fruits = list() + if(names_in_order.len <= 3) + fruits = names_in_order + else + for(var/i in 1 to 3) + fruits += names_in_order[i] + fruits += "other plants" + var/fruit_list = english_list(fruits) + description = "A [alcohol_description] wine brewed from [fruit_list]." + + var/flavor = "" + if(!primary_tastes.len) + primary_tastes = list("[alcohol_description] alcohol") + flavor += english_list(primary_tastes) + if(secondary_tastes.len) + flavor += ", with a hint of " + flavor += english_list(secondary_tastes) + taste_message = flavor + if(holder.my_atom) + holder.my_atom.on_reagent_change() diff --git a/code/modules/reagents/chemistry/reagents/medicine.dm b/code/modules/reagents/chemistry/reagents/medicine.dm index 7007643e652..7a211780446 100644 --- a/code/modules/reagents/chemistry/reagents/medicine.dm +++ b/code/modules/reagents/chemistry/reagents/medicine.dm @@ -543,21 +543,23 @@ /datum/reagent/medicine/oculine/on_mob_life(mob/living/M) var/update_flags = STATUS_UPDATE_NONE if(prob(80)) - if(ishuman(M)) - var/mob/living/carbon/human/H = M - var/obj/item/organ/internal/eyes/E = H.get_int_organ(/obj/item/organ/internal/eyes) + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/obj/item/organ/internal/eyes/E = C.get_int_organ(/obj/item/organ/internal/eyes) if(istype(E)) E.heal_internal_damage(1) + var/obj/item/organ/internal/ears/ears = C.get_int_organ(/obj/item/organ/internal/ears) + if(istype(ears)) + ears.AdjustEarDamage(-1) + if(ears.ear_damage < 25 && prob(30)) + ears.deaf = 0 update_flags |= M.AdjustEyeBlurry(-1, FALSE) - update_flags |= M.AdjustEarDamage(-1, FALSE) + update_flags |= M.AdjustEarDamage(-1) if(prob(50)) update_flags |= M.CureNearsighted(FALSE) if(prob(30)) update_flags |= M.CureBlind(FALSE) update_flags |= M.SetEyeBlind(0, FALSE) - if(M.ear_damage <= 25) - if(prob(30)) - M.SetEarDeaf(0) return ..() | update_flags /datum/reagent/medicine/atropine diff --git a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm index 7ab7d97dd63..362aebfcc10 100644 --- a/code/modules/reagents/chemistry/recipes/pyrotechnics.dm +++ b/code/modules/reagents/chemistry/recipes/pyrotechnics.dm @@ -287,16 +287,19 @@ datum/chemical_reaction/flash_powder if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) - M.AdjustEarDamage(rand(0, 5)) - M.EarDeaf(15) - if(M.ear_damage >= 15) - to_chat(M, "Your ears start to ring badly!") - if(prob(M.ear_damage - 5)) - to_chat(M, "You can't hear anything!") - M.disabilities |= DEAF - else - if(M.ear_damage >= 5) - to_chat(M, "Your ears start to ring!") + M.AdjustEarDamage(rand(0, 5), 15) + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/obj/item/organ/internal/ears/ears = C.get_int_organ(/obj/item/organ/internal/ears) + if(istype(ears)) + if(ears.ear_damage >= 15) + to_chat(M, "Your ears start to ring badly!") + if(prob(ears.ear_damage - 5)) + to_chat(M, "You can't hear anything!") + M.BecomeDeaf() + else + if(ears.ear_damage >= 5) + to_chat(M, "Your ears start to ring!") holder.remove_reagent("sonic_powder", created_volume) /datum/chemical_reaction/sonic_powder_deafen @@ -322,16 +325,20 @@ datum/chemical_reaction/flash_powder if(!ear_safety) M.Stun(max(10/distance, 3)) M.Weaken(max(10/distance, 3)) - M.AdjustEarDamage(rand(0, 5)) - M.EarDeaf(15) - if(M.ear_damage >= 15) - to_chat(M, "Your ears start to ring badly!") - if(prob(M.ear_damage - 5)) - to_chat(M, "You can't hear anything!") - M.BecomeDeaf() - else - if(M.ear_damage >= 5) - to_chat(M, "Your ears start to ring!") + M.AdjustEarDamage(rand(0, 5), 15) + if(iscarbon(M)) + var/mob/living/carbon/C = M + var/obj/item/organ/internal/ears/ears = C.get_int_organ(/obj/item/organ/internal/ears) + if(istype(ears)) + if(ears.ear_damage >= 15) + to_chat(M, "Your ears start to ring badly!") + if(prob(ears.ear_damage - 5)) + to_chat(M, "You can't hear anything!") + M.BecomeDeaf() + else + if(ears.ear_damage >= 5) + to_chat(M, "Your ears start to ring!") + /datum/chemical_reaction/phlogiston name = "phlogiston" diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index 69030fafa74..e82dbda249d 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -95,7 +95,6 @@ spawn(5) reagents.clear_reagents() return else if(istype(target, /obj/structure/reagent_dispensers)) //A dispenser. Transfer FROM it TO us. - if(target.reagents && !target.reagents.total_volume) to_chat(user, "[target] is empty and can't be refilled!") return @@ -107,7 +106,7 @@ var/trans = target.reagents.trans_to(src, amount_per_transfer_from_this) to_chat(user, "You fill [src] with [trans] unit\s of the contents of [target].") - else if(target.is_open_container() && target.reagents) //Something like a glass. Player probably wants to transfer TO it. + else if(target.is_refillable() && is_drainable()) //Something like a glass. Player probably wants to transfer TO it. if(!reagents.total_volume) to_chat(user, "[src] is empty.") return diff --git a/code/modules/recycling/conveyor2.dm b/code/modules/recycling/conveyor2.dm index 4bbc25a8037..64c201a319f 100644 --- a/code/modules/recycling/conveyor2.dm +++ b/code/modules/recycling/conveyor2.dm @@ -1,6 +1,7 @@ #define DIRECTION_FORWARDS 1 #define DIRECTION_OFF 0 #define DIRECTION_REVERSED -1 +#define IS_OPERATING (operating && can_conveyor_run()) GLOBAL_LIST_INIT(conveyor_belts, list()) //Saves us having to look through the entire machines list for our things GLOBAL_LIST_INIT(conveyor_switches, list()) @@ -22,7 +23,6 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) var/operable = TRUE // Can this belt actually go? var/list/affecting // the list of all items that will be moved this ptick var/reversed = FALSE // set to TRUE to have the conveyor belt be reversed - speed_process = TRUE //gotta go fast var/id //ID of the connected lever // create a conveyor @@ -84,7 +84,7 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) /obj/machinery/conveyor/update_icon() ..() - if(operating && can_conveyor_run()) + if(IS_OPERATING) icon_state = "conveyor_started_[clockwise ? "cw" : "ccw"]" if(reversed) icon_state += "_r" @@ -161,20 +161,30 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) update_icon() /obj/machinery/conveyor/process() - if(!operating) - return - if(!can_conveyor_run()) + if(!IS_OPERATING) return use_power(100) affecting = loc.contents - src // moved items will be all in loc - if(!affecting) - return - sleep(1) - for(var/atom/movable/A in affecting) - if(!A.anchored) - if(A.loc == loc) // prevents the object from being affected if it's not currently here. - step(A,forwards) + var/still_stuff_to_move = FALSE + for(var/atom/movable/AM in affecting) + if(AM.anchored) + continue + still_stuff_to_move = TRUE + addtimer(CALLBACK(src, .proc/move_thing, AM), 1) CHECK_TICK + if(!still_stuff_to_move && speed_process) + makeNormalProcess() + else if(still_stuff_to_move && !speed_process) + makeSpeedProcess() + +/obj/machinery/conveyor/Crossed(atom/movable/AM) + if(!speed_process && !AM.anchored) + makeSpeedProcess() + ..() + +/obj/machinery/conveyor/proc/move_thing(atom/movable/AM) + if(!AM.anchored && AM.loc == loc) + step(AM, forwards) /obj/machinery/conveyor/proc/can_conveyor_run() if(stat & BROKEN) @@ -475,3 +485,4 @@ GLOBAL_LIST_INIT(conveyor_switches, list()) #undef DIRECTION_FORWARDS #undef DIRECTION_OFF #undef DIRECTION_REVERSED +#undef IS_OPERATING diff --git a/code/modules/research/designs/autolathe_designs.dm b/code/modules/research/designs/autolathe_designs.dm index 5a54bf54005..af3088b514b 100644 --- a/code/modules/research/designs/autolathe_designs.dm +++ b/code/modules/research/designs/autolathe_designs.dm @@ -881,3 +881,11 @@ materials = list(MAT_GLASS = 2500) //1.25 glass sheets, broken mirrors will return a shard (1 sheet) build_path = /obj/item/mounted/mirror category = list("initial", "Miscellaneous") + +/datum/design/safe_internals + name = "Safe Internals" + id = "safe" + build_type = AUTOLATHE + materials = list(MAT_METAL = 1000) + build_path = /obj/item/safe_internals + category = list("initial", "Construction") diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index d678a541912..0c2688cc3f1 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -353,16 +353,3 @@ var/ert_request_answered = FALSE name = "centcomm bounced radio" frequency = ERT_FREQ icon_state = "radio" - -/obj/item/storage/box/responseteam/ - name = "boxed survival kit" - -/obj/item/storage/box/responseteam/New() - ..() - new /obj/item/clothing/mask/breath(src) - new /obj/item/tank/emergency_oxygen/engi(src) - new /obj/item/flashlight/flare(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) diff --git a/code/modules/space_management/space_level.dm b/code/modules/space_management/space_level.dm index e2c18699a64..e53264e5d57 100644 --- a/code/modules/space_management/space_level.dm +++ b/code/modules/space_management/space_level.dm @@ -21,7 +21,8 @@ var/dirt_count = 0 var/list/init_list = list() -/datum/space_level/New(z, name, transition_type = SELFLOOPING, traits = list(BLOCK_TELEPORT)) +/datum/space_level/New(z, level_name, transition_type = SELFLOOPING, traits = list(BLOCK_TELEPORT)) + name = level_name zpos = z flags = traits build_space_destination_arrays() diff --git a/code/modules/surgery/organs/blood.dm b/code/modules/surgery/organs/blood.dm index 3c9d310852c..327e0a7d268 100644 --- a/code/modules/surgery/organs/blood.dm +++ b/code/modules/surgery/organs/blood.dm @@ -2,6 +2,8 @@ BLOOD SYSTEM ****************************************************/ +#define EXOTIC_BLEED_MULTIPLIER 4 //Multiplies the actually bled amount by this number for the purposes of turf reaction calculations. + /mob/living/carbon/human/proc/suppress_bloodloss(amount) if(bleedsuppress) return @@ -104,7 +106,7 @@ if(dna.species.exotic_blood) var/datum/reagent/R = GLOB.chemical_reagents_list[get_blood_id()] if(istype(R) && isturf(loc)) - R.reaction_turf(get_turf(src), amt) + R.reaction_turf(get_turf(src), amt * EXOTIC_BLEED_MULTIPLIER) /mob/living/proc/restore_blood() blood_volume = initial(blood_volume) diff --git a/code/modules/surgery/organs/ears.dm b/code/modules/surgery/organs/ears.dm new file mode 100644 index 00000000000..d04e5a95279 --- /dev/null +++ b/code/modules/surgery/organs/ears.dm @@ -0,0 +1,64 @@ +/obj/item/organ/internal/ears + name = "ears" + icon_state = "ears" + gender = PLURAL + organ_tag = "ears" + parent_organ = "head" + slot = "ears" + + // `deaf` measures "ticks" of deafness. While > 0, the person is deaf. + var/deaf = 0 + + // `ear_damage` measures long term damage to the ears, if too high, + // the person will not have either `deaf` or `ear_damage` decrease + // without external aid (earmuffs, drugs) + var/ear_damage = 0 + +/obj/item/organ/internal/ears/on_life() + if(!iscarbon(owner)) + return + var/mob/living/carbon/C = owner + // genetic deafness prevents the body from using the ears, even if healthy + if(C.disabilities & DEAF) + deaf = max(deaf, 1) + else + if(ishuman(C)) + var/mob/living/carbon/human/H = C + if((H.l_ear && H.l_ear.flags_2 & HEALS_EARS_2) || (H.r_ear && H.r_ear.flags_2 & HEALS_EARS_2)) + deaf = max(deaf - 1, 1) + ear_damage = max(ear_damage - 0.10, 0) + // if higher than UNHEALING_EAR_DAMAGE, no natural healing occurs. + if(ear_damage < UNHEALING_EAR_DAMAGE) + ear_damage = max(ear_damage - 0.05, 0) + deaf = max(deaf - 1, 0) + +/obj/item/organ/internal/ears/proc/RestoreEars() + deaf = 0 + ear_damage = 0 + + var/mob/living/carbon/C = owner + if(istype(C) && C.disabilities & DEAF) + deaf = 1 + +/obj/item/organ/internal/ears/proc/AdjustEarDamage(ddmg, ddeaf) + ear_damage = max(ear_damage + ddmg, 0) + deaf = max(deaf + ddeaf, 0) + +/obj/item/organ/internal/ears/proc/MinimumDeafTicks(value) + deaf = max(deaf, value) + +// Mob procs +/mob/living/carbon/RestoreEars() + var/obj/item/organ/internal/ears/ears = get_int_organ(/obj/item/organ/internal/ears) + if(ears) + ears.RestoreEars() + +/mob/living/carbon/AdjustEarDamage(ddmg, ddeaf) + var/obj/item/organ/internal/ears/ears = get_int_organ(/obj/item/organ/internal/ears) + if(ears) + ears.AdjustEarDamage(ddmg, ddeaf) + +/mob/living/carbon/MinimumDeafTicks(value) + var/obj/item/organ/internal/ears/ears = get_int_organ(/obj/item/organ/internal/ears) + if(ears) + ears.MinimumDeafTicks(value) \ No newline at end of file diff --git a/code/modules/surgery/organs/organ_internal.dm b/code/modules/surgery/organs/organ_internal.dm index 4858435cc5f..2dbf85a3b45 100644 --- a/code/modules/surgery/organs/organ_internal.dm +++ b/code/modules/surgery/organs/organ_internal.dm @@ -64,6 +64,7 @@ log_runtime(EXCEPTION("[src] attempted to remove from a [parent_organ], but [parent_organ] didn't exist! [atom_loc_line(M)]"), src) else parent.internal_organs -= src + H.update_int_organs() for(var/X in actions) var/datum/action/A = X @@ -105,6 +106,10 @@ insert(H) return 1 +// Rendering! +/obj/item/organ/internal/proc/render() + return + /obj/item/reagent_containers/food/snacks/organ name = "appendix" icon_state = "appendix" @@ -247,7 +252,7 @@ to_chat(owner, "HONK") owner.SetSleeping(0) owner.Stuttering(20) - owner.AdjustEarDeaf(30) + owner.MinimumDeafTicks(30) owner.Weaken(3) owner << 'sound/items/AirHorn.ogg' if(prob(30)) diff --git a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm index c13c4da83f6..eedcb52be00 100644 --- a/code/modules/surgery/organs/vocal_cords.dm +++ b/code/modules/surgery/organs/vocal_cords.dm @@ -122,7 +122,7 @@ var/static/regex/multispin_words = regex("like a record baby") var/mob/living/list/listeners = list() for(var/mob/living/L in get_mobs_in_view(8, owner, TRUE)) - if(!L.ear_deaf && !L.null_rod_check() && L != owner && L.stat != DEAD) + if(L.can_hear() && !L.null_rod_check() && L != owner && L.stat != DEAD) if(ishuman(L)) var/mob/living/carbon/human/H = L if(istype(H.l_ear, /obj/item/clothing/ears/earmuffs) || istype(H.r_ear, /obj/item/clothing/ears/earmuffs)) diff --git a/code/modules/telesci/bscrystal.dm b/code/modules/telesci/bscrystal.dm index 250ddea1f0f..b1c0153df45 100644 --- a/code/modules/telesci/bscrystal.dm +++ b/code/modules/telesci/bscrystal.dm @@ -19,10 +19,9 @@ pixel_y = rand(-5, 5) /obj/item/stack/ore/bluespace_crystal/attack_self(var/mob/user) - blink_mob(user) - user.drop_item() - user.visible_message("[user] crushes the [src]!") - qdel(src) + if(use(1)) + blink_mob(user) + user.visible_message("[user] crushes a [singular_name]!") /obj/item/stack/ore/bluespace_crystal/proc/blink_mob(var/mob/living/L) if(!is_teleport_allowed(L.z)) diff --git a/goon/browserassets/js/browserOutput.js b/goon/browserassets/js/browserOutput.js index 7f775879fcd..06f968044fe 100644 --- a/goon/browserassets/js/browserOutput.js +++ b/goon/browserassets/js/browserOutput.js @@ -336,7 +336,7 @@ function setCookie(cname, cvalue, exdays) { var d = new Date(); d.setTime(d.getTime() + (exdays*24*60*60*1000)); var expires = 'expires='+d.toUTCString(); - document.cookie = "paradise-" + cname + '=' + cvalue + '; ' + expires; + document.cookie = "paradise-" + cname + '=' + cvalue + '; ' + expires + '; path=/'; } function getCookie(cname) { diff --git a/html/changelog.html b/html/changelog.html index 6c78179f1ae..181610bce0c 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,322 @@ -->
+
13 November 2018
+Birdtalon updated:
+-
+
- Fixes playtime self checker. +
Certhic updated:
+-
+
- fixed a cigs runtime error +
TDSSS updated:
+-
+
- Ancient station's lockdown is now lifted correctly. +
- Ancient station RD console can now be used. +
craftxbox updated:
+-
+
- use mob voice instead of mob name for radios broadcasting signals. +
datlo updated:
+-
+
- Prevent wizards from casting rod form inside the wizard den. +
12 November 2018
+Azule Utama updated:
+-
+
- Fixed text errors in the descriptions for Booger cocktails and Feral cat grenades. +
Birdtalon updated:
+-
+
- Verb to check your own playtime. +
CornMyCob updated:
+-
+
- You can now unwrench and move the library machines/computers, chem master, chem heater, washing machine, pandemic and PDA painter +
Farie82 updated:
+-
+
- Added the pressure damage reduction to mining bots. No more killing machines called mining bots. +
variableundefined updated:
+-
+
- AI can now select the alien screen display +
- Nearly every single sprite accessories (species customization option) has been separated and refactored. Report missing hairstyle / screen / horns / frills / tails etc. +
- Desolate's peacekeeper fluff cyborg sprite is now his service sprite. +
11 November 2018
+Azule Utama updated:
+-
+
- Borgs can no longer stunbaton into infinity. Their batons will now deactivate if they have no power left after hitting someone and cannot be turned back on until they recharge. +
Eschess updated:
+-
+
- large cardboard boxes now show their size when examining +
- fulltile plasma glass windows now have armor +
- rised plastitanium windows integrity +
Farie82 updated:
+-
+
- You can now hurt mining bots with welders on any attempt other than help +
- Can put suits and such back into the suit storage units +
- Fixed the tank/magboots storage part being called Breathmask storage, lazy copy pasta +
Squirgenheimer updated:
+-
+
- Hatched alien larvas will default to being created on the turf of the mob instead of the mob's location, unless specifically allowed (like closets and spacepods) +
tigercat2000 updated:
+-
+
- Ears are now an organ, which can be damaged, removed, and inserted! +
- Human icon code should perform massively better. +
10 November 2018
+Citinited updated:
+-
+
- Prevents an infinite metal exploit using the autolathe. +
- Minimum returnable metal of ammunition boxes has been lowered from 2000 to 500. +
Dovydas12345 updated:
+-
+
- Fixes being unable to slice certain food grown by hydroponics (pineapple, watermelon etc.) +
Shazbot updated:
+-
+
- Some fancy new box sprites, props to Shazbot for the sprites +
- Old cuff box is gone +
TDSSS updated:
+-
+
- Quarantine is now its own lawset. +
09 November 2018
+Alonefromhell updated:
+-
+
- Most sheets held in hand should now display either a metal or reinforced glass icon where appropriate. +
- Holopad should no longer automatically revert to default sprite. +
Azule Utama updated:
+-
+
- Small change to cursed heart's spellbook description. +
AzuleUtama updated:
+-
+
- RCD now gives visible messages when building without enough ammo or on an invalid tile. +
Citinited updated:
+-
+
- Fixes ghosts being able to make conveyors drain more power than they should. +
Dave-TH updated:
+-
+
- Space levels is named now. +
Mitchs98 updated:
+-
+
- Chemical implants now work and can be properly filled via beaker or syringe. Reagents inside can also be syringed out. +
Warior4356 updated:
+-
+
- Thermal Drill, Diamond Tipped Thermal Drill, Safe Codes Paper, Safe Internals, Gives Captain Floor Safe, Gives Captain Safe Codes, Safe-cracking Kit +
- Removed Captain's Digital Safe +
- Changes safe contents +
- Added a safe drilling sound +
- Added drill and safe intenral sprites made by Shazbot194 +
08 November 2018
+Citinited updated:
+-
+
- Conveyors use less power now +
Eschess updated:
+-
+
- fixes the NOR, NAND and XOR logical gates +
- reinforced plasma glass windows give you reinforced plasma glass sheets now +
- fulltile reinforced plasma glass windows now have armor +
Farie82 updated:
+-
+
- Mining bots now function as expected when giving them a health upgrade. No more repairing without healing +
Fel updated:
+-
+
- You can now craft wooden barrels with 30 pieces of wood! They can hold up to 300u of reagents. +
- Putting hydroponics-grown plants into the barrel lets you ferment them for alcohol! Some give bar drinks, while others simply give plain fruit wine. +
- Reagent containers like bottle & glass should be more consistent now. +
Spartan updated:
+-
+
- Plastic bags and wet floor signs can now spawn in maint. +
- Plastic bags are now supplied to your syndicate uplink. Apply directly to head. +
Wario4356 updated:
+-
+
- Mecha can now drill other mecha +
Warior4356 updated:
+-
+
- Mecha drills now tell you when they can't drill +
datlo updated:
+-
+
- Added the Toxins Payload Casing to crafting recipes, a new method of activating tank transfer valve bombs. +
tigercat2000 updated:
+-
+
- Mecha now use action buttons instead of ugly verbs. +
- Mecha weapons can now be selected through a radial menu brought up by Ctrl Clicking on the Mecha while you are piloting it. +
- Tooltips now appear on radial menu buttons when you hover over them. Seriously, why wasn't this a thing in the first place? +
- Action button icons are now located in their own file. +
- Captain and HoS can be nearsighted again. +
variableundefined updated:
+-
+
- Baycard, including tarot cards to loadout +
- Baycard to prize machine +
- All non-syndicate card deck on map has been replaced with bay card. +
07 November 2018
+Spartan updated:
+-
+
- Bluespace Crystals no longer use the entire stack when used on self to teleport. +
Squirgenheimer updated:
+-
+
- toggling off global antag candidacy will disable you from being selected by the Create Antagonist verb. +
TDSSS updated:
+-
+
- added mulebot control to captain's PDA again. +
name here updated:
+-
+
- objective lists are now sorted for admins. +
uc_guy updated:
+-
+
- IPCs and slimes now have an effect on the floor when bleeding. +
06 November 2018
+R1f73r updated:
+-
+
- Added a death text to headslugs when they die +
Squirgenheimer updated:
+-
+
- blob and autotraitor game modes will now check for Global Antag Candidacy when picking new antagonists after round start +
- Global Antag Candidacy button will now show up after round start +
TDSSS updated:
+-
+
- Can no longer attempt to build tranquilite walls (and delete the wall in the process) +
TatsumakiMagi updated:
+-
+
- target icon updates when lit by user +
Triiodine updated:
+-
+
- Airlock sensors & vent system to west mining outpost (Safety first!) +
- Disposals inlet now directly goes to cargo _delivery_ (not conveyor) +
- More spawns for science nerds in accordance to highpop. +
- All conflicting C_tags, dispatch cops or AI should freely use all cameras now. +
- [delta] APC to virology mainroom +
- [delta] All unsimulated turfs are now simulated. +
Ty-Omaha updated:
+-
+
- Fixes spacing in admin deletion logs +
datlo updated:
+-
+
- Added syndicate themed internals to traitor spacesuit and hardsuit. +
05 November 2018
+AzuleUtama updated:
+-
+
- Added Traitor's toolbelt +
- Replaced Military belt with Traitor's toolbelt in the uplink. +
- Price of new belt lowered to 2TC +
- Replaced Military belt with Traitor's toolbelt in maintenance loot. +
Regen updated:
+-
+
- The tentacle changeling power now generates admin logs. +
TatsumakiMagi updated:
+-
+
- Fixes adjacency and standing checks for cutouts +
04 November 2018
+AffectedArc07 updated:
+-
+
- Makes status display font crispy. mmmmmmmmmmmmm +
Citinited updated:
+-
+
- Fixes a bug in machines when switching between speedy and normal processing speeds. +
Dave-TH updated:
+-
+
- Adds the access tuner, a syndicate device for interfacing with airlocks. Try it out! +
Farie82 updated:
+-
+
- Clings now appear dead on medical huds when using regenerative stasis +
R1f73r updated:
+-
+
- Admin Character names will no longer appear in adminhelps +
TDSSS updated:
+-
+
- Allow , in names, Kidan of the world, rejoice +
- Made kidan random name generation less shitty +
Triiodine updated:
+-
+
- ghost role sprites with a palette more depressed than the playerbase +
- medical doc spawn to ghost station +
- Xydonus's second fluff item +
03 November 2018
+Certhic updated:
+-
+
- Added diona nymph action buttons +
- Added diona nymph resist alert when they're merged +
- Diona nymph can now initiate merge with the gestalt +
- Diona nymph can now leave their gestalt by resisting +
- Diona nymph can no longer attack its gestalt +
Farie82 updated:
+-
+
- Security comments now work again. Sec hud arrests will now function as intended. +
Fox McCloud updated:
+-
+
- Fixes exploit involving materials and the recycler +
Jazz23 updated:
+-
+
- A method of uploading coordinates to perma teleporter circuit board. +
variableundefined updated:
+-
+
- Tigercat2000 & variableundefined (Ansari) to the maintainer list. +
02 November 2018
Purpose updated:
-
diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml
index 201ae83ae1b..200a5f9d54f 100644
--- a/html/changelogs/.all_changelog.yml
+++ b/html/changelogs/.all_changelog.yml
@@ -7822,3 +7822,214 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
- rscadd: Adds glowsticks. Currently only available in AncientStation.
variableundefined:
- rscadd: Attack log to stun gloves
+2018-11-03:
+ Certhic:
+ - rscadd: Added diona nymph action buttons
+ - rscadd: Added diona nymph resist alert when they're merged
+ - rscadd: Diona nymph can now initiate merge with the gestalt
+ - bugfix: Diona nymph can now leave their gestalt by resisting
+ - bugfix: Diona nymph can no longer attack its gestalt
+ Farie82:
+ - bugfix: Security comments now work again. Sec hud arrests will now function as
+ intended.
+ Fox McCloud:
+ - bugfix: Fixes exploit involving materials and the recycler
+ Jazz23:
+ - rscadd: A method of uploading coordinates to perma teleporter circuit board.
+ variableundefined:
+ - rscadd: Tigercat2000 & variableundefined (Ansari) to the maintainer list.
+2018-11-04:
+ AffectedArc07:
+ - tweak: Makes status display font crispy. mmmmmmmmmmmmm
+ Citinited:
+ - bugfix: Fixes a bug in machines when switching between speedy and normal processing
+ speeds.
+ Dave-TH:
+ - rscadd: Adds the access tuner, a syndicate device for interfacing with airlocks.
+ Try it out!
+ Farie82:
+ - bugfix: Clings now appear dead on medical huds when using regenerative stasis
+ R1f73r:
+ - bugfix: Admin Character names will no longer appear in adminhelps
+ TDSSS:
+ - tweak: Allow , in names, Kidan of the world, rejoice
+ - tweak: Made kidan random name generation less shitty
+ Triiodine:
+ - rscadd: ghost role sprites with a palette more depressed than the playerbase
+ - rscadd: medical doc spawn to ghost station
+ - rscadd: Xydonus's second fluff item
+2018-11-05:
+ AzuleUtama:
+ - rscadd: Added Traitor's toolbelt
+ - tweak: Replaced Military belt with Traitor's toolbelt in the uplink.
+ - tweak: Price of new belt lowered to 2TC
+ - tweak: Replaced Military belt with Traitor's toolbelt in maintenance loot.
+ Regen:
+ - bugfix: The tentacle changeling power now generates admin logs.
+ TatsumakiMagi:
+ - bugfix: Fixes adjacency and standing checks for cutouts
+2018-11-06:
+ R1f73r:
+ - rscadd: Added a death text to headslugs when they die
+ Squirgenheimer:
+ - bugfix: blob and autotraitor game modes will now check for Global Antag Candidacy
+ when picking new antagonists after round start
+ - tweak: Global Antag Candidacy button will now show up after round start
+ TDSSS:
+ - bugfix: Can no longer attempt to build tranquilite walls (and delete the wall
+ in the process)
+ TatsumakiMagi:
+ - bugfix: target icon updates when lit by user
+ Triiodine:
+ - rscadd: Airlock sensors & vent system to west mining outpost (Safety first!)
+ - tweak: Disposals inlet now directly goes to cargo _delivery_ (not conveyor)
+ - bugfix: More spawns for science nerds in accordance to highpop.
+ - bugfix: All conflicting C_tags, dispatch cops or AI should freely use all cameras
+ now.
+ - rscadd: '[delta] APC to virology mainroom'
+ - bugfix: '[delta] All unsimulated turfs are now simulated.'
+ Ty-Omaha:
+ - spellcheck: Fixes spacing in admin deletion logs
+ datlo:
+ - rscadd: Added syndicate themed internals to traitor spacesuit and hardsuit.
+2018-11-07:
+ Spartan:
+ - bugfix: Bluespace Crystals no longer use the entire stack when used on self to
+ teleport.
+ Squirgenheimer:
+ - tweak: toggling off global antag candidacy will disable you from being selected
+ by the Create Antagonist verb.
+ TDSSS:
+ - bugfix: added mulebot control to captain's PDA again.
+ name here:
+ - tweak: objective lists are now sorted for admins.
+ uc_guy:
+ - bugfix: IPCs and slimes now have an effect on the floor when bleeding.
+2018-11-08:
+ Citinited:
+ - tweak: Conveyors use less power now
+ Eschess:
+ - bugfix: fixes the NOR, NAND and XOR logical gates
+ - bugfix: reinforced plasma glass windows give you reinforced plasma glass sheets
+ now
+ - bugfix: fulltile reinforced plasma glass windows now have armor
+ Farie82:
+ - bugfix: Mining bots now function as expected when giving them a health upgrade.
+ No more repairing without healing
+ Fel:
+ - rscadd: You can now craft wooden barrels with 30 pieces of wood! They can hold
+ up to 300u of reagents.
+ - rscadd: Putting hydroponics-grown plants into the barrel lets you ferment them
+ for alcohol! Some give bar drinks, while others simply give plain fruit wine.
+ - tweak: Reagent containers like bottle & glass should be more consistent now.
+ Spartan:
+ - tweak: Plastic bags and wet floor signs can now spawn in maint.
+ - rscadd: Plastic bags are now supplied to your syndicate uplink. Apply directly
+ to head.
+ Wario4356:
+ - bugfix: Mecha can now drill other mecha
+ Warior4356:
+ - bugfix: Mecha drills now tell you when they can't drill
+ datlo:
+ - bugfix: Added the Toxins Payload Casing to crafting recipes, a new method of activating
+ tank transfer valve bombs.
+ tigercat2000:
+ - rscadd: Mecha now use action buttons instead of ugly verbs.
+ - rscadd: Mecha weapons can now be selected through a radial menu brought up by
+ Ctrl Clicking on the Mecha while you are piloting it.
+ - rscadd: Tooltips now appear on radial menu buttons when you hover over them. Seriously,
+ why wasn't this a thing in the first place?
+ - tweak: Action button icons are now located in their own file.
+ - tweak: Captain and HoS can be nearsighted again.
+ variableundefined:
+ - rscadd: Baycard, including tarot cards to loadout
+ - rscadd: Baycard to prize machine
+ - tweak: All non-syndicate card deck on map has been replaced with bay card.
+2018-11-09:
+ Alonefromhell:
+ - bugfix: Most sheets held in hand should now display either a metal or reinforced
+ glass icon where appropriate.
+ - bugfix: Holopad should no longer automatically revert to default sprite.
+ Azule Utama:
+ - spellcheck: Small change to cursed heart's spellbook description.
+ AzuleUtama:
+ - bugfix: RCD now gives visible messages when building without enough ammo or on
+ an invalid tile.
+ Citinited:
+ - bugfix: Fixes ghosts being able to make conveyors drain more power than they should.
+ Dave-TH:
+ - tweak: Space levels is named now.
+ Mitchs98:
+ - bugfix: Chemical implants now work and can be properly filled via beaker or syringe.
+ Reagents inside can also be syringed out.
+ Warior4356:
+ - rscadd: Thermal Drill, Diamond Tipped Thermal Drill, Safe Codes Paper, Safe Internals,
+ Gives Captain Floor Safe, Gives Captain Safe Codes, Safe-cracking Kit
+ - rscdel: Removed Captain's Digital Safe
+ - tweak: Changes safe contents
+ - soundadd: Added a safe drilling sound
+ - imageadd: Added drill and safe intenral sprites made by Shazbot194
+2018-11-10:
+ Citinited:
+ - bugfix: Prevents an infinite metal exploit using the autolathe.
+ - tweak: Minimum returnable metal of ammunition boxes has been lowered from 2000
+ to 500.
+ Dovydas12345:
+ - bugfix: Fixes being unable to slice certain food grown by hydroponics (pineapple,
+ watermelon etc.)
+ Shazbot:
+ - imageadd: Some fancy new box sprites, props to Shazbot for the sprites
+ - imagedel: Old cuff box is gone
+ TDSSS:
+ - tweak: Quarantine is now its own lawset.
+2018-11-11:
+ Azule Utama:
+ - bugfix: Borgs can no longer stunbaton into infinity. Their batons will now deactivate
+ if they have no power left after hitting someone and cannot be turned back on
+ until they recharge.
+ Eschess:
+ - bugfix: large cardboard boxes now show their size when examining
+ - bugfix: fulltile plasma glass windows now have armor
+ - tweak: rised plastitanium windows integrity
+ Farie82:
+ - bugfix: You can now hurt mining bots with welders on any attempt other than help
+ - bugfix: Can put suits and such back into the suit storage units
+ - spellcheck: Fixed the tank/magboots storage part being called Breathmask storage,
+ lazy copy pasta
+ Squirgenheimer:
+ - tweak: Hatched alien larvas will default to being created on the turf of the mob
+ instead of the mob's location, unless specifically allowed (like closets and
+ spacepods)
+ tigercat2000:
+ - rscadd: Ears are now an organ, which can be damaged, removed, and inserted!
+ - tweak: Human icon code should perform massively better.
+2018-11-12:
+ Azule Utama:
+ - spellcheck: Fixed text errors in the descriptions for Booger cocktails and Feral
+ cat grenades.
+ Birdtalon:
+ - rscadd: Verb to check your own playtime.
+ CornMyCob:
+ - rscadd: You can now unwrench and move the library machines/computers, chem master,
+ chem heater, washing machine, pandemic and PDA painter
+ Farie82:
+ - bugfix: Added the pressure damage reduction to mining bots. No more killing machines
+ called mining bots.
+ variableundefined:
+ - rscadd: AI can now select the alien screen display
+ - tweak: Nearly every single sprite accessories (species customization option) has
+ been separated and refactored. Report missing hairstyle / screen / horns / frills
+ / tails etc.
+ - tweak: Desolate's peacekeeper fluff cyborg sprite is now his service sprite.
+2018-11-13:
+ Birdtalon:
+ - bugfix: Fixes playtime self checker.
+ Certhic:
+ - bugfix: fixed a cigs runtime error
+ TDSSS:
+ - bugfix: Ancient station's lockdown is now lifted correctly.
+ - bugfix: Ancient station RD console can now be used.
+ craftxbox:
+ - bugfix: use mob voice instead of mob name for radios broadcasting signals.
+ datlo:
+ - bugfix: Prevent wizards from casting rod form inside the wizard den.
diff --git a/html/changelogs/AutoChangeLog-pr-10096.yml b/html/changelogs/AutoChangeLog-pr-10096.yml
deleted file mode 100644
index 648287f96cb..00000000000
--- a/html/changelogs/AutoChangeLog-pr-10096.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-author: "Fox McCloud"
-delete-after: True
-changes:
- - bugfix: "Fixes exploit involving materials and the recycler"
diff --git a/icons/effects/drill.dmi b/icons/effects/drill.dmi
new file mode 100644
index 00000000000..c6935b39eed
Binary files /dev/null and b/icons/effects/drill.dmi differ
diff --git a/icons/mob/actions.dmi b/icons/mob/actions/actions.dmi
similarity index 100%
rename from icons/mob/actions.dmi
rename to icons/mob/actions/actions.dmi
diff --git a/icons/mob/actions/actions_mecha.dmi b/icons/mob/actions/actions_mecha.dmi
new file mode 100644
index 00000000000..81c706b22c8
Binary files /dev/null and b/icons/mob/actions/actions_mecha.dmi differ
diff --git a/icons/mob/belt.dmi b/icons/mob/belt.dmi
index c833c6d66c2..0cfc59b0553 100644
Binary files a/icons/mob/belt.dmi and b/icons/mob/belt.dmi differ
diff --git a/icons/mob/body_accessory.dmi b/icons/mob/body_accessory.dmi
index b6d28330b69..48198ff0901 100644
Binary files a/icons/mob/body_accessory.dmi and b/icons/mob/body_accessory.dmi differ
diff --git a/icons/mob/custom_synthetic/custom-synthetic.dmi b/icons/mob/custom_synthetic/custom-synthetic.dmi
index 5b50438d6dd..d0e38f40a7d 100644
Binary files a/icons/mob/custom_synthetic/custom-synthetic.dmi and b/icons/mob/custom_synthetic/custom-synthetic.dmi differ
diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi
index 43e9a775ff2..b5444b2ff87 100644
Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ
diff --git a/icons/mob/human_face.dmi b/icons/mob/human_face.dmi
index 10badae1648..ff471760fe8 100644
Binary files a/icons/mob/human_face.dmi and b/icons/mob/human_face.dmi differ
diff --git a/icons/mob/inhands/items_lefthand.dmi b/icons/mob/inhands/items_lefthand.dmi
index 1455fa9ab0e..149a5ddc12c 100644
Binary files a/icons/mob/inhands/items_lefthand.dmi and b/icons/mob/inhands/items_lefthand.dmi differ
diff --git a/icons/mob/inhands/items_righthand.dmi b/icons/mob/inhands/items_righthand.dmi
index d7e258376af..ec0d78a792f 100644
Binary files a/icons/mob/inhands/items_righthand.dmi and b/icons/mob/inhands/items_righthand.dmi differ
diff --git a/icons/mob/screen_alert.dmi b/icons/mob/screen_alert.dmi
index 56c1730fd3a..60488151158 100644
Binary files a/icons/mob/screen_alert.dmi and b/icons/mob/screen_alert.dmi differ
diff --git a/icons/mob/sprite_accessories/diona/diona_hair.dmi b/icons/mob/sprite_accessories/diona/diona_hair.dmi
new file mode 100644
index 00000000000..1c29dbc3b4e
Binary files /dev/null and b/icons/mob/sprite_accessories/diona/diona_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/drask/drask_body_markings.dmi b/icons/mob/sprite_accessories/drask/drask_body_markings.dmi
new file mode 100644
index 00000000000..2a0ef5d32b5
Binary files /dev/null and b/icons/mob/sprite_accessories/drask/drask_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/grey/grey_body_markings.dmi b/icons/mob/sprite_accessories/grey/grey_body_markings.dmi
new file mode 100644
index 00000000000..f24f23a5e1e
Binary files /dev/null and b/icons/mob/sprite_accessories/grey/grey_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/human/human_body_markings.dmi b/icons/mob/sprite_accessories/human/human_body_markings.dmi
new file mode 100644
index 00000000000..6495176fea2
Binary files /dev/null and b/icons/mob/sprite_accessories/human/human_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/human/human_facial_hair.dmi b/icons/mob/sprite_accessories/human/human_facial_hair.dmi
new file mode 100644
index 00000000000..26f04a7a5fd
Binary files /dev/null and b/icons/mob/sprite_accessories/human/human_facial_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/human/human_hair.dmi b/icons/mob/sprite_accessories/human/human_hair.dmi
new file mode 100644
index 00000000000..0d5d01c3a3f
Binary files /dev/null and b/icons/mob/sprite_accessories/human/human_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/ipc/ipc_face.dmi b/icons/mob/sprite_accessories/ipc/ipc_face.dmi
new file mode 100644
index 00000000000..f98029b5297
Binary files /dev/null and b/icons/mob/sprite_accessories/ipc/ipc_face.dmi differ
diff --git a/icons/mob/sprite_accessories/ipc/ipc_head_accessories.dmi b/icons/mob/sprite_accessories/ipc/ipc_head_accessories.dmi
new file mode 100644
index 00000000000..e635f47c518
Binary files /dev/null and b/icons/mob/sprite_accessories/ipc/ipc_head_accessories.dmi differ
diff --git a/icons/mob/sprite_accessories/ipc/ipc_optics.dmi b/icons/mob/sprite_accessories/ipc/ipc_optics.dmi
new file mode 100644
index 00000000000..f6c534eaa2e
Binary files /dev/null and b/icons/mob/sprite_accessories/ipc/ipc_optics.dmi differ
diff --git a/icons/mob/sprite_accessories/kidan/kidan_body_markings.dmi b/icons/mob/sprite_accessories/kidan/kidan_body_markings.dmi
new file mode 100644
index 00000000000..c25611a8868
Binary files /dev/null and b/icons/mob/sprite_accessories/kidan/kidan_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/kidan/kidan_hair.dmi b/icons/mob/sprite_accessories/kidan/kidan_hair.dmi
new file mode 100644
index 00000000000..65820d3bf6e
Binary files /dev/null and b/icons/mob/sprite_accessories/kidan/kidan_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/kidan/kidan_head_accessories.dmi b/icons/mob/sprite_accessories/kidan/kidan_head_accessories.dmi
new file mode 100644
index 00000000000..cf578b68560
Binary files /dev/null and b/icons/mob/sprite_accessories/kidan/kidan_head_accessories.dmi differ
diff --git a/icons/mob/sprite_accessories/kidan/kidan_head_markings.dmi b/icons/mob/sprite_accessories/kidan/kidan_head_markings.dmi
new file mode 100644
index 00000000000..c5ec5348a60
Binary files /dev/null and b/icons/mob/sprite_accessories/kidan/kidan_head_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi b/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi
new file mode 100644
index 00000000000..8ac1e0f4f05
Binary files /dev/null and b/icons/mob/sprite_accessories/nucleation/nucleation_face.dmi differ
diff --git a/icons/mob/sprite_accessories/skrell/skrell_hair.dmi b/icons/mob/sprite_accessories/skrell/skrell_hair.dmi
new file mode 100644
index 00000000000..e3fba69295f
Binary files /dev/null and b/icons/mob/sprite_accessories/skrell/skrell_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_body_markings.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_body_markings.dmi
new file mode 100644
index 00000000000..799d2d7a72f
Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_facial_hair.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_facial_hair.dmi
new file mode 100644
index 00000000000..b584b6fa8fd
Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_facial_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_hair.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_hair.dmi
new file mode 100644
index 00000000000..dedf089392e
Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_head_accessories.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_head_accessories.dmi
new file mode 100644
index 00000000000..1d62570f0f7
Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_head_accessories.dmi differ
diff --git a/icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi b/icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi
new file mode 100644
index 00000000000..fe9b6af8972
Binary files /dev/null and b/icons/mob/sprite_accessories/tajaran/tajaran_head_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/unathi/unathi_body_markings.dmi b/icons/mob/sprite_accessories/unathi/unathi_body_markings.dmi
new file mode 100644
index 00000000000..a137874de9a
Binary files /dev/null and b/icons/mob/sprite_accessories/unathi/unathi_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi b/icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi
new file mode 100644
index 00000000000..d39c143a8b8
Binary files /dev/null and b/icons/mob/sprite_accessories/unathi/unathi_facial_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/unathi/unathi_hair.dmi b/icons/mob/sprite_accessories/unathi/unathi_hair.dmi
new file mode 100644
index 00000000000..48fdf4b5b68
Binary files /dev/null and b/icons/mob/sprite_accessories/unathi/unathi_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/unathi/unathi_head_markings.dmi b/icons/mob/sprite_accessories/unathi/unathi_head_markings.dmi
new file mode 100644
index 00000000000..02d51448512
Binary files /dev/null and b/icons/mob/sprite_accessories/unathi/unathi_head_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_body_markings.dmi b/icons/mob/sprite_accessories/vox/vox_body_markings.dmi
new file mode 100644
index 00000000000..fa802bb0ffe
Binary files /dev/null and b/icons/mob/sprite_accessories/vox/vox_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi b/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi
new file mode 100644
index 00000000000..f707601b09a
Binary files /dev/null and b/icons/mob/sprite_accessories/vox/vox_facial_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_hair.dmi b/icons/mob/sprite_accessories/vox/vox_hair.dmi
new file mode 100644
index 00000000000..fd3e47498fd
Binary files /dev/null and b/icons/mob/sprite_accessories/vox/vox_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi
new file mode 100644
index 00000000000..ca435a12ee9
Binary files /dev/null and b/icons/mob/sprite_accessories/vox/vox_tail_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi b/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi
new file mode 100644
index 00000000000..70ef0d08f7e
Binary files /dev/null and b/icons/mob/sprite_accessories/vox/vox_tail_markings2.dmi differ
diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_body_markings.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_body_markings.dmi
new file mode 100644
index 00000000000..08fa92e656d
Binary files /dev/null and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_body_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dmi
new file mode 100644
index 00000000000..ad992fbdfd7
Binary files /dev/null and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_facial_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_hair.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_hair.dmi
new file mode 100644
index 00000000000..ab84f128b5d
Binary files /dev/null and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_hair.dmi differ
diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi
new file mode 100644
index 00000000000..5943b1ef51c
Binary files /dev/null and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_head_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi
new file mode 100644
index 00000000000..28a247c39fe
Binary files /dev/null and b/icons/mob/sprite_accessories/vulpkanin/vulpkanin_tail_markings.dmi differ
diff --git a/icons/mob/sprite_accessories/wryn/wryn_face.dmi b/icons/mob/sprite_accessories/wryn/wryn_face.dmi
new file mode 100644
index 00000000000..f826b969c57
Binary files /dev/null and b/icons/mob/sprite_accessories/wryn/wryn_face.dmi differ
diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi
index 354d0fbebf6..7ffa0461742 100644
Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ
diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi
index 6ba24f30489..98c63155bd4 100644
Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ
diff --git a/icons/obj/card.dmi b/icons/obj/card.dmi
index 4799f8736d2..0dbab70dd32 100644
Binary files a/icons/obj/card.dmi and b/icons/obj/card.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 436d2fa3cea..ed4b3fa8627 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index ec96b276ab6..2603a655bff 100644
Binary files a/icons/obj/custom_items.dmi and b/icons/obj/custom_items.dmi differ
diff --git a/icons/obj/device.dmi b/icons/obj/device.dmi
index 03ea5ef9684..02de48a6f41 100644
Binary files a/icons/obj/device.dmi and b/icons/obj/device.dmi differ
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 4b53ea70f51..9284e790cf8 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ
diff --git a/icons/obj/objects.dmi b/icons/obj/objects.dmi
index 1206aa48dfc..f9c13a5c332 100644
Binary files a/icons/obj/objects.dmi and b/icons/obj/objects.dmi differ
diff --git a/icons/obj/storage.dmi b/icons/obj/storage.dmi
index bd7a6ab837c..ddfe7ccb506 100644
Binary files a/icons/obj/storage.dmi and b/icons/obj/storage.dmi differ
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index e1364852b9f..dfc7faf89df 100644
Binary files a/icons/obj/structures.dmi and b/icons/obj/structures.dmi differ
diff --git a/icons/obj/surgery.dmi b/icons/obj/surgery.dmi
index 6a211451466..4ff367c4cc3 100644
Binary files a/icons/obj/surgery.dmi and b/icons/obj/surgery.dmi differ
diff --git a/icons/obj/tank.dmi b/icons/obj/tank.dmi
index e5eec2cf459..72cce42bd79 100644
Binary files a/icons/obj/tank.dmi and b/icons/obj/tank.dmi differ
diff --git a/nano/templates/safe.tmpl b/nano/templates/safe.tmpl
index 0e8bb29faa0..48e1616b968 100644
--- a/nano/templates/safe.tmpl
+++ b/nano/templates/safe.tmpl
@@ -33,14 +33,14 @@
{{:helper.link('Left 10', 'arrow-left', {'increment': 10})}}
{{:helper.link('Left 1', 'arrow-left', {'increment': 1})}}
{{:data.dial}}
{{:helper.link('Right 1', 'arrow-right', null, 'disabled')}}
- {{:helper.link('Right 10', 'arrow-right', null, 'disabled')}}
- {{:helper.link('Right 100', 'arrow-right', null, 'disabled')}}
- {{else}}
+ {{if data.locked}}
{{:helper.link('Right 1', 'arrow-right', {'decrement': 1})}}
{{:helper.link('Right 10', 'arrow-right', {'decrement': 10})}}
{{:helper.link('Right 50', 'arrow-right', {'decrement': 50})}}
+ {{else}}
+ {{:helper.link('Right 1', 'arrow-right', null, 'disabled')}}
+ {{:helper.link('Right 10', 'arrow-right', null, 'disabled')}}
+ {{:helper.link('Right 100', 'arrow-right', null, 'disabled')}}
{{/if}}