Merge branch 'winterball2021' of github.com:keronshb/Citadel-Station-13 into winterball

This commit is contained in:
Linzolle
2021-11-26 18:46:57 -07:00
50 changed files with 124894 additions and 1 deletions
+20 -1
View File
@@ -57,6 +57,7 @@
hole_size = LARGE_HOLE
/obj/structure/fence/attackby(obj/item/W, mob/user)
var/current_stage = hole_size
if(W.tool_behaviour == TOOL_WIRECUTTER)
if(!cuttable)
to_chat(user, "<span class='notice'>This section of the fence can't be cut.</span>")
@@ -64,7 +65,6 @@
if(invulnerable)
to_chat(user, "<span class='notice'>This fence is too strong to cut through.</span>")
return
var/current_stage = hole_size
if(current_stage >= MAX_HOLE_SIZE)
to_chat(user, "<span class='notice'>This fence has too much cut out of it already.</span>")
return
@@ -86,6 +86,25 @@
update_cut_status()
else if(istype(W, /obj/item/stack/rods) && broken)
if(!hole_size)
to_chat(user, "<span class='info'>The [src] has no cuts in it!</span>")
return
var/obj/item/stack/rods/R = W
if(do_after(user, CUT_TIME, target = src))
if(current_stage == hole_size)
switch(--hole_size)
if(NO_HOLE)
visible_message("<span class='notice'>\The [user] repairs \the [src] fully.</span>")
to_chat(user, "<span class='info'>You repaire the [src] back to it's former glory.</span>")
climbable = TRUE
if(MEDIUM_HOLE)
visible_message("<span class='notice'>\The [user] patches up \the [src].</span>")
to_chat(user, "<span class='info'>The hole in \the [src] is reduced slightly, though someone could probably sill squeeze though if you don't patch it up more.</span>")
climbable = FALSE
R.use(1)
update_cut_status()
return TRUE
/obj/structure/fence/proc/update_cut_status()
+6
View File
@@ -78,6 +78,12 @@
deconstructible = FALSE
layer = EDGED_TURF_LAYER
/obj/structure/fluff/lightpost/light
desc = "That which most enchants the Edinians is the lighting by gas of the boulevards... These humble rows of lamps, shining with a clarity white and pure, have a marvelous effect upon the streets on Nova Edina. Adorned with a cheery garb, in tune with the festive spirits of the city."
light_power = 0.8
light_range = 10
light_color = "#ffeeab"
/obj/structure/fluff/bus
name = "bus"
desc = "GO TO SCHOOL. READ A BOOK."