From 34951f4ffb3bf06bd9895e34b00bf00086c34a77 Mon Sep 17 00:00:00 2001 From: Darkest08 <144275411+Darkest08@users.noreply.github.com> Date: Sat, 6 Apr 2024 21:19:54 +0300 Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BD=D0=B5=D0=B1=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D1=88=D0=B8=D0=B5=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=BF=D0=BE=20=D1=81=D0=BD=D0=B0=D1=80=D1=8F=D0=B6=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D1=8E=20=D0=BE=D0=B1=D1=80,=20=D0=B5=D1=80=D0=B5=D1=82?= =?UTF-8?q?=D0=B8=D0=BA=D1=83=20=D0=B8=20=D0=BF=D1=80.=20(#900)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: забыл паузу удалить в Build.bat, залетело в ПРе * fix: святая вода в коробках со святой водой, а не патроны * fix: правки обр, еретика и дискошара --- code/datums/ert.dm | 2 +- code/game/gamemodes/clock_cult/clock_cult.dm | 2 + code/game/gamemodes/cult/cult.dm | 2 + code/game/machinery/dance_machine.dm | 10 +- .../items/implants/implant_deathrattle.dm | 13 ++ code/game/objects/items/storage/firstaid.dm | 13 +- .../objects/structures/ghost_role_spawners.dm | 6 +- code/modules/admin/verbs/one_click_antag.dm | 2 +- .../eldritch_cult/eldritch_book.dm | 5 +- code/modules/antagonists/ert/ert.dm | 13 +- code/modules/antagonists/official/official.dm | 2 +- code/modules/clothing/outfits/ert.dm | 118 +++++++----------- code/modules/clothing/outfits/standard.dm | 2 +- code/modules/clothing/suits/armor.dm | 4 +- code/modules/projectiles/guns/energy/pulse.dm | 2 +- modular_bluemoon/SmiLeY/code/ert/pizza_ert.dm | 4 +- 16 files changed, 94 insertions(+), 106 deletions(-) diff --git a/code/datums/ert.dm b/code/datums/ert.dm index e303d08caa6b..36631ae84012 100644 --- a/code/datums/ert.dm +++ b/code/datums/ert.dm @@ -85,7 +85,7 @@ mission = "Разберитесь с проблемами на станции [station_name()], а также проведите плановую проверку всех Отделов и Командования." /datum/ert/inquisition - roles = list(/datum/antagonist/ert/chaplain/inquisitor, /datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor) + roles = list(/datum/antagonist/ert/security/inquisitor, /datum/antagonist/ert/medic/inquisitor) leader_role = /datum/antagonist/ert/commander/inquisitor rename_team = "Inquisition" mission = "Уничтожьте любые следы паранормальной активности на борту Космической Станции Тринадцатого Сектора." diff --git a/code/game/gamemodes/clock_cult/clock_cult.dm b/code/game/gamemodes/clock_cult/clock_cult.dm index c698a6843011..ffaacb5123a0 100644 --- a/code/game/gamemodes/clock_cult/clock_cult.dm +++ b/code/game/gamemodes/clock_cult/clock_cult.dm @@ -62,6 +62,8 @@ Credit where due: return FALSE if(M.mind.unconvertable) return FALSE + if (IS_HERETIC(M)) + return FALSE else return FALSE if(iscultist(M) || isconstruct(M) || ispAI(M)) diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 4c93d0891ca0..e4e4724929d9 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -27,6 +27,8 @@ return FALSE if(M.mind.unconvertable) return FALSE + if(IS_HERETIC(M)) + return FALSE else return FALSE if(HAS_TRAIT(M, TRAIT_MINDSHIELD) || issilicon(M) || isbot(M) || isdrone(M) || is_servant_of_ratvar(M) || !M.client) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 984bbf10c94a..40dc038b2878 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -398,6 +398,7 @@ /obj/machinery/jukebox/disco/proc/dance3(var/mob/living/M) var/matrix/initial_matrix = matrix(M.transform) + var/matrix/initial_matrix_ = matrix(M.transform) for (var/i in 1 to 75) if (!M) return @@ -441,7 +442,7 @@ initial_matrix.Translate(-3,0) animate(M, transform = initial_matrix, time = 1, loop = 0) sleep(1) - M.lying_fix() + M.lying_fix(initial_matrix_) /obj/machinery/jukebox/disco/proc/dance4(var/mob/living/M) @@ -461,6 +462,7 @@ /obj/machinery/jukebox/disco/proc/dance5(var/mob/living/M) animate(M, transform = matrix(180, MATRIX_ROTATE), time = 1, loop = 0) var/matrix/initial_matrix = matrix(M.transform) + var/matrix/initial_matrix_ = matrix(M.transform) for (var/i in 1 to 60) if (!M) return @@ -491,10 +493,10 @@ initial_matrix.Translate(-3,0) animate(M, transform = initial_matrix, time = 1, loop = 0) sleep(1) - M.lying_fix() + M.lying_fix(initial_matrix_) -/mob/living/proc/lying_fix() - animate(src, transform = null, time = 1, loop = 0) +/mob/living/proc/lying_fix(var/matrix/initial_matrix) + animate(src, transform = initial_matrix, time = 1, loop = 0) lying_prev = 0 /obj/machinery/jukebox/proc/dance_over() diff --git a/code/game/objects/items/implants/implant_deathrattle.dm b/code/game/objects/items/implants/implant_deathrattle.dm index ed195ab55e42..a26883e235dd 100644 --- a/code/game/objects/items/implants/implant_deathrattle.dm +++ b/code/game/objects/items/implants/implant_deathrattle.dm @@ -72,3 +72,16 @@ name = "implant case - 'Deathrattle'" desc = "A glass case containing a deathrattle implant." imp_type = /obj/item/implant/deathrattle + +/datum/deathrattle_group/centcom + name = "Centcom Agent" + +/obj/item/implant/deathrattle/centcom + name = "centcom deathrattle implant" + desc = "Hope no one else dies, prepare for when they do." + group = /datum/deathrattle_group/centcom + +/obj/item/implant/deathrattle/centcom/implant(mob/living/target, mob/user, silent = FALSE, force = FALSE) + . = ..() + group.register(src) + return . diff --git a/code/game/objects/items/storage/firstaid.dm b/code/game/objects/items/storage/firstaid.dm index 1094ff22f1b4..4600e1299f4b 100644 --- a/code/game/objects/items/storage/firstaid.dm +++ b/code/game/objects/items/storage/firstaid.dm @@ -201,9 +201,9 @@ new /obj/item/healthanalyzer/advanced(src) new /obj/item/reagent_containers/syringe/piercing(src) new /obj/item/bonesetter(src) + new /obj/item/pinpointer/crew(src) + new /obj/item/sensor_device(src) new /obj/item/reagent_containers/medspray/sterilizine(src) - new /obj/item/reagent_containers/medspray/sterilizine(src) - new /obj/item/reagent_containers/glass/bottle/morphine(src) new /obj/item/reagent_containers/glass/bottle/morphine(src) new /obj/item/hypospray/mkii/CMO/combat/synthflesh(src) @@ -215,14 +215,13 @@ if(empty) return new /obj/item/stack/medical/gauze(src) - new /obj/item/stack/medical/gauze(src) - new /obj/item/reagent_containers/hypospray/medipen/oxandrolone(src) - new /obj/item/reagent_containers/hypospray/medipen/salacid(src) - new /obj/item/reagent_containers/hypospray/combat/omnizine(src) + new /obj/item/reagent_containers/medspray/sterilizine(src) + new /obj/item/reagent_containers/glass/bottle/morphine(src) + new /obj/item/reagent_containers/glass/bottle/morphine(src) new /obj/item/reagent_containers/hypospray/combat/omnizine(src) new /obj/item/reagent_containers/hypospray/medipen/penacid(src) new /obj/item/reagent_containers/hypospray/medipen/penacid(src) - + new /obj/item/reagent_containers/hypospray/medipen/penacid(src) /obj/item/storage/firstaid/radbgone diff --git a/code/game/objects/structures/ghost_role_spawners.dm b/code/game/objects/structures/ghost_role_spawners.dm index 852aaf22885e..47b48604e074 100644 --- a/code/game/objects/structures/ghost_role_spawners.dm +++ b/code/game/objects/structures/ghost_role_spawners.dm @@ -571,7 +571,7 @@ gloves = /obj/item/clothing/gloves/tackler/combat/insulated ears = /obj/item/radio/headset/syndicate/alt back = /obj/item/storage/backpack - implants = list(/obj/item/implant/weapons_auth, /obj/item/implant/deathrattle, /obj/item/implant/explosive, /obj/item/implant/mindshield) + implants = list(/obj/item/implant/weapons_auth, /obj/item/implant/deathrattle/centcom, /obj/item/implant/explosive, /obj/item/implant/mindshield) id = /obj/item/card/id/syndicate give_space_cooler_if_synth = TRUE // BLUEMOON ADD @@ -1207,7 +1207,7 @@ /obj/item/storage/firstaid/regular=1, /obj/item/stamp/syndicate=1, ) - implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth) + implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth) cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant) id = /obj/item/card/id @@ -1260,7 +1260,7 @@ /obj/item/storage/firstaid/regular=1, /obj/item/stamp/centcom=1, ) - implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth) + implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth) cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant) id = /obj/item/card/id diff --git a/code/modules/admin/verbs/one_click_antag.dm b/code/modules/admin/verbs/one_click_antag.dm index b6d7e6dfbc6d..d0672155e54a 100644 --- a/code/modules/admin/verbs/one_click_antag.dm +++ b/code/modules/admin/verbs/one_click_antag.dm @@ -381,7 +381,7 @@ var/datum/antagonist/ert/ert = antag mannequin.equipOutfit(initial(ert.outfit), TRUE) else if (ispath(antag, /datum/antagonist/official)) - mannequin.equipOutfit(/datum/outfit/centcom_official, TRUE) + mannequin.equipOutfit(/datum/outfit/ert/centcom_official, TRUE) /datum/admins/proc/makeERTPreviewIcon(list/settings) // Set up the dummy for its photoshoot diff --git a/code/modules/antagonists/eldritch_cult/eldritch_book.dm b/code/modules/antagonists/eldritch_cult/eldritch_book.dm index ba7fcb0be11f..d83bc479e017 100644 --- a/code/modules/antagonists/eldritch_cult/eldritch_book.dm +++ b/code/modules/antagonists/eldritch_cult/eldritch_book.dm @@ -14,11 +14,14 @@ ///Where we cannot create the rune? var/static/list/blacklisted_turfs = typecacheof(list(/turf/closed,/turf/open/space,/turf/open/lava)) +/obj/item/forbidden_book/Initialize(mapload) + . = ..() + AddComponent(/datum/component/anti_magic, FALSE, FALSE) + /obj/item/forbidden_book/Destroy() last_user = null . = ..() - /obj/item/forbidden_book/examine(mob/user) . = ..() if(!IS_HERETIC(user)) diff --git a/code/modules/antagonists/ert/ert.dm b/code/modules/antagonists/ert/ert.dm index 57a69bed2ff7..0ccd37d338d8 100644 --- a/code/modules/antagonists/ert/ert.dm +++ b/code/modules/antagonists/ert/ert.dm @@ -131,17 +131,14 @@ /datum/antagonist/ert/medic/inquisitor outfit = /datum/outfit/ert/medic/inquisitor +/datum/antagonist/ert/medic/inquisitor/on_gain() + . = ..() + owner.isholy = TRUE + /datum/antagonist/ert/security/inquisitor outfit = /datum/outfit/ert/security/inquisitor -/datum/antagonist/ert/chaplain - role = "Священник" - outfit = /datum/outfit/ert/chaplain - -/datum/antagonist/ert/chaplain/inquisitor - outfit = /datum/outfit/ert/chaplain/inquisitor - -/datum/antagonist/ert/chaplain/on_gain() +/datum/antagonist/ert/security/inquisitor/on_gain() . = ..() owner.isholy = TRUE diff --git a/code/modules/antagonists/official/official.dm b/code/modules/antagonists/official/official.dm index 27dcd0e63574..47465475931a 100644 --- a/code/modules/antagonists/official/official.dm +++ b/code/modules/antagonists/official/official.dm @@ -18,7 +18,7 @@ var/mob/living/carbon/human/H = owner.current if(!istype(H)) return - H.equipOutfit(/datum/outfit/centcom_official) + H.equipOutfit(/datum/outfit/ert/centcom_official) if(CONFIG_GET(flag/enforce_human_authority)) H.set_species(/datum/species/human) diff --git a/code/modules/clothing/outfits/ert.dm b/code/modules/clothing/outfits/ert.dm index b90651eceb17..17bf6dc9a109 100644 --- a/code/modules/clothing/outfits/ert.dm +++ b/code/modules/clothing/outfits/ert.dm @@ -13,7 +13,7 @@ give_space_cooler_if_synth = TRUE // BLUEMOON ADD - implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth) + implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth) cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security,/obj/item/organ/cyberimp/chest/nutrimentextreme, /obj/item/organ/cyberimp/chest/chem_implant) @@ -503,52 +503,12 @@ W.access = list(ACCESS_MAINT_TUNNELS,ACCESS_CENT_GENERAL) W.update_label(W.registered_name, W.assignment) -/datum/outfit/centcom_official - name = "CentCom Official" - - uniform = /obj/item/clothing/under/rank/centcom/officer - shoes = /obj/item/clothing/shoes/laceup - gloves = /obj/item/clothing/gloves/color/black - ears = /obj/item/radio/headset/headset_cent/alt - head = /obj/item/clothing/head/beret/sec/ntr_beret - glasses = /obj/item/clothing/glasses/sunglasses - belt = /obj/item/gun/energy/e_gun/nuclear/ert - back = /obj/item/storage/backpack/satchel - l_hand = /obj/item/clipboard - id = /obj/item/card/id/ert - backpack_contents = list(/obj/item/storage/box/survival/centcom=1, - /obj/item/pda/heads=1, - /obj/item/pen=1) - - implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth) - - cybernetic_implants = list(/obj/item/organ/cyberimp/eyes/hud/security, - /obj/item/organ/cyberimp/chest/nutrimentextreme, - /obj/item/organ/cyberimp/chest/chem_implant) - -/datum/outfit/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) - if(visualsOnly) - return - - var/obj/item/radio/R = H.ears - R.set_frequency(FREQ_CENTCOM) - R.freqlock = TRUE - - var/obj/item/card/id/W = H.wear_id - W.icon_state = "centcom" - W.access = get_all_accesses()//They get full station access. - W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access. - W.assignment = "CentCom Official" - W.registered_name = H.real_name - W.update_label(W.registered_name, W.assignment) - /datum/outfit/ert/commander/inquisitor name = "Inquisition Commander" mask = /obj/item/clothing/mask/gas/sechailer/swat glasses = /obj/item/clothing/glasses/hud/health/night/syndicate l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted - r_hand = /obj/item/nullrod/scythe/talking/chainsword suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal belt = /obj/item/storage/belt/military/ert_max backpack_contents = list(/obj/item/storage/box/survival/centcom=1, @@ -575,7 +535,6 @@ glasses = /obj/item/clothing/glasses/hud/health/night/syndicate suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted - r_hand = /obj/item/nullrod/scythe/talking/chainsword belt = /obj/item/storage/belt/military/ert_max backpack_contents = list(/obj/item/storage/box/survival/centcom=1, /obj/item/storage/firstaid/regular=1, @@ -602,7 +561,6 @@ glasses = /obj/item/clothing/glasses/hud/health/night/syndicate suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor l_hand = /obj/item/gun/ballistic/automatic/proto/unrestricted - r_hand = /obj/item/nullrod/scythe/talking/chainsword belt = /obj/item/defibrillator/compact/loaded_ert backpack_contents = list(/obj/item/storage/box/survival/centcom=1, /obj/item/storage/box/ammo/smgap=1,\ @@ -621,40 +579,52 @@ /obj/item/organ/cyberimp/chest/thrusters, ) -/datum/outfit/ert/chaplain/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) - ..() +//Агенты ЦК - if(visualsOnly) - return - - var/obj/item/radio/R = H.ears - R.keyslot = new /obj/item/encryptionkey/heads/hop - R.recalculateChannels() - -/datum/outfit/ert/chaplain - name = "ERT Chaplain" - - mask = /obj/item/clothing/mask/gas/sechailer/swat - suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor // Chap role always gets this suit - id = /obj/item/card/id/ert/chaplain +/datum/outfit/ert/centcom_official + name = "CentCom Official" + uniform = /obj/item/clothing/under/syndicate/sniper + suit = /obj/item/clothing/suit/armor/vest/agent + shoes = /obj/item/clothing/shoes/laceup + head = /obj/item/clothing/head/HoS/beret/syndicate glasses = /obj/item/clothing/glasses/hud/health/night/syndicate - back = /obj/item/storage/backpack/cultpack - belt = /obj/item/storage/belt/soulstone - r_hand = /obj/item/gun/ballistic/automatic/laser + belt = /obj/item/storage/belt/military/ert_max + back = /obj/item/storage/backpack/satchel + mask = null + id = /obj/item/card/id/ert + backpack_contents = list(/obj/item/storage/box/survival/centcom=1, - /obj/item/nullrod=1, - /obj/item/storage/firstaid/regular=1,\ - /obj/item/ammo_box/magazine/recharge=4) + /obj/item/pda/heads=1, + /obj/item/stamp/centcom=1, + /obj/item/stamp/syndicate=1, + ) + implants = list( + /obj/item/implant/mindshield, + /obj/item/implant/deathrattle/centcom, + /obj/item/implant/weapons_auth, + /obj/item/implant/krav_maga, + ) -/datum/outfit/ert/chaplain/inquisitor - name = "Inquisition Chaplain" + cybernetic_implants = list( + /obj/item/organ/cyberimp/eyes/hud/security, + /obj/item/organ/cyberimp/chest/nutrimentextreme, + /obj/item/organ/cyberimp/chest/chem_implant/plus, + /obj/item/organ/eyes/robotic/thermals, + /obj/item/organ/cyberimp/mouth/breathing_tube, + ) - mask = /obj/item/clothing/mask/gas/sechailer/swat - suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor - belt = /obj/item/storage/belt/soulstone/full/chappy - backpack_contents = list(/obj/item/storage/box/survival/centcom=1, +/datum/outfit/ert/centcom_official/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE, client/preference_source) + if(visualsOnly) + return - /obj/item/grenade/chem_grenade/holy=1, - /obj/item/nullrod=1, - /obj/item/storage/firstaid/regular=1,\ - /obj/item/ammo_box/magazine/recharge=4) + var/obj/item/radio/R = H.ears + R.set_frequency(FREQ_CENTCOM) + R.freqlock = TRUE + + var/obj/item/card/id/W = H.wear_id + W.icon_state = "centcom" + W.access = get_all_accesses()//They get full station access. + W.access += get_centcom_access("Death Commando")//Let's add their alloted CentCom access. + W.assignment = "CentCom Official" + W.registered_name = H.real_name + W.update_label(W.registered_name, W.assignment) diff --git a/code/modules/clothing/outfits/standard.dm b/code/modules/clothing/outfits/standard.dm index 34d5dc60c3f4..6d685e560822 100644 --- a/code/modules/clothing/outfits/standard.dm +++ b/code/modules/clothing/outfits/standard.dm @@ -405,7 +405,7 @@ /obj/item/pinpointer/nuke=1,\ /obj/item/grenade/plastic/x4=1) - implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle, /obj/item/implant/weapons_auth) + implants = list(/obj/item/implant/mindshield, /obj/item/implant/deathrattle/centcom, /obj/item/implant/weapons_auth) cybernetic_implants = list( /obj/item/organ/cyberimp/eyes/hud/security, diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index a2b238a49a89..df2520baa102 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -317,8 +317,8 @@ blood_overlay_type = "armor" armor = list(MELEE = 10, BULLET = 10, LASER = 60, ENERGY = 60, BOMB = 0, BIO = 0, RAD = 0, FIRE = 100, ACID = 100, WOUND = 15) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF - var/hit_reflect_chance = 40 - var/list/protected_zones = list(BODY_ZONE_CHEST, BODY_ZONE_PRECISE_GROIN) + var/hit_reflect_chance = 60 + var/list/protected_zones = list(BODY_ZONE_CHEST, BODY_ZONE_HEAD, BODY_ZONE_L_ARM, BODY_ZONE_R_ARM, BODY_ZONE_L_LEG, BODY_ZONE_R_LEG) /obj/item/clothing/suit/armor/laserproof/run_block(mob/living/owner, atom/object, damage, attack_text, attack_type, armour_penetration, mob/attacker, def_zone, final_block_chance, list/block_return) if(def_zone in protected_zones) diff --git a/code/modules/projectiles/guns/energy/pulse.dm b/code/modules/projectiles/guns/energy/pulse.dm index bbe5c4147f80..a65eaf8f7781 100644 --- a/code/modules/projectiles/guns/energy/pulse.dm +++ b/code/modules/projectiles/guns/energy/pulse.dm @@ -2,7 +2,7 @@ name = "\improper Pulse Rifle" desc = "A heavy-duty, multifaceted energy rifle with three modes. Preferred by front-line combat personnel." icon_state = "pulse" - item_state = null + item_state = "gun" w_class = WEIGHT_CLASS_BULKY force = 10 modifystate = TRUE diff --git a/modular_bluemoon/SmiLeY/code/ert/pizza_ert.dm b/modular_bluemoon/SmiLeY/code/ert/pizza_ert.dm index 73b049813ced..9c534bb6eae7 100644 --- a/modular_bluemoon/SmiLeY/code/ert/pizza_ert.dm +++ b/modular_bluemoon/SmiLeY/code/ert/pizza_ert.dm @@ -85,7 +85,7 @@ /datum/outfit/ert/pizza_ert/post_equip() . = ..() -/datum/outfit/ert/pizza/pre_equip(mob/living/carbon/human/equipped_human, visualsOnly) +/datum/outfit/ert/pizza_ert/pre_equip(mob/living/carbon/human/equipped_human, visualsOnly) var/list/pizza_list = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/pineapple) r_hand = pick(pizza_list) backpack_contents += list( @@ -94,7 +94,7 @@ pizza_list,\ ) -/datum/outfit/ert/pizza/leader/pre_equip(mob/living/carbon/human/equipped_human, visualsOnly) +/datum/outfit/ert/pizza_ert/leader/pre_equip(mob/living/carbon/human/equipped_human, visualsOnly) var/list/pizza_list = list(/obj/item/pizzabox/margherita, /obj/item/pizzabox/mushroom, /obj/item/pizzabox/meat, /obj/item/pizzabox/pineapple) r_hand = pick(pizza_list) backpack_contents += list(