cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-20 19:44:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Ports TG bamboo and Punji Sticks (#24497)

Browse Source 
* 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:
chuga-git
2024-04-07 04:38:10 -05:00
committed by GitHub
parent 1c68d1a792
commit df8fef119d
33 changed files with 311 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/sheet_types.dm
+41 -5
View File
@@ -233,11 +233,6 @@ GLOBAL_LIST_INIT(wood_recipes, list(
new /datum/stack_recipe("pew (left)", /obj/structure/chair/sofa/pew/left, 5, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("pew (right)", /obj/structure/chair/sofa/pew/right, 5, one_per_turf = TRUE, on_floor = TRUE),
)),
new /datum/stack_recipe_list("bamboo benches", list(
new /datum/stack_recipe("bamboo bench (middle)", /obj/structure/chair/sofa/bamboo, 2, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("bamboo bench (left)", /obj/structure/chair/sofa/bamboo/left, 2, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("bamboo bench (right)", /obj/structure/chair/sofa/bamboo/right, 2, one_per_turf = TRUE, on_floor = TRUE),
)),
null,
new /datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 1.5 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 4 SECONDS),
@@ -270,6 +265,47 @@ GLOBAL_LIST_INIT(wood_recipes, list(
recipes = GLOB.wood_recipes
return ..()
/*
* Bamboo
*/
GLOBAL_LIST_INIT(bamboo_recipes, list(
new /datum/stack_recipe("punji sticks trap", /obj/structure/punji_sticks, req_amount = 5, time = 3 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("bamboo spear", /obj/item/spear/bamboo, req_amount = 25, time = 9 SECONDS),
new /datum/stack_recipe("blow gun", /obj/item/gun/syringe/blowgun, req_amount = 10, time = 7 SECONDS),
new /datum/stack_recipe("rice hat", /obj/item/clothing/head/rice_hat, req_amount = 10, time = 7 SECONDS),
null,
new /datum/stack_recipe("bamboo mat piece", /obj/item/stack/tile/bamboo, req_amount = 1, res_amount = 4, max_res_amount = 20),
new /datum/stack_recipe_list("tatami mats", list(
new /datum/stack_recipe("green tatami", /obj/item/stack/tile/bamboo/tatami, req_amount = 1, res_amount = 4, max_res_amount = 20),
new /datum/stack_recipe("purple tatami", /obj/item/stack/tile/bamboo/tatami/purple, req_amount = 1, res_amount = 4, max_res_amount = 20),
new /datum/stack_recipe("black tatami", /obj/item/stack/tile/bamboo/tatami/black, req_amount = 1, res_amount = 4, max_res_amount = 20),
)),
null,
new /datum/stack_recipe_list("bamboo benches", list(
new /datum/stack_recipe("bamboo bench (middle)", /obj/structure/chair/sofa/bamboo, req_amount = 3, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("bamboo bench (left)", /obj/structure/chair/sofa/bamboo/left, req_amount = 3, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("bamboo bench (right)", /obj/structure/chair/sofa/bamboo/right, req_amount = 3, time = 1 SECONDS, one_per_turf = TRUE, on_floor = TRUE)
)),
))
/obj/item/stack/sheet/bamboo
name = "bamboo cuttings"
desc = "Finely cut bamboo sticks."
singular_name = "cut bamboo stick"
icon = 'icons/obj/stacks/organic.dmi'
icon_state = "sheet-bamboo"
item_state = "sheet-bamboo"
resistance_flags = FLAMMABLE
sheettype = "bamboo"
merge_type = /obj/item/stack/sheet/bamboo
/obj/item/stack/sheet/bamboo/New(loc, amount=null)
recipes = GLOB.bamboo_recipes
return ..()
/obj/item/stack/sheet/bamboo/fifty
amount = 50
/*
* Cloth
*/
code/game/objects/items/stacks/stack_recipe.dm
+25 -4
View File
@@ -3,19 +3,40 @@
* Recipe datum
*/
/datum/stack_recipe
/// Visible title of recipe
var/title = "ERROR"
/// Resulting typepath of crafted atom
var/result_type
/// Required stack amount to make
var/req_amount = 1
/// Amount of atoms made
var/res_amount = 1
/// Maximum amount of atoms made
var/max_res_amount = 1
/// Time to make
var/time = 0
var/one_per_turf = 0
var/on_floor = 0
var/on_floor_or_lattice = 0
/// Only one resulting atom is allowed per turf
var/one_per_turf = FALSE
/// Requires a floor underneath to make
var/on_floor = FALSE
/// Requires a floor OR lattice underneath to make
var/on_floor_or_lattice = FALSE
/// Requires a valid window location to make
var/window_checks = FALSE
/// Resulting atom is a cult structure
var/cult_structure = FALSE
/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = 0, on_floor = 0, on_floor_or_lattice = 0, window_checks = FALSE, cult_structure = FALSE)
/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1, time = 0, one_per_turf = FALSE, on_floor = FALSE, on_floor_or_lattice = FALSE, window_checks = FALSE, cult_structure = FALSE)
src.title = title
src.result_type = result_type
src.req_amount = req_amount
code/game/objects/items/stacks/tiles/tile_types.dm
+46
View File
@@ -68,6 +68,52 @@
energy_type = /datum/robot_storage/energy/wood_tile
is_cyborg = TRUE
//Bamboo
/obj/item/stack/tile/bamboo
name = "bamboo mat pieces"
singular_name = "bamboo mat piece"
gender = PLURAL
desc = "A piece of a bamboo mat with a decorative trim."
icon_state = "tile_bamboo"
turf_type = /turf/simulated/floor/bamboo
merge_type = /obj/item/stack/tile/bamboo
parent_stack = TRUE
resistance_flags = FLAMMABLE
/obj/item/stack/tile/bamboo/twenty
amount = 20
/obj/item/stack/tile/bamboo/tatami
name = "tatami with green rim"
singular_name = "green tatami floor tile"
icon_state = "tile_tatami_green"
turf_type = /turf/simulated/floor/bamboo/tatami
merge_type = /obj/item/stack/tile/bamboo/tatami
/obj/item/stack/tile/bamboo/tatami/twenty
amount = 20
/obj/item/stack/tile/bamboo/tatami/purple
name = "tatami with purple rim"
singular_name = "purple tatami floor tile"
icon_state = "tile_tatami_purple"
turf_type = /turf/simulated/floor/bamboo/tatami/purple
merge_type = /obj/item/stack/tile/bamboo/tatami/purple
/obj/item/stack/tile/bamboo/tatami/purple/twenty
amount = 20
/obj/item/stack/tile/bamboo/tatami/black
name = "tatami with black rim"
singular_name = "black tatami floor tile"
icon_state = "tile_tatami_black"
turf_type = /turf/simulated/floor/bamboo/tatami/black
merge_type = /obj/item/stack/tile/bamboo/tatami/black
/obj/item/stack/tile/bamboo/tatami/black/twenty
amount = 20
//Carpets
/obj/item/stack/tile/carpet
name = "carpet"
code/game/objects/items/weapons/twohanded.dm
+7
View File
@@ -321,6 +321,13 @@
throwforce = 22
armour_penetration_percentage = 15 //Enhanced armor piercing
//Blatant imitation of spear, but all natural. Also not valid for explosive modification.
/obj/item/spear/bamboo
name = "bamboo spear"
desc = "A haphazardly-constructed bamboo stick with a sharpened tip, ready to poke holes into unsuspecting people."
base_icon_state = "bamboo_spear"
icon_state = "bamboo_spear0"
throwforce = 22
//GREY TIDE
/obj/item/spear/grey_tide