Removes some var/const that should be defines (#51461)

* Removes some var/const that should be defines

* change requests

* change requests
This commit is contained in:
spookydonut
2020-06-25 03:00:09 -04:00
committed by GitHub
parent 6f78641ae3
commit 88d1d36aef
15 changed files with 89 additions and 63 deletions
+8 -4
View File
@@ -1,3 +1,7 @@
#define DISCONNECTED 0
#define CLAMPED_OFF 1
#define OPERATING 2
// Powersink - used to drain station power
/obj/item/powersink
@@ -20,10 +24,6 @@
var/mode = 0 // 0 = off, 1=clamped (off), 2=operating
var/admins_warned = FALSE // stop spam, only warn the admins once that we are about to boom
var/const/DISCONNECTED = 0
var/const/CLAMPED_OFF = 1
var/const/OPERATING = 2
var/obj/structure/cable/attached // the attached cable
/obj/item/powersink/update_icon_state()
@@ -158,3 +158,7 @@
STOP_PROCESSING(SSobj, src)
explosion(src.loc, 4,8,16,32)
qdel(src)
#undef DISCONNECTED
#undef CLAMPED_OFF
#undef OPERATING
@@ -1,3 +1,5 @@
#define FREQ_LISTENING (1<<0)
/obj/item/radio
icon = 'icons/obj/radio.dmi'
name = "station bounced radio"
@@ -38,9 +40,6 @@
var/list/channels = list() // Map from name (see communications.dm) to on/off. First entry is current department (:h).
var/list/secure_radio_connections
var/const/FREQ_LISTENING = 1
//FREQ_BROADCASTING = 2
/obj/item/radio/suicide_act(mob/living/user)
user.visible_message("<span class='suicide'>[user] starts bouncing [src] off [user.p_their()] head! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return BRUTELOSS
@@ -374,7 +373,7 @@
/obj/item/radio/borg/resetChannels()
. = ..()
var/mob/living/silicon/robot/R = loc
if(istype(R))
for(var/ch_name in R.module.radio_channels)
+1 -1
View File
@@ -13,7 +13,7 @@
var/obj/item/reagent_containers/spray/cleaner/myspray
var/obj/item/lightreplacer/myreplacer
var/signs = 0
var/const/max_signs = 4
var/max_signs = 4
/obj/structure/janitorialcart/Initialize()
@@ -1,3 +1,5 @@
#define OPEN_DURATION 6
#define CLOSE_DURATION 6
// A place where tube pods stop, and people can get in or out.
// Mappers: use "Generate Instances from Directions" for this
@@ -19,9 +21,6 @@
var/base_icon = "station0"
var/boarding_dir //from which direction you can board the tube
var/const/OPEN_DURATION = 6
var/const/CLOSE_DURATION = 6
/obj/structure/transit_tube/station/New()
..()
START_PROCESSING(SSobj, src)
@@ -295,3 +294,6 @@
/obj/structure/transit_tube/station/dispenser/reverse/flipped/init_tube_dirs()
..()
boarding_dir = dir
#undef OPEN_DURATION
#undef CLOSE_DURATION
@@ -12,7 +12,6 @@
var/list/tube_dirs //list of directions this tube section can connect to.
var/exit_delay = 1
var/enter_delay = 0
var/const/time_to_unwrench = 2 SECONDS
/obj/structure/transit_tube/CanAllowThrough(atom/movable/mover, turf/target)
. = ..()
@@ -43,7 +42,7 @@
to_chat(user, "<span class='warning'>Remove the pod first!</span>")
return
user.visible_message("<span class='notice'>[user] starts to detach \the [src].</span>", "<span class='notice'>You start to detach the [name]...</span>")
if(W.use_tool(src, user, time_to_unwrench, volume=50))
if(W.use_tool(src, user, 2 SECONDS, volume=50))
to_chat(user, "<span class='notice'>You detach the [name].</span>")
var/obj/structure/c_transit_tube/R = new tube_construction(loc)
R.setDir(dir)
@@ -9,7 +9,6 @@
density = FALSE
layer = LOW_ITEM_LAYER //same as the built tube
anchored = FALSE
var/const/time_to_unwrench = 2 SECONDS
var/flipped = 0
var/build_type = /obj/structure/transit_tube
var/flipped_build_type
@@ -46,7 +45,7 @@
return
to_chat(user, "<span class='notice'>You start attaching the [name]...</span>")
add_fingerprint(user)
if(I.use_tool(src, user, time_to_unwrench, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user)))
if(I.use_tool(src, user, 2 SECONDS, volume=50, extra_checks=CALLBACK(src, .proc/can_wrench_in_loc, user)))
to_chat(user, "<span class='notice'>You attach the [name].</span>")
var/obj/structure/transit_tube/R = new build_type(loc, dir)
transfer_fingerprints_to(R)