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

[Skyrat Mirror] interdyne - gives miners point cards, places sansufentanyl in the medical area #135

Merged
merged 1 commit into from
Oct 18, 2023
Merged

[Skyrat Mirror] interdyne - gives miners point cards, places sansufentanyl in the medical area #135

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
1 change: 1 addition & 0 deletions _maps/RandomRuins/IceRuins/skyrat/icemoon_underground_syndicate_base1_skyrat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1825,6 +1825,7 @@
dir = 4
},
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
/obj/structure/closet/crate/freezer/sansufentanyl,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/medbay)
"oZ" = (
Expand Down
1 change: 1 addition & 0 deletions _maps/RandomRuins/LavaRuins/skyrat/lavaland_surface_syndicate_base1_skyrat.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,6 +1177,7 @@
dir = 4
},
/obj/structure/window/reinforced/survival_pod/spawner/directional/east,
/obj/structure/closet/crate/freezer/sansufentanyl,
/turf/open/floor/iron/dark,
/area/ruin/syndicate_lava_base/medbay)
"mk" = (
Expand Down
20 changes: 15 additions & 5 deletions modular_skyrat/modules/mapping/code/lavaland_ruin_code.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,8 @@
/obj/item/mining_voucher=1,
/obj/item/t_scanner/adv_mining_scanner/lesser=1,
/obj/item/gun/energy/recharge/kinetic_accelerator=1,\
/obj/item/stack/marker_beacon/ten=1)
/obj/item/stack/marker_beacon/ten=1,\
/obj/item/card/mining_point_card=1)

/datum/outfit/lavaland_syndicate/shaftminer/deckofficer
name = "Interdyne Deck Officer"
Expand Down Expand Up @@ -94,7 +95,7 @@
icon_state = "syndie_headset"
inhand_icon_state = null
radiosound = 'modular_skyrat/modules/radiosound/sound/radio/syndie.ogg'
keyslot = new /obj/item/encryptionkey/headset_syndicate/interdyne
keyslot = /obj/item/encryptionkey/headset_syndicate/interdyne

/obj/item/radio/headset/interdyne/Initialize(mapload)
. = ..()
Expand All @@ -106,9 +107,18 @@
command = TRUE

/obj/item/radio/headset/interdyne/comms
keyslot = new /obj/item/encryptionkey/headset_syndicate/interdyne
keyslot2 = new /obj/item/encryptionkey/syndicate

keyslot = /obj/item/encryptionkey/headset_syndicate/interdyne
keyslot2 = /obj/item/encryptionkey/syndicate

/obj/structure/closet/crate/freezer/sansufentanyl
name = "sansufentanyl crate"
desc = "A freezer. Contains refrigerated Sansufentanyl, for managing Hereditary Manifold Sickness. A product of Interdyne Pharmaceuticals."

/obj/structure/closet/crate/freezer/sansufentanyl/PopulateContents()
. = ..()
for(var/grabbin_pills in 1 to 10)
new /obj/item/storage/pill_bottle/sansufentanyl(src)

//MOBS

// hivelords that stand guard where they spawn
Expand Down