Skip to content

Commit

Permalink
forecon SG no longer has camouflaged stuff (#149)
Browse files Browse the repository at this point in the history
Quickfix.
  • Loading branch information
AndroBetel authored Mar 12, 2024
1 parent 2b9a3c3 commit 414d726
Show file tree
Hide file tree
Showing 4 changed files with 29 additions and 3 deletions.
6 changes: 6 additions & 0 deletions code/game/objects/items/storage/belt.dm
Original file line number Diff line number Diff line change
Expand Up @@ -608,6 +608,9 @@
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)

/obj/item/storage/belt/marine/smartgunner/standard
has_gamemode_skin = FALSE

/obj/item/storage/belt/marine/quackers
name = "Mr. Quackers"
desc = "What are we going to do today, Mr. Quackers?"
Expand Down Expand Up @@ -1640,6 +1643,9 @@
)
has_gamemode_skin = TRUE

/obj/item/storage/belt/gun/smartgunner/standard
has_gamemode_skin = FALSE

/obj/item/storage/belt/gun/smartgunner/full/fill_preset_inventory()
handle_item_insertion(new /obj/item/weapon/gun/pistol/m4a3())
new /obj/item/ammo_magazine/pistol/hp(src)
Expand Down
17 changes: 17 additions & 0 deletions code/game/objects/structures/crates_lockers/closets/job_closets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,23 @@
new /obj/item/storage/belt/marine/smartgunner(src)
new /obj/item/storage/belt/gun/smartgunner(src)

/obj/structure/closet/secure_closet/smartgunner_forecon
name = "smartgunner locker"
desc = "A secure storage unit for a smartgunner."
req_one_access = list(ACCESS_MARINE_LEADER, ACCESS_MARINE_SMARTPREP)

/obj/structure/closet/secure_closet/smartgunner_forecon/Initialize()
. = ..()
new /obj/item/weapon/gun/smartgun(src)
new /obj/item/smartgun_battery(src)
new /obj/item/clothing/suit/storage/marine/smartgunner/standard(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/ammo_magazine/smartgun(src)
new /obj/item/storage/belt/marine/smartgunner/standard(src)
new /obj/item/storage/belt/gun/smartgunner/standard(src)

/obj/structure/closet/cryo/Initialize()
. = ..()
new /obj/item/clothing/under/marine(src)
Expand Down
3 changes: 3 additions & 0 deletions code/modules/clothing/suits/marine_armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -435,6 +435,9 @@

UnregisterSignal(user, COMSIG_HUMAN_ATTEMPTING_EQUIP)

/obj/item/clothing/suit/storage/marine/smartgunner/standard
flags_atom = NO_SNOW_TYPE

/obj/item/clothing/suit/storage/marine/leader
name = "\improper B12 pattern marine armor"
desc = "A lightweight suit of carbon fiber body armor built for quick movement. Designed in a lovely forest green. Use it to toggle the built-in flashlight."
Expand Down
6 changes: 3 additions & 3 deletions maps/map_files/rover/rover.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@
/turf/open/space/basic,
/area/golden_arrow/canteen)
"aC" = (
/obj/structure/closet/secure_closet/smartgunner{
req_access_txt = "14;39";
req_one_access = list()
/obj/structure/closet/secure_closet/smartgunner_forecon{
req_one_access = list();
req_access_txt = "14;39"
},
/turf/open/floor/almayer,
/area/golden_arrow/squad_one)
Expand Down

0 comments on commit 414d726

Please sign in to comment.