mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-27 15:17:01 +01:00
[Modular] Mesa: Xen adjustments (#12521)
* Initial cummit * oops * Fixes and adjustments * stewpid innit * Final fix * pizza fix? * Update gunsgalore_guns40x32.dmi * quick mre dessert fix * baseturf fix * Update blackmesa.dmm * guh?????? * Throwing shit and watching if it sticks * Update turfs.dm * Update turfs.dm * Update blackmesa.dmm * Update create_and_destroy.dm * Update blackmesa.dmm * MMG addition Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
Stalkeros2
+1740
-1751
File diff suppressed because it is too large
Load Diff
@@ -94,6 +94,8 @@
|
||||
ignore += typesof(/obj/structure/biohazard_blob)
|
||||
//Unused - not supposed to be spawned without SSliquids
|
||||
ignore += typesof(/turf/open/openspace/ocean)
|
||||
//Baseturf editors can only go up to ten, stop this.
|
||||
ignore += typesof(/obj/effect/baseturf_helper)
|
||||
//SKYRAT EDIT END
|
||||
|
||||
var/list/cached_contents = spawn_at.contents.Copy()
|
||||
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 880 B |
Binary file not shown.
|
After Width: | Height: | Size: 588 B |
Binary file not shown.
|
After Width: | Height: | Size: 583 B |
@@ -0,0 +1,61 @@
|
||||
|
||||
/datum/armament_entry/hecu/bodyarmor
|
||||
category = "Armor Kit"
|
||||
category_item_limit = 4
|
||||
|
||||
/datum/armament_entry/hecu/bodyarmor/normal
|
||||
name = "Basic Armor Kit"
|
||||
description = "Contains a set of two basic armor pieces, meant to moderately protect your body against everything."
|
||||
item_type = /obj/item/storage/box/armor_set/normal
|
||||
max_purchase = 4
|
||||
cost = 6
|
||||
|
||||
/datum/armament_entry/hecu/bodyarmor/bulletproof
|
||||
name = "Bulletproof Armor Kit"
|
||||
description = "Contains a set of two bulletproof armor pieces, meant to greatly protect your body against bullets and explosives."
|
||||
item_type = /obj/item/storage/box/armor_set/bulletproof
|
||||
max_purchase = 4
|
||||
cost = 10
|
||||
|
||||
/datum/armament_entry/hecu/bodyarmor/pcv
|
||||
name = "PCV Kit"
|
||||
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
|
||||
|
||||
/obj/item/storage/box/armor_set
|
||||
name = "box of armor"
|
||||
desc = "Box full of armor. Amazing."
|
||||
icon_state = "box"
|
||||
illustration = null
|
||||
|
||||
/obj/item/storage/box/armor_set/ComponentInitialize()
|
||||
. = ..()
|
||||
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
|
||||
STR.set_holdable(list(/obj/item/clothing/suit/armor,/obj/item/clothing/suit/space/hev_suit/pcv,/obj/item/clothing/head/helmet))
|
||||
STR.max_items = 2
|
||||
|
||||
/obj/item/storage/box/armor_set/normal
|
||||
name = "basic armor set"
|
||||
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)
|
||||
|
||||
/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)
|
||||
|
||||
/obj/item/storage/box/armor_set/pcv
|
||||
name = "PCV Mk. II armor set"
|
||||
desc = "Box containing a PCV Mark II armor vest and helmet."
|
||||
|
||||
/obj/item/storage/box/armor_set/pcv/PopulateContents()
|
||||
new /obj/item/clothing/suit/space/hev_suit/pcv(src)
|
||||
new /obj/item/clothing/head/helmet/space/hev_suit/pcv(src)
|
||||
@@ -0,0 +1,69 @@
|
||||
#define ARMAMENT_SUBCATEGORY_SHOTGUN "Shotguns"
|
||||
|
||||
/datum/armament_entry/hecu/primary
|
||||
category = ARMAMENT_CATEGORY_PRIMARY
|
||||
category_item_limit = 4
|
||||
slot_to_equip = ITEM_SLOT_SUITSTORE
|
||||
cost = 10
|
||||
|
||||
/datum/armament_entry/hecu/primary/submachinegun
|
||||
subcategory = ARMAMENT_SUBCATEGORY_SUBMACHINEGUN
|
||||
mags_to_spawn = 4
|
||||
|
||||
/datum/armament_entry/hecu/primary/submachinegun/p90
|
||||
item_type = /obj/item/gun/ballistic/automatic/p90
|
||||
max_purchase = 4
|
||||
cost = 7
|
||||
|
||||
/datum/armament_entry/hecu/primary/submachinegun/mp5
|
||||
item_type = /obj/item/gun/ballistic/automatic/mp5
|
||||
max_purchase = 4
|
||||
cost = 7
|
||||
|
||||
/datum/armament_entry/hecu/primary/assaultrifle
|
||||
subcategory = ARMAMENT_SUBCATEGORY_ASSAULTRIFLE
|
||||
mags_to_spawn = 3
|
||||
|
||||
/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
|
||||
|
||||
/datum/armament_entry/hecu/primary/shotgun
|
||||
subcategory = ARMAMENT_SUBCATEGORY_SHOTGUN
|
||||
mags_to_spawn = 1
|
||||
|
||||
/datum/armament_entry/hecu/primary/shotgun/shotgun_highcap
|
||||
item_type = /obj/item/gun/ballistic/shotgun/m23
|
||||
max_purchase = 2
|
||||
cost = 5
|
||||
magazine = /obj/item/storage/box/ammo_box/shotgun_12g
|
||||
magazine_cost = 4
|
||||
|
||||
/datum/armament_entry/hecu/primary/shotgun/autoshotgun_pump
|
||||
item_type = /obj/item/gun/ballistic/shotgun/automatic/as2
|
||||
max_purchase = 1
|
||||
cost = 7
|
||||
magazine = /obj/item/storage/box/ammo_box/shotgun_12g
|
||||
magazine_cost = 4
|
||||
|
||||
/datum/armament_entry/hecu/primary/special
|
||||
subcategory = ARMAMENT_SUBCATEGORY_SPECIAL
|
||||
mags_to_spawn = 2
|
||||
|
||||
/datum/armament_entry/hecu/primary/special/sniper_rifle
|
||||
item_type = /obj/item/gun/ballistic/automatic/cfa_rifle
|
||||
max_purchase = 1
|
||||
cost = 15
|
||||
|
||||
/obj/item/storage/box/ammo_box/shotgun_12g
|
||||
|
||||
/obj/item/storage/box/ammo_box/shotgun_12g/PopulateContents()
|
||||
new /obj/item/ammo_box/magazine/m12g(src)
|
||||
new /obj/item/ammo_box/magazine/m12g(src)
|
||||
new /obj/item/ammo_box/magazine/m12g(src)
|
||||
new /obj/item/ammo_box/magazine/m12g/slug(src)
|
||||
new /obj/item/ammo_box/magazine/m12g/slug(src)
|
||||
new /obj/item/ammo_box/magazine/m12g/slug(src)
|
||||
new /obj/item/ammo_box/magazine/m12g/dragon(src)
|
||||
@@ -0,0 +1,23 @@
|
||||
// SECONDARY WEAPONS
|
||||
/datum/armament_entry/hecu/secondary
|
||||
category = ARMAMENT_CATEGORY_SECONDARY
|
||||
category_item_limit = 4
|
||||
cost = 5
|
||||
mags_to_spawn = 2
|
||||
|
||||
/datum/armament_entry/hecu/secondary/pistol
|
||||
subcategory = ARMAMENT_SUBCATEGORY_PISTOL
|
||||
|
||||
/datum/armament_entry/hecu/secondary/pistol/m1911
|
||||
item_type = /obj/item/gun/ballistic/automatic/pistol/m1911
|
||||
max_purchase = 4
|
||||
|
||||
/datum/armament_entry/hecu/secondary/pistol/glock
|
||||
item_type = /obj/item/gun/ballistic/automatic/pistol/g17/mesa
|
||||
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
|
||||
@@ -0,0 +1,28 @@
|
||||
/datum/armament_entry/hecu/explosives
|
||||
category = ARMAMENT_CATEGORY_EXPLOSIVES
|
||||
category_item_limit = 16
|
||||
|
||||
/datum/armament_entry/hecu/explosives/frag
|
||||
item_type = /obj/item/grenade/frag
|
||||
max_purchase = 8
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/explosives/flashbang
|
||||
item_type = /obj/item/grenade/flashbang
|
||||
max_purchase = 8
|
||||
cost = 2
|
||||
|
||||
/datum/armament_entry/hecu/explosives/smoke
|
||||
item_type = /obj/item/grenade/smokebomb
|
||||
max_purchase = 8
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/explosives/mine
|
||||
item_type = /obj/item/minespawner/explosive
|
||||
max_purchase = 8
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/explosives/c4
|
||||
item_type = /obj/item/grenade/c4
|
||||
max_purchase = 3
|
||||
cost = 3
|
||||
@@ -0,0 +1,79 @@
|
||||
/datum/armament_entry/hecu/medical
|
||||
category = ARMAMENT_CATEGORY_MEDICAL
|
||||
category_item_limit = 20
|
||||
|
||||
/datum/armament_entry/hecu/medical/defib
|
||||
item_type = /obj/item/defibrillator/loaded
|
||||
max_purchase = 1
|
||||
cost = 4
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit
|
||||
subcategory = ARMAMENT_SUBCATEGORY_MEDKIT
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/basic
|
||||
item_type = /obj/item/storage/medkit/regular
|
||||
max_purchase = 3
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/brute
|
||||
item_type = /obj/item/storage/medkit/brute
|
||||
max_purchase = 2
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/toxin
|
||||
item_type = /obj/item/storage/medkit/toxin
|
||||
max_purchase = 1
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/fire
|
||||
item_type = /obj/item/storage/medkit/fire
|
||||
max_purchase = 1
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/o2
|
||||
item_type = /obj/item/storage/medkit/o2
|
||||
max_purchase = 1
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/medical/medkit/expeditionary
|
||||
item_type = /obj/item/storage/medkit/expeditionary
|
||||
max_purchase = 1
|
||||
cost = 5
|
||||
|
||||
/datum/armament_entry/hecu/medical/injector
|
||||
subcategory = ARMAMENT_SUBCATEGORY_INJECTOR
|
||||
|
||||
/datum/armament_entry/hecu/medical/injector/bloodloss
|
||||
item_type = /obj/item/reagent_containers/hypospray/medipen/blood_loss
|
||||
max_purchase = 4
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/medical/injector/atropine
|
||||
item_type = /obj/item/reagent_containers/hypospray/medipen/atropine
|
||||
max_purchase = 4
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/medical/injector/salacid
|
||||
item_type = /obj/item/reagent_containers/hypospray/medipen/salacid
|
||||
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/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
|
||||
|
||||
/datum/armament_entry/hecu/medical/injector/bag
|
||||
item_type = /obj/item/storage/bag/medpens
|
||||
max_purchase = 2
|
||||
cost = 4
|
||||
@@ -0,0 +1,23 @@
|
||||
/datum/armament_entry/hecu/melee
|
||||
category = ARMAMENT_CATEGORY_MELEE
|
||||
category_item_limit = 4
|
||||
|
||||
/datum/armament_entry/hecu/melee/lethal
|
||||
subcategory = ARMAMENT_SUBCATEGORY_MELEE_LETHAL
|
||||
|
||||
/datum/armament_entry/hecu/melee/lethal/combat_knife
|
||||
item_type = /obj/item/knife/combat
|
||||
max_purchase = 4
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/melee/nonlethal
|
||||
subcategory = ARMAMENT_SUBCATEGORY_MELEE_NONLETHAL
|
||||
|
||||
/datum/armament_entry/hecu/melee/nonlethal/baton
|
||||
item_type = /obj/item/melee/baton
|
||||
max_purchase = 4
|
||||
cost = 5
|
||||
|
||||
/datum/armament_entry/hecu/melee/nonlethal/kravmaga
|
||||
item_type = /obj/item/clothing/gloves/krav_maga/combatglovesplus
|
||||
cost = 12
|
||||
@@ -0,0 +1,48 @@
|
||||
/datum/armament_entry/hecu/misc
|
||||
category = "Misc. Equipment"
|
||||
category_item_limit = 24
|
||||
|
||||
/datum/armament_entry/hecu/misc/cigarettes
|
||||
item_type = /obj/item/storage/fancy/cigarettes/cigpack_syndicate
|
||||
max_purchase = 2
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/zippo
|
||||
item_type = /obj/item/lighter
|
||||
max_purchase = 1
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/rollie
|
||||
item_type = /obj/item/clothing/mask/cigarette/rollie/cannabis
|
||||
max_purchase = 8
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/pizza
|
||||
item_type = /obj/item/food/pizza/margherita
|
||||
max_purchase = 3
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/mre
|
||||
item_type = /obj/item/storage/box/hecu_rations
|
||||
max_purchase = 6
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/guitar
|
||||
item_type = /obj/item/instrument/guitar
|
||||
max_purchase = 1
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/cards
|
||||
item_type = /obj/item/toy/cards/deck
|
||||
max_purchase = 1
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/dosh
|
||||
item_type = /obj/item/stack/spacecash/c1000
|
||||
max_purchase = 8
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/misc/whiskey
|
||||
item_type = /obj/item/reagent_containers/food/drinks/bottle/whiskey
|
||||
max_purchase = 2
|
||||
cost = 1
|
||||
@@ -0,0 +1,62 @@
|
||||
/datum/armament_entry/hecu/utility
|
||||
category = ARMAMENT_CATEGORY_UTILITY
|
||||
category_item_limit = 20
|
||||
|
||||
/datum/armament_entry/hecu/utility/survival_pack
|
||||
item_type = /obj/item/storage/box/nri_survival_pack
|
||||
max_purchase = 4
|
||||
cost = 4
|
||||
|
||||
/datum/armament_entry/hecu/utility/pouch
|
||||
item_type = /obj/item/storage/bag/ammo
|
||||
max_purchase = 8
|
||||
cost = 1
|
||||
|
||||
/datum/armament_entry/hecu/utility/pouch_knives
|
||||
item_type = /obj/item/storage/bag/ammo/marksman
|
||||
max_purchase = 4
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/utility/basic_tools
|
||||
item_type = /obj/item/storage/toolbox/mechanical
|
||||
max_purchase = 2
|
||||
cost = 2
|
||||
|
||||
/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
|
||||
|
||||
/datum/armament_entry/hecu/utility/compact_shield
|
||||
item_type = /obj/item/shield/riot/tele
|
||||
max_purchase = 1
|
||||
cost = 10
|
||||
|
||||
/datum/armament_entry/hecu/utility/flash_shield
|
||||
item_type = /obj/item/shield/riot/flash
|
||||
max_purchase = 1
|
||||
cost = 15
|
||||
|
||||
/datum/armament_entry/hecu/utility/combat_shield
|
||||
item_type = /obj/item/shield/riot/pointman/hecu
|
||||
max_purchase = 1
|
||||
cost = 25
|
||||
|
||||
/datum/armament_entry/hecu/utility/zipties
|
||||
item_type = /obj/item/storage/box/zipties
|
||||
max_purchase = 1
|
||||
cost = 3
|
||||
|
||||
/datum/armament_entry/hecu/utility/jammer
|
||||
name = "Radio Jammer"
|
||||
description = "When activated, this cell powered device will block all outgoing radio communication."
|
||||
item_type = /obj/item/jammer
|
||||
max_purchase = 1
|
||||
cost = 4
|
||||
|
||||
/datum/armament_entry/hecu/utility/suppressor
|
||||
item_type = /obj/item/suppressor
|
||||
max_purchase = 4
|
||||
cost = 4
|
||||
@@ -0,0 +1,19 @@
|
||||
// VENDOR
|
||||
/obj/machinery/armament_station/hecu
|
||||
required_access = list(ACCESS_AWAY_SEC)
|
||||
|
||||
armament_type = /datum/armament_entry/hecu
|
||||
|
||||
// ARMAMENT ENTRIES
|
||||
|
||||
/datum/armament_entry/hecu
|
||||
var/mags_to_spawn = 5
|
||||
|
||||
/datum/armament_entry/hecu/after_equip(turf/safe_drop_location, obj/item/item_to_equip)
|
||||
if(istype(item_to_equip, /obj/item/gun/ballistic))
|
||||
var/obj/item/gun/ballistic/spawned_ballistic_gun = item_to_equip
|
||||
if(spawned_ballistic_gun.magazine && !istype(spawned_ballistic_gun.magazine, /obj/item/ammo_box/magazine/internal))
|
||||
var/obj/item/storage/box/ammo_box/spawned_box = new(safe_drop_location)
|
||||
spawned_box.name = "ammo box - [spawned_ballistic_gun.name]"
|
||||
for(var/i in 1 to mags_to_spawn)
|
||||
new spawned_ballistic_gun.mag_type (spawned_box)
|
||||
@@ -63,8 +63,8 @@
|
||||
prompt_name = "a tactical squad member"
|
||||
outfit = /datum/outfit/hecu
|
||||
you_are_text = "You are an elite tactical squad 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. 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, if any, 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 = "Do not try to explore the level unless Vanguard is dead. Stay around your area. Allowed races are humans and IPCs."
|
||||
flavour_text = "You and four other marines have been selected for a guard duty near one of the Black Mesa's entrances. 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 = "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/item/clothing/under/rank/security/officer/hecu
|
||||
@@ -82,6 +82,7 @@
|
||||
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
|
||||
icon_state = "hecu_pack"
|
||||
worn_icon_state = "hecu_pack"
|
||||
uses_advanced_reskins = TRUE
|
||||
unique_reskin = list(
|
||||
"Olive" = list(
|
||||
@@ -99,6 +100,7 @@
|
||||
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecucloth.dmi'
|
||||
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/hecumob.dmi'
|
||||
icon_state = "hecu_belt"
|
||||
worn_icon_state = "hecu_belt"
|
||||
uses_advanced_reskins = TRUE
|
||||
unique_reskin = list(
|
||||
"Olive" = list(
|
||||
@@ -114,29 +116,24 @@
|
||||
/datum/outfit/hecu
|
||||
name = "HECU Grunt"
|
||||
uniform = /obj/item/clothing/under/rank/security/officer/hecu
|
||||
head = /obj/item/clothing/head/helmet/space/hev_suit/pcv
|
||||
mask = /obj/item/clothing/mask/gas/hecu2
|
||||
gloves = /obj/item/clothing/gloves/combat
|
||||
suit = /obj/item/clothing/suit/space/hev_suit/pcv
|
||||
suit_store = /obj/item/gun/ballistic/automatic/m16
|
||||
belt = /obj/item/storage/belt/military/assault/hecu
|
||||
ears = /obj/item/radio/headset
|
||||
glasses = /obj/item/clothing/glasses/hud/health/sunglasses
|
||||
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/ammo_box/magazine/m16 = 3,
|
||||
/obj/item/storage/medkit/emergency,
|
||||
/obj/item/storage/box/hecu_rations,
|
||||
/obj/item/gun/ballistic/automatic/pistol/g17/mesa,
|
||||
/obj/item/ammo_box/magazine/multi_sprite/g17 = 2,
|
||||
/obj/item/knife/combat
|
||||
/obj/item/knife/combat,
|
||||
/obj/item/armament_points_card/assaultops
|
||||
)
|
||||
id = /obj/item/card/id
|
||||
id_trim = /datum/id_trim/hecu
|
||||
skillchips = list(/obj/item/skillchip/chameleon/reload)
|
||||
|
||||
/datum/outfit/hecu/post_equip(mob/living/carbon/human/equipped_human, visualsOnly)
|
||||
. = ..()
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/gun/ballistic/automatic/laser/marksman
|
||||
/obj/item/gun/ballistic/automatic/laser/marksman // Cheap replacement for a gauss rifle.
|
||||
name = "designated marksman rifle"
|
||||
desc = "A special laser beam sniper rifle designed by a certain now defunct research facility."
|
||||
icon_state = "ctfmarksman"
|
||||
@@ -31,3 +31,44 @@
|
||||
tracer_type = /obj/effect/projectile/tracer/solar
|
||||
muzzle_type = /obj/effect/projectile/muzzle/solar
|
||||
impact_type = /obj/effect/projectile/impact/solar
|
||||
|
||||
/obj/item/gun/ballistic/automatic/mp5
|
||||
name = "\improper MP5"
|
||||
desc = "An old SMG, this one is chambered in 9mm, a very common and powerful cartridge. It has Heckler & Koch etched above the magazine well."
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_guns40x32.dmi'
|
||||
lefthand_file = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_lefthand.dmi'
|
||||
righthand_file ='modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_righthand.dmi'
|
||||
icon_state = "mp5"
|
||||
inhand_icon_state = "mp5"
|
||||
selector_switch_icon = TRUE
|
||||
mag_type = /obj/item/ammo_box/magazine/mp5
|
||||
bolt_type = BOLT_TYPE_LOCKING
|
||||
can_suppress = TRUE
|
||||
burst_size = 3
|
||||
fire_delay = 1.25
|
||||
spread = 2.5
|
||||
mag_display = TRUE
|
||||
alt_icons = TRUE
|
||||
realistic = TRUE
|
||||
load_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg'
|
||||
load_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magin.ogg'
|
||||
rack_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_cock.ogg'
|
||||
lock_back_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltback.ogg'
|
||||
eject_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg'
|
||||
eject_empty_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_magout.ogg'
|
||||
bolt_drop_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/interact/mp5_boltforward.ogg'
|
||||
fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire.ogg'
|
||||
alternative_fire_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg'
|
||||
suppressed_sound = 'modular_skyrat/modules/gunsgalore/sound/guns/fire/mp5_fire_suppressed.ogg'
|
||||
weapon_weight = WEAPON_MEDIUM
|
||||
w_class = WEIGHT_CLASS_NORMAL
|
||||
|
||||
/obj/item/ammo_box/magazine/mp5
|
||||
name = "MP5 magazine (9mm)"
|
||||
desc = "Magazines taking 9mm ammunition; it fits in the MP5."
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
|
||||
icon_state = "mp5"
|
||||
ammo_type = /obj/item/ammo_casing/c9mm
|
||||
caliber = CALIBER_9MM
|
||||
max_ammo = 30
|
||||
multiple_sprites = AMMO_BOX_FULL_EMPTY_BASIC
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
|
||||
/mob/living/simple_animal/hostile/blackmesa/xen/headcrab_zombie/gordon_freeman
|
||||
name = "\improper Gordon Freeman"
|
||||
desc = "Gordon Freeman in the flesh."
|
||||
desc = "Gordon Freeman in the flesh. Or in the zombified form, it seems."
|
||||
icon_state = "gordon_freeman"
|
||||
speed = -2
|
||||
environment_smash = ENVIRONMENT_SMASH_RWALLS
|
||||
@@ -67,8 +67,6 @@
|
||||
/obj/effect/sliding_puzzle/freeman
|
||||
reward_type = /obj/item/keycard/freeman_boss_entry
|
||||
|
||||
|
||||
|
||||
/obj/effect/freeman_blocker
|
||||
name = "freeman blocker"
|
||||
|
||||
|
||||
@@ -17,16 +17,19 @@
|
||||
name = "MRE main course - Pork and Beans"
|
||||
desc = "Main course of the ancient military ration designed for ground troops. This one is pork and beans covered in some tomato sauce."
|
||||
tastes = list("beans" = 1, "pork" = 1, "tomato sauce" = 1)
|
||||
foodtypes = MEAT | VEGETABLES
|
||||
|
||||
/obj/item/food/mre_course/main/macaroni
|
||||
name = "MRE main course - Macaroni and Cheese"
|
||||
desc = "Main course of the ancient military ration designed for ground troops. This one is preboiled macaroni covered in some federal reserve cheese."
|
||||
tastes = list("cold macaroni" = 1, "bland cheese" = 1)
|
||||
foodtypes = DAIRY | GRAIN
|
||||
|
||||
/obj/item/food/mre_course/main/rice
|
||||
name = "MRE main course - Rice and Beef"
|
||||
desc = "Main course of the ancient military ration designed for ground troops. This one is rice with beef, covered in gravy."
|
||||
tastes = list("dense rice" = 1, "bits of beef" = 1, "gravy" = 1)
|
||||
foodtypes = GRAIN | MEAT
|
||||
|
||||
/obj/item/food/mre_course/side
|
||||
name = "MRE side course"
|
||||
@@ -37,16 +40,19 @@
|
||||
name = "MRE side course - Cornbread"
|
||||
desc = "Side course of the ancient military ration designed for ground troops. This one is cornbread."
|
||||
tastes = list("cornbread" = 1)
|
||||
foodtypes = GRAIN
|
||||
|
||||
/obj/item/food/mre_course/side/pie
|
||||
name = "MRE side course - Meat Pie"
|
||||
desc = "Side course of the ancient military ration designed for ground troops. This one is some meat pie."
|
||||
tastes = list("pie dough" = 1, "ground meat" = 1, "Texas" = 1)
|
||||
foodtypes = MEAT | GRAIN
|
||||
|
||||
/obj/item/food/mre_course/side/chicken
|
||||
name = "MRE side course - Sweet 'n Sour Chicken"
|
||||
desc = "Side course of the ancient military ration designed for ground troops. This one is some undefined chicken-looking meat covered in cheap reddish sauce."
|
||||
tastes = list("bits of chicken meat" = 1, "sweet and sour sauce" = 1, "salt" = 1)
|
||||
foodtypes = MEAT | FRIED
|
||||
|
||||
/obj/item/food/mre_course/dessert
|
||||
name = "MRE dessert"
|
||||
@@ -57,16 +63,19 @@
|
||||
name = "MRE dessert - Cookie"
|
||||
desc = "Dessert of the ancient military ration designed for ground troops. This one is a big dry cookie."
|
||||
tastes = list("dryness" = 1, "hard cookie" = 1, "chocolate chip" = 1)
|
||||
foodtypes = GRAIN | SUGAR
|
||||
|
||||
/obj/item/food/mre_course/dessert/cake
|
||||
name = "MRE dessert - Apple Pie"
|
||||
desc = "Dessert of the ancient military ration designed for ground troops. This one is an amorphous apple pie."
|
||||
tastes = list("apple" = 1, "moist cake" = 1, "sugar" = 1)
|
||||
foodtypes = GRAIN | SUGAR | FRUIT
|
||||
|
||||
/obj/item/food/mre_course/dessert/chocolate
|
||||
name = "MRE dessert - Dark Chocolate"
|
||||
desc = "Dessert of the ancient military ration designed for ground troops. This one is a dark bar of chocolate."
|
||||
tastes = list("vanilla" = 1, "artificial chocolate" = 1, "chemicals" = 1)
|
||||
foodtypes = JUNKFOOD | SUGAR
|
||||
|
||||
/obj/item/storage/box/hecu_rations
|
||||
name = "Meal, Ready-to-Eat"
|
||||
|
||||
@@ -13,48 +13,67 @@
|
||||
name = "black mesa sand baseturf editor"
|
||||
baseturf = /turf/open/misc/ironsand/black_mesa
|
||||
|
||||
/obj/effect/baseturf_helper/black_mesa_xen
|
||||
name = "xen baseturf editor"
|
||||
baseturf = /turf/open/water/xen_acid
|
||||
|
||||
/turf/closed/indestructible/rock/xen
|
||||
name = "strange wall"
|
||||
color = "#ac3b06"
|
||||
baseturfs = /turf/closed/indestructible/rock/xen
|
||||
|
||||
/turf/open/misc/xen
|
||||
name = "strange weeds"
|
||||
desc = "It feels soft to the touch, like a carpet... only... wet."
|
||||
icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi'
|
||||
icon_state = "xen_turf"
|
||||
baseturfs = /turf/open/misc/xen
|
||||
footstep = FOOTSTEP_GRASS
|
||||
barefootstep = FOOTSTEP_GRASS
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/water/beach/xen
|
||||
desc = "It's mirky and filled with strange organisms."
|
||||
name = "xen water"
|
||||
icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi'
|
||||
baseturfs = /turf/open/water/beach/xen
|
||||
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/misc/beach/coastline_t/xen
|
||||
desc = "It's mirky and filled with strange organisms."
|
||||
name = "xen water"
|
||||
icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi'
|
||||
baseturfs = /turf/open/misc/beach/coastline_t/xen
|
||||
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/misc/beach/coastline_t/sandwater_inner/xen
|
||||
desc = "It's mirky and filled with strange organisms."
|
||||
name = "xen water"
|
||||
icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi'
|
||||
baseturfs = /turf/open/misc/beach/coastline_t/sandwater_inner/xen
|
||||
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/misc/beach/coastline_b/xen
|
||||
name = "xen water"
|
||||
desc = "It's mirky and filled with strange organisms."
|
||||
icon = 'modular_skyrat/modules/black_mesa/icons/xen_turfs.dmi'
|
||||
baseturfs = /turf/open/misc/beach/coastline_b/xen
|
||||
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/misc/dirt/planet/xen
|
||||
name = "strange path"
|
||||
color = "#ee5f1c"
|
||||
baseturfs = /turf/open/misc/dirt/planet/xen
|
||||
planetary_atmos = TRUE
|
||||
|
||||
/turf/open/water/xen_acid
|
||||
baseturfs = /turf/open/water/xen_acid
|
||||
initial_gas_mix = OPENTURF_DEFAULT_ATMOS
|
||||
planetary_atmos = TRUE
|
||||
color = COLOR_VIBRANT_LIME
|
||||
light_range = 2
|
||||
light_color = COLOR_VIBRANT_LIME
|
||||
|
||||
@@ -19,3 +19,38 @@
|
||||
/obj/item/crowbar/freeman/ultimate/Initialize(mapload)
|
||||
. = ..()
|
||||
add_filter("rad_glow", 2, list("type" = "outline", "color" = "#fbff1479", "size" = 2))
|
||||
|
||||
/obj/item/shield/riot/pointman/hecu
|
||||
name = "ballistic shield"
|
||||
desc = "A shield fit for those that want to sprint headfirst into the unknown! Cumbersome as hell. Repair with iron."
|
||||
icon_state = "ballistic"
|
||||
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi'
|
||||
worn_icon_state = "ballistic_worn"
|
||||
worn_icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi'
|
||||
inhand_icon_state = "ballistic"
|
||||
lefthand_file = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_l.dmi'
|
||||
righthand_file = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic_r.dmi'
|
||||
force = 14
|
||||
throwforce = 5
|
||||
throw_speed = 1
|
||||
throw_range = 1
|
||||
block_chance = 45
|
||||
slot_flags = ITEM_SLOT_BACK
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
attack_verb_continuous = list("shoves", "bashes")
|
||||
attack_verb_simple = list("shove", "bash")
|
||||
transparent = TRUE
|
||||
max_integrity = 150
|
||||
repairable_by = /obj/item/stack/sheet/iron //what to repair the shield with
|
||||
|
||||
|
||||
/obj/item/shield/riot/pointman/hecu/shatter(mob/living/carbon/human/owner)
|
||||
playsound(owner, 'sound/effects/glassbr3.ogg', 100)
|
||||
new /obj/item/ballistic_broken((get_turf(src)))
|
||||
|
||||
/obj/item/ballistic_broken
|
||||
name = "broken ballistic shield"
|
||||
desc = "An unsalvageable, unrecoverable mess of armor steel and kevlar. Should've maintained it, huh?"
|
||||
icon_state = "ballistic_broken"
|
||||
icon = 'modular_skyrat/modules/awaymissions_skyrat/icons/ballistic.dmi'
|
||||
w_class = WEIGHT_CLASS_BULKY
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 48 KiB |
@@ -6,7 +6,7 @@
|
||||
|
||||
/obj/item/gun/energy
|
||||
has_gun_safety = TRUE
|
||||
|
||||
|
||||
/obj/item/gun/energy/plasmacutter
|
||||
has_gun_safety = FALSE
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
|
||||
/obj/item/gun/ballistic/rifle/enchanted
|
||||
has_gun_safety = FALSE
|
||||
|
||||
|
||||
/obj/item/gun/ballistic/automatic/laser/ctf
|
||||
has_gun_safety = FALSE
|
||||
|
||||
@@ -27,4 +27,6 @@
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/deagle/ctf
|
||||
has_gun_safety = FALSE
|
||||
|
||||
|
||||
/obj/item/gun/ballistic/automatic/pistol/g17/mesa
|
||||
has_gun_safety = FALSE
|
||||
|
||||
@@ -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
|
||||
mag_type = /obj/item/ammo_box/magazine/m16/extended
|
||||
can_suppress = FALSE
|
||||
burst_size = 3
|
||||
fire_delay = 2
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 8.5 KiB After Width: | Height: | Size: 8.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 6.4 KiB After Width: | Height: | Size: 6.9 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
Before Width: | Height: | Size: 655 B After Width: | Height: | Size: 698 B |
@@ -33,10 +33,10 @@
|
||||
new /obj/item/clothing/suit/armor/vest/leather/gunman(src)
|
||||
new /obj/item/clothing/shoes/combat(src)
|
||||
|
||||
/obj/item/ammo_box/magazine/m16/extended //i will add custom sprites to this
|
||||
/obj/item/ammo_box/magazine/m16/extended
|
||||
name = "m4a1 magazine (5.56x45mm)"
|
||||
icon = 'modular_skyrat/modules/gunsgalore/icons/guns/gunsgalore_items.dmi'
|
||||
icon_state = "5.56mm"
|
||||
icon_state = "m16e"
|
||||
ammo_type = /obj/item/ammo_casing/a556
|
||||
caliber = "a556"
|
||||
max_ammo = 30
|
||||
|
||||
@@ -4745,6 +4745,15 @@
|
||||
#include "modular_skyrat\modules\black_mesa\code\uber_teleporter.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\weapons.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\xen_crystal.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\__armament_bodyarmor.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\_armament_primary.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\_armaments_secondary.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\armament_explosives.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\armament_medical.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\armament_melee.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\armament_miscellaneous.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\armament_utility.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\armaments\hecu_armament_station.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\mobs\bullsquid.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\mobs\gordon_freeman.dm"
|
||||
#include "modular_skyrat\modules\black_mesa\code\mobs\headcrab.dm"
|
||||
|
||||
Reference in New Issue
Block a user