shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos

Browse Source
This commit is contained in:
Putnam
2021-03-08 14:46:46 -08:00
parent f07a9c13fb 457077770e
commit cc360288bd
760 changed files with 31912 additions and 23386 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+6 -5
View File
@@ -531,7 +531,7 @@ By design, d1 is the smallest direction and d2 is the highest
user.visible_message("<span class='suicide'>[user] is strangling [user.p_them()]self with [src]! It looks like [user.p_theyre()] trying to commit suicide!</span>")
return(OXYLOSS)
/obj/item/stack/cable_coil/Initialize(mapload, new_amount = null)
/obj/item/stack/cable_coil/Initialize(mapload, new_amount, merge = TRUE)
. = ..()
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
@@ -823,7 +823,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/random
color = "#ffffff"
/obj/item/stack/cable_coil/random/Initialize(mapload, new_amount = null, param_color = null)
/obj/item/stack/cable_coil/random/Initialize(mapload, new_amount, merge = TRUE, param_color = null)
. = ..()
var/list/cable_colors = GLOB.cable_colors
color = pick(cable_colors)
@@ -835,12 +835,13 @@ By design, d1 is the smallest direction and d2 is the highest
amount = null
icon_state = "coil2"
/obj/item/stack/cable_coil/cut/Initialize(mapload)
. = ..()
/obj/item/stack/cable_coil/cut/Initialize(mapload, new_amount, merge = TRUE)
// do random amount calls BEFORE we add the mats or else the code eats shit and dies
if(!amount)
amount = rand(1,2)
pixel_x = rand(-2,2)
pixel_y = rand(-2,2)
. = ..()
update_icon()
/obj/item/stack/cable_coil/cut/red
@@ -869,7 +870,7 @@ By design, d1 is the smallest direction and d2 is the highest
/obj/item/stack/cable_coil/cut/random
color = "#ffffff"
/obj/item/stack/cable_coil/cut/random/Initialize(mapload, new_amount = null, param_color = null)
/obj/item/stack/cable_coil/cut/random/Initialize(mapload, new_amount, merge = TRUE, param_color = null)
. = ..()
var/list/cable_colors = GLOB.cable_colors
color = pick(cable_colors)
code/modules/power/solar.dm
+5 -7
View File
@@ -245,12 +245,10 @@
to_chat(user, "<span class='warning'>You need to secure the assembly before you can add glass.</span>")
return
var/obj/item/stack/sheet/S = W
var/obj/item/stack/sheet/G = S.change_stack(null, 2)
if(G)
glass_type = G
G.moveToNullspace()
playsound(src.loc, 'sound/machines/click.ogg', 50, 1)
user.visible_message("[user] places the glass on the solar assembly.", "<span class='notice'>You place the glass on the solar assembly.</span>")
if(S.use(2))
glass_type = W.type
playsound(src.loc, 'sound/machines/click.ogg', 50, TRUE)
user.visible_message("<span class='notice'>[user] places the glass on the solar assembly.</span>", "<span class='notice'>You place the glass on the solar assembly.</span>")
if(tracker)
new /obj/machinery/power/tracker(get_turf(src), src)
else
@@ -258,7 +256,7 @@
else
to_chat(user, "<span class='warning'>You need two sheets of glass to put them into a solar panel!</span>")
return
return 1
return TRUE
if(!tracker)
if(istype(W, /obj/item/electronics/tracker))