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

Redo of clown/mime door fix.

Browse Source
This commit is contained in:
GeneralChaos81
2016-09-12 20:11:54 +10:00
parent c589fbab34
commit c5e9b0514f
6 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/stacks/sheets/mineral.dm
+4 -4
View File
@@ -65,7 +65,7 @@ var/global/list/datum/stack_recipe/bananium_recipes = list ( \
new/datum/stack_recipe("bananium grenade casing", /obj/item/weapon/grenade/bananade/casing, 4, on_floor = 1), \
)
var/global/list/datum/stack_recipe/mime_recipes = list ( \
var/global/list/datum/stack_recipe/tranquillite_recipes = list ( \
new/datum/stack_recipe("silent tile", /obj/item/stack/tile/silent, 1, 4, 20), \
new/datum/stack_recipe("invisible wall", /obj/structure/barricade/mime, 5, one_per_turf = 1, on_floor = 1, time = 50), \
)
@@ -184,7 +184,7 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \
name = "bananium"
icon_state = "sheet-clown"
origin_tech = "materials=4"
sheettype = "clown"
sheettype = "bananium"
materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/sheet/mineral/bananium/New(var/loc, var/amount=null)
@@ -196,12 +196,12 @@ var/global/list/datum/stack_recipe/mime_recipes = list ( \
singular_name = "beret"
icon_state = "sheet-mime"
origin_tech = "materials=4"
sheettype = "mime"
sheettype = "tranquillite"
materials = list(MAT_TRANQUILLITE=MINERAL_MATERIAL_AMOUNT)
/obj/item/stack/sheet/mineral/tranquillite/New(var/loc, var/amount=null)
..()
recipes = mime_recipes
recipes = tranquillite_recipes
/obj/item/stack/sheet/mineral/enruranium
name = "enriched uranium"
code/game/objects/structures/false_walls.dm
+2 -2
View File
@@ -240,14 +240,14 @@
canSmoothWith = list(/obj/structure/falsewall/alien, /turf/simulated/wall/mineral/alien)
/obj/structure/falsewall/clown
/obj/structure/falsewall/bananium
name = "bananium wall"
desc = "A wall with bananium plating. Honk!"
icon = 'icons/turf/walls/bananium_wall.dmi'
icon_state = ""
mineral = "clown"
walltype = "clown"
canSmoothWith = list(/obj/structure/falsewall/clown, /turf/simulated/wall/mineral/clown)
canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/simulated/wall/mineral/bananium)
/obj/structure/falsewall/sandstone
name = "sandstone wall"