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

[MIRROR] Sideports a couple of init unit tests from Neb.

Browse Source
This commit is contained in:
Chompstation Bot
2021-02-27 18:45:36 +00:00
parent bfe487e41a
commit ad57e1ad13
129 changed files with 1193 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/pda/cart.dm
View File

@@ -154,7 +154,7 @@ var/list/civilian_cartridges = list(
/obj/item/weapon/cartridge/signal/Initialize()
radio = new /obj/item/radio/integrated/signal(src)
..()
. = ..()
/obj/item/weapon/cartridge/signal/science
name = "\improper Signal Ace 2 cartridge"

12
code/modules/pda/radio.dm
View File

@@ -107,13 +107,11 @@
return ..()
/obj/item/radio/integrated/signal/Initialize()
if(!radio_controller)
return
if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
src.frequency = sanitize_frequency(src.frequency)
set_frequency(frequency)
. = ..()
if(radio_controller)
if(src.frequency < PUBLIC_LOW_FREQ || src.frequency > PUBLIC_HIGH_FREQ)
src.frequency = sanitize_frequency(src.frequency)
set_frequency(frequency)
/obj/item/radio/integrated/signal/proc/set_frequency(new_frequency)
radio_controller.remove_object(src, frequency)