From 8d5030f3a733df3ec70b15190d09840f6ce42ec6 Mon Sep 17 00:00:00 2001 From: uraniummeltdown Date: Tue, 16 Jan 2018 09:02:18 +0500 Subject: [PATCH] rename all 'clown' to 'bananium' for bananium mineral objects (#34462) --- .../lavaland_biodome_clown_planet.dmm | 20 +++++++++--------- _maps/RandomRuins/SpaceRuins/asteroid4.dmm | 2 +- .../SpaceRuins/crashedclownship.dmm | 4 ++-- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 2 +- _maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 2 +- _maps/RandomZLevels/spacebattle.dmm | 2 +- code/datums/components/material_container.dm | 2 +- code/game/machinery/doors/airlock_types.dm | 4 ++-- .../objects/items/stacks/sheets/mineral.dm | 8 +++---- .../objects/structures/door_assembly_types.dm | 4 ++-- code/game/objects/structures/false_walls.dm | 6 +++--- code/game/turfs/simulated/minerals.dm | 4 ++-- .../turfs/simulated/wall/mineral_walls.dm | 4 ++-- code/modules/mining/ores_coins.dm | 2 +- icons/obj/mining.dmi | Bin 66640 -> 66639 bytes icons/turf/mining.dmi | Bin 35516 -> 35517 bytes 16 files changed, 33 insertions(+), 33 deletions(-) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index b6414d27049..1f087a6dc87 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -442,7 +442,7 @@ }, /area/ruin/powered/clownplanet) "bp" = ( -/turf/closed/mineral/clown, +/turf/closed/mineral/bananium, /area/ruin/powered/clownplanet) "bq" = ( /obj/item/pickaxe, @@ -628,10 +628,10 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bS" = ( -/obj/item/coin/clown, -/obj/item/coin/clown, -/obj/item/coin/clown, -/obj/item/coin/clown, +/obj/item/coin/bananium, +/obj/item/coin/bananium, +/obj/item/coin/bananium, +/obj/item/coin/bananium, /obj/machinery/light/small{ dir = 8 }, @@ -671,7 +671,7 @@ }, /area/ruin/powered/clownplanet) "bZ" = ( -/obj/machinery/door/airlock/clown, +/obj/machinery/door/airlock/bananium, /turf/open/indestructible/sound{ icon_state = "bananium"; name = "bananium floor"; @@ -803,10 +803,10 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "dL" = ( -/obj/item/coin/clown, -/obj/item/coin/clown, -/obj/item/coin/clown, -/obj/item/coin/clown, +/obj/item/coin/bananium, +/obj/item/coin/bananium, +/obj/item/coin/bananium, +/obj/item/coin/bananium, /obj/machinery/light/small{ dir = 4 }, diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm index acdc6575127..c6234672bfd 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm @@ -18,7 +18,7 @@ /turf/closed/mineral/random/high_chance, /area/ruin/unpowered) "g" = ( -/turf/closed/mineral/clown, +/turf/closed/mineral/bananium, /area/ruin/unpowered) "h" = ( /turf/open/floor/plating/asteroid/airless, diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 76197719333..3eb74e5dfb6 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -9,10 +9,10 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "d" = ( -/turf/closed/wall/mineral/clown, +/turf/closed/wall/mineral/bananium, /area/ruin/unpowered) "e" = ( -/obj/machinery/door/airlock/clown, +/obj/machinery/door/airlock/bananium, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "f" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index 2a1fc96a1b4..54c97ce1ebb 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -2300,7 +2300,7 @@ /turf/closed/mineral/diamond, /area/awaymission/BMPship) "hw" = ( -/turf/closed/mineral/clown, +/turf/closed/mineral/bananium, /area/awaymission/BMPship) "hx" = ( /obj/structure/frame/computer{ diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 2ca7883db41..01b743f341e 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -72,7 +72,7 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "ao" = ( -/obj/item/coin/clown, +/obj/item/coin/bananium, /turf/open/floor/engine, /area/tcommsat/chamber) "ap" = ( diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index f957ba259a9..9f3b0c8fc17 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -2474,7 +2474,7 @@ /turf/open/floor/mineral/plastitanium/airless, /area/space/nearstation) "iE" = ( -/turf/closed/mineral/clown, +/turf/closed/mineral/bananium, /area/space/nearstation) "iF" = ( /obj/machinery/door/airlock/external, diff --git a/code/datums/components/material_container.dm b/code/datums/components/material_container.dm index 2cdbf7196de..e91aa3a89e7 100644 --- a/code/datums/components/material_container.dm +++ b/code/datums/components/material_container.dm @@ -339,7 +339,7 @@ name = "Bananium" id = MAT_BANANIUM sheet_type = /obj/item/stack/sheet/mineral/bananium - coin_type = /obj/item/coin/clown + coin_type = /obj/item/coin/bananium /datum/material/titanium name = "Titanium" diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index 08e5b42a46e..c0ebce67b07 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -226,14 +226,14 @@ opacity = 0 glass = TRUE -/obj/machinery/door/airlock/clown +/obj/machinery/door/airlock/bananium name = "bananium airlock" desc = "Honkhonkhonk" icon = 'icons/obj/doors/airlocks/station/bananium.dmi' assemblytype = /obj/structure/door_assembly/door_assembly_bananium doorOpen = 'sound/items/bikehorn.ogg' -/obj/machinery/door/airlock/clown/glass +/obj/machinery/door/airlock/bananium/glass opacity = 0 glass = TRUE diff --git a/code/game/objects/items/stacks/sheets/mineral.dm b/code/game/objects/items/stacks/sheets/mineral.dm index e44366daec1..c2a3feac38c 100644 --- a/code/game/objects/items/stacks/sheets/mineral.dm +++ b/code/game/objects/items/stacks/sheets/mineral.dm @@ -231,20 +231,20 @@ GLOBAL_LIST_INIT(silver_recipes, list ( \ */ /obj/item/stack/sheet/mineral/bananium name = "bananium" - icon_state = "sheet-clown" + icon_state = "sheet-bananium" singular_name = "bananium sheet" - sheettype = "clown" + sheettype = "bananium" materials = list(MAT_BANANIUM=MINERAL_MATERIAL_AMOUNT) novariants = TRUE grind_results = list("banana" = 20) -GLOBAL_LIST_INIT(clown_recipes, list ( \ +GLOBAL_LIST_INIT(bananium_recipes, list ( \ new/datum/stack_recipe("bananium tile", /obj/item/stack/tile/mineral/bananium, 1, 4, 20), \ new/datum/stack_recipe("Clown Statue", /obj/structure/statue/bananium/clown, 5, one_per_turf = 1, on_floor = 1), \ )) /obj/item/stack/sheet/mineral/bananium/Initialize(mapload, new_amount, merge = TRUE) - recipes = GLOB.clown_recipes + recipes = GLOB.bananium_recipes . = ..() /* diff --git a/code/game/objects/structures/door_assembly_types.dm b/code/game/objects/structures/door_assembly_types.dm index cdbdbdfb322..b4e8b19aacb 100644 --- a/code/game/objects/structures/door_assembly_types.dm +++ b/code/game/objects/structures/door_assembly_types.dm @@ -206,9 +206,9 @@ desc = "Honk." icon = 'icons/obj/doors/airlocks/station/bananium.dmi' base_name = "bananium airlock" - airlock_type = /obj/machinery/door/airlock/clown + airlock_type = /obj/machinery/door/airlock/bananium mineral = "bananium" - glass_type = /obj/machinery/door/airlock/clown/glass + glass_type = /obj/machinery/door/airlock/bananium/glass /obj/structure/door_assembly/door_assembly_sandstone name = "sandstone airlock assembly" diff --git a/code/game/objects/structures/false_walls.dm b/code/game/objects/structures/false_walls.dm index ebeb065b2aa..03a9b2a0706 100644 --- a/code/game/objects/structures/false_walls.dm +++ b/code/game/objects/structures/false_walls.dm @@ -261,14 +261,14 @@ if(exposed_temperature > 300) burnbabyburn() -/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 = "bananium" mineral = /obj/item/stack/sheet/mineral/bananium - walltype = /turf/closed/wall/mineral/clown - canSmoothWith = list(/obj/structure/falsewall/clown, /turf/closed/wall/mineral/clown) + walltype = /turf/closed/wall/mineral/bananium + canSmoothWith = list(/obj/structure/falsewall/bananium, /turf/closed/wall/mineral/bananium) /obj/structure/falsewall/sandstone diff --git a/code/game/turfs/simulated/minerals.dm b/code/game/turfs/simulated/minerals.dm index 47ec9d032b5..3fab8737ba5 100644 --- a/code/game/turfs/simulated/minerals.dm +++ b/code/game/turfs/simulated/minerals.dm @@ -322,12 +322,12 @@ defer_change = 1 -/turf/closed/mineral/clown +/turf/closed/mineral/bananium mineralType = /obj/item/ore/bananium mineralAmt = 3 spreadChance = 0 spread = 0 - scan_state = "rock_Clown" + scan_state = "rock_Bananium" /turf/closed/mineral/bscrystal diff --git a/code/game/turfs/simulated/wall/mineral_walls.dm b/code/game/turfs/simulated/wall/mineral_walls.dm index e8975c41aaa..e73377cb504 100644 --- a/code/game/turfs/simulated/wall/mineral_walls.dm +++ b/code/game/turfs/simulated/wall/mineral_walls.dm @@ -34,13 +34,13 @@ explosion_block = 3 canSmoothWith = list(/turf/closed/wall/mineral/diamond, /obj/structure/falsewall/diamond) -/turf/closed/wall/mineral/clown +/turf/closed/wall/mineral/bananium name = "bananium wall" desc = "A wall with bananium plating. Honk!" icon = 'icons/turf/walls/bananium_wall.dmi' icon_state = "bananium" sheet_type = /obj/item/stack/sheet/mineral/bananium - canSmoothWith = list(/turf/closed/wall/mineral/clown, /obj/structure/falsewall/clown) + canSmoothWith = list(/turf/closed/wall/mineral/bananium, /obj/structure/falsewall/bananium) /turf/closed/wall/mineral/sandstone name = "sandstone wall" diff --git a/code/modules/mining/ores_coins.dm b/code/modules/mining/ores_coins.dm index 65b2b47117e..4f11f1328e6 100644 --- a/code/modules/mining/ores_coins.dm +++ b/code/modules/mining/ores_coins.dm @@ -364,7 +364,7 @@ value = 80 materials = list(MAT_URANIUM = MINERAL_MATERIAL_AMOUNT*0.2) -/obj/item/coin/clown +/obj/item/coin/bananium name = "bananium coin" cmineral = "bananium" icon_state = "coin_bananium_heads" diff --git a/icons/obj/mining.dmi b/icons/obj/mining.dmi index da070e618c6525b3a9f256f443484b0edd48b194..9fb4ab3b20feed56abd0ce0c819798a4ec1ce755 100644 GIT binary patch delta 839 zcmV-N1GxOqhy>4w1dt?uCwf#^bVOxyV{&P5bZKvH004NLwV1(f+b|4<&+$_T?bR*f zw86GR4l5D_8PH-tH|%K8mSS^}DMON-c2B>9+s4`Aif++E00;PfilQXyx6j4RYQ4D= z%iB%VD(ldYScvP(X*AiR^rcvct64ND6&9uM{x}a_iG?_G;PX;{>9c4e(K@jZNi^A7 zs8sj-!WpYF^AN-`Bo33-U_C;3*bFJ%HaZMSRcrH@TktB#TEJew&%;oP&vqpzchR2m+|LL_k#C-EuyX=#rPF5FiM z6_7_#!r1US-v9xBVNFLve>l-=Xj*iypS7fhy`+(?;2bMtZ?_JTV+|O(@+GV zpO#a21S#*=axF+{7J!>Q>oNFn=#}I5!n|>0zS< z?38*EZd%z>uVmuYqc1InuVq&%d*O-wUaLq1UH`H4auBGj1g;9+o8 zdkt_ljg#Yl4)_kO3}_EFFr&*J;hYX@TE;7u ztAUYf2KJ(OKI|--+YmCa7klIw!S3E8vmb%-?^7~=dqz=ns9mGO$+kx4K$xcvhV9oO z1tb-oRmSm_8P8B=Oc#ly_Ib12hRGf4ec3``h<7@AEMr1_n(ID1`Z4a~8E5aQ7Xde+ zT7w&zR9`a6$Bszu#}mr(M->v*nD4lqwYzVUk$BorUV<%D_;5Y9O$SmkPHt|HMd}M=F1D90;0sE|!qGJF6 delta 840 zcmV-O1GoIohy>7x1dt?uD0);_bVOxyV{&P5bZKvH004NLwU|*)+b|HvpPNr%!D~QG zq1yJ)hiyfONuWt=+GBJ{OmeGp7uik<`}BJVwCP6h1;j(8RQmnTf1mC1CCBQ^#pTtF zT3=s9owg2{)JmP7&ZF5D3ty>~I$K1uN@H31{*UwEwOXko2R^TVv^k1q1zM+8Dv4%y z7HZu;?>M$PwxdpF-tOXnd{5TG!NM2i~bB|2Z z73t0G#Vb^|7r$OL)~i&4u}UnVuxLzLbGN6@2lRO~E3||{CVks3@+T~ z0%{cI*sGQL z6fX`APp>c8jEbK@#WN|{6yiy={o)Gg#(=9~5-hg;h)a!sJ2aiPlVJH?=y9nP*cGtJ z0`oUKg!xyrvwDyj`=anG&mza4b^s>Ufry=*)jR;=4ln%yIBdPuH zUx1gxjHG+uV=<4Dc==8dQY;C*AldhtINgFJq;O4tY!K7THIR>FdihME_7NJ)H*i0? zs)Opcn8(R~VflN5wg_nV4ayq^X{CcSQt&tAn+ob$u#Oc_@lR(p)*bg3kPQ9?EsbuY z!B#w*$4PuPAEv`<#{{0k-gji$2H6@3sZ2X=MYW`4gW#*Q!a}h416WXE4{%9&@!%KDYVLHc$*Yx0qGNS&vsUZttLQKP S&dIJ}8CgbyR0Ee(0|EOL{G#*# diff --git a/icons/turf/mining.dmi b/icons/turf/mining.dmi index 8770f77cd98d582a14e7f44cb7cfc7edf43658ae..3cb60d45b14b236daa396ea3d2e5df3334780093 100644 GIT binary patch delta 291 zcmV+;0o?w)l>)t$0+1ws3VKvnbVOxyV{&P5bZKvH004NLmC~_l!!QuW@!5KcBUw$U z61PnU4NV<_hvXH^#Zs-Kwp1iF#&6%DL!gjaHwu3G^9i(u{o&Z0p*}U@YC+w^;g36lW@tKhrO_DGlH9VOFZm*{F%qRf1P?<~45^HqbN zINVZiIX;p$ZDd%-uoJ^(?rnl!UVzbN)izmb&dE)fOqjF&%Z*BgUEX@LTZXL|_K9Ji p8TN%?cMSWwXyaEEAlKhxYdD;1s85af0cvrOdp5!OVzV{@hKZ$Wk4XRk delta 290 zcmV+-0p0$+l>)q#0+1ws33^mmbVOxyV{&P5bZKvH004NLmD0~@!!Qg6@N@hWqP>PO zx7ojg58F~o4(%%hHSuDx)E>5J$lLGGLt)TGIvRfd_$0K3kKMjGLVak|#l}RzgMsSd zQ56&Q*@1!WMitJ|;PUm6GG+?~Rxxzn?Ve6Kc*?fLF4M)XRMAs^OkhB(;w$3WCNNN` zqPHW?U_h6;)TO=~L;k;@zyIEQJfqL#nf^22$dqH4Jd5)3Mm&Ycqds&Fea9SW43mUA z8l1!@>TR0@mbbL4odlNIw~1l70Vc;v+pyHkiJLInIJ55MMzz2$cfHxIz*YkLB(To{ o`y#Nf0{gaT(@!K6Kip$$*d1%A4~_Z-mAH>n{=r;Bvo`^TiRgKjIRF3v