cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 03:02:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4683 from Woodratt/01302018_SC_POIMAP

Browse Source 
Southern Cross POI adjustment and Map adjustments
This commit is contained in:
Neerti
2018-01-31 15:42:48 -05:00
committed by GitHub
parent 44b8b6f5ce 28dfb0b4b0
commit c18ce47bff
5 changed files with 69 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/devices/radio/headset.dm
View File

@@ -180,6 +180,13 @@
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/captain/sfr
name = "SFR headset"
desc = "A headset belonging to a Sif Free Radio DJ. SFR, best tunes in the wilderness."
icon_state = "com_headset_alt"
item_state = "headset"
ks2type = /obj/item/device/encryptionkey/heads/captain
/obj/item/device/radio/headset/heads/ai_integrated //No need to care about icons, it should be hidden inside the AI anyway.
name = "\improper AI subspace transceiver"
desc = "Integrated AI radio transceiver."

17
code/game/objects/random/random.dm
View File

@@ -897,6 +897,18 @@ something, make sure it's not in one of the other lists.*/
prob(1);/obj/item/weapon/beartrap,
prob(2);/obj/item/weapon/handcuffs,)
/obj/random/sfr
name = "random SFR headset"
desc = "This is a headset spawn."
icon = 'icons/misc/mark.dmi'
icon_state = "rup"
/obj/random/sfr/item_to_spawn()
return pick(prob(25);/obj/item/device/radio/headset/heads/captain/sfr,
prob(25);/obj/item/device/radio/headset/headset_cargo/alt,
prob(25);/obj/item/device/radio/headset/headset_com/alt,
prob(25);/obj/item/device/radio/headset)
/obj/random/rigsuit
name = "Random rigsuit"
desc = "This is a random rigsuit."
@@ -1003,6 +1015,11 @@ var/list/multi_point_spawns
id = "Captain's spare id"
item_path = /obj/item/weapon/card/id/gold/captain/spare
/obj/random_multi/single_item/sfr_headset
name = "Multi Point - headset"
id = "SFR headset"
item_path = /obj/random/sfr
//Multiple Object Spawn
/obj/random/multiple