[Technically modular] Mesa balancing run number big number (#12731)

* Finally fixed

* OOPS HAHA

* haha oops

* More map adjustments and one (1) RLD

* Big expansion

* Update blackmesa.dmm

* Update blackmesa.dmm

* Update blackmesa.dmm

* Update blackmesa.dmm

* Quick gib fix

* Update blackmesa.dmm

* SL placed

* fix

* a

* radio fix

* Update walkie_talkie.dm

* Update walkie_talkie.dm

* Update walkie_talkie.dm

* Makes bowmen more worth to buy

* Removes transceivers

Actually, that's a terrible idea.

* Update tgstation.dme
This commit is contained in:
Stalkeros2
2022-04-19 18:06:02 +01:00
committed by GitHub
parent fde147ab55
commit 14ab6439df
26 changed files with 3003 additions and 1352 deletions
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -628,7 +628,7 @@
/turf/open/floor/iron/cafeteria,
/area/awaymission/wildwest/mines)
"ee" = (
/obj/item/ammo_box/magazine/m16,
/obj/item/ammo_box/magazine/m16/vintage,
/turf/open/misc/ironsand,
/area/awaymission/wildwest/vault)
"ej" = (
@@ -3158,7 +3158,7 @@
/area/awaymission/wildwest/vault)
"Sg" = (
/obj/structure/closet/crate,
/obj/item/ammo_box/magazine/m16,
/obj/item/ammo_box/magazine/m16/vintage,
/turf/open/floor/iron,
/area/awaymission/wildwest/refine)
"Sj" = (
Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 9.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 6.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

@@ -22,7 +22,7 @@
description = "Contains a set of two hazardous environment armor pieces. This armor gives you a robust all-around protection, as well as mild regeneration."
item_type = /obj/item/storage/box/armor_set/pcv
max_purchase = 4
cost = 18
cost = 20
/obj/item/storage/box/armor_set
name = "box of armor"
@@ -41,16 +41,16 @@
desc = "Box containing a basic armor vest and helmet."
/obj/item/storage/box/armor_set/normal/PopulateContents()
new /obj/item/clothing/suit/armor/vest/security(src)
new /obj/item/clothing/head/helmet/sec(src)
new /obj/item/clothing/suit/armor/vest/hecu(src)
new /obj/item/clothing/head/helmet/hecu(src)
/obj/item/storage/box/armor_set/bulletproof
name = "bulletproof armor set"
desc = "Box containing a bulletproof armor vest and helmet."
/obj/item/storage/box/armor_set/bulletproof/PopulateContents()
new /obj/item/clothing/suit/armor/bulletproof(src)
new /obj/item/clothing/head/helmet/alt(src)
new /obj/item/clothing/suit/armor/bulletproof/hecu(src)
new /obj/item/clothing/head/helmet/alt/hecu(src)
/obj/item/storage/box/armor_set/pcv
name = "PCV Mk. II armor set"
@@ -17,8 +17,8 @@
/datum/armament_entry/hecu/primary/submachinegun/mp5
item_type = /obj/item/gun/ballistic/automatic/mp5
max_purchase = 4
cost = 7
max_purchase = 2
cost = 10
/datum/armament_entry/hecu/primary/assaultrifle
subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
@@ -27,8 +27,8 @@
/datum/armament_entry/hecu/primary/assaultrifle/m16
item_type = /obj/item/gun/ballistic/automatic/m16
max_purchase = 1
cost = 12
magazine = /obj/item/ammo_box/magazine/m16/extended
cost = 14
magazine = /obj/item/ammo_box/magazine/m16
/datum/armament_entry/hecu/primary/shotgun
subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
@@ -55,7 +55,15 @@
/datum/armament_entry/hecu/primary/special/sniper_rifle
item_type = /obj/item/gun/ballistic/automatic/cfa_rifle
max_purchase = 1
cost = 15
cost = 18
/datum/armament_entry/hecu/primary/special/hmg
item_type = /obj/item/mounted_machine_gun_folded
max_purchase = 1
cost = 22
magazine = /obj/item/ammo_box/magazine/mmg_box
mags_to_spawn = 1
magazine_cost = 2
/obj/item/storage/box/ammo_box/shotgun_12g
@@ -17,7 +17,21 @@
max_purchase = 4
mags_to_spawn = 3
/datum/armament_entry/hecu/secondary/pistol/deagle
item_type = /obj/item/gun/ballistic/automatic/pistol/deagle
max_purchase = 1
cost = 9
/datum/armament_entry/hecu/secondary/pistol/revolver
item_type = /obj/item/gun/ballistic/revolver/detective
max_purchase = 4
cost = 3
mags_to_spawn = 0
magazine = /obj/item/storage/box/ammo_box/revolver
magazine_cost = 4
/obj/item/storage/box/ammo_box/revolver
/obj/item/storage/box/ammo_box/revolver/PopulateContents()
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38(src)
new /obj/item/ammo_box/c38/dumdum(src)
new /obj/item/ammo_box/c38/dumdum(src)
new /obj/item/ammo_box/c38/match(src)
@@ -1,6 +1,6 @@
/datum/armament_entry/hecu/explosives
category = ARMAMENT_CATEGORY_EXPLOSIVES
category_item_limit = 16
category_item_limit = 8
/datum/armament_entry/hecu/explosives/frag
item_type = /obj/item/grenade/frag
@@ -23,7 +23,7 @@
/datum/armament_entry/hecu/medical/medkit/toxin
item_type = /obj/item/storage/medkit/toxin
max_purchase = 1
cost = 3
cost = 2
/datum/armament_entry/hecu/medical/medkit/fire
item_type = /obj/item/storage/medkit/fire
@@ -33,7 +33,12 @@
/datum/armament_entry/hecu/medical/medkit/o2
item_type = /obj/item/storage/medkit/o2
max_purchase = 1
cost = 3
cost = 2
/datum/armament_entry/hecu/medical/medkit/advanced
item_type = /obj/item/storage/medkit/advanced
max_purchase = 1
cost = 4
/datum/armament_entry/hecu/medical/medkit/expeditionary
item_type = /obj/item/storage/medkit/expeditionary
@@ -63,17 +68,12 @@
max_purchase = 4
cost = 1
/datum/armament_entry/hecu/medical/injector/oxandrolone
item_type = /obj/item/reagent_containers/hypospray/medipen/oxandrolone
max_purchase = 4
cost = 1
/datum/armament_entry/hecu/medical/injector/stimulant
item_type = /obj/item/reagent_containers/hypospray/medipen/stimulants
max_purchase = 4
cost = 1
max_purchase = 2
cost = 4
/datum/armament_entry/hecu/medical/injector/bag
item_type = /obj/item/storage/bag/medpens
max_purchase = 2
cost = 4
cost = 5
@@ -20,4 +20,4 @@
/datum/armament_entry/hecu/melee/nonlethal/kravmaga
item_type = /obj/item/clothing/gloves/krav_maga/combatglovesplus
cost = 12
cost = 10
@@ -5,7 +5,7 @@
/datum/armament_entry/hecu/utility/survival_pack
item_type = /obj/item/storage/box/nri_survival_pack
max_purchase = 4
cost = 4
cost = 3
/datum/armament_entry/hecu/utility/pouch
item_type = /obj/item/storage/bag/ammo
@@ -20,34 +20,39 @@
/datum/armament_entry/hecu/utility/basic_tools
item_type = /obj/item/storage/toolbox/mechanical
max_purchase = 2
cost = 2
cost = 1
/datum/armament_entry/hecu/utility/advanced_tools
name = "Powertoolbelt"
description = "Tool belt full of power-ful tools."
item_type = /obj/item/storage/belt/utility/full/powertools
max_purchase = 1
cost = 5
cost = 4
/datum/armament_entry/hecu/utility/light_device
item_type = /obj/item/construction/rld/mini
max_purchase = 2
cost = 3
/datum/armament_entry/hecu/utility/compact_shield
item_type = /obj/item/shield/riot/tele
max_purchase = 1
cost = 10
cost = 5
/datum/armament_entry/hecu/utility/flash_shield
item_type = /obj/item/shield/riot/flash
max_purchase = 1
cost = 15
cost = 10
/datum/armament_entry/hecu/utility/combat_shield
item_type = /obj/item/shield/riot/pointman/hecu
max_purchase = 1
cost = 25
cost = 20
/datum/armament_entry/hecu/utility/zipties
item_type = /obj/item/storage/box/zipties
max_purchase = 1
cost = 3
max_purchase = 2
cost = 1
/datum/armament_entry/hecu/utility/jammer
name = "Radio Jammer"
@@ -59,7 +64,7 @@
/datum/armament_entry/hecu/utility/suppressor
item_type = /obj/item/suppressor
max_purchase = 4
cost = 4
cost = 2
/datum/armament_entry/hecu/utility/bowman
item_type = /obj/item/radio/headset/headset_faction/bowman
@@ -0,0 +1,110 @@
/obj/item/clothing/suit/armor/vest/hecu
name = "plate carrier system"
desc = "A modular armor vest with inserted plates and armor elements that provide decent protection against most types of damage. Despite its modularity, however, you can't remove any of its pieces."
icon_state = "combat_vest"
inhand_icon_state = "armoralt"
blood_overlay_type = "armor"
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi'
uses_advanced_reskins = TRUE
unique_reskin = list(
"Basic" = list(
RESKIN_ICON_STATE = "combat_vest",
RESKIN_WORN_ICON_STATE = "combat_vest"
),
"Corpsman" = list(
RESKIN_ICON_STATE = "combat_vest_medic",
RESKIN_WORN_ICON_STATE = "combat_vest_medic"
),
"Basic Black" = list(
RESKIN_ICON_STATE = "combat_vest_black",
RESKIN_WORN_ICON_STATE = "combat_vest_black"
),
"Corpsman Black" = list(
RESKIN_ICON_STATE = "combat_vest_medic_black",
RESKIN_WORN_ICON_STATE = "combat_vest_medic_black"
),
)
/obj/item/clothing/head/helmet/hecu
name = "combat helmet"
desc = "A (previously) common helmet design meant to protect its user's head from impacts."
icon_state = "combat_helmet"
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi'
uses_advanced_reskins = TRUE
unique_reskin = list(
"Basic" = list(
RESKIN_ICON_STATE = "combat_helmet",
RESKIN_WORN_ICON_STATE = "combat_helmet"
),
"Corpsman" = list(
RESKIN_ICON_STATE = "combat_helmet_medic",
RESKIN_WORN_ICON_STATE = "combat_helmet_medic"
),
"Basic Black" = list(
RESKIN_ICON_STATE = "combat_helmet_black",
RESKIN_WORN_ICON_STATE = "combat_helmet_black"
),
"Corpsman Black" = list(
RESKIN_ICON_STATE = "combat_helmet_medic_black",
RESKIN_WORN_ICON_STATE = "combat_helmet_medic_black"
),
)
/obj/item/clothing/suit/armor/bulletproof/hecu
name = "ceramic vest"
desc = "Vest made from some brittle and highly conductive, yet incredibly impact- and shock-resistant material. Might be of best use against bullets and explosives."
icon_state = "ceramic_vest"
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_digi.dmi'
uses_advanced_reskins = TRUE
unique_reskin = list(
"Basic" = list(
RESKIN_ICON_STATE = "ceramic_vest",
RESKIN_WORN_ICON_STATE = "ceramic_vest"
),
"Corpsman" = list(
RESKIN_ICON_STATE = "ceramic_vest_medic",
RESKIN_WORN_ICON_STATE = "ceramic_vest_medic"
),
"Basic Black" = list(
RESKIN_ICON_STATE = "ceramic_vest_black",
RESKIN_WORN_ICON_STATE = "ceramic_vest_black"
),
"Corpsman Black" = list(
RESKIN_ICON_STATE = "ceramic_vest_medic_black",
RESKIN_WORN_ICON_STATE = "ceramic_vest_medic_black"
),
)
/obj/item/clothing/head/helmet/alt/hecu
name = "ceramic helmet"
desc = "Helmet made from some brittle and highly conductive, yet incredibly impact- and shock-resistant material. Might be of best use against bullets and explosives."
icon_state = "ceramic_helmet"
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
worn_icon_digi = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob_muzzled.dmi'
can_flashlight = FALSE
uses_advanced_reskins = TRUE
unique_reskin = list(
"Basic" = list(
RESKIN_ICON_STATE = "ceramic_helmet",
RESKIN_WORN_ICON_STATE = "ceramic_helmet"
),
"Corpsman" = list(
RESKIN_ICON_STATE = "ceramic_helmet_medic",
RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic"
),
"Basic Black" = list(
RESKIN_ICON_STATE = "ceramic_helmet_black",
RESKIN_WORN_ICON_STATE = "ceramic_helmet_black"
),
"Corpsman Black" = list(
RESKIN_ICON_STATE = "ceramic_helmet_medic_black",
RESKIN_WORN_ICON_STATE = "ceramic_helmet_medic_black"
),
)
@@ -8,6 +8,11 @@
flavour_text = "You are a scientist in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within."
restricted_species = list(/datum/species/human)
/obj/effect/mob_spawn/ghost_role/human/black_mesa/special(mob/living/carbon/human/spawned_human)
. = ..()
spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND)
spawned_human.remove_language(/datum/language/common)
/datum/outfit/science_team
name = "Scientist"
uniform = /obj/item/clothing/under/rank/rnd/scientist/skyrat/hlscience
@@ -33,6 +38,11 @@
outfit = /datum/outfit/security_guard
you_are_text = "You are a security guard in a top secret government facility. You blacked out. Now, you have woken up to the horrors that lay within. DO NOT TRY TO EXPLORE THE LEVEL. STAY AROUND YOUR AREA."
/obj/effect/mob_spawn/ghost_role/human/black_mesa/guard/special(mob/living/carbon/human/spawned_human)
. = ..()
spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND)
spawned_human.remove_language(/datum/language/common)
/obj/item/clothing/under/rank/security/peacekeeper/sol/traffic/blackmesa
name = "security guard uniform"
desc = "About that beer I owe'd ya!"
@@ -67,6 +77,11 @@
important_text = "Do not try to explore the level unless Vanguard is dead or cooperative. Stay around your area. Allowed races are humans and IPCs."
restricted_species = list(/datum/species/human, /datum/species/robotic/ipc)
/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/special(mob/living/carbon/human/spawned_human)
. = ..()
spawned_human.remove_language(/datum/language/common)
spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND)
/obj/item/clothing/under/rank/security/officer/hecu
name = "urban camouflage BDU"
desc = "A baggy military camouflage uniform with an ERDL pattern. The range of whites and greys proves useful in urban environments."
@@ -121,10 +136,10 @@
mask = /obj/item/clothing/mask/gas/hecu2
gloves = /obj/item/clothing/gloves/combat
belt = /obj/item/storage/belt/military/assault/hecu
ears = /obj/item/radio/headset
ears = /obj/item/radio/headset/headset_faction
shoes = /obj/item/clothing/shoes/combat
l_pocket = /obj/item/grenade/smokebomb
r_pocket = /obj/item/binoculars
l_pocket = /obj/item/reagent_containers/food/drinks/flask
r_pocket = /obj/item/flashlight/flare
back = /obj/item/storage/backpack/ert/odst/hecu
backpack_contents = list(
/obj/item/storage/box/survival/radio,
@@ -142,6 +157,55 @@
equipped_human.faction |= FACTION_HECU
/datum/id_trim/hecu
assignment = "HECU Soldier"
assignment = "HECU Marine"
trim_state = "trim_securityofficer"
access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC)
/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader
name = "HECU Squad Leader"
prompt_name = "a tactical squad's leader"
outfit = /datum/outfit/hecu/leader
you_are_text = "You are an elite tactical squad's leader deployed into the research facility to contain the infestation."
flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. Due to the lack of any real briefing, and your briefing officer's death during the landing, you have no clue as to what your objective is, so you and your group have set up a camp here. You haven't heard much from the north-west post, except for the sounds of gunshots, and their radios went silent. On top of that, your escape helicopter was shot down mid-flight, and another one won't arrive so soon; with your machinegunner being shot down with a precise headshot by something, or SOMEONE. You are likely on your own, at least for now."
important_text = "Keep and sustain marines' morale and discipline. Delegate responsibilities at the best of your abilities. Do not try to explore the level unless Vanguard is dead or cooperative. Stay around your area. Allowed races are humans and IPCs."
restricted_species = list(/datum/species/human, /datum/species/robotic/ipc)
/obj/effect/mob_spawn/ghost_role/human/black_mesa/hecu/leader/special(mob/living/carbon/human/spawned_human)
. = ..()
spawned_human.grant_language(/datum/language/uncommon, TRUE, TRUE, LANGUAGE_MIND)
spawned_human.grant_language(/datum/language/neorusskya, TRUE, TRUE, LANGUAGE_MIND)
spawned_human.grant_language(/datum/language/yangyu, TRUE, TRUE, LANGUAGE_MIND)
spawned_human.remove_language(/datum/language/common)
/datum/outfit/hecu/leader
name = "HECU Captain"
uniform = /obj/item/clothing/under/rank/security/officer/hecu
head = /obj/item/clothing/head/beret/sec
mask = /obj/item/clothing/mask/gas/hecu2
gloves = /obj/item/clothing/gloves/tackler/combat/insulated
belt = /obj/item/storage/belt/military/assault/hecu
ears = /obj/item/radio/headset/headset_faction/bowman/captain
shoes = /obj/item/clothing/shoes/combat
l_pocket = /obj/item/grenade/smokebomb
r_pocket = /obj/item/binoculars
back = /obj/item/storage/backpack/ert/odst/hecu
backpack_contents = list(
/obj/item/storage/box/survival/radio,
/obj/item/storage/medkit/emergency,
/obj/item/storage/box/hecu_rations,
/obj/item/knife/combat,
/obj/item/armament_points_card/assaultops,
/obj/item/book/granter/martial/cqc
)
id = /obj/item/card/id
id_trim = /datum/id_trim/hecu_leader
skillchips = list(/obj/item/skillchip/chameleon/reload)
/datum/outfit/hecu/leader/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
. = ..()
equipped_human.faction |= FACTION_HECU
/datum/id_trim/hecu_leader
assignment = "HECU Captain"
trim_state = "trim_securityofficer"
access = list(ACCESS_BRIG_ENTRANCE, ACCESS_SECURITY, ACCESS_AWAY_SEC)
@@ -14,8 +14,8 @@
ranged_message = "jumps"
taunt_chance = 100
turns_per_move = 7
maxHealth = 100
health = 100
maxHealth = 50
health = 50
speed = 3
ranged = TRUE
dodging = TRUE
@@ -24,7 +24,7 @@
attack_verb_simple = "punch"
attack_sound = 'sound/weapons/punch1.ogg'
combat_mode = TRUE
loot = list(/obj/item/melee/baton)
loot = list(/obj/effect/gibspawner/human, /obj/item/melee/baton)
atmos_requirements = list("min_oxy" = 5, "max_oxy" = 0, "min_tox" = 0, "max_tox" = 1, "min_co2" = 0, "max_co2" = 5, "min_n2" = 0, "max_n2" = 0)
unsuitable_atmos_damage = 7.5
faction = list(FACTION_HECU)
@@ -159,7 +159,7 @@
icon_living = "security_guard_ranged"
casingtype = /obj/item/ammo_casing/b9mm
projectilesound = 'sound/weapons/gun/pistol/shot.ogg'
loot = list(/obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/g17/mesa)
loot = list(/obj/effect/gibspawner/human, /obj/item/clothing/suit/armor/vest/blueshirt, /obj/item/gun/ballistic/automatic/pistol/g17/mesa)
rapid_melee = 1
/mob/living/simple_animal/hostile/blackmesa/blackops
@@ -20,7 +20,7 @@
ranged = TRUE
rapid = 3
alert_cooldown = 2 MINUTES
harm_intent_damage = 5
harm_intent_damage = 50
melee_damage_lower = 30
melee_damage_upper = 40
attack_verb_continuous = "lathes"
@@ -28,7 +28,7 @@
attack_sound = 'sound/weapons/punch1.ogg'
status_flags = NONE
del_on_death = TRUE
wander = FALSE
wander = TRUE
loot = list(/obj/effect/gibspawner/xeno, /obj/item/stack/sheet/bluespace_crystal/fifty, /obj/item/key/gateway, /obj/item/uber_teleporter)
movement_type = FLYING
@@ -66,13 +66,14 @@
. = ..()
alert_sound_to_playing('modular_skyrat/modules/black_mesa/sound/mobs/nihilanth/nihilanth_death01.ogg')
new /obj/effect/singularity_creation(loc)
message_admins("[src] has been defeated, a spacetime cascade will occur in 10 seconds.")
addtimer(CALLBACK(src, .proc/endgame_shit), 10 SECONDS)
message_admins("[src] has been defeated, a spacetime cascade might occur in 30 seconds.")
addtimer(CALLBACK(src, .proc/endgame_shit), 30 SECONDS)
/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/proc/endgame_shit()
to_chat(world, span_danger("You feel as though a powerful force has been defeated..."))
var/datum/round_event_control/resonance_cascade/event_to_start = new()
event_to_start.runEvent()
if(prob(60))
var/datum/round_event_control/resonance_cascade/event_to_start = new()
event_to_start.runEvent()
/mob/living/simple_animal/hostile/blackmesa/xen/nihilanth/LoseAggro()
. = ..()
@@ -14,7 +14,8 @@
/datum/round_event/portal_storm/resonance_cascade
hostile_types = list(
/mob/living/simple_animal/hostile/blackmesa/xen/bullsquid = 30,
/mob/living/simple_animal/hostile/blackmesa/xen/houndeye = 30,
/mob/living/simple_animal/hostile/blackmesa/xen/headcrab = 30
/mob/living/simple_animal/hostile/blackmesa/xen/bullsquid = 25,
/mob/living/simple_animal/hostile/blackmesa/xen/houndeye = 25,
/mob/living/simple_animal/hostile/blackmesa/xen/headcrab = 25,
/mob/living/simple_animal/hostile/blackmesa/xen/vortigaunt/slave = 25
)
@@ -72,9 +72,12 @@
..()
/obj/machinery/porta_turret/syndicate/pod/toolbox/mesa
max_integrity = 100
stun_projectile = /obj/projectile/bullet/advanced/b9mm/rubber
lethal_projectile = /obj/projectile/bullet/c9mm/ap
max_integrity = 150
req_access = list(ACCESS_AWAY_SEC)
faction = list(FACTION_HECU)
shot_delay = 0.75
shot_delay = 0.5
/obj/machinery/porta_turret/black_mesa/friendly
@@ -247,7 +247,7 @@
new /obj/item/gun/ballistic/automatic/akm(src)
new /obj/item/ammo_box/magazine/akm(src)
new /obj/item/gun/ballistic/automatic/m16(src)
new /obj/item/ammo_box/magazine/m16(src)
new /obj/item/ammo_box/magazine/m16/vintage(src)
new /obj/item/gun/ballistic/automatic/mg34(src)
new /obj/item/ammo_box/magazine/mg34(src)
new /obj/item/gun/ballistic/automatic/mp40(src)
@@ -11,7 +11,7 @@
slot_flags = ITEM_SLOT_BELT | ITEM_SLOT_BACK
w_class = WEIGHT_CLASS_BULKY
weapon_weight = WEAPON_HEAVY
mag_type = /obj/item/ammo_box/magazine/m16/extended
mag_type = /obj/item/ammo_box/magazine/m16
can_suppress = FALSE
burst_size = 3
fire_delay = 2
@@ -27,6 +27,15 @@
/obj/item/ammo_box/magazine/m16
name = "m16 magazine (5.56x45mm)"
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
icon_state = "m16e"
ammo_type = /obj/item/ammo_casing/a556
caliber = "a556"
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/ammo_box/magazine/m16/vintage
name = "vintage m16 magazine (5.56x45mm)"
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
icon_state = "m16"
ammo_type = /obj/item/ammo_casing/a556
caliber = "a556"
@@ -11,7 +11,7 @@
#define HEV_ARMOR_POWEROFF list(20, 20, 20, 20, 30, 40, 40, 40, 40, 10)
#define PCV_ARMOR_POWEROFF list(30, 30, 30, 30, 30, 30, 20, 20, 20, 10)
#define HEV_ARMOR_POWERON list(60, 60, 60, 60, 90, 100, 100, 100, 100, 30)
#define HEV_ARMOR_POWERON list(50, 50, 50, 50, 90, 100, 100, 100, 100, 30)
#define PCV_ARMOR_POWERON list(40, 40, 40, 40, 60, 75, 50, 50, 50, 40)
#define HEV_POWERUSE_AIRTANK 2
@@ -51,6 +51,7 @@
clothing_traits = list(TRAIT_REAGENT_SCANNER)
visor_flags_inv = HIDEMASK|HIDEEYES|HIDEFACE|HIDEFACIALHAIR
visor_flags = STOPSPRESSUREDAMAGE
dog_fashion = null
slowdown = 0
/obj/item/clothing/suit/space/hev_suit
@@ -7,7 +7,7 @@
/datum/opposing_force_equipment/ammo/m16
item_type = /obj/item/ammo_box/magazine/m16
description = "A twenty-round magazine for the M16 assault rifle. Uses 5.56x45mm ammunition."
description = "A thirty-round magazine for the M16 assault rifle. Uses 5.56x45mm ammunition."
/datum/opposing_force_equipment/ammo/akm
item_type = /obj/item/ammo_box/magazine/akm
@@ -9,8 +9,6 @@
var/datum/component/uplink/hidden_uplink = GetComponent(/datum/component/uplink)
hidden_uplink.name = "old radio"
/obj/item/reagent_containers/glass/rag/large
volume = 30
amount_per_transfer_from_this = 30
@@ -33,15 +31,6 @@
new /obj/item/clothing/suit/armor/vest/leather/gunman(src)
new /obj/item/clothing/shoes/combat(src)
/obj/item/ammo_box/magazine/m16/extended
name = "m4a1 magazine (5.56x45mm)"
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
icon_state = "m16e"
ammo_type = /obj/item/ammo_casing/a556
caliber = "a556"
max_ammo = 30
multiple_sprites = AMMO_BOX_FULL_EMPTY
/obj/item/autosurgeon/organ/syndicate/hackerman
starting_organ = /obj/item/organ/cyberimp/arm/hacker
+1
View File
@@ -4775,6 +4775,7 @@
#include "modular_skyrat\modules\biohazard_blob\code\biohazard_blob_structures.dm"
#include "modular_skyrat\modules\biohazard_blob\code\mold_event.dm"
#include "modular_skyrat\modules\black_mesa\code\area.dm"
#include "modular_skyrat\modules\black_mesa\code\armor.dm"
#include "modular_skyrat\modules\black_mesa\code\bump_teleporter.dm"
#include "modular_skyrat\modules\black_mesa\code\drops.dm"
#include "modular_skyrat\modules\black_mesa\code\follow_component.dm"