cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-22 11:38:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

porting healthbars from RS + mat fixes

Browse Source
This commit is contained in:
Kashargul
2024-01-29 00:00:25 +01:00
committed by GitHub
parent ba1d1fa768
commit 691c3ca75f
13 changed files with 274 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/shards.dm
+1 -1
View File
@@ -50,7 +50,7 @@
if(W.has_tool_quality(TOOL_WELDER) && material.shard_can_repair)
var/obj/item/weapon/weldingtool/WT = W.get_welder()
if(WT.remove_fuel(0, user))
material.place_sheet(loc)
material.place_sheet(loc, 1)
qdel(src)
return
return ..()
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+3 -3
View File
@@ -155,7 +155,7 @@
/obj/structure/bed/proc/remove_padding()
if(padding_material)
padding_material.place_sheet(get_turf(src))
padding_material.place_sheet(get_turf(src), 1)
padding_material = null
update_icon()
@@ -164,9 +164,9 @@
update_icon()
/obj/structure/bed/proc/dismantle()
material.place_sheet(get_turf(src))
material.place_sheet(get_turf(src), 1)
if(padding_material)
padding_material.place_sheet(get_turf(src))
padding_material.place_sheet(get_turf(src), 1)
/obj/structure/bed/psych
name = "psychiatrist's couch"
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+3 -3
View File
@@ -67,7 +67,7 @@ var/global/list/stool_cache = list() //haha stool
/obj/item/weapon/stool/proc/remove_padding()
if(padding_material)
padding_material.place_sheet(get_turf(src))
padding_material.place_sheet(get_turf(src), 1)
padding_material = null
update_icon()
@@ -104,9 +104,9 @@ var/global/list/stool_cache = list() //haha stool
/obj/item/weapon/stool/proc/dismantle()
if(material)
material.place_sheet(get_turf(src))
material.place_sheet(get_turf(src), 1)
if(padding_material)
padding_material.place_sheet(get_turf(src))
padding_material.place_sheet(get_turf(src), 1)
qdel(src)
/obj/item/weapon/stool/attackby(obj/item/weapon/W as obj, mob/user as mob)