Skip to content
This repository was archived by the owner on May 22, 2025. It is now read-only.

Give free miners access to mechs and borgs #11673

Merged
JamieD1 merged 3 commits into from
Jul 1, 2021
Merged

Give free miners access to mechs and borgs #11673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
aa944e7
First pass at giving free miners some mech/borg access
adamsong Jun 30, 2021
f752ef4
Fixed some things, removed the firmware hack from the exosuit fab and…
adamsong Jun 30, 2021
d5386d7
Removed newline from file I ended up not wanting to change
adamsong Jun 30, 2021
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/shuttles/whiteship_miner.dmm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,6 +347,7 @@
amount = 10
},
/obj/item/mecha_parts/mecha_equipment/ripleyupgrade,
/obj/item/borg/upgrade/freeminer,
/turf/open/floor/mineral/titanium/white,
/area/shuttle/abandoned)
"bd" = (
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/access.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,7 @@
#define ACCESS_TCOM_ADMIN 70
#define ACCESS_FREEMINER 71
#define ACCESS_FREEMINER_CAPTAIN 72
#define ACCESS_FREEMINER_ENGINEER 73

//BEGIN CENTCOM ACCESS
/*Should leave plenty of room if we need to add more access levels.
Expand Down Expand Up @@ -144,3 +145,4 @@
#define ACCESS_MECH_SECURITY 302
#define ACCESS_MECH_SCIENCE 303
#define ACCESS_MECH_ENGINE 304
#define ACCESS_MECH_FREEMINER 310
2 changes: 1 addition & 1 deletion code/game/mecha/working/ripley.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
armor = list("melee" = 40, "bullet" = 20, "laser" = 10, "energy" = 20, "bomb" = 40, "bio" = 0, "rad" = 20, "fire" = 100, "acid" = 100)
max_equip = 6
wreckage = /obj/structure/mecha_wreckage/ripley
internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING)
internals_req_access = list(ACCESS_MECH_ENGINE, ACCESS_MECH_SCIENCE, ACCESS_MECH_MINING, ACCESS_MECH_FREEMINER)
var/list/cargo = new
var/cargo_capacity = 15
var/hides = 0
Expand Down
9 changes: 9 additions & 0 deletions code/game/objects/items/robot/robot_upgrades.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@

R.revive()

/obj/item/borg/upgrade/freeminer
name = "free miner cyborg firmware hack"
desc = "Used to override the default firmware of a cyborg with the freeminer version."
icon_state = "cyborg_upgrade2"
one_use = TRUE

/obj/item/borg/upgrade/freeminer/action(mob/living/silicon/robot/R, user = usr)
R.req_access = list(ACCESS_FREEMINER_ENGINEER)

/obj/item/borg/upgrade/vtec
name = "cyborg VTEC module"
desc = "Used to kick in a cyborg's VTEC systems, increasing their speed."
Expand Down
9 changes: 7 additions & 2 deletions yogstation/code/datums/ruins/free_miners.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
r_pocket = null
gloves = /obj/item/clothing/gloves/color/yellow
belt = /obj/item/storage/belt/utility/full
id = /obj/item/card/id/freeminer/engi

/obj/effect/mob_spawn/human/free_miner/captain
name = "Free Miner Captain"
Expand All @@ -117,11 +118,15 @@

/obj/item/card/id/freeminer
name = "Free Miner Crewman ID"
access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER)
access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER)

/obj/item/card/id/freeminer/engi
name = "Free Miner Engineer ID"
access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER)

/obj/item/card/id/freeminer/captain
name = "Free Miner Ship Pilot ID"
access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_FREEMINER_CAPTAIN)
access = list(ACCESS_MINERAL_STOREROOM, ACCESS_FREEMINER, ACCESS_MECH_FREEMINER, ACCESS_FREEMINER_ENGINEER, ACCESS_FREEMINER_CAPTAIN)

/obj/item/storage/box/ids/free_miners
name = "box of spare IDs"
Expand Down