Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Standardises unmeltable SG & Specialist Gear, and removes the (now-legacy) SG kit from req. #6893

Merged
merged 1 commit into from
Aug 9, 2024
Merged

Standardises unmeltable SG & Specialist Gear, and removes the (now-legacy) SG kit from req. #6893

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions code/datums/supply_packs/weapons.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
/datum/supply_packs/m56b_smartgun
name = "M56B Smartgun System Package (x1)"
contains = list(
/obj/item/storage/box/m56_system,
)
cost = 100
containertype = /obj/structure/closet/crate/weapon
containername = "M56B Smartgun System Package"
group = "Weapons"

/datum/supply_packs/m56_hmg
name = "M56D Heavy Machine Gun (x1)"
contains = list(
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/marine_armor/ghillie.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
specialty = "M45 pattern ghillie"
valid_accessory_slots = list(ACCESSORY_SLOT_ARMBAND, ACCESSORY_SLOT_DECOR, ACCESSORY_SLOT_MEDAL, ACCESSORY_SLOT_PONCHO)
restricted_accessory_slots = list(ACCESSORY_SLOT_ARMBAND)
unacidable = TRUE

var/camo_active = FALSE
var/hide_in_progress = FALSE
Expand Down
1 change: 1 addition & 0 deletions code/modules/clothing/suits/marine_armor/smartgunner.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
storage_slots = 2
slowdown = SLOWDOWN_ARMOR_LIGHT
flags_inventory = BLOCKSHARPOBJ|SMARTGUN_HARNESS
unacidable = TRUE
allowed = list(
/obj/item/tank/emergency_oxygen,
/obj/item/device/flashlight,
Expand Down
Loading