Skip to content

Commit

Permalink
fix: небольшие правки по снаряжению обр, еретику и пр. (BlueMoon-Labs…
Browse files Browse the repository at this point in the history
…#900)

* fix: забыл паузу удалить в Build.bat, залетело в ПРе

* fix: святая вода в коробках со святой водой, а не патроны

* fix: правки обр, еретика и дискошара
  • Loading branch information
Darkest08 authored Apr 6, 2024
1 parent 4bf31e6 commit 34951f4
Show file tree
Hide file tree
Showing 16 changed files with 94 additions and 106 deletions.
2 changes: 1 addition & 1 deletion code/datums/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "Уничтожьте любые следы паранормальной активности на борту Космической Станции Тринадцатого Сектора."
Expand Down
2 changes: 2 additions & 0 deletions code/game/gamemodes/clock_cult/clock_cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 2 additions & 0 deletions code/game/gamemodes/cult/cult.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
10 changes: 6 additions & 4 deletions code/game/machinery/dance_machine.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down Expand Up @@ -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()
Expand Down
13 changes: 13 additions & 0 deletions code/game/objects/items/implants/implant_deathrattle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
13 changes: 6 additions & 7 deletions code/game/objects/items/storage/firstaid.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/structures/ghost_role_spawners.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/one_click_antag.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 4 additions & 1 deletion code/modules/antagonists/eldritch_cult/eldritch_book.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
13 changes: 5 additions & 8 deletions code/modules/antagonists/ert/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/antagonists/official/official.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
118 changes: 44 additions & 74 deletions code/modules/clothing/outfits/ert.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand Down Expand Up @@ -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,
Expand All @@ -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,
Expand All @@ -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,\
Expand All @@ -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)
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/standard.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/energy/pulse.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading

0 comments on commit 34951f4

Please sign in to comment.