mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-26 13:37:58 +01:00
TG: •Softcaps, flippable
•Improved bodybags, also changed sprites. Scream at me if you don't like them, I'll change them back. Also sorry for the 114KB new sound. •Sorry but I really have to defecate while writing this •You can find the unused newscaster sprite of my new project in terminals.dmi Revision: r2928 Author: polyxenitopalidou
This commit is contained in:
@@ -16,6 +16,7 @@
|
||||
desc = "This box contains body bags."
|
||||
icon_state = "bodybags"
|
||||
item_state = "syringe_kit"
|
||||
foldable = /obj/item/stack/sheet/cardboard //BubbleWrap
|
||||
|
||||
|
||||
New()
|
||||
@@ -40,10 +41,10 @@
|
||||
density = 0
|
||||
|
||||
|
||||
attackby(P as obj, mob/user as mob)
|
||||
if (istype(P, /obj/item/weapon/pen))
|
||||
attackby(W as obj, mob/user as mob)
|
||||
if (istype(W, /obj/item/weapon/pen))
|
||||
var/t = input(user, "What would you like the label to be?", text("[]", src.name), null) as text
|
||||
if (user.equipped() != P)
|
||||
if (user.equipped() != W)
|
||||
return
|
||||
if (!in_range(src, user) && src.loc != user)
|
||||
return
|
||||
@@ -51,10 +52,16 @@
|
||||
if (t)
|
||||
src.name = "body bag - "
|
||||
src.name += t
|
||||
src.overlays += image(src.icon, "bodybag_label")
|
||||
else
|
||||
src.name = "body bag"
|
||||
..()
|
||||
return
|
||||
//..() //Doesn't need to run the parent. Since when can fucking bodybags be welded shut? -Agouri
|
||||
return
|
||||
else if(istype(W, /obj/item/weapon/wirecutters))
|
||||
user << "You cut the tag off the bodybag"
|
||||
src.name = "body bag"
|
||||
src.overlays = null
|
||||
return
|
||||
|
||||
|
||||
close()
|
||||
@@ -74,4 +81,5 @@
|
||||
new/obj/item/bodybag(get_turf(src))
|
||||
spawn(0)
|
||||
del(src)
|
||||
return
|
||||
return
|
||||
|
||||
|
||||
@@ -37,7 +37,10 @@
|
||||
|
||||
src.icon_state = src.icon_opened
|
||||
src.opened = 1
|
||||
playsound(src.loc, 'click.ogg', 15, 1, -3)
|
||||
if(istype(src, /obj/structure/closet/body_bag))
|
||||
playsound(src.loc, 'zip.ogg', 15, 1, -3)
|
||||
else
|
||||
playsound(src.loc, 'click.ogg', 15, 1, -3)
|
||||
density = 0
|
||||
return 1
|
||||
|
||||
@@ -64,7 +67,10 @@
|
||||
M.loc = src
|
||||
src.icon_state = src.icon_closed
|
||||
src.opened = 0
|
||||
playsound(src.loc, 'click.ogg', 15, 1, -3)
|
||||
if(istype(src, /obj/structure/closet/body_bag))
|
||||
playsound(src.loc, 'zip.ogg', 15, 1, -3)
|
||||
else
|
||||
playsound(src.loc, 'click.ogg', 15, 1, -3)
|
||||
density = 1
|
||||
return 1
|
||||
|
||||
@@ -121,7 +127,7 @@
|
||||
if(istype(W, /obj/item/weapon/grab))
|
||||
src.MouseDrop_T(W:affecting, user) //act like they were dragged onto the closet
|
||||
|
||||
if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
|
||||
if(istype(W, /obj/item/weapon/weldingtool) && W:welding )
|
||||
if(!W:remove_fuel(0,user))
|
||||
user << "\blue You need more welding fuel to complete this task."
|
||||
return
|
||||
@@ -142,7 +148,7 @@
|
||||
if(W)
|
||||
W.loc = src.loc
|
||||
|
||||
else if(istype(W, /obj/item/weapon/weldingtool) && W:welding)
|
||||
else if(istype(W, /obj/item/weapon/weldingtool) && W:welding )
|
||||
if(!W:remove_fuel(0,user))
|
||||
user << "\blue You need more welding fuel to complete this task."
|
||||
return
|
||||
|
||||
@@ -270,6 +270,23 @@ THERMAL GLASSES
|
||||
usr << "You push the mask up out of your face."
|
||||
usr.update_clothing()
|
||||
|
||||
/obj/item/clothing/head/cargosoft/dropped()
|
||||
src.icon_state = "cargosoft"
|
||||
src.flipped=0
|
||||
..()
|
||||
|
||||
/obj/item/clothing/head/cargosoft/verb/flip()
|
||||
set category = "Object"
|
||||
set name = "Flip cap"
|
||||
src.flipped = !src.flipped
|
||||
if(src.flipped)
|
||||
icon_state = "cargosoft_flipped"
|
||||
usr << "You flip the hat backwards."
|
||||
else
|
||||
icon_state = "cargosoft"
|
||||
usr << "You flip the hat back in normal position."
|
||||
|
||||
|
||||
/obj/item/clothing/shoes/magboots/verb/toggle()
|
||||
set name = "Toggle Magboots"
|
||||
set category = "Object"
|
||||
|
||||
Reference in New Issue
Block a user