cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-22 12:29:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

21/10/23 Bugfixes (#17648)

Browse Source
This commit is contained in:
Wowzewow (Wezzy)
2023-10-22 12:36:19 +00:00
committed by GitHub
parent 4354159d25
commit 8332ab1343
6 changed files with 50 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/stool_bed_chair_nest/stools.dm
+8 -8
View File
@@ -21,7 +21,7 @@
if(!held_item || use_check_and_message(usr) || buckled || (anchored && padding_material)) // Make sure held_item = null if you don't want it to get picked up.
return
usr.visible_message(SPAN_NOTICE("[usr] [withdraw_verb]s \the [src.name]."), SPAN_NOTICE("You [withdraw_verb] \the [src.name]."))
var/obj/item/material/stool/S = new held_item(src.loc, material.name, padding_material ? padding_material.name : null, painted_colour) // Handles all the material code so you don't have to.
var/obj/item/material/stool/S = new held_item(src.loc, material.name, padding_material?.name, painted_colour) // Handles all the material code so you don't have to.
TransferComponents(S)
if(material_alteration & MATERIAL_ALTERATION_COLOR) // For snowflakes like wood chairs.
S.color = material.icon_colour
@@ -254,7 +254,7 @@
user.visible_message(SPAN_NOTICE("[user] [deploy_verb]s \the [src.name]."), SPAN_NOTICE("You [deploy_verb] \the [name]."))
// playsound(src, deploy_sound ? deploy_sound : drop_sound, DROP_SOUND_VOLUME)
user.drop_from_inventory(src)
var/obj/structure/bed/stool/S = new origin_type(get_turf(loc), material.name, padding_material ? padding_material.name : null, painted_colour) // Fuck me.
var/obj/structure/bed/stool/S = new origin_type(get_turf(loc), material?.name, padding_material?.name, painted_colour) // Fuck me.
TransferComponents(S)
S.dir = user.dir // Plant it where the user's facing
if(blood_DNA)
@@ -308,10 +308,10 @@
base_icon = "bar_stool"
origin_type = /obj/structure/bed/stool/bar
/obj/item/material/stool/bar/New(var/newloc, new_material)
/obj/item/material/stool/bar/New(var/newloc, new_material, new_padding_material, new_painted_colour)
if(!new_material)
new_material = MATERIAL_STEEL
..(newloc, new_material)
..(newloc, new_material, new_padding_material, new_painted_colour)
/obj/item/material/stool/hover
icon_state = "hover_stool_item"
@@ -319,10 +319,10 @@
base_icon = "hover_stool"
origin_type = /obj/structure/bed/stool/hover
/obj/item/material/stool/hover/New(var/newloc, new_material)
/obj/item/material/stool/hover/New(var/newloc, new_material, new_padding_material, new_painted_colour)
if(!new_material)
new_material = MATERIAL_SHUTTLE_SKRELL
..(newloc, new_material)
..(newloc, new_material, new_padding_material, new_painted_colour)
/obj/item/material/stool/bamboo
icon_state = "bamboo_stool_item"
@@ -330,10 +330,10 @@
base_icon = "bamboo_stool"
origin_type = /obj/structure/bed/stool/bamboo
/obj/item/material/stool/bamboo/New(var/newloc, new_material)
/obj/item/material/stool/bamboo/New(var/newloc, new_material, new_padding_material, new_painted_colour)
if(!new_material)
new_material = MATERIAL_BAMBOO
..(newloc, new_material)
..(newloc, new_material, new_padding_material, new_painted_colour)
/obj/structure/flora/log_bench
name = "log bench"