cyberpresidentvanellope/YWPolarisVore
1
0
Fork 0
mirror of https://github.com/Yawn-Wider/YWPolarisVore.git synced 2026-08-28 15:40:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into reagentToDefines

Browse Source
This commit is contained in:
Kashargul
2024-12-06 21:57:14 +01:00
committed by GitHub
parent 429398bdd7 5092af9321
commit 939fcbb488
212 changed files with 5049 additions and 1312 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/personal_shield_generator_vr.dm
+1 -1
View File
@@ -539,7 +539,7 @@
//Misc belts. Admin-spawn only atm.
/obj/item/personal_shield_generator/belt/adminbus
desc = "You should not see this. You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
desc = DEVELOPER_WARNING_NAME + " You REALLY should not see this. If you do, you have either been blessed or are about to be the target of some sick prank."
modifier_type = /datum/modifier/shield_projection/admin
generator_hit_cost = 0
generator_active_cost = 0
code/game/objects/items/devices/radio/headset.dm
+11 -1
View File
@@ -466,6 +466,7 @@
/obj/item/radio/headset/alt/ert
name = "emergency response team bowman headset"
icon_state = "com_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/ia
@@ -493,6 +494,8 @@
/obj/item/radio/headset/alt/centcom
name = "centcom bowman headset"
icon_state = "com_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/nanotrasen
name = "\improper NT radio headset"
@@ -503,6 +506,8 @@
/obj/item/radio/headset/alt/nanotrasen
name = "\improper NT bowman headset"
icon_state = "nt_headset_alt"
centComm = 1
ks2type = /obj/item/encryptionkey/ert
/obj/item/radio/headset/pathfinder
name = "pathfinder's headset"
@@ -513,6 +518,8 @@
/obj/item/radio/headset/alt/pathfinder
name = "pathfinder's bowman headset"
icon_state = "exp_headset_alt"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/pathfinder
/obj/item/radio/headset/pilot
name = "pilot's headset"
@@ -522,6 +529,7 @@
/obj/item/radio/headset/alt/pilot
name = "pilot's bowman headset"
icon_state = "pilot_headset_alt"
adhoc_fallback = TRUE
/obj/item/radio/headset/explorer
name = "away team member's headset"
@@ -532,6 +540,8 @@
/obj/item/radio/headset/alt/explorer
name = "away team's bowman headset"
icon_state = "exp_headset_alt"
adhoc_fallback = TRUE
ks2type = /obj/item/encryptionkey/explorer
/obj/item/radio/headset/sar
name = "search and rescue headset"
@@ -635,4 +645,4 @@
/obj/item/radio/headset/heads/ai_integrated/receive_range(freq, level)
if (disabledAi)
return -1 //Transciever Disabled.
return ..(freq, level, 1)
return ..(freq, level, 1)