mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-07-16 17:43:35 +01:00
Ports TG bamboo and Punji Sticks (#24497)
* adds most things
* STOP BECOMING CRLF
* half the sprites ported
* adds floor turfs, hopefully
* adds bamboo stack recipes and parameter documentation for datum/stack_recipe
* adds the crude syringe and sprite
* Revert "adds the crude syringe and sprite"
This reverts commit d949332055.
* adds crude syringe and sprite
* nevermind, goon license moment
* bamboo walls, false walls, and sprites
* caltrops check for shoe thickmaterial flag
* added spear and fixed filepaths
* smoothing and caltrops are even more broken
* Fixes sprite smoothing and caltrop weirdness
* whitespace
* fixes tile stacking
* Henri review
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* royal blue and red carpets no longer smooth
* henri review
* actual henri review, thanks git
* Henri review electric boogaloo
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
* removes bamboo walls (rip)
* Update code/game/turfs/simulated/floor/fancy_floor.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
---------
Co-authored-by: cybercapitalism <98280110+cybercapitalism@users.noreply.github.com>
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
This commit is contained in:
@@ -86,6 +86,9 @@
|
||||
if(istype(W, /obj/item/stack/sheet/runed_metal))
|
||||
to_chat(user, "<span class='warning'>You can't seem to make the metal bend.</span>")
|
||||
return
|
||||
if(istype(W, /obj/item/stack/sheet/bamboo)) // pending wall resprite(tm)
|
||||
to_chat(user, "<span class='warning'>The bamboo doesn't seem to fit around the girder.</span>")
|
||||
return
|
||||
|
||||
if(istype(W,/obj/item/stack/rods))
|
||||
var/obj/item/stack/rods/S = W
|
||||
|
||||
@@ -424,7 +424,7 @@
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 70
|
||||
buildstackamount = 2
|
||||
buildstacktype = /obj/item/stack/sheet/wood
|
||||
buildstacktype = /obj/item/stack/sheet/bamboo
|
||||
|
||||
/obj/structure/chair/sofa/bamboo/left
|
||||
icon_state = "bamboo_sofaend_left"
|
||||
@@ -453,7 +453,7 @@
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 70
|
||||
buildstackamount = 2
|
||||
buildstacktype = /obj/item/stack/sheet/wood
|
||||
buildstacktype = /obj/item/stack/sheet/bamboo
|
||||
|
||||
/obj/item/chair
|
||||
name = "chair"
|
||||
@@ -497,8 +497,8 @@
|
||||
/obj/item/chair/stool/bamboo
|
||||
name = "bamboo stool"
|
||||
desc = "Not the most comfortable, but vegan!"
|
||||
item_state = "bamboo_stool"
|
||||
icon_state = "bamboo_stool_toppled"
|
||||
item_state = "stool_bamboo"
|
||||
origin_type = /obj/structure/chair/stool/bamboo
|
||||
|
||||
/obj/item/chair/attack_self(mob/user)
|
||||
|
||||
Reference in New Issue
Block a user