mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-21 02:57:48 +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:
co-authored by
Henri215
cybercapitalism
parent
1c68d1a792
commit
df8fef119d
@@ -83,6 +83,32 @@
|
||||
tastes = list("sugarcane" = 1)
|
||||
distill_reagent = "rum"
|
||||
|
||||
/obj/item/seeds/bamboo
|
||||
name = "pack of bamboo seeds"
|
||||
desc = "A plant known for its flexible and resistant logs."
|
||||
icon_state = "seed-bamboo"
|
||||
species = "bamboo"
|
||||
plantname = "Bamboo"
|
||||
product = /obj/item/grown/log/bamboo
|
||||
lifespan = 80
|
||||
endurance = 70
|
||||
maturation = 15
|
||||
production = 2
|
||||
yield = 5
|
||||
potency = 50
|
||||
growthstages = 3
|
||||
growing_icon = 'icons/obj/hydroponics/growing.dmi'
|
||||
icon_dead = "bamboo-dead"
|
||||
genes = list(/datum/plant_gene/trait/repeated_harvest)
|
||||
mutatelist = null
|
||||
|
||||
/obj/item/grown/log/bamboo
|
||||
seed = /obj/item/seeds/bamboo
|
||||
name = "bamboo log"
|
||||
desc = "A long and resistant bamboo log."
|
||||
icon_state = "bamboo"
|
||||
plank_type = /obj/item/stack/sheet/bamboo // this needs to get datumized :)
|
||||
plank_name = "bamboo sticks"
|
||||
|
||||
// Gatfruit
|
||||
/obj/item/seeds/gatfruit
|
||||
|
||||
@@ -102,6 +102,26 @@
|
||||
/obj/item/grown/log/steel/CheckAccepted(obj/item/I)
|
||||
return FALSE
|
||||
|
||||
/*
|
||||
* Punji sticks
|
||||
*/
|
||||
/obj/structure/punji_sticks
|
||||
name = "punji sticks"
|
||||
desc = "Don't step on this."
|
||||
icon = 'icons/obj/hydroponics/equipment.dmi'
|
||||
icon_state = "punji"
|
||||
resistance_flags = FLAMMABLE
|
||||
max_integrity = 30
|
||||
anchored = TRUE
|
||||
|
||||
/obj/structure/punji_sticks/Initialize(mapload)
|
||||
. = ..()
|
||||
AddComponent(/datum/component/caltrop, 20, 30, 100, 6 SECONDS, CALTROP_BYPASS_SHOES)
|
||||
|
||||
/obj/structure/punji_sticks/spikes
|
||||
name = "wooden spikes"
|
||||
icon_state = "woodspike"
|
||||
|
||||
/////////BONFIRES//////////
|
||||
|
||||
/obj/structure/bonfire
|
||||
|
||||
@@ -145,10 +145,8 @@
|
||||
|
||||
/obj/structure/flora/ash/cacti/Initialize(mapload)
|
||||
. = ..()
|
||||
// min dmg 3, max dmg 6, prob(70)
|
||||
AddComponent(/datum/component/caltrop, 3, 6, 70)
|
||||
|
||||
|
||||
/*********
|
||||
* Rocks *
|
||||
*********/
|
||||
|
||||
@@ -399,3 +399,17 @@
|
||||
/obj/item/gun/syringe/rapidsyringe/preloaded/beaker_blaster/attack_self(mob/living/user)
|
||||
// no printing infinite syringes.
|
||||
return
|
||||
|
||||
/// craftable bamboo syringe gun
|
||||
/obj/item/gun/syringe/blowgun
|
||||
name = "blowgun"
|
||||
desc = "Fire syringes at a short distance."
|
||||
icon_state = "blowgun"
|
||||
item_state = "gun"
|
||||
|
||||
/obj/item/gun/syringe/blowgun/process_fire(atom/target, mob/living/user, message = TRUE, params = null, zone_override = "", bonus_spread = 0)
|
||||
visible_message("<span class='danger'>[user] shoots the blowgun!</span>")
|
||||
|
||||
user.adjustStaminaLoss(20, FALSE)
|
||||
user.adjustOxyLoss(20)
|
||||
return ..()
|
||||
|
||||
@@ -271,3 +271,4 @@
|
||||
amount_per_transfer_from_this = 50
|
||||
volume = 50
|
||||
list_reagents = list("toxin" = 15, "pancuronium" = 10, "cyanide" = 5, "facid" = 10, "fluorine" = 10)
|
||||
|
||||
|
||||
@@ -210,11 +210,3 @@
|
||||
materials = list(MAT_BIOMASS = 400)
|
||||
build_path = /obj/item/clothing/accessory/holster
|
||||
category = list("initial","Leather and Cloth")
|
||||
|
||||
/datum/design/rice_hat
|
||||
name = "Rice hat"
|
||||
id = "rice_hat"
|
||||
build_type = BIOGENERATOR
|
||||
materials = list(MAT_BIOMASS = 300)
|
||||
build_path = /obj/item/clothing/head/rice_hat
|
||||
category = list("initial","Leather and Cloth")
|
||||
|
||||
Reference in New Issue
Block a user