cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2022-02-06 21:43:02 -05:00
committed by GitHub
parent 84fc4e68c3
commit 4dded2ec62
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/game/machinery/suit_storage_unit_vr.dm
View File

@@ -53,12 +53,9 @@
model_text = "Talon captain" model_text = "Talon captain"
req_access = list(access_talon) req_access = list(access_talon)
departments = list(/datum/suit_cycler_choice/department/talon/officer) departments = list(/datum/suit_cycler_choice/department/talon/officer)
<<<<<<< HEAD
=======
/obj/machinery/suit_cycler/vintage/tminer /obj/machinery/suit_cycler/vintage/tminer
name = "Talon miner suit cycler" name = "Talon miner suit cycler"
model_text = "Talon miner" model_text = "Talon miner"
req_access = list(access_talon) req_access = list(access_talon)
departments = list(/datum/suit_cycler_choice/department/talon/miner) departments = list(/datum/suit_cycler_choice/department/talon/miner)
>>>>>>> 982372b1a12... Merge pull request #12164 from PastelPrinceDan/talonmining