mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-23 12:08:28 +01:00
more new to Init (#17147)
* more new to Init * fix pumps * style update * fix atmos memory leak * fix mech * qdel in here * Update hands.dm * Update rings.dm
This commit is contained in:
@@ -74,18 +74,6 @@
|
||||
desc = "A gift card with a heart on the cover."
|
||||
icon_state = "greetingcard_heart"
|
||||
|
||||
/obj/item/paper/card/New()
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = null
|
||||
|
||||
if(info != initial(info))
|
||||
info = html_encode(info)
|
||||
info = replacetext(info, "\n", "<BR>")
|
||||
info = parsepencode(info)
|
||||
return
|
||||
|
||||
/obj/item/paper/alien
|
||||
name = "alien tablet"
|
||||
desc = "It looks highly advanced"
|
||||
@@ -107,18 +95,16 @@
|
||||
//lipstick wiping is in code/game/objects/items/weapons/cosmetics.dm!
|
||||
|
||||
/obj/item/paper/Initialize(mapload, var/text, var/title)
|
||||
. = ..()
|
||||
. = ..()
|
||||
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
if(istext(title))
|
||||
name = title
|
||||
if(istext(text))
|
||||
info = text
|
||||
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
if(mapload) // Jank, but we do this to prevent maploaded papers from somehow stacking across rounds if re-added to the board by a player.
|
||||
was_maploaded = TRUE
|
||||
|
||||
/obj/item/paper/New(var/newloc, var/text, var/title)
|
||||
..()
|
||||
pixel_y = rand(-8, 8)
|
||||
pixel_x = rand(-9, 9)
|
||||
stamps = ""
|
||||
@@ -137,11 +123,9 @@
|
||||
info = replacetext(info, "\n", "<BR>")
|
||||
info = parsepencode(info)
|
||||
|
||||
spawn(2)
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
return
|
||||
update_icon()
|
||||
update_space(info)
|
||||
updateinfolinks()
|
||||
|
||||
/obj/item/paper/update_icon()
|
||||
if(icon_state == "paper_talisman")
|
||||
|
||||
@@ -149,8 +149,8 @@
|
||||
throw_range = 3
|
||||
throw_speed = 1
|
||||
|
||||
/obj/item/shreddedp/New()
|
||||
..()
|
||||
/obj/item/shreddedp/Initialize(mapload)
|
||||
. = ..()
|
||||
pixel_x = rand(-5,5)
|
||||
pixel_y = rand(-5,5)
|
||||
if(prob(65)) color = pick("#BABABA","#7F7F7F")
|
||||
|
||||
@@ -37,11 +37,10 @@ var/global/photo_count = 0
|
||||
var/icon/tiny
|
||||
var/photo_size = 3
|
||||
|
||||
/obj/item/photo/New()
|
||||
/obj/item/photo/Initialize(mapload)
|
||||
. = ..()
|
||||
id = photo_count++
|
||||
|
||||
|
||||
|
||||
/obj/item/photo/attack_self(mob/user as mob)
|
||||
user.examinate(src)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user