From 734d0166a090fadc32c09510e0ad527bf4273daa Mon Sep 17 00:00:00 2001 From: Contrabang <91113370+Contrabang@users.noreply.github.com> Date: Sat, 30 Nov 2024 07:04:03 -0500 Subject: [PATCH] Removes some non-existant typepaths (#27362) * Adds CI for missing icon_states * yeah * more fixes * more fixes * seems good * moar * fix * yea * hrtyhrt * yeah * WOE * Removes some non-existant typepaths * yes --- .../lavaland_surface_althland_excavation.dmm | 2 +- .../RandomRuins/SpaceRuins/blowntcommsat.dmm | 2 +- .../SpaceRuins/telecomns_returns.dmm | 4 +- _maps/map_files/stations/metastation.dmm | 6 +- code/__HELPERS/text.dm | 6 +- code/_globalvars/lists/maint_loot_tables.dm | 2 +- code/datums/chatmessage.dm | 2 +- code/datums/keybindings/emote_keybinds.dm | 14 ++-- code/datums/outfits/outfit_admin.dm | 2 +- code/datums/periodic_news.dm | 4 +- code/datums/spells/chef.dm | 6 +- code/datums/spells/mime.dm | 2 +- code/datums/spells/summonitem.dm | 2 +- .../wires/particle_accelerator_wires.dm | 10 +-- code/game/area/areas/depot-areas.dm | 8 +-- code/game/dna/dna_modifier.dm | 36 +++++----- .../game/gamemodes/miniantags/demons/demon.dm | 2 +- .../demons/slaughter_demon/slaughter.dm | 8 +-- .../miniantags/guardian/host_actions.dm | 2 +- .../miniantags/guardian/types/ranged.dm | 4 +- .../gamemodes/miniantags/revenant/revenant.dm | 6 +- code/game/gamemodes/objective.dm | 2 +- code/game/gamemodes/steal_items.dm | 2 +- code/game/jobs/job/support.dm | 6 +- code/game/machinery/suit_storage_unit.dm | 2 +- .../game/machinery/vendors/generic_vendors.dm | 4 +- .../machinery/vendors/wardrobe_vendors.dm | 4 +- code/game/objects/effects/forcefields.dm | 2 +- code/game/objects/effects/landmarks.dm | 4 +- .../effects/spawners/depot_spawners.dm | 6 +- .../game/objects/effects/spawners/lootdrop.dm | 2 +- .../effects/spawners/random/misc_spawners.dm | 4 +- .../weapons/bio_chips/bio_chip_prescan.dm | 4 +- .../weapons/bio_chips/bio_chip_storage.dm | 6 +- code/game/objects/items/weapons/caution.dm | 2 +- code/game/objects/items/weapons/disks.dm | 2 +- .../objects/items/weapons/dna_injector.dm | 2 +- .../objects/items/weapons/storage/belt.dm | 2 +- .../crates_lockers/closets/malfunction.dm | 4 +- .../closets/secure/depot_closets.dm | 22 +++--- .../objects/structures/grey_autocloner.dm | 2 +- .../objects/structures/lavaland/ladder.dm | 2 +- .../antag_org/antag_org_syndicate.dm | 4 +- code/modules/awaymissions/loot.dm | 4 +- code/modules/clothing/chameleon.dm | 72 +++++++++---------- code/modules/clothing/head/beret.dm | 4 +- code/modules/clothing/masks/voicemodulator.dm | 2 +- code/modules/clothing/suits/misc_suits.dm | 2 +- code/modules/clothing/under/misc_jumpsuits.dm | 2 +- .../food_and_drinks/recipes/recipes_grill.dm | 2 +- .../recipes/recipes_microwave.dm | 4 +- code/modules/martial_arts/adminfu.dm | 2 +- .../combos/adminfu/healing_palm.dm | 4 +- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../carbon/alien/humanoid/humanoid_emote.dm | 8 +-- .../mob/living/carbon/human/species/moth.dm | 10 +-- .../mob/living/silicon/robot/robot_modules.dm | 2 +- .../friendly/nian_caterpillar.dm | 6 +- .../simple_animal/hostile/gorilla/gorilla.dm | 6 +- .../living/simple_animal/hostile/hellhound.dm | 2 +- .../sprite_accessories/unathi/unathi_hair.dm | 2 +- code/modules/mod/mod_control.dm | 2 +- .../particle_accelerator/particle_control.dm | 2 +- .../chemistry/reagents/drinks_reagents.dm | 2 +- .../chemistry/reagents/food_reagents.dm | 2 +- code/modules/response_team/ert.dm | 38 +++++----- code/modules/response_team/ert_outfits.dm | 60 ++++++++-------- code/modules/vehicle/tg_vehicles/scooter.dm | 4 +- .../vehicle/tg_vehicles/tg_vehicle_actions.dm | 8 +-- .../27362_remove_redundant_typepaths.txt | 15 ++++ 70 files changed, 252 insertions(+), 237 deletions(-) create mode 100644 tools/UpdatePaths/Scripts/27362_remove_redundant_typepaths.txt diff --git a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm index 0d7ed5db187..00d96dd7467 100644 --- a/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm +++ b/_maps/map_files/RandomRuins/LavaRuins/lavaland_surface_althland_excavation.dmm @@ -1127,7 +1127,7 @@ "Es" = ( /obj/structure/lattice/catwalk/mining, /obj/effect/mapping_helpers/no_lava, -/obj/structure/ladder/unusable, +/obj/structure/ladder, /turf/simulated/floor/chasm, /area/lavaland/surface/outdoors) "Et" = ( diff --git a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm index 9089c4f18f2..1486bb4f9a6 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/blowntcommsat.dmm @@ -857,7 +857,7 @@ /turf/simulated/floor/plasteel, /area/ruin/space/tcommsat) "Zd" = ( -/obj/structure/closet/malf/suits, +/obj/structure/closet/malf_suits, /turf/simulated/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm index 94f6209c037..a81a95f50cc 100644 --- a/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm +++ b/_maps/map_files/RandomRuins/SpaceRuins/telecomns_returns.dmm @@ -538,7 +538,7 @@ }, /area/ruin/space/telecomms/chamber) "kU" = ( -/obj/structure/closet/malf/suits, +/obj/structure/closet/malf_suits, /obj/effect/spawner/random/cobweb/left/frequent, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) @@ -2334,7 +2334,7 @@ }, /area/ruin/space/telecomms/chamber) "Jz" = ( -/obj/structure/closet/malf/suits, +/obj/structure/closet/malf_suits, /turf/simulated/floor/plasteel, /area/ruin/space/telecomms/tele) "JC" = ( diff --git a/_maps/map_files/stations/metastation.dmm b/_maps/map_files/stations/metastation.dmm index 5bb30c6beb3..40927457e54 100644 --- a/_maps/map_files/stations/metastation.dmm +++ b/_maps/map_files/stations/metastation.dmm @@ -4450,7 +4450,7 @@ /area/station/maintenance/port) "azQ" = ( /obj/item/stack/sheet/cardboard, -/obj/effect/spawner/random/janitor/supplies, +/obj/effect/spawner/random/jani_supplies, /turf/simulated/floor/plating, /area/station/maintenance/port2) "azR" = ( @@ -34134,7 +34134,7 @@ icon_state = "1-4" }, /obj/effect/turf_decal/stripes/line, -/obj/effect/spawner/random/janitor/supplies, +/obj/effect/spawner/random/jani_supplies, /turf/simulated/floor/plating, /area/station/public/storage/emergency/port) "cuc" = ( @@ -39591,7 +39591,7 @@ /area/station/maintenance/apmaint) "cPq" = ( /obj/effect/mapping_helpers/turfs/damage, -/obj/effect/spawner/random/janitor/supplies, +/obj/effect/spawner/random/jani_supplies, /turf/simulated/floor/plating, /area/station/maintenance/port) "cPr" = ( diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 2c8e2e1fd1b..d42d688eed8 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -602,12 +602,12 @@ text = replacetext(text, "", "\[syndielogo\]") return text -/datum/html/split_holder +/datum/html_split_holder var/list/opening var/inner_text var/list/closing -/datum/html/split_holder/New() +/datum/html_split_holder/New() opening = list() inner_text = "" closing = list() @@ -615,7 +615,7 @@ /proc/split_html(raw_text="") // gently borrowed and re-purposed from code/modules/pda/utilities.dm // define a datum to hold our result - var/datum/html/split_holder/s = new() + var/datum/html_split_holder/s = new() // copy the raw_text to get started var/text = copytext_char(raw_text, 1) diff --git a/code/_globalvars/lists/maint_loot_tables.dm b/code/_globalvars/lists/maint_loot_tables.dm index 12640e2c35a..b2bb676fa8f 100644 --- a/code/_globalvars/lists/maint_loot_tables.dm +++ b/code/_globalvars/lists/maint_loot_tables.dm @@ -122,7 +122,7 @@ GLOBAL_LIST_INIT(maintenance_loot_tier_1, list( GLOBAL_LIST_INIT(maintenance_loot_tier_2, list( list( // Rarer items - /obj/effect/spawner/random/mod/maint, + /obj/effect/spawner/random/mod_maint, /obj/item/clothing/glasses/meson, /obj/item/clothing/head/welding, /obj/item/crowbar/red, diff --git a/code/datums/chatmessage.dm b/code/datums/chatmessage.dm index 8108bf3f430..5a40bab9138 100644 --- a/code/datums/chatmessage.dm +++ b/code/datums/chatmessage.dm @@ -106,7 +106,7 @@ // Clip message var/maxlen = CHAT_MESSAGE_MAX_LENGTH - var/datum/html/split_holder/s = split_html(text) + var/datum/html_split_holder/s = split_html(text) if(length_char(s.inner_text) > maxlen) var/chattext = copytext_char(s.inner_text, 1, maxlen + 1) + "..." text = jointext(s.opening, "") + chattext + jointext(s.closing, "") diff --git a/code/datums/keybindings/emote_keybinds.dm b/code/datums/keybindings/emote_keybinds.dm index f81ed46cd94..a021b95995f 100644 --- a/code/datums/keybindings/emote_keybinds.dm +++ b/code/datums/keybindings/emote_keybinds.dm @@ -278,15 +278,15 @@ return isalien(M) && ..() /datum/keybinding/emote/carbon/alien/humanoid/roar - linked_emote = /datum/emote/living/carbon/alien/humanoid/roar + linked_emote = /datum/emote/living/carbon/alien_humanoid/roar name = "Roar" /datum/keybinding/emote/carbon/alien/humanoid/hiss - linked_emote = /datum/emote/living/carbon/alien/humanoid/hiss + linked_emote = /datum/emote/living/carbon/alien_humanoid/hiss name = "Hiss" /datum/keybinding/emote/carbon/alien/humanoid/gnarl - linked_emote = /datum/emote/living/carbon/alien/humanoid/gnarl + linked_emote = /datum/emote/living/carbon/alien_humanoid/gnarl name = "Gnarl" /datum/keybinding/emote/carbon/brain @@ -397,7 +397,7 @@ linked_emote = /datum/emote/living/carbon/human/salute name = "Salute" -/datum/keybinding/emote/carbon/human/sign/signal +/datum/keybinding/emote/carbon/human/signal linked_emote = /datum/emote/living/carbon/sign/signal name = "Signal" @@ -509,7 +509,7 @@ linked_emote = /datum/emote/living/carbon/human/creak name = "Creak" -/datum/keybinding/emote/carbon/human/slime/squish +/datum/keybinding/emote/carbon/human/squish linked_emote = /datum/emote/living/carbon/human/slime/squish name = "Squish" @@ -556,11 +556,11 @@ linked_emote = /datum/emote/living/carbon/human/monkey/tail name = "Tail (Monkey)" -/datum/keybinding/emote/carbon/human/monkey/scream/screech +/datum/keybinding/emote/carbon/human/monkey/screech linked_emote = /datum/emote/living/carbon/human/scream/screech name = "Screech (Monkey)" -/datum/keybinding/emote/carbon/human/monkey/scream/screech/roar +/datum/keybinding/emote/carbon/human/monkey/screech/roar linked_emote = /datum/emote/living/carbon/human/scream/screech/roar name = "Roar (Monkey)" diff --git a/code/datums/outfits/outfit_admin.dm b/code/datums/outfits/outfit_admin.dm index d1e087f4deb..519c58dc6e2 100644 --- a/code/datums/outfits/outfit_admin.dm +++ b/code/datums/outfits/outfit_admin.dm @@ -780,7 +780,7 @@ /datum/outfit/admin/solgov/lieutenant name = "TSF Lieutenant" uniform = /obj/item/clothing/under/solgov/command - head = /obj/item/clothing/head/beret/solgov/command + head = /obj/item/clothing/head/beret/solgov glasses = /obj/item/clothing/glasses/night back = /obj/item/storage/backpack/satchel shoes = /obj/item/clothing/shoes/magboots/elite diff --git a/code/datums/periodic_news.dm b/code/datums/periodic_news.dm index 03715e6ec02..ed8102f06cf 100644 --- a/code/datums/periodic_news.dm +++ b/code/datums/periodic_news.dm @@ -36,7 +36,7 @@ the experiments, and reported to have died in a \"work accident\" by Nanotrasen Inc."} author = "Unauthorized" -/datum/news_announcement/bluespace_research/announcement +/datum/news_announcement/bluespace_research round_time = 60*20 message = {"The new field of research trying to explain several interesting spacetime oddities, also known as \"Bluespace Research\", has reached new heights. Of the several @@ -69,7 +69,7 @@ accordingly."} round_time = 60 * 90 -/datum/news_announcement/lotus_tree/explosions +/datum/news_announcement/lotus_tree channel_name = "Nyx Daily" author = "Reporter Leland H. Howards" diff --git a/code/datums/spells/chef.dm b/code/datums/spells/chef.dm index 642f5476f44..b07004f5c87 100644 --- a/code/datums/spells/chef.dm +++ b/code/datums/spells/chef.dm @@ -1,4 +1,4 @@ -/datum/spell/chef/expert_chef +/datum/spell/expert_chef name = "Expert Chef Knowledge" desc = "Find things you can cook with the items in reach." school = "chef" @@ -9,9 +9,9 @@ action_background_icon_state = "bg_default" still_recharging_msg = "All this thinking makes your head hurt, wait a bit longer." -/datum/spell/chef/expert_chef/cast(list/targets, mob/user = usr) +/datum/spell/expert_chef/cast(list/targets, mob/user = usr) var/mob/living/carbon/human/H = targets[1] H.expert_chef_knowledge() -/datum/spell/chef/expert_chef/create_new_targeting() +/datum/spell/expert_chef/create_new_targeting() return new /datum/spell_targeting/self diff --git a/code/datums/spells/mime.dm b/code/datums/spells/mime.dm index 5f483b4edf8..e1229dbcc16 100644 --- a/code/datums/spells/mime.dm +++ b/code/datums/spells/mime.dm @@ -64,7 +64,7 @@ name = "Invisible Greater Wall" desc = "Form an invisible three tile wide blockade." school = "mime" - wall_type = /obj/effect/forcefield/mime/advanced + wall_type = /obj/effect/forcefield/mime invocation_type = "emote" invocation_emote_self = "You form a blockade in front of yourself." base_cooldown = 60 SECONDS diff --git a/code/datums/spells/summonitem.dm b/code/datums/spells/summonitem.dm index 7d2d7f7251c..2c4ceebcc56 100644 --- a/code/datums/spells/summonitem.dm +++ b/code/datums/spells/summonitem.dm @@ -68,7 +68,7 @@ to_chat(pocket.owner, "Your [pocket.name] suddenly feels lighter. How strange!") visible_item = FALSE break - if(istype(item_to_retrieve.loc, /obj/item/storage/hidden/implant)) //The implant should be left alone + if(istype(item_to_retrieve.loc, /obj/item/storage/hidden_implant)) //The implant should be left alone var/obj/item/storage/S = item_to_retrieve.loc for(var/mob/M in S.mobs_viewing) to_chat(M, "[item_to_retrieve] suddenly disappears!") diff --git a/code/datums/wires/particle_accelerator_wires.dm b/code/datums/wires/particle_accelerator_wires.dm index 526ffd80270..34a7d1313fe 100644 --- a/code/datums/wires/particle_accelerator_wires.dm +++ b/code/datums/wires/particle_accelerator_wires.dm @@ -1,19 +1,19 @@ -/datum/wires/particle_acc/control_box +/datum/wires/particle_accelerator wire_count = 5 holder_type = /obj/machinery/particle_accelerator/control_box proper_name = "Particle accelerator control" -/datum/wires/particle_acc/control_box/New(atom/_holder) +/datum/wires/particle_accelerator/New(atom/_holder) wires = list(WIRE_PARTICLE_POWER, WIRE_PARTICLE_STRENGTH, WIRE_PARTICLE_INTERFACE, WIRE_PARTICLE_POWER_LIMIT) return ..() -/datum/wires/particle_acc/control_box/interactable(mob/user) +/datum/wires/particle_accelerator/interactable(mob/user) var/obj/machinery/particle_accelerator/control_box/C = holder if(C.construction_state == 2) return TRUE return FALSE -/datum/wires/particle_acc/control_box/on_pulse(wire) +/datum/wires/particle_accelerator/on_pulse(wire) var/obj/machinery/particle_accelerator/control_box/C = holder switch(wire) if(WIRE_PARTICLE_POWER) @@ -29,7 +29,7 @@ C.visible_message("[bicon(C)][C] makes a large whirring noise.") ..() -/datum/wires/particle_acc/control_box/on_cut(wire, mend) +/datum/wires/particle_accelerator/on_cut(wire, mend) var/obj/machinery/particle_accelerator/control_box/C = holder switch(wire) if(WIRE_PARTICLE_POWER) diff --git a/code/game/area/areas/depot-areas.dm b/code/game/area/areas/depot-areas.dm index dabbf83d947..67bf0eaef50 100644 --- a/code/game/area/areas/depot-areas.dm +++ b/code/game/area/areas/depot-areas.dm @@ -170,7 +170,7 @@ qdel(B) for(var/mob/living/simple_animal/hostile/syndicate/N in src) N.a_intent = INTENT_HELP - for(var/obj/structure/closet/secure_closet/syndicate/depot/L in src) + for(var/obj/structure/closet/secure_closet/depot/L in src) if(L.opened) L.close() if(!L.locked) @@ -184,7 +184,7 @@ N.a_intent = INTENT_HARM for(var/obj/machinery/door/airlock/A in src) A.req_access = list(ACCESS_SYNDICATE_LEADER) - for(var/obj/structure/closet/secure_closet/syndicate/depot/L in src) + for(var/obj/structure/closet/secure_closet/depot/L in src) if(L.locked) L.locked = !L.locked L.req_access = list() @@ -352,7 +352,7 @@ if(L.name == "syndi_depot_shield") var/obj/machinery/shieldwall/syndicate/S = new /obj/machinery/shieldwall/syndicate(L.loc) shield_list += S.UID() - for(var/obj/structure/closet/secure_closet/syndicate/depot/armory/L in src) + for(var/obj/structure/closet/secure_closet/depot/armory/L in src) if(L.opened) L.close() if(!L.locked) @@ -374,7 +374,7 @@ if(S) qdel(S) shield_list = list() - for(var/obj/structure/closet/secure_closet/syndicate/depot/armory/L in src) + for(var/obj/structure/closet/secure_closet/depot/armory/L in src) if(L.locked) L.locked = !L.locked L.update_icon() diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 13964ce6225..3e140fca048 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -8,7 +8,7 @@ #define PAGE_REJUVENATORS "rejuvenators" //list("data" = null, "owner" = null, "label" = null, "type" = null, "ue" = 0), -/datum/dna2/record +/datum/dna2_record var/datum/dna/dna = null var/types = 0 var/name = "Empty" @@ -20,7 +20,7 @@ var/mind = null var/languages = null -/datum/dna2/record/proc/GetData() +/datum/dna2_record/proc/GetData() var/list/ser=list("data" = null, "owner" = null, "label" = null, "type" = null, "ue" = 0) if(dna) ser["ue"] = (types & DNA2_BUF_UE) == DNA2_BUF_UE @@ -36,8 +36,8 @@ ser["type"] = "se" return ser -/datum/dna2/record/proc/copy() - var/datum/dna2/record/newrecord = new /datum/dna2/record +/datum/dna2_record/proc/copy() + var/datum/dna2_record/newrecord = new /datum/dna2_record newrecord.dna = dna.Clone() newrecord.types = types newrecord.name = name @@ -317,7 +317,7 @@ var/selected_ui_target_hex = 1 var/radiation_duration = 2.0 var/radiation_intensity = 1.0 - var/list/datum/dna2/record/buffers[3] + var/list/datum/dna2_record/buffers[3] var/irradiating = 0 var/injector_ready = FALSE //Quick fix for issue 286 (screwdriver the screen twice to restore injector) -Pete var/obj/machinery/dna_scannernew/connected = null @@ -342,7 +342,7 @@ /obj/machinery/computer/scan_consolenew/Initialize(mapload) . = ..() for(var/i=0;i<3;i++) - buffers[i+1]=new /datum/dna2/record + buffers[i+1]=new /datum/dna2_record addtimer(CALLBACK(src, PROC_REF(find_machine)), 1 SECONDS) addtimer(CALLBACK(src, PROC_REF(ready)), 25 SECONDS) @@ -360,7 +360,7 @@ arr += "[i]:[EncodeDNABlock(buffer[i])]" return arr -/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(obj/item/dnainjector/I, blk, datum/dna2/record/buffer) +/obj/machinery/computer/scan_consolenew/proc/setInjectorBlock(obj/item/dnainjector/I, blk, datum/dna2_record/buffer) var/pos = findtext(blk,":") if(!pos) return FALSE @@ -425,7 +425,7 @@ data["disk"] = diskData var/list/new_buffers = list() - for(var/datum/dna2/record/buf in buffers) + for(var/datum/dna2_record/buf in buffers) new_buffers += list(buf.GetData()) data["buffers"]=new_buffers @@ -673,11 +673,11 @@ if(bufferId < 1 || bufferId > 3) // Not a valid buffer id return - var/datum/dna2/record/buffer = buffers[bufferId] + var/datum/dna2_record/buffer = buffers[bufferId] switch(bufferOption) if("saveUI") if(connected.occupant && connected.occupant.dna) - var/datum/dna2/record/databuf = new + var/datum/dna2_record/databuf = new databuf.types = DNA2_BUF_UI // DNA2_BUF_UE databuf.dna = connected.occupant.dna.Clone() if(ishuman(connected.occupant)) @@ -686,7 +686,7 @@ buffers[bufferId] = databuf if("saveUIAndUE") if(connected.occupant && connected.occupant.dna) - var/datum/dna2/record/databuf = new + var/datum/dna2_record/databuf = new databuf.types = DNA2_BUF_UI|DNA2_BUF_UE databuf.dna = connected.occupant.dna.Clone() if(ishuman(connected.occupant)) @@ -695,7 +695,7 @@ buffers[bufferId] = databuf if("saveSE") if(connected.occupant && connected.occupant.dna) - var/datum/dna2/record/databuf = new + var/datum/dna2_record/databuf = new databuf.types = DNA2_BUF_SE databuf.dna = connected.occupant.dna.Clone() if(ishuman(connected.occupant)) @@ -703,7 +703,7 @@ databuf.name = "Structural Enzymes" buffers[bufferId] = databuf if("clear") - buffers[bufferId] = new /datum/dna2/record() + buffers[bufferId] = new /datum/dna2_record() if("changeLabel") ui_modal_input(src, "changeBufferLabel", "Please enter the new buffer label:", null, list("id" = bufferId), buffer.name, UI_MODAL_INPUT_MAX_LENGTH_NAME) if("transfer") @@ -726,7 +726,7 @@ if(connected.radiation_check()) return - var/datum/dna2/record/buf = buffers[bufferId] + var/datum/dna2_record/buf = buffers[bufferId] if(buf.types & DNA2_BUF_UI) if(buf.types & DNA2_BUF_UE) @@ -752,7 +752,7 @@ if("saveDisk") if(isnull(disk) || disk.read_only) return - var/datum/dna2/record/buf = buffers[bufferId] + var/datum/dna2_record/buf = buffers[bufferId] disk.buf = buf.copy() disk.name = "data disk - '[buf.name]'" if("wipeDisk") @@ -781,7 +781,7 @@ addtimer(CALLBACK(src, PROC_REF(injector_cooldown_finish)), 10 SECONDS) // Create it - var/datum/dna2/record/buf = buffers[buffer_id] + var/datum/dna2_record/buf = buffers[buffer_id] var/obj/item/dnainjector/I = new() I.forceMove(loc) I.name += " ([buf.name])" @@ -816,14 +816,14 @@ var/buffer_id = text2num(arguments["id"]) if(buffer_id < 1 || buffer_id > length(buffers)) return - var/datum/dna2/record/buf = buffers[buffer_id] + var/datum/dna2_record/buf = buffers[buffer_id] var/obj/item/dnainjector/I = create_injector(buffer_id) setInjectorBlock(I, answer, buf.copy()) if("changeBufferLabel") var/buffer_id = text2num(arguments["id"]) if(buffer_id < 1 || buffer_id > length(buffers)) return - var/datum/dna2/record/buf = buffers[buffer_id] + var/datum/dna2_record/buf = buffers[buffer_id] buf.name = answer buffers[buffer_id] = buf else diff --git a/code/game/gamemodes/miniantags/demons/demon.dm b/code/game/gamemodes/miniantags/demons/demon.dm index 50f053ee75c..91aa036212b 100644 --- a/code/game/gamemodes/miniantags/demons/demon.dm +++ b/code/game/gamemodes/miniantags/demons/demon.dm @@ -27,7 +27,7 @@ see_in_dark = 8 lighting_alpha = LIGHTING_PLANE_ALPHA_MOSTLY_INVISIBLE del_on_death = TRUE - var/datum/action/innate/demon/whisper/whisper_action + var/datum/action/innate/demon_whisper/whisper_action /mob/living/simple_animal/demon/Initialize(mapload) . = ..() diff --git a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm index 0d87e2ed00a..beb1b7ae99c 100644 --- a/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm +++ b/code/game/gamemodes/miniantags/demons/slaughter_demon/slaughter.dm @@ -164,15 +164,15 @@ //Paradise Port: I added this because..SPOOPY DEMON IN YOUR BRAIN -/datum/action/innate/demon/whisper +/datum/action/innate/demon_whisper name = "Demonic Whisper" button_overlay_icon_state = "demon_comms" button_background_icon_state = "bg_demon" -/datum/action/innate/demon/whisper/IsAvailable() +/datum/action/innate/demon_whisper/IsAvailable() return ..() -/datum/action/innate/demon/whisper/proc/choose_targets(mob/user = usr)//yes i am copying from telepathy..hush... +/datum/action/innate/demon_whisper/proc/choose_targets(mob/user = usr)//yes i am copying from telepathy..hush... var/list/validtargets = list() for(var/mob/living/M in view(user.client.maxview(), get_turf(user))) if(M && M.mind && M.stat != DEAD) @@ -188,7 +188,7 @@ var/mob/living/target = tgui_input_list(user, "Choose the target to talk to", "Targeting", validtargets) return target -/datum/action/innate/demon/whisper/Activate() +/datum/action/innate/demon_whisper/Activate() var/mob/living/choice = choose_targets() if(!choice) return diff --git a/code/game/gamemodes/miniantags/guardian/host_actions.dm b/code/game/gamemodes/miniantags/guardian/host_actions.dm index f2c736edbf5..4a4ff5144ba 100644 --- a/code/game/gamemodes/miniantags/guardian/host_actions.dm +++ b/code/game/gamemodes/miniantags/guardian/host_actions.dm @@ -142,7 +142,7 @@ var/mob/living/simple_animal/hostile/guardian/ranged/guardian_user = user if(length(guardian_user.snares) < 6) var/turf/snare_loc = get_turf(target) - var/obj/item/effect/snare/S = new /obj/item/effect/snare(snare_loc) + var/obj/effect/snare/S = new /obj/effect/snare(snare_loc) S.spawner = guardian_user S.name = "[get_area(snare_loc)] trap ([snare_loc.x],[snare_loc.y],[snare_loc.z])" guardian_user.snares |= S diff --git a/code/game/gamemodes/miniantags/guardian/types/ranged.dm b/code/game/gamemodes/miniantags/guardian/types/ranged.dm index efd4d59801e..d3f67b67ef5 100644 --- a/code/game/gamemodes/miniantags/guardian/types/ranged.dm +++ b/code/game/gamemodes/miniantags/guardian/types/ranged.dm @@ -82,7 +82,7 @@ return // we don't want blob tiles to hurt us when we fly over them and trigger /Crossed(), this prevents ranged scouts from being insta killed return ..() // otherwise do normal damage! -/obj/item/effect/snare +/obj/effect/snare name = "snare" desc = "You shouldn't be seeing this!" var/mob/living/spawner @@ -94,7 +94,7 @@ /obj/effect/snare/singularity_pull() return -/obj/item/effect/snare/Crossed(AM as mob|obj, oldloc) +/obj/effect/snare/Crossed(AM as mob|obj, oldloc) if(isliving(AM)) var/turf/snare_loc = get_turf(loc) if(spawner) diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index 7f10d941664..f11fcae608b 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -224,7 +224,7 @@ icon_state = "revenant_draining" animate(src, alpha = 0, time = 3 SECONDS) visible_message("[src]'s body breaks apart into a fine pile of blue dust.") - new /obj/item/ectoplasm/revenant(get_turf(src)) + new /obj/item/ectoplasm(get_turf(src)) ghostize() qdel(src) @@ -353,14 +353,14 @@ /datum/objective/revenantFluff/check_completion() return TRUE -/obj/item/ectoplasm/revenant +/obj/item/ectoplasm name = "glimmering residue" desc = "A pile of fine blue dust. Small tendrils of violet mist swirl around it." icon = 'icons/effects/effects.dmi' icon_state = "revenantEctoplasm" w_class = WEIGHT_CLASS_SMALL -/obj/item/ectoplasm/revenant/examine(mob/user) +/obj/item/ectoplasm/examine(mob/user) . = ..() . += "Lifeless ectoplasm, still faintly glimmering in the light. From what was once a spirit seeking revenge on the station." diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index 39b823cc3e9..f7728512214 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -4,7 +4,7 @@ GLOBAL_LIST_EMPTY(all_objectives) /// Stores objective [names][/datum/objective/var/name] as list keys, and their corresponding typepaths as list values. GLOBAL_LIST_EMPTY(admin_objective_list) -GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) - /datum/theft_objective/steal - /datum/theft_objective/number - /datum/theft_objective/unique)) +GLOBAL_LIST_INIT(potential_theft_objectives, (subtypesof(/datum/theft_objective) - /datum/theft_objective/number - /datum/theft_objective/unique)) /datum/objective /** diff --git a/code/game/gamemodes/steal_items.dm b/code/game/gamemodes/steal_items.dm index bf203737cc1..174711c8a09 100644 --- a/code/game/gamemodes/steal_items.dm +++ b/code/game/gamemodes/steal_items.dm @@ -117,7 +117,7 @@ protected_jobs = list("Research Director", "Scientist", "Roboticist") //no one with protolathe access, who will often be handed a core location_override = "the Research Director's Office" -/datum/theft_objective/steal/documents +/datum/theft_objective/documents name = "any set of secret documents of any organization" typepath = /obj/item/documents //Any set of secret documents. Doesn't have to be NT's location_override = "the Vault" diff --git a/code/game/jobs/job/support.dm b/code/game/jobs/job/support.dm index e0fc7cde9c2..d0dbf604b5c 100644 --- a/code/game/jobs/job/support.dm +++ b/code/game/jobs/job/support.dm @@ -148,7 +148,7 @@ /obj/item/stack/marker_beacon/ten=1 ) -/datum/outfit/job/miner/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/mining/equipped/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() if(visualsOnly) return @@ -156,7 +156,7 @@ var/obj/item/clothing/suit/hooded/S = H.wear_suit S.ToggleHood() -/datum/outfit/job/miner/equipped/modsuit +/datum/outfit/job/mining/equipped/modsuit name = "Shaft Miner (Equipment + MODsuit)" back = /obj/item/mod/control/pre_equipped/mining/asteroid mask = /obj/item/clothing/mask/breath @@ -287,7 +287,7 @@ ADD_TRAIT(H.mind, TRAIT_TABLE_LEAP, ROUNDSTART_TRAIT) ADD_TRAIT(H.mind, TRAIT_KNOWS_COOKING_RECIPES, ROUNDSTART_TRAIT) if(H.mind) - H.mind.AddSpell(new /datum/spell/chef/expert_chef) + H.mind.AddSpell(new /datum/spell/expert_chef) /datum/job/hydro title = "Botanist" diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 4864a68880b..907c897f1dd 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -181,7 +181,7 @@ /obj/machinery/suit_storage_unit/gulag name = "gulag suit storage unit" suit_type = /obj/item/clothing/suit/space/prisoner_gulag - helmet_type = /obj/item/clothing/head/space/prisoner_gulag + helmet_type = /obj/item/clothing/head/helmet/space/prisoner_gulag mask_type = /obj/item/clothing/mask/breath /obj/machinery/suit_storage_unit/expedition diff --git a/code/game/machinery/vendors/generic_vendors.dm b/code/game/machinery/vendors/generic_vendors.dm index 2574bc1caab..4a2da6635d4 100644 --- a/code/game/machinery/vendors/generic_vendors.dm +++ b/code/game/machinery/vendors/generic_vendors.dm @@ -655,7 +655,7 @@ /obj/item/clothing/head/chicken = 1, /obj/item/clothing/under/costume/gladiator = 1, /obj/item/clothing/head/helmet/gladiator = 1, - /obj/item/clothing/under/misc/gimmick/rank/captain/suit = 1, + /obj/item/clothing/under/misc/gimmick_captain_suit = 1, /obj/item/clothing/head/flatcap = 1, /obj/item/clothing/suit/storage/labcoat/mad = 1, /obj/item/clothing/glasses/gglasses = 1, @@ -773,7 +773,7 @@ /obj/item/clothing/head/chicken = 50, /obj/item/clothing/under/costume/gladiator = 100, /obj/item/clothing/head/helmet/gladiator = 50, - /obj/item/clothing/under/misc/gimmick/rank/captain/suit = 100, + /obj/item/clothing/under/misc/gimmick_captain_suit = 100, /obj/item/clothing/head/flatcap = 30, /obj/item/clothing/suit/storage/labcoat/mad = 75, /obj/item/clothing/glasses/gglasses = 20, diff --git a/code/game/machinery/vendors/wardrobe_vendors.dm b/code/game/machinery/vendors/wardrobe_vendors.dm index 56f5736359d..4a49df72a7a 100644 --- a/code/game/machinery/vendors/wardrobe_vendors.dm +++ b/code/game/machinery/vendors/wardrobe_vendors.dm @@ -32,7 +32,7 @@ /obj/item/clothing/mask/balaclava = 1, /obj/item/clothing/mask/gas/sechailer/swat = 2, /obj/item/clothing/suit/jacket/bomber/sec = 2, - /obj/item/clothing/suit/greatcoat/sec = 2, + /obj/item/clothing/suit/sec_greatcoat = 2, /obj/item/clothing/suit/armor/secjacket = 4, /obj/item/clothing/suit/armor/secponcho = 4, /obj/item/clothing/suit/hooded/wintercoat/security = 4, @@ -72,7 +72,7 @@ /obj/item/clothing/mask/balaclava = 60, /obj/item/clothing/mask/gas/sechailer/swat = 60, /obj/item/clothing/suit/jacket/bomber/sec = 75, - /obj/item/clothing/suit/greatcoat/sec = 75, + /obj/item/clothing/suit/sec_greatcoat = 75, /obj/item/clothing/suit/armor/secjacket = 75, /obj/item/clothing/suit/armor/secponcho = 75, /obj/item/clothing/suit/hooded/wintercoat/security = 75, diff --git a/code/game/objects/effects/forcefields.dm b/code/game/objects/effects/forcefields.dm index 3aafeb4e4ff..14545e54e28 100644 --- a/code/game/objects/effects/forcefields.dm +++ b/code/game/objects/effects/forcefields.dm @@ -59,7 +59,7 @@ desc = "You have a bad feeling about this." max_integrity = 80 -/obj/effect/forcefield/mime/advanced +/obj/effect/forcefield/mime icon_state = null name = "invisible blockade" desc = "You might be here a while." diff --git a/code/game/objects/effects/landmarks.dm b/code/game/objects/effects/landmarks.dm index bed724a3324..b4dac11fbc3 100644 --- a/code/game/objects/effects/landmarks.dm +++ b/code/game/objects/effects/landmarks.dm @@ -450,7 +450,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp /obj/effect/landmark/costume/madscientist/Initialize(mapload) . = ..() - new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc) + new /obj/item/clothing/under/misc/gimmick_captain_suit(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/suit/storage/labcoat/mad(src.loc) new /obj/item/clothing/glasses/gglasses(src.loc) @@ -458,7 +458,7 @@ INITIALIZE_IMMEDIATE(/obj/effect/landmark/newplayer_start) //Without this you sp /obj/effect/landmark/costume/elpresidente/Initialize(mapload) . = ..() - new /obj/item/clothing/under/misc/gimmick/rank/captain/suit(src.loc) + new /obj/item/clothing/under/misc/gimmick_captain_suit(src.loc) new /obj/item/clothing/head/flatcap(src.loc) new /obj/item/clothing/mask/cigarette/cigar/havana(src.loc) new /obj/item/clothing/shoes/jackboots(src.loc) diff --git a/code/game/objects/effects/spawners/depot_spawners.dm b/code/game/objects/effects/spawners/depot_spawners.dm index e2e38083192..8c20cd6b677 100644 --- a/code/game/objects/effects/spawners/depot_spawners.dm +++ b/code/game/objects/effects/spawners/depot_spawners.dm @@ -58,7 +58,7 @@ /obj/effect/spawner/random/syndicate/trapped_documents name = "50pc trapped documents" icon_state = "folder" - spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot + spawn_inside = /obj/structure/closet/secure_closet/depot loot = list( /obj/item/documents/syndicate/yellow, /obj/item/documents/syndicate/yellow/trapped, @@ -66,7 +66,7 @@ // Loot /obj/effect/spawner/random/syndicate/loot - spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot + spawn_inside = /obj/structure/closet/secure_closet/depot /obj/effect/spawner/random/syndicate/loot/common name = "syndicate depot loot, common" @@ -160,7 +160,7 @@ /obj/effect/spawner/random/syndicate/loot/armory name = "syndicate depot loot, armory" - spawn_inside = /obj/structure/closet/secure_closet/syndicate/depot/armory + spawn_inside = /obj/structure/closet/secure_closet/depot/armory // Combat orientated items that could give the player an advantage if an antag messes with them. loot = list( /obj/item/autosurgeon/organ/syndicate/oneuse/razorwire, diff --git a/code/game/objects/effects/spawners/lootdrop.dm b/code/game/objects/effects/spawners/lootdrop.dm index ee32405e068..1b9e052a480 100644 --- a/code/game/objects/effects/spawners/lootdrop.dm +++ b/code/game/objects/effects/spawners/lootdrop.dm @@ -539,7 +539,7 @@ /obj/item/clothing/under/solgov/elite = 50, /obj/item/clothing/under/solgov/command = 50, /obj/item/clothing/under/retro/security = 50, - /obj/item/clothing/under/misc/gimmick/rank/captain/suit = 50, + /obj/item/clothing/under/misc/gimmick_captain_suit = 50, /obj/item/clothing/under/misc/durathread = 50, /obj/item/clothing/under/psysuit = 50, /obj/item/clothing/under/costume/cuban_suit = 50, diff --git a/code/game/objects/effects/spawners/random/misc_spawners.dm b/code/game/objects/effects/spawners/random/misc_spawners.dm index 4b05982f3a4..71e8df6d674 100644 --- a/code/game/objects/effects/spawners/random/misc_spawners.dm +++ b/code/game/objects/effects/spawners/random/misc_spawners.dm @@ -74,7 +74,7 @@ /obj/effect/spawner/random/book/record_item(type_path_to_make) SSblackbox.record_feedback("tally", "random_spawners", 1, "[/obj/item/book]") -/obj/effect/spawner/random/mod/maint +/obj/effect/spawner/random/mod_maint name = "maint MOD module spawner" loot = list( /obj/item/mod/module/springlock = 2, @@ -83,7 +83,7 @@ ) record_spawn = TRUE -/obj/effect/spawner/random/janitor/supplies +/obj/effect/spawner/random/jani_supplies icon = 'icons/effects/random_spawners.dmi' icon_state = "mopbucket" name = "janitorial supplies spawner" diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm index e544e333c45..c4eb39d3072 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_prescan.dm @@ -7,7 +7,7 @@ trigger_causes = BIOCHIP_TRIGGER_DEATH_ANY implant_state = "implant-alien" var/obj/machinery/grey_autocloner/linked - var/datum/dna2/record/our_record + var/datum/dna2_record/our_record /obj/item/bio_chip/grey_autocloner/Destroy() linked = null @@ -26,7 +26,7 @@ . = ..() if(!. || !ishuman(imp_in)) return FALSE - our_record = new /datum/dna2/record() + our_record = new /datum/dna2_record() our_record.ckey = imp_in.ckey var/obj/item/organ/B = imp_in.get_int_organ(/obj/item/organ/internal/brain) B.dna.check_integrity() diff --git a/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm b/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm index 51cd1caadcc..c4534bd882d 100644 --- a/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm +++ b/code/game/objects/items/weapons/bio_chips/bio_chip_storage.dm @@ -1,4 +1,4 @@ -/obj/item/storage/hidden/implant +/obj/item/storage/hidden_implant name = "bluespace pocket" storage_slots = 2 max_w_class = WEIGHT_CLASS_NORMAL @@ -17,11 +17,11 @@ implant_data = /datum/implant_fluff/storage implant_state = "implant-syndicate" - var/obj/item/storage/hidden/implant/storage + var/obj/item/storage/hidden_implant/storage /obj/item/bio_chip/storage/Initialize(mapload) . = ..() - storage = new /obj/item/storage/hidden/implant(src) + storage = new /obj/item/storage/hidden_implant(src) /obj/item/bio_chip/storage/emp_act(severity) ..() diff --git a/code/game/objects/items/weapons/caution.dm b/code/game/objects/items/weapons/caution.dm index fa5b3c6877a..883dc8def00 100644 --- a/code/game/objects/items/weapons/caution.dm +++ b/code/game/objects/items/weapons/caution.dm @@ -71,7 +71,7 @@ name = "proximity mine dispenser" icon = 'icons/obj/janitor.dmi' icon_state = "caution" - energy_type = /datum/robot_storage/energy/janitor/landmine + energy_type = /datum/robot_storage/energy/jani_landmine is_cyborg = TRUE /obj/item/stack/caution/proximity_sign/malf/afterattack(atom/target, mob/user, proximity) diff --git a/code/game/objects/items/weapons/disks.dm b/code/game/objects/items/weapons/disks.dm index 8f113c53993..99629843d98 100644 --- a/code/game/objects/items/weapons/disks.dm +++ b/code/game/objects/items/weapons/disks.dm @@ -9,7 +9,7 @@ /obj/item/disk/data name = "Cloning Data Disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. - var/datum/dna2/record/buf = null + var/datum/dna2_record/buf = null var/read_only = FALSE //Well,it's still a floppy disk /obj/item/disk/data/proc/initialize_data() diff --git a/code/game/objects/items/weapons/dna_injector.dm b/code/game/objects/items/weapons/dna_injector.dm index 1625e1329b3..b976673864b 100644 --- a/code/game/objects/items/weapons/dna_injector.dm +++ b/code/game/objects/items/weapons/dna_injector.dm @@ -6,7 +6,7 @@ item_state = "dnainjector" belt_icon = "syringe" var/block = 0 - var/datum/dna2/record/buf = null + var/datum/dna2_record/buf = null throw_speed = 3 throw_range = 5 w_class = WEIGHT_CLASS_TINY diff --git a/code/game/objects/items/weapons/storage/belt.dm b/code/game/objects/items/weapons/storage/belt.dm index b3e867e3232..b4c0e17cd4b 100644 --- a/code/game/objects/items/weapons/storage/belt.dm +++ b/code/game/objects/items/weapons/storage/belt.dm @@ -35,7 +35,7 @@ update_weight() /obj/item/storage/belt/can_be_inserted(obj/item/I, stop_messages = FALSE) - if(isstorage(loc) && !istype(loc, /obj/item/storage/backpack/holding) && !istype(loc, /obj/item/storage/hidden/implant) && !storable) + if(isstorage(loc) && !istype(loc, /obj/item/storage/backpack/holding) && !istype(loc, /obj/item/storage/hidden_implant) && !storable) to_chat(usr, "You can't seem to fit [I] into [src].") return FALSE . = ..() diff --git a/code/game/objects/structures/crates_lockers/closets/malfunction.dm b/code/game/objects/structures/crates_lockers/closets/malfunction.dm index 5665c22e234..61bcc02b98c 100644 --- a/code/game/objects/structures/crates_lockers/closets/malfunction.dm +++ b/code/game/objects/structures/crates_lockers/closets/malfunction.dm @@ -1,9 +1,9 @@ -/obj/structure/closet/malf/suits +/obj/structure/closet/malf_suits desc = "It's a storage unit for operational gear." icon_state = "syndicate" -/obj/structure/closet/malf/suits/populate_contents() +/obj/structure/closet/malf_suits/populate_contents() new /obj/item/tank/jetpack/void(src) new /obj/item/clothing/mask/breath(src) new /obj/effect/nasavoidsuitspawner(src) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/depot_closets.dm b/code/game/objects/structures/crates_lockers/closets/secure/depot_closets.dm index 12f5295730d..78139592e79 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/depot_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/depot_closets.dm @@ -1,4 +1,4 @@ -/obj/structure/closet/secure_closet/syndicate/depot +/obj/structure/closet/secure_closet/depot name = "depot supply closet" desc = "A red and black lootbox full of things the Head of Security is going to flip their shit over." locked = FALSE @@ -9,20 +9,20 @@ var/is_armory = FALSE var/ignore_use = FALSE -/obj/structure/closet/secure_closet/syndicate/depot/emag_act() +/obj/structure/closet/secure_closet/depot/emag_act() . = ..() loot_pickup() -/obj/structure/closet/secure_closet/syndicate/depot/open() +/obj/structure/closet/secure_closet/depot/open() . = ..() if(opened) loot_pickup() -/obj/structure/closet/secure_closet/syndicate/depot/dump_contents() +/obj/structure/closet/secure_closet/depot/dump_contents() loot_pickup() . = ..() -/obj/structure/closet/secure_closet/syndicate/depot/proc/loot_pickup() +/obj/structure/closet/secure_closet/depot/proc/loot_pickup() if(!ignore_use) var/area/syndicate_depot/core/depotarea = get_area(src) if(istype(depotarea)) @@ -30,33 +30,33 @@ if(is_armory) depotarea.armory_locker_looted() -/obj/structure/closet/secure_closet/syndicate/depot/attack_animal(mob/M) +/obj/structure/closet/secure_closet/depot/attack_animal(mob/M) if(isanimal(M) && ("syndicate" in M.faction)) to_chat(M, "[src] resists your attack!") return return ..() -/obj/structure/closet/secure_closet/syndicate/depot/attackby(obj/item/W, mob/user, params) +/obj/structure/closet/secure_closet/depot/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/rcs)) to_chat(user, "Bluespace interference prevents [W] from locking onto [src]!") return return ..() -/obj/structure/closet/secure_closet/syndicate/depot/emp_act(severity) +/obj/structure/closet/secure_closet/depot/emp_act(severity) return -/obj/structure/closet/secure_closet/syndicate/depot/togglelock(mob/user) +/obj/structure/closet/secure_closet/depot/togglelock(mob/user) . = ..() if(!locked) loot_pickup() -/obj/structure/closet/secure_closet/syndicate/depot/attack_ghost(mob/user) +/obj/structure/closet/secure_closet/depot/attack_ghost(mob/user) if(user.can_advanced_admin_interact()) ignore_use = TRUE toggle(user) ignore_use = FALSE -/obj/structure/closet/secure_closet/syndicate/depot/armory +/obj/structure/closet/secure_closet/depot/armory req_access = list(ACCESS_SYNDICATE) is_armory = TRUE icon_state = "armory" diff --git a/code/game/objects/structures/grey_autocloner.dm b/code/game/objects/structures/grey_autocloner.dm index f2609eb4176..7afed5b66b3 100644 --- a/code/game/objects/structures/grey_autocloner.dm +++ b/code/game/objects/structures/grey_autocloner.dm @@ -31,7 +31,7 @@ autoclone.linked = src atom_say("Link confirmed!") -/obj/machinery/grey_autocloner/proc/growclone(datum/dna2/record/R) +/obj/machinery/grey_autocloner/proc/growclone(datum/dna2_record/R) if(attempting || stat & (NOPOWER|BROKEN)) return FALSE clonemind = locateUID(R.mind) diff --git a/code/game/objects/structures/lavaland/ladder.dm b/code/game/objects/structures/lavaland/ladder.dm index 87699999752..3f97db6e9e7 100644 --- a/code/game/objects/structures/lavaland/ladder.dm +++ b/code/game/objects/structures/lavaland/ladder.dm @@ -1,4 +1,4 @@ -/obj/structure/ladder/unusable +/obj/structure/ladder name = "shattered ladder" desc = "The shattered remnants of a ladder hanging over the pitch-black chasm, providing no safe route to the abyss beneath. Its fractured rungs suggest an inevitable plunge, as if the remainder might soon join the void." icon = 'icons/obj/structures.dmi' diff --git a/code/modules/antagonists/antag_org/antag_org_syndicate.dm b/code/modules/antagonists/antag_org/antag_org_syndicate.dm index 4534bf960e1..e287d525486 100644 --- a/code/modules/antagonists/antag_org/antag_org_syndicate.dm +++ b/code/modules/antagonists/antag_org/antag_org_syndicate.dm @@ -56,7 +56,7 @@ Get the job done, and we'll be one step closer to ending Nanotrasen's slave empire." focus = 70 targeted_departments = list(DEPARTMENT_SCIENCE) - theft_targets = list(/datum/theft_objective/reactive, /datum/theft_objective/steal/documents, /datum/theft_objective/hand_tele) + theft_targets = list(/datum/theft_objective/reactive, /datum/theft_objective/documents, /datum/theft_objective/hand_tele) /datum/antag_org/syndicate/electra // Mostly target Engineering name = "Electra Dynamics" @@ -78,7 +78,7 @@ intro_desc = "You are an undercover agent of the Federation Analytics and Intelligence Directorate, a Trans-Solar agency keeping tabs on the Corporate Wars, among other duties. \ Be quick, be efficient, and don't get caught. The Directorate will deny any involvement with your presence here." forced_objectives = list(/datum/objective/assassinate/syndicate, /datum/objective/steal) - theft_targets = list(/datum/theft_objective/blueprints, /datum/theft_objective/steal/documents) + theft_targets = list(/datum/theft_objective/blueprints, /datum/theft_objective/documents) chaos_level = ORG_CHAOS_HUNTER /datum/antag_org/syndicate/gorlex // Hijack only diff --git a/code/modules/awaymissions/loot.dm b/code/modules/awaymissions/loot.dm index 7f77d78c7f2..e4ed7ac7a54 100644 --- a/code/modules/awaymissions/loot.dm +++ b/code/modules/awaymissions/loot.dm @@ -1,11 +1,11 @@ -/obj/effect/spawner/away/lootdrop +/obj/effect/spawner/away_lootdrop icon = 'icons/mob/screen_gen.dmi' icon_state = "x2" var/lootcount = 1 //how many items will be spawned var/lootdoubles = 0 //if the same item can be spawned twice var/loot = "" //a list of possible items to spawn- a string of paths -/obj/effect/spawner/away/lootdrop/Initialize(mapload) +/obj/effect/spawner/away_lootdrop/Initialize(mapload) ..() var/list/things = params2list(loot) diff --git a/code/modules/clothing/chameleon.dm b/code/modules/clothing/chameleon.dm index f721a0eb778..3a5d9ff0b24 100644 --- a/code/modules/clothing/chameleon.dm +++ b/code/modules/clothing/chameleon.dm @@ -40,7 +40,7 @@ var/list/outfit_types = O.get_chameleon_disguise_info() for(var/V in user.chameleon_item_actions) - var/datum/action/item_action/chameleon/change/action = V + var/datum/action/item_action/chameleon_change/action = V for(var/T in outfit_types) if(ispath(T, action.chameleon_type)) action.update_look(user, T) @@ -60,7 +60,7 @@ return TRUE -/datum/action/item_action/chameleon/change +/datum/action/item_action/chameleon_change name = "Chameleon Change" var/static/list/chameleon_blacklist = list() //This is a typecache var/static/list/chameleon_list = list() @@ -69,12 +69,12 @@ var/obj/item/holder var/emp_timer -/datum/action/item_action/chameleon/change/New(Target) +/datum/action/item_action/chameleon_change/New(Target) . = ..() holder = Target -/datum/action/item_action/chameleon/change/Grant(mob/M) +/datum/action/item_action/chameleon_change/Grant(mob/M) if(M && (owner != M)) if(!M.chameleon_item_actions) M.chameleon_item_actions = list(src) @@ -84,7 +84,7 @@ M.chameleon_item_actions |= src ..() -/datum/action/item_action/chameleon/change/Remove(mob/M) +/datum/action/item_action/chameleon_change/Remove(mob/M) if(M && (M == owner)) LAZYREMOVE(M.chameleon_item_actions, src) if(!LAZYLEN(M.chameleon_item_actions)) @@ -92,23 +92,23 @@ qdel(O) ..() -/datum/action/item_action/chameleon/change/UpdateButton(atom/movable/screen/movable/action_button/button, status_only, force) +/datum/action/item_action/chameleon_change/UpdateButton(atom/movable/screen/movable/action_button/button, status_only, force) . = ..() if(.) button.name = "Change [chameleon_name] Appearance" -/datum/action/item_action/chameleon/change/ui_host() +/datum/action/item_action/chameleon_change/ui_host() return holder -/datum/action/item_action/chameleon/change/ui_state(mob/user) +/datum/action/item_action/chameleon_change/ui_state(mob/user) return GLOB.physical_state -/datum/action/item_action/chameleon/change/ui_data(mob/user) +/datum/action/item_action/chameleon_change/ui_data(mob/user) var/list/data = list() data["selected_appearance"] = "[holder.name]_[holder.icon_state]" return data -/datum/action/item_action/chameleon/change/ui_static_data(mob/user, datum/tgui/ui = null) +/datum/action/item_action/chameleon_change/ui_static_data(mob/user, datum/tgui/ui = null) var/list/data = list() var/list/chameleon_skins = list() for(var/chameleon_type in chameleon_list[chameleon_name]) @@ -122,14 +122,14 @@ data["chameleon_skins"] = chameleon_skins return data -/datum/action/item_action/chameleon/change/ui_interact(mob/user, datum/tgui/ui = null) +/datum/action/item_action/chameleon_change/ui_interact(mob/user, datum/tgui/ui = null) ui = SStgui.try_update_ui(user, src, ui) if(!ui) ui = new(user, src, "Chameleon", "Change [chameleon_name] Appearance") ui.open() ui.set_autoupdate(FALSE) -/datum/action/item_action/chameleon/change/ui_act(action, list/params) +/datum/action/item_action/chameleon_change/ui_act(action, list/params) if(..()) return @@ -137,7 +137,7 @@ if("change_appearance") update_look(usr, chameleon_list[chameleon_name][params["new_appearance"]]) -/datum/action/item_action/chameleon/change/proc/initialize_disguises() +/datum/action/item_action/chameleon_change/proc/initialize_disguises() UpdateButtons() chameleon_blacklist |= typecacheof(target.type) if(!isnull(chameleon_list[chameleon_name])) @@ -152,10 +152,10 @@ if(isnull(chameleon_list[chameleon_name][chameleon_item_name])) chameleon_list[chameleon_name][chameleon_item_name] = I -/datum/action/item_action/chameleon/change/proc/select_look(mob/user) +/datum/action/item_action/chameleon_change/proc/select_look(mob/user) ui_interact(user) -/datum/action/item_action/chameleon/change/proc/random_look(mob/user) +/datum/action/item_action/chameleon_change/proc/random_look(mob/user) var/picked_name = pick(chameleon_list[chameleon_name]) // If a user is provided, then this item is in use, and we // need to update our icons and stuff @@ -169,7 +169,7 @@ else update_item(chameleon_list[chameleon_name][picked_name]) -/datum/action/item_action/chameleon/change/proc/update_look(mob/user, obj/item/picked_item) +/datum/action/item_action/chameleon_change/proc/update_look(mob/user, obj/item/picked_item) if(isliving(user)) var/mob/living/C = user if(C.stat != CONSCIOUS) @@ -181,7 +181,7 @@ SStgui.update_uis(src) UpdateButtons() -/datum/action/item_action/chameleon/change/proc/update_item(obj/item/picked_item) +/datum/action/item_action/chameleon_change/proc/update_item(obj/item/picked_item) target.name = initial(picked_item.name) target.desc = initial(picked_item.desc) target.icon_state = initial(picked_item.icon_state) @@ -208,14 +208,14 @@ target.icon = initial(picked_item.icon) -/datum/action/item_action/chameleon/change/Trigger(left_click) +/datum/action/item_action/chameleon_change/Trigger(left_click) if(!IsAvailable()) return select_look(owner) return 1 -/datum/action/item_action/chameleon/change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME) +/datum/action/item_action/chameleon_change/proc/emp_randomise(amount = EMP_RANDOMISE_TIME) START_PROCESSING(SSprocessing, src) random_look(owner) @@ -223,7 +223,7 @@ if(new_value > emp_timer) emp_timer = new_value -/datum/action/item_action/chameleon/change/process() +/datum/action/item_action/chameleon_change/process() if(world.time > emp_timer) STOP_PROCESSING(SSprocessing, src) return @@ -249,7 +249,7 @@ "Grey" = 'icons/mob/clothing/species/grey/under/color.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/under/chameleon/Initialize(mapload) . = ..() @@ -301,7 +301,7 @@ "Vox" = 'icons/mob/clothing/species/vox/suit.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/suit/chameleon/Initialize(mapload) . = ..() @@ -338,7 +338,7 @@ "Grey" = 'icons/mob/clothing/species/grey/eyes.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/glasses/chameleon/Initialize(mapload) . = ..() @@ -377,7 +377,7 @@ examine_extensions = list(EXAMINE_HUD_SECURITY_READ, EXAMINE_HUD_SECURITY_WRITE) flash_protect = FLASH_PROTECTION_FLASH - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/glasses/hud/security/chameleon/Initialize(mapload) . = ..() @@ -402,7 +402,7 @@ // for style // also its this typepath because random shit type checks based on the meson path /obj/item/clothing/glasses/meson/chameleon - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/glasses/meson/chameleon/Initialize(mapload) . = ..() @@ -431,7 +431,7 @@ resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/gloves/chameleon/Initialize(mapload) . = ..() @@ -469,7 +469,7 @@ "Vox" = 'icons/mob/clothing/species/vox/head/softcap.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/head/chameleon/Initialize(mapload) . = ..() @@ -514,7 +514,7 @@ "Grey" = 'icons/mob/clothing/species/grey/mask.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/mask/chameleon/Initialize(mapload) . = ..() @@ -564,7 +564,7 @@ resistance_flags = NONE armor = list(MELEE = 5, BULLET = 5, LASER = 5, ENERGY = 0, BOMB = 0, RAD = 0, FIRE = 50, ACID = 50) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/shoes/chameleon/Initialize(mapload) . = ..() @@ -600,7 +600,7 @@ "Vox" = 'icons/mob/clothing/species/vox/back.dmi' ) - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/storage/backpack/chameleon/Initialize(mapload) . = ..() @@ -624,7 +624,7 @@ /obj/item/storage/belt/chameleon name = "tool-belt" desc = "Can hold various tools." - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/storage/belt/chameleon/Initialize(mapload) . = ..() @@ -648,7 +648,7 @@ /obj/item/radio/headset/chameleon name = "radio headset" - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/radio/headset/chameleon/Initialize(mapload) . = ..() @@ -671,7 +671,7 @@ /obj/item/pda/chameleon name = "PDA" - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/pda/chameleon/Initialize(mapload) . = ..() @@ -695,7 +695,7 @@ /obj/item/stamp/chameleon dye_color = DYE_RAINBOW - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/stamp/chameleon/Initialize(mapload) . = ..() @@ -712,7 +712,7 @@ . = ..() chameleon_action.emp_randomise(INFINITY) -/datum/action/item_action/chameleon/change/modsuit/update_item(obj/item/picked_item) +/datum/action/item_action/chameleon_change/modsuit/update_item(obj/item/picked_item) if(ismodcontrol(target)) var/obj/item/mod/control/C = target C.current_disguise = FALSE @@ -729,7 +729,7 @@ for(var/obj/item/mod/module/chameleon/tosignal in C.contents) tosignal.RegisterSignal(C, COMSIG_MOD_ACTIVATE, TYPE_PROC_REF(/obj/item/mod/module/chameleon, return_look), TRUE) -/datum/action/item_action/chameleon/change/modsuit/select_look(mob/user) +/datum/action/item_action/chameleon_change/modsuit/select_look(mob/user) if(ismodcontrol(target)) var/obj/item/mod/control/C = target if(C.current_disguise) //backup check diff --git a/code/modules/clothing/head/beret.dm b/code/modules/clothing/head/beret.dm index 9832b2438b7..5f141ca97a7 100644 --- a/code/modules/clothing/head/beret.dm +++ b/code/modules/clothing/head/beret.dm @@ -179,7 +179,7 @@ //Special Roles -/obj/item/clothing/head/beret/solgov/command +/obj/item/clothing/head/beret/solgov name = "\improper TSF Lieutenant's beret" desc = "A beret worn by marines of the Trans-Solar Federation. The insignia signifies the wearer bears the rank of a Lieutenant." icon_state = "beret_solgovc" @@ -188,7 +188,7 @@ armor = list(MELEE = 10, BULLET = 20, LASER = 20, ENERGY = 5, BOMB = 15, RAD = 0, FIRE = 50, ACID = 75) strip_delay = 80 -/obj/item/clothing/head/beret/solgov/command/elite +/obj/item/clothing/head/beret/solgov/elite name = "\improper MARSOC Lieutenant's beret" desc = "A beret worn by junior officers of the Trans-Solar Federation's Marine Special Operations Command. The insignia signifies the wearer bears the rank of a Lieutenant." armor = list(MELEE = 25, BULLET = 75, LASER = 5, ENERGY = 5, BOMB = 15, RAD = 50, FIRE = 200, ACID = 200) diff --git a/code/modules/clothing/masks/voicemodulator.dm b/code/modules/clothing/masks/voicemodulator.dm index 665ef58fe45..89d39cd8b57 100644 --- a/code/modules/clothing/masks/voicemodulator.dm +++ b/code/modules/clothing/masks/voicemodulator.dm @@ -20,7 +20,7 @@ icon_state = "swat" item_state = "swat" - var/datum/action/item_action/chameleon/change/chameleon_action + var/datum/action/item_action/chameleon_change/chameleon_action /obj/item/clothing/mask/gas/voice_modulator/chameleon/Initialize(mapload) . = ..() diff --git a/code/modules/clothing/suits/misc_suits.dm b/code/modules/clothing/suits/misc_suits.dm index 2a484557e8f..1701f6dde2c 100644 --- a/code/modules/clothing/suits/misc_suits.dm +++ b/code/modules/clothing/suits/misc_suits.dm @@ -840,7 +840,7 @@ flags_inv = HIDEMASK|HIDEEARS|HIDEEYES //Basic jacket and subtypes -/obj/item/clothing/suit/greatcoat/sec +/obj/item/clothing/suit/sec_greatcoat name = "security greatcoat" desc = "A wool-lined coat made from rugged materials that altogether make up to be a comfortable coat.\ GLORY TO ARSTOSKHA!!" icon_state = "secgreatcoat" diff --git a/code/modules/clothing/under/misc_jumpsuits.dm b/code/modules/clothing/under/misc_jumpsuits.dm index 680d3915fa5..5d49a6258f6 100644 --- a/code/modules/clothing/under/misc_jumpsuits.dm +++ b/code/modules/clothing/under/misc_jumpsuits.dm @@ -58,7 +58,7 @@ item_state = "gy_suit" item_color = "vice" -/obj/item/clothing/under/misc/gimmick/rank/captain/suit +/obj/item/clothing/under/misc/gimmick_captain_suit name = "captain's suit" desc = "A green suit and yellow necktie. Exemplifies authority." icon_state = "green_suit" diff --git a/code/modules/food_and_drinks/recipes/recipes_grill.dm b/code/modules/food_and_drinks/recipes/recipes_grill.dm index ac90ef968f2..9b563ab882d 100644 --- a/code/modules/food_and_drinks/recipes/recipes_grill.dm +++ b/code/modules/food_and_drinks/recipes/recipes_grill.dm @@ -124,7 +124,7 @@ ) result = /obj/item/food/wingfangchu -/datum/recipe/grill/human/kebab +/datum/recipe/grill/human_kebab items = list( /obj/item/stack/rods, /obj/item/food/meat/human, diff --git a/code/modules/food_and_drinks/recipes/recipes_microwave.dm b/code/modules/food_and_drinks/recipes/recipes_microwave.dm index 8ed36bca48c..adea439a694 100644 --- a/code/modules/food_and_drinks/recipes/recipes_microwave.dm +++ b/code/modules/food_and_drinks/recipes/recipes_microwave.dm @@ -293,7 +293,7 @@ ) result = /obj/item/food/donut/spaceman/jelly/cherry -/datum/recipe/microwave/human/burger +/datum/recipe/microwave/human_burger items = list( /obj/item/food/meat/human, /obj/item/food/grown/lettuce, @@ -312,7 +312,7 @@ items = list( /obj/item/food/bun, /obj/item/food/grown/lettuce, - /obj/item/food/meat //do not place this recipe before /datum/recipe/microwave/human/burger + /obj/item/food/meat //do not place this recipe before /datum/recipe/microwave/human_burger ) result = /obj/item/food/burger/plain diff --git a/code/modules/martial_arts/adminfu.dm b/code/modules/martial_arts/adminfu.dm index 7352dfb0f4a..c8ae841ffb5 100644 --- a/code/modules/martial_arts/adminfu.dm +++ b/code/modules/martial_arts/adminfu.dm @@ -1,7 +1,7 @@ /datum/martial_art/adminfu name = "Way of the Dancing Admin" has_explaination_verb = TRUE - combos = list(/datum/martial_combo/adminfu/healing_palm) + combos = list(/datum/martial_combo/healing_palm) weight = 99999999 //Matt Malvor? /datum/martial_art/adminfu/harm_act(mob/living/carbon/human/A, mob/living/carbon/human/D) diff --git a/code/modules/martial_arts/combos/adminfu/healing_palm.dm b/code/modules/martial_arts/combos/adminfu/healing_palm.dm index 668e5e290ff..94f50710783 100644 --- a/code/modules/martial_arts/combos/adminfu/healing_palm.dm +++ b/code/modules/martial_arts/combos/adminfu/healing_palm.dm @@ -1,10 +1,10 @@ -/datum/martial_combo/adminfu/healing_palm +/datum/martial_combo/healing_palm name = "Healing Palm" steps = list(MARTIAL_COMBO_STEP_GRAB, MARTIAL_COMBO_STEP_HELP) explaination_text = "Heals or revives a creature." combo_text_override = "Grab, switch hands, Help" -/datum/martial_combo/adminfu/healing_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) +/datum/martial_combo/healing_palm/perform_combo(mob/living/carbon/human/user, mob/living/target, datum/martial_art/MA) user.do_attack_animation(target) target.visible_message("[user] smacks [target] in the forehead!") diff --git a/code/modules/mining/equipment/explorer_gear.dm b/code/modules/mining/equipment/explorer_gear.dm index aa5e1bf52f3..2a38225d245 100644 --- a/code/modules/mining/equipment/explorer_gear.dm +++ b/code/modules/mining/equipment/explorer_gear.dm @@ -125,7 +125,7 @@ resistance_flags = FIRE_PROOF hide_tail_by_species = list("Vox" , "Vulpkanin" , "Unathi" , "Tajaran") -/obj/item/clothing/head/space/prisoner_gulag +/obj/item/clothing/head/helmet/space/prisoner_gulag name = "gulag helmet" desc = "A metallic helmet designed to operate with the mining suit, while dense it offers little protection aside heat." icon_state = "hardsuit_gulag" diff --git a/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm b/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm index 7e458de0362..f6095a0b231 100644 --- a/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm +++ b/code/modules/mob/living/carbon/alien/humanoid/humanoid_emote.dm @@ -1,10 +1,10 @@ /** * Emotes usable by humanoid xenomorphs. */ -/datum/emote/living/carbon/alien/humanoid +/datum/emote/living/carbon/alien_humanoid mob_type_allowed_typecache = list(/mob/living/carbon/alien/humanoid) -/datum/emote/living/carbon/alien/humanoid/roar +/datum/emote/living/carbon/alien_humanoid/roar key = "roar" key_third_person = "roars" message = "roars!" @@ -13,7 +13,7 @@ sound = "sound/voice/hiss5.ogg" volume = 80 -/datum/emote/living/carbon/alien/humanoid/hiss +/datum/emote/living/carbon/alien_humanoid/hiss key = "hiss" key_third_person = "hisses" message = "hisses!" @@ -22,7 +22,7 @@ sound = "sound/voice/hiss1.ogg" volume = 30 -/datum/emote/living/carbon/alien/humanoid/gnarl +/datum/emote/living/carbon/alien_humanoid/gnarl key = "gnarl" key_third_person = "gnarls" message = "gnarls and shows its teeth." diff --git a/code/modules/mob/living/carbon/human/species/moth.dm b/code/modules/mob/living/carbon/human/species/moth.dm index 72f5699ef5f..690096f8e7b 100644 --- a/code/modules/mob/living/carbon/human/species/moth.dm +++ b/code/modules/mob/living/carbon/human/species/moth.dm @@ -168,7 +168,7 @@ to_chat(H, "You cannot weave a cocoon in your current state.") return H.visible_message("[H] finishes weaving a cocoon!", "You finish weaving your cocoon.") - var/obj/structure/moth/cocoon/C = new(get_turf(H)) + var/obj/structure/moth_cocoon/C = new(get_turf(H)) H.forceMove(C) C.preparing_to_emerge = TRUE H.apply_status_effect(STATUS_EFFECT_COCOONED) @@ -181,14 +181,14 @@ /** * Removes moth from cocoon, restores burnt wings */ -/datum/action/innate/cocoon/proc/emerge(obj/structure/moth/cocoon/C) +/datum/action/innate/cocoon/proc/emerge(obj/structure/moth_cocoon/C) for(var/mob/living/carbon/human/H in C.contents) H.remove_status_effect(STATUS_EFFECT_COCOONED) H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS) C.preparing_to_emerge = FALSE qdel(C) -/obj/structure/moth/cocoon +/obj/structure/moth_cocoon name = "\improper Nian cocoon" desc = "Someone wrapped in a Nian cocoon." icon = 'icons/effects/effects.dmi' @@ -197,11 +197,11 @@ max_integrity = 60 var/preparing_to_emerge -/obj/structure/moth/cocoon/Initialize(mapload) +/obj/structure/moth_cocoon/Initialize(mapload) . = ..() icon_state = pick("cocoon1", "cocoon2", "cocoon3") -/obj/structure/moth/cocoon/Destroy() +/obj/structure/moth_cocoon/Destroy() if(!preparing_to_emerge) visible_message("[src] splits open from within!") else diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 59774d0d8fd..72c68abaf91 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -1110,7 +1110,7 @@ max_amount = 25 //Energy stack for landmines -/datum/robot_storage/energy/janitor/landmine +/datum/robot_storage/energy/jani_landmine name = "Landmine Synthesizer" statpanel_name = "Landmines" max_amount = 4 diff --git a/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm b/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm index 3a2145527bb..31cc4310a23 100644 --- a/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm +++ b/code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm @@ -54,7 +54,7 @@ add_language("Tkachi") evolve_action.Grant(src) -/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth/cocoon/C, datum/mind/M) +/mob/living/simple_animal/nian_caterpillar/proc/evolve(obj/structure/moth_cocoon/C, datum/mind/M) if(stat != CONSCIOUS) return FALSE @@ -136,7 +136,7 @@ button_overlay_icon = 'icons/effects/effects.dmi' button_overlay_icon_state = "cocoon1" -/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth/cocoon/C) +/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth_cocoon/C) for(var/mob/living/carbon/human/H in C) H.remove_status_effect(STATUS_EFFECT_COCOONED) H.remove_status_effect(STATUS_EFFECT_BURNT_WINGS) @@ -148,7 +148,7 @@ user.visible_message("[user] begins to hold still and concentrate on weaving a cocoon...", "You begin to focus on weaving a cocoon... (This will take [COCOON_WEAVE_DELAY / 10] seconds, and you must hold still.)") if(do_after(user, COCOON_WEAVE_DELAY, FALSE, user)) - var/obj/structure/moth/cocoon/C = new(get_turf(user)) + var/obj/structure/moth_cocoon/C = new(get_turf(user)) var/datum/mind/H = user.mind user.evolve(C, H) addtimer(CALLBACK(src, PROC_REF(emerge), C), COCOON_EMERGE_DELAY, TIMER_UNIQUE) diff --git a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm index 21243b038a5..e02bbe1f879 100644 --- a/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm +++ b/code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm @@ -45,7 +45,7 @@ /mob/living/simple_animal/hostile/gorilla/Initialize(mapload) . = ..() - var/datum/action/innate/gorilla/gorilla_toggle/toggle = new + var/datum/action/innate/gorilla_toggle/toggle = new toggle.Grant(src) var/static/default_cache = typecacheof(list(/obj/structure/closet/crate)) // Normal crates only please, no weird sized ones carriable_cache = default_cache @@ -54,14 +54,14 @@ LAZYCLEARLIST(crates_in_hand) return ..() -/datum/action/innate/gorilla/gorilla_toggle +/datum/action/innate/gorilla_toggle name = "Toggle Stand" desc = "Toggles between crawling and standing up." button_overlay_icon = 'icons/mob/actions/actions_animal.dmi' button_overlay_icon_state = "gorilla_toggle" check_flags = AB_CHECK_CONSCIOUS -/datum/action/innate/gorilla/gorilla_toggle/Activate() +/datum/action/innate/gorilla_toggle/Activate() . = ..() var/mob/living/simple_animal/hostile/gorilla/gorilla = owner if(!istype(gorilla)) diff --git a/code/modules/mob/living/simple_animal/hostile/hellhound.dm b/code/modules/mob/living/simple_animal/hostile/hellhound.dm index 16078c0187c..559e9f7fd5b 100644 --- a/code/modules/mob/living/simple_animal/hostile/hellhound.dm +++ b/code/modules/mob/living/simple_animal/hostile/hellhound.dm @@ -37,7 +37,7 @@ /mob/living/simple_animal/hostile/hellhound/Initialize(mapload) . = ..() - var/datum/action/innate/demon/whisper/whisper_action = new + var/datum/action/innate/demon_whisper/whisper_action = new whisper_action.Grant(src) ADD_TRAIT(src, TRAIT_NOBREATH, SPECIES_TRAIT) diff --git a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm index beed2052449..c0191862d40 100644 --- a/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm +++ b/code/modules/mob/new_player/sprite_accessories/unathi/unathi_hair.dm @@ -24,7 +24,7 @@ name = "Short Horns" icon_state = "short_horns" -/datum/sprite_accessory/hairy/unathi/curled +/datum/sprite_accessory/hair/unathi/curled name = "Curled Horns" icon_state = "curled_horns" diff --git a/code/modules/mod/mod_control.dm b/code/modules/mod/mod_control.dm index 3f4aacde15c..d0da24d5ac1 100644 --- a/code/modules/mod/mod_control.dm +++ b/code/modules/mod/mod_control.dm @@ -90,7 +90,7 @@ /// Is the jetpack on so we should make ion effects? var/jetpack_active = FALSE /// Cham option for when the cham module is installed. - var/datum/action/item_action/chameleon/change/modsuit/chameleon_action + var/datum/action/item_action/chameleon_change/modsuit/chameleon_action /// Is the control unit disquised? var/current_disguise = FALSE diff --git a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm index 1e8456780c9..9a1b310032e 100644 --- a/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/engines/singularity/particle_accelerator/particle_control.dm @@ -26,7 +26,7 @@ var/list/obj/structure/particle_accelerator/connected_parts var/assembled = 0 var/parts = null - var/datum/wires/particle_acc/control_box/wires = null + var/datum/wires/particle_accelerator/wires = null /// Layout of the particle accelerator. Used by the UI var/list/layout = list( list(list("name" = "EM Containment Grid Left", "icon_state" = "emitter_right", "status" = "", "dir" = "1"), list("name" = "Blank1", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank2", "icon_state" = "blank", "status" = "good", "dir" = "1"), list("name" = "Blank3", "icon_state" = "blank", "status" = "good", "dir" = "1")), diff --git a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm index c4060c3a187..15ef7da805a 100644 --- a/code/modules/reagents/chemistry/reagents/drinks_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/drinks_reagents.dm @@ -538,7 +538,7 @@ drink_desc = "Made with real grapes! Shocking!" taste_description = "grape soda" -/datum/reagent/consumable/drink/coco/icecoco +/datum/reagent/consumable/drink/icecoco name = "Iced Cocoa" id = "icecoco" description = "Hot cocoa and ice, refreshing and cool." diff --git a/code/modules/reagents/chemistry/reagents/food_reagents.dm b/code/modules/reagents/chemistry/reagents/food_reagents.dm index 93e1ca44243..c4c52e2c4d6 100644 --- a/code/modules/reagents/chemistry/reagents/food_reagents.dm +++ b/code/modules/reagents/chemistry/reagents/food_reagents.dm @@ -360,7 +360,7 @@ color = "#302000" // rgb: 48, 32, 0 taste_description = "oil" -/datum/reagent/consumbale/olivepaste +/datum/reagent/consumable/olivepaste name = "Olive Paste" id = "olivepaste" description = "A mushy pile of freshly ground olives." diff --git a/code/modules/response_team/ert.dm b/code/modules/response_team/ert.dm index 5830ff8631f..0a3784e212c 100644 --- a/code/modules/response_team/ert.dm +++ b/code/modules/response_team/ert.dm @@ -308,12 +308,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages) // -- AMBER TEAM -- /datum/response_team/amber - engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/amber - security_outfit = /datum/outfit/job/centcom/response_team/security/amber - medical_outfit = /datum/outfit/job/centcom/response_team/medic/amber - command_outfit = /datum/outfit/job/centcom/response_team/commander/amber - janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/amber - paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/amber + engineering_outfit = /datum/outfit/job/response_team/engineer/amber + security_outfit = /datum/outfit/job/response_team/security/amber + medical_outfit = /datum/outfit/job/response_team/medic/amber + command_outfit = /datum/outfit/job/response_team/commander/amber + janitor_outfit = /datum/outfit/job/response_team/janitorial/amber + paranormal_outfit = /datum/outfit/job/response_team/paranormal/amber /datum/response_team/amber/announce_team() if(silent) @@ -323,12 +323,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages) // -- RED TEAM -- /datum/response_team/red - engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/red - security_outfit = /datum/outfit/job/centcom/response_team/security/red - medical_outfit = /datum/outfit/job/centcom/response_team/medic/red - command_outfit = /datum/outfit/job/centcom/response_team/commander/red - janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/red - paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/red + engineering_outfit = /datum/outfit/job/response_team/engineer/red + security_outfit = /datum/outfit/job/response_team/security/red + medical_outfit = /datum/outfit/job/response_team/medic/red + command_outfit = /datum/outfit/job/response_team/commander/red + janitor_outfit = /datum/outfit/job/response_team/janitorial/red + paranormal_outfit = /datum/outfit/job/response_team/paranormal/red borg_path = /mob/living/silicon/robot/ert/red /datum/response_team/red/announce_team() @@ -339,12 +339,12 @@ GLOBAL_LIST_EMPTY(ert_request_messages) // -- GAMMA TEAM -- /datum/response_team/gamma - engineering_outfit = /datum/outfit/job/centcom/response_team/engineer/gamma - security_outfit = /datum/outfit/job/centcom/response_team/security/gamma - medical_outfit = /datum/outfit/job/centcom/response_team/medic/gamma - command_outfit = /datum/outfit/job/centcom/response_team/commander/gamma - janitor_outfit = /datum/outfit/job/centcom/response_team/janitorial/gamma - paranormal_outfit = /datum/outfit/job/centcom/response_team/paranormal/gamma + engineering_outfit = /datum/outfit/job/response_team/engineer/gamma + security_outfit = /datum/outfit/job/response_team/security/gamma + medical_outfit = /datum/outfit/job/response_team/medic/gamma + command_outfit = /datum/outfit/job/response_team/commander/gamma + janitor_outfit = /datum/outfit/job/response_team/janitorial/gamma + paranormal_outfit = /datum/outfit/job/response_team/paranormal/gamma borg_path = /mob/living/silicon/robot/ert/gamma /datum/response_team/gamma/announce_team() @@ -352,7 +352,7 @@ GLOBAL_LIST_EMPTY(ert_request_messages) return GLOB.major_announcement.Announce("Attention, [station_name()]. We are sending a code GAMMA elite Emergency Response Team. Standby.", "ERT En-Route") -/datum/outfit/job/centcom/response_team +/datum/outfit/job/response_team name = "Response team" var/rt_assignment = "Emergency Response Team Member" var/rt_job = "This is a bug" diff --git a/code/modules/response_team/ert_outfits.dm b/code/modules/response_team/ert_outfits.dm index 45d4ce66204..28a7793d089 100644 --- a/code/modules/response_team/ert_outfits.dm +++ b/code/modules/response_team/ert_outfits.dm @@ -1,6 +1,6 @@ /* ERT OUTFIT DATUMS */ -/datum/outfit/job/centcom/response_team/imprint_idcard(mob/living/carbon/human/H) +/datum/outfit/job/response_team/imprint_idcard(mob/living/carbon/human/H) var/obj/item/card/id/W = H.wear_id if(!istype(W)) return @@ -15,7 +15,7 @@ if(H.mind && H.mind.initial_account && H.mind.initial_account.account_number) W.associated_account_number = H.mind.initial_account.account_number -/datum/outfit/job/centcom/response_team/imprint_pda(mob/living/carbon/human/H) +/datum/outfit/job/response_team/imprint_pda(mob/living/carbon/human/H) var/obj/item/pda/PDA = H.wear_pda if(istype(PDA)) PDA.owner = H.real_name @@ -23,14 +23,14 @@ PDA.ownrank = rt_assignment PDA.name = "PDA-[H.real_name] ([PDA.ownjob])" -/datum/outfit/job/centcom/response_team/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/response_team/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() H.job = rt_mob_job //////////////////// COMMANDER /////////////////// -/datum/outfit/job/centcom/response_team/commander +/datum/outfit/job/response_team/commander name = "RT Commander" rt_assignment = "Emergency Response Team Leader" rt_job = "Emergency Response Team Leader" @@ -42,13 +42,13 @@ l_pocket = /obj/item/pinpointer r_pocket = /obj/item/melee/classic_baton/telescopic -/datum/outfit/job/centcom/response_team/commander/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/response_team/commander/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() H.rename_character(null, "[pick("Lieutenant", "Captain", "Major")] [pick(GLOB.last_names)]") H.age = rand(35, 45) -/datum/outfit/job/centcom/response_team/commander/amber +/datum/outfit/job/response_team/commander/amber name = "RT Commander (Amber)" shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/armor/vest/ert/command @@ -63,7 +63,7 @@ /obj/item/flashlight = 1 ) -/datum/outfit/job/centcom/response_team/commander/red +/datum/outfit/job/response_team/commander/red name = "RT Commander (Red)" shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/commander @@ -89,7 +89,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/commander/gamma +/datum/outfit/job/response_team/commander/gamma name = "RT Commander (Gamma)" shoes = /obj/item/clothing/shoes/magboots/elite back = /obj/item/mod/control/pre_equipped/responsory/commander @@ -120,7 +120,7 @@ //////////////////// SECURITY /////////////////// -/datum/outfit/job/centcom/response_team/security +/datum/outfit/job/response_team/security name = "RT Security" rt_assignment = "Emergency Response Team Officer" rt_job = "Emergency Response Team Officer" @@ -131,7 +131,7 @@ pda = /obj/item/pda/heads/ert/security id = /obj/item/card/id/ert/security -/datum/outfit/job/centcom/response_team/security/amber +/datum/outfit/job/response_team/security/amber name = "RT Security (Amber)" shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/armor/vest/ert/security @@ -147,7 +147,7 @@ /obj/item/flashlight/seclite = 1 ) -/datum/outfit/job/centcom/response_team/security/red +/datum/outfit/job/response_team/security/red name = "RT Security (Red)" shoes = /obj/item/clothing/shoes/combat suit = /obj/item/clothing/suit/space/hardsuit/ert/security @@ -174,7 +174,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/security/gamma +/datum/outfit/job/response_team/security/gamma name = "RT Security (Gamma)" shoes = /obj/item/clothing/shoes/magboots/elite belt = /obj/item/storage/belt/security/response_team_gamma @@ -208,7 +208,7 @@ //////////////////// ENGINEER /////////////////// -/datum/outfit/job/centcom/response_team/engineer +/datum/outfit/job/response_team/engineer name = "RT Engineer" rt_assignment = "Emergency Response Team Engineer" rt_job = "Emergency Response Team Engineer" @@ -219,7 +219,7 @@ id = /obj/item/card/id/ert/engineering belt = /obj/item/storage/belt/utility/chief/full -/datum/outfit/job/centcom/response_team/engineer/amber +/datum/outfit/job/response_team/engineer/amber name = "RT Engineer (Amber)" shoes = /obj/item/clothing/shoes/magboots suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer @@ -243,7 +243,7 @@ /obj/item/organ/internal/eyes/cybernetic/shield ) -/datum/outfit/job/centcom/response_team/engineer/red +/datum/outfit/job/response_team/engineer/red name = "RT Engineer (Red)" shoes = /obj/item/clothing/shoes/magboots/advance suit = /obj/item/clothing/suit/space/hardsuit/ert/engineer/gamma @@ -272,7 +272,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/engineer/gamma +/datum/outfit/job/response_team/engineer/gamma name = "RT Engineer (Gamma)" shoes = /obj/item/clothing/shoes/magboots/elite back = /obj/item/mod/control/pre_equipped/responsory/engineer @@ -305,7 +305,7 @@ //////////////////// MEDIC /////////////////// -/datum/outfit/job/centcom/response_team/medic +/datum/outfit/job/response_team/medic name = "RT Medic" rt_assignment = "Emergency Response Team Medic" rt_job = "Emergency Response Team Medic" @@ -315,7 +315,7 @@ pda = /obj/item/pda/heads/ert/medical id = /obj/item/card/id/ert/medic -/datum/outfit/job/centcom/response_team/medic/amber +/datum/outfit/job/response_team/medic/amber name = "RT Medic (Amber)" head = /obj/item/clothing/head/helmet/ert/medical shoes = /obj/item/clothing/shoes/white @@ -337,7 +337,7 @@ /obj/item/soap/nanotrasen = 1 ) -/datum/outfit/job/centcom/response_team/medic/red +/datum/outfit/job/response_team/medic/red name = "RT Medic (Red)" rt_mob_job = "ERT Medical" shoes = /obj/item/clothing/shoes/magboots @@ -370,7 +370,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/medic/gamma +/datum/outfit/job/response_team/medic/gamma name = "RT Medic (Gamma)" shoes = /obj/item/clothing/shoes/magboots/elite glasses = /obj/item/clothing/glasses/night @@ -407,7 +407,7 @@ //////////////////// PARANORMAL /////////////////// -/datum/outfit/job/centcom/response_team/paranormal +/datum/outfit/job/response_team/paranormal name = "RT Paranormal" rt_assignment = "Emergency Response Team Inquisitor" rt_job = "Emergency Response Team Inquisitor" @@ -428,19 +428,19 @@ /obj/item/storage/bible = 1 ) -/datum/outfit/job/centcom/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/response_team/paranormal/pre_equip(mob/living/carbon/human/H, visualsOnly = FALSE) . = ..() if(istype(H.mind)) ADD_TRAIT(H.mind, TRAIT_HOLY, ROUNDSTART_TRAIT) -/datum/outfit/job/centcom/response_team/paranormal/amber +/datum/outfit/job/response_team/paranormal/amber name = "RT Paranormal (Amber)" suit = /obj/item/clothing/suit/armor/vest/ert/security/paranormal head = /obj/item/clothing/head/helmet/ert/security/paranormal suit_store = /obj/item/gun/energy/disabler r_pocket = /obj/item/nullrod -/datum/outfit/job/centcom/response_team/paranormal/red +/datum/outfit/job/response_team/paranormal/red name = "RT Paranormal (Red)" suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal suit_store = /obj/item/gun/energy/gun @@ -464,7 +464,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/paranormal/gamma +/datum/outfit/job/response_team/paranormal/gamma name = "RT Paranormal (Gamma)" l_pocket = /obj/item/grenade/clusterbuster/holy back = /obj/item/mod/control/pre_equipped/responsory/inquisitory/chaplain @@ -492,7 +492,7 @@ //////////////////// JANITORIAL /////////////////// -/datum/outfit/job/centcom/response_team/janitorial +/datum/outfit/job/response_team/janitorial name = "RT Janitor" rt_assignment = "Emergency Response Team Janitor" rt_job = "Emergency Response Team Janitor" @@ -513,13 +513,13 @@ /obj/item/melee/flyswatter = 1 ) -/datum/outfit/job/centcom/response_team/janitorial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) +/datum/outfit/job/response_team/janitorial/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() if(visualsOnly) return ADD_TRAIT(H, TRAIT_NEVER_MISSES_DISPOSALS, ROUNDSTART_TRAIT) -/datum/outfit/job/centcom/response_team/janitorial/amber +/datum/outfit/job/response_team/janitorial/amber name = "RT Janitor (Amber)" suit = /obj/item/clothing/suit/armor/vest/ert/janitor head = /obj/item/clothing/head/helmet/ert/janitor @@ -531,7 +531,7 @@ /obj/item/organ/internal/cyberimp/arm/janitorial/advanced ) -/datum/outfit/job/centcom/response_team/janitorial/red +/datum/outfit/job/response_team/janitorial/red name = "RT Janitor (Red)" suit = /obj/item/clothing/suit/space/hardsuit/ert/janitor glasses = /obj/item/clothing/glasses/hud/janitor/sunglasses @@ -550,7 +550,7 @@ /obj/item/bio_chip/death_alarm ) -/datum/outfit/job/centcom/response_team/janitorial/gamma +/datum/outfit/job/response_team/janitorial/gamma name = "RT Janitor (Gamma)" glasses = /obj/item/clothing/glasses/hud/janitor/night back = /obj/item/mod/control/pre_equipped/responsory/janitor diff --git a/code/modules/vehicle/tg_vehicles/scooter.dm b/code/modules/vehicle/tg_vehicles/scooter.dm index f275c858eeb..1a751677edb 100644 --- a/code/modules/vehicle/tg_vehicles/scooter.dm +++ b/code/modules/vehicle/tg_vehicles/scooter.dm @@ -80,8 +80,8 @@ /obj/tgvehicle/scooter/skateboard/generate_actions() . = ..() - initialize_controller_action_type(/datum/action/vehicle/scooter/skateboard/ollie, VEHICLE_CONTROL_DRIVE) - initialize_controller_action_type(/datum/action/vehicle/scooter/skateboard/kickflip, VEHICLE_CONTROL_DRIVE) + initialize_controller_action_type(/datum/action/vehicle/skateboard/ollie, VEHICLE_CONTROL_DRIVE) + initialize_controller_action_type(/datum/action/vehicle/skateboard/kickflip, VEHICLE_CONTROL_DRIVE) /obj/tgvehicle/scooter/skateboard/post_buckle_mob(mob/living/M)//allows skateboards to be non-dense but still allows 2 skateboarders to collide with each other set_density(TRUE) diff --git a/code/modules/vehicle/tg_vehicles/tg_vehicle_actions.dm b/code/modules/vehicle/tg_vehicles/tg_vehicle_actions.dm index 95eff06bc62..c82fb7f001b 100644 --- a/code/modules/vehicle/tg_vehicles/tg_vehicle_actions.dm +++ b/code/modules/vehicle/tg_vehicles/tg_vehicle_actions.dm @@ -198,13 +198,13 @@ vehicle_target = null return ..() -/datum/action/vehicle/scooter/skateboard/ollie +/datum/action/vehicle/skateboard/ollie name = "Ollie" desc = "Get some air! Land on a table or fence to do a gnarly grind." button_overlay_icon_state = "skateboard_ollie" check_flags = AB_CHECK_CONSCIOUS -/datum/action/vehicle/scooter/skateboard/ollie/Trigger(left_click) +/datum/action/vehicle/skateboard/ollie/Trigger(left_click) . = ..() if(!.) return @@ -248,13 +248,13 @@ rider.pass_flags = old_pass vehicle.pass_flags = old_v_pass -/datum/action/vehicle/scooter/skateboard/kickflip +/datum/action/vehicle/skateboard/kickflip name = "Kickflip" desc = "Kick your board up and catch it." button_overlay_icon_state = "skateboard_ollie" check_flags = AB_CHECK_CONSCIOUS -/datum/action/vehicle/scooter/skateboard/kickflip/Trigger(left_click) +/datum/action/vehicle/skateboard/kickflip/Trigger(left_click) var/obj/tgvehicle/scooter/skateboard/board = vehicle_target var/mob/living/rider = owner diff --git a/tools/UpdatePaths/Scripts/27362_remove_redundant_typepaths.txt b/tools/UpdatePaths/Scripts/27362_remove_redundant_typepaths.txt new file mode 100644 index 00000000000..72bf7b56e72 --- /dev/null +++ b/tools/UpdatePaths/Scripts/27362_remove_redundant_typepaths.txt @@ -0,0 +1,15 @@ +/obj/effect/forcefield/mime/advanced : /obj/effect/forcefield/mime/@SUBTYPES{@OLD} +/obj/effect/spawner/away/lootdrop : /obj/effect/spawner/away_lootdrop/@SUBTYPES{@OLD} +/obj/effect/spawner/random/janitor/supplies : /obj/effect/spawner/random/jani_supplies/@SUBTYPES{@OLD} +/obj/effect/spawner/random/mod/maint : /obj/effect/spawner/random/mod_maint/@SUBTYPES{@OLD} +/obj/item/clothing/head/beret/solgov/command : /obj/item/clothing/head/beret/command/@SUBTYPES{@OLD} +/obj/item/clothing/head/space/prisoner_gulag : /obj/item/clothing/head/helmet/space/prisoner_gulag/@SUBTYPES{@OLD} +/obj/item/clothing/suit/greatcoat/sec : /obj/item/clothing/suit/sec_greatcoat/@SUBTYPES{@OLD} +/obj/item/clothing/under/misc/gimmick/rank/captain/suit : /obj/item/clothing/under/misc/gimmick_captain_suit/@SUBTYPES{@OLD} +/obj/item/ectoplasm/revenant : /obj/item/ectoplasm/@SUBTYPES{@OLD} +/obj/item/effect/snare : /obj/effect/snare/@SUBTYPES{@OLD} +/obj/item/storage/hidden/implant : /obj/item/storage/hidden_implant/@SUBTYPES{@OLD} +/obj/structure/closet/malf/suits : /obj/structure/closet/malf_suits/@SUBTYPES{@OLD} +/obj/structure/closet/secure_closet/syndicate/depot : /obj/structure/closet/secure_closet/depot/@SUBTYPES{@OLD} +/obj/structure/ladder/unusable : /obj/structure/ladder/@SUBTYPES{@OLD} +/obj/structure/moth/cocoon : /obj/structure/moth_cocoon/@SUBTYPES{@OLD}