mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 12:07:27 +01:00
Removes a lot of redefined procs (#26186)
* aaaaaaaaaaaaaaa * Forgor * Adds missing /proc/ --------- Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com>
This commit is contained in:
@@ -18,9 +18,6 @@
|
||||
/obj/effect/decal/cleanable/blood/gibs/robot/dry() //pieces of robots do not dry up like
|
||||
return
|
||||
|
||||
/obj/effect/decal/cleanable/blood/gibs/robot/can_bloodcrawl_in()
|
||||
return FALSE
|
||||
|
||||
/obj/effect/decal/cleanable/blood/gibs/robot/streak(list/directions)
|
||||
spawn(0)
|
||||
var/direction = pick(directions)
|
||||
|
||||
@@ -89,7 +89,7 @@ GLOBAL_LIST_INIT(glass_recipes, list (
|
||||
if(!G && !RG && replace)
|
||||
user.put_in_hands(RG)
|
||||
return
|
||||
|
||||
|
||||
return ..()
|
||||
|
||||
//////////////////////////////
|
||||
|
||||
@@ -568,6 +568,7 @@ GLOBAL_LIST_INIT(cult_recipes, list (
|
||||
. = ..()
|
||||
icon_state = GET_CULT_DATA(runed_metal_icon_state, initial(icon_state))
|
||||
item_state = GET_CULT_DATA(runed_metal_item_state, initial(item_state))
|
||||
recipes = GLOB.cult_recipes
|
||||
|
||||
/obj/item/stack/sheet/runed_metal/attack_self(mob/living/user)
|
||||
if(!IS_CULTIST(user))
|
||||
@@ -597,10 +598,6 @@ GLOBAL_LIST_INIT(cult_recipes, list (
|
||||
/obj/item/stack/sheet/runed_metal/fifty
|
||||
amount = 50
|
||||
|
||||
/obj/item/stack/sheet/runed_metal/New(loc, amount=null)
|
||||
recipes = GLOB.cult_recipes
|
||||
return ..()
|
||||
|
||||
//////////////////////////////
|
||||
// MARK: BRASS
|
||||
//////////////////////////////
|
||||
|
||||
@@ -53,7 +53,7 @@
|
||||
var/icon/new_donut_icon = icon('icons/obj/food/containers.dmi', "[(I - 1)]donut[donut.donut_sprite_type]")
|
||||
. += new_donut_icon
|
||||
|
||||
/obj/item/storage/fancy/update_icon_state()
|
||||
/obj/item/storage/fancy/donut_box/update_icon_state()
|
||||
return
|
||||
|
||||
/obj/item/storage/fancy/donut_box/populate_contents()
|
||||
@@ -96,13 +96,15 @@
|
||||
name = "Candle pack"
|
||||
desc = "A pack of red candles."
|
||||
icon = 'icons/obj/candle.dmi'
|
||||
icon_state = "candlebox5"
|
||||
icon_state = "candlebox0"
|
||||
icon_type = "candle"
|
||||
item_state = "candlebox5"
|
||||
storage_slots = 5
|
||||
throwforce = 2
|
||||
slot_flags = SLOT_FLAG_BELT
|
||||
|
||||
/obj/item/storage/fancy/candle_box/full
|
||||
icon_state = "candlebox5"
|
||||
|
||||
/obj/item/storage/fancy/candle_box/full/populate_contents()
|
||||
for(var/I in 1 to storage_slots)
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
noz = make_noz()
|
||||
|
||||
/obj/item/watertank/Destroy()
|
||||
if(on)
|
||||
remove_noz()
|
||||
QDEL_NULL(noz)
|
||||
return ..()
|
||||
|
||||
@@ -69,12 +71,6 @@
|
||||
M.unEquip(noz, 1)
|
||||
return
|
||||
|
||||
/obj/item/watertank/Destroy()
|
||||
if(on)
|
||||
remove_noz()
|
||||
QDEL_NULL(noz)
|
||||
return ..()
|
||||
|
||||
/obj/item/watertank/attack_hand(mob/user)
|
||||
if(loc == user)
|
||||
toggle_mister(user)
|
||||
|
||||
@@ -82,10 +82,6 @@
|
||||
/obj/structure/closet/statue/open()
|
||||
return
|
||||
|
||||
/obj/structure/closet/statue/open()
|
||||
return
|
||||
|
||||
|
||||
/obj/structure/closet/statue/close()
|
||||
return
|
||||
|
||||
|
||||
@@ -36,9 +36,6 @@
|
||||
/obj/structure/flora/tree/dead/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/largetransparency, 0, 1, 0, 0)
|
||||
|
||||
/obj/structure/flora/tree/dead/Initialize(mapload)
|
||||
. = ..()
|
||||
icon_state = "tree_[rand(1, 6)]"
|
||||
|
||||
/obj/structure/flora/tree/palm
|
||||
|
||||
@@ -25,7 +25,10 @@
|
||||
. = ..()
|
||||
. += "<span class='notice'>A powered wire underneath this will cause the grille to shock anyone who touches the grill. An electric shock may leap forth if the grill is damaged.</span>"
|
||||
. += "<span class='notice'>Use <b>wirecutters</b> to deconstruct this item.</span>"
|
||||
|
||||
if(anchored)
|
||||
. += "<span class='notice'>It's secured in place with <b>screws</b>. The rods look like they could be <b>cut</b> through.</span>"
|
||||
else
|
||||
. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"
|
||||
|
||||
/obj/structure/grille/fence
|
||||
var/width = 3
|
||||
@@ -64,13 +67,6 @@
|
||||
return
|
||||
icon_state = "grille50_[rand(0,3)]"
|
||||
|
||||
/obj/structure/grille/examine(mob/user)
|
||||
. = ..()
|
||||
if(anchored)
|
||||
. += "<span class='notice'>It's secured in place with <b>screws</b>. The rods look like they could be <b>cut</b> through.</span>"
|
||||
if(!anchored)
|
||||
. += "<span class='notice'>The anchoring screws are <i>unscrewed</i>. The rods look like they could be <b>cut</b> through.</span>"
|
||||
|
||||
/obj/structure/grille/Bumped(atom/user)
|
||||
if(ismob(user))
|
||||
if(!(shockcooldown <= world.time))
|
||||
|
||||
@@ -24,9 +24,6 @@
|
||||
/obj/structure/lattice/examine(mob/user)
|
||||
. = ..()
|
||||
. += deconstruction_hints(user)
|
||||
|
||||
/obj/structure/lattice/examine(mob/user)
|
||||
. = ..()
|
||||
. += "<span class='notice'>Add a floor tile to build a floor on top of the lattice.</span>"
|
||||
|
||||
/obj/structure/lattice/proc/deconstruction_hints(mob/user)
|
||||
|
||||
@@ -79,7 +79,7 @@
|
||||
to_chat(user, "<span class='notice'>You uninstall [src].</span>")
|
||||
qdel(src)
|
||||
|
||||
/obj/structure/transit_tube/wrench_act(mob/living/user, obj/item/I)
|
||||
/obj/structure/transit_tube_pod/wrench_act(mob/living/user, obj/item/I)
|
||||
. = TRUE
|
||||
to_chat(user, "<span class='notice'>You must uninstall [src] before disassembling it!</span>")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user