From 8edfdfa1561277f4ff1294b18ecf3aae5aa6ed58 Mon Sep 17 00:00:00 2001 From: BurgerLUA Date: Sun, 9 Sep 2018 04:39:37 -0700 Subject: [PATCH] Battlemonster and other fixes (#5242) Fixed the battlemonster coin not having a sprite. (Unreported) Fixed legendary battlemonster cards not appearing in vendors. (Unreported) Fixed new battlemonster decks incorrectly displaying 0 cards. (Unreported) Fixes #5212 Fixed potential powernet issue with surface by removing redundant wires. --- code/game/machinery/vending_types.dm | 5 +- code/modules/battlemonsters/items/deck.dm | 2 +- code/modules/battlemonsters/items/wrapped.dm | 1 + html/changelogs/burgerbb-morefixes.yml | 41 ++++++ icons/obj/items.dmi | Bin 86692 -> 86692 bytes maps/aurora/aurora-4_mainlevel.dmm | 31 +++-- maps/aurora/aurora-6_surface.dmm | 135 +++++++------------ 7 files changed, 111 insertions(+), 104 deletions(-) create mode 100644 html/changelogs/burgerbb-morefixes.yml diff --git a/code/game/machinery/vending_types.dm b/code/game/machinery/vending_types.dm index 0af329af996..7aca17a8e6c 100644 --- a/code/game/machinery/vending_types.dm +++ b/code/game/machinery/vending_types.dm @@ -861,11 +861,10 @@ /obj/item/battle_monsters/wrapped/species/lizard = 150, /obj/item/battle_monsters/wrapped/species/cat = 150, /obj/item/battle_monsters/wrapped/species/ant = 150, - /obj/item/battle_monsters/wrapped/rare = 200, - /obj/item/battle_monsters/wrapped/legendary = 400 + /obj/item/battle_monsters/wrapped/rare = 200 ) contraband = list( - /obj/item/battle_monsters/wrapped/legendary = 1 + /obj/item/battle_monsters/wrapped/legendary = 2 ) premium = list( /obj/item/weapon/coin/battlemonsters = 10 diff --git a/code/modules/battlemonsters/items/deck.dm b/code/modules/battlemonsters/items/deck.dm index a55946780ac..b0aa2d30ffb 100644 --- a/code/modules/battlemonsters/items/deck.dm +++ b/code/modules/battlemonsters/items/deck.dm @@ -6,8 +6,8 @@ var/deck_size = 52 /obj/item/battle_monsters/deck/Initialize() - update_icon() . = ..() + update_icon() /obj/item/battle_monsters/deck/proc/get_top_card() return stored_card_names[stored_card_names.len] diff --git a/code/modules/battlemonsters/items/wrapped.dm b/code/modules/battlemonsters/items/wrapped.dm index e6cbc6e9bb0..91b5145e7b4 100644 --- a/code/modules/battlemonsters/items/wrapped.dm +++ b/code/modules/battlemonsters/items/wrapped.dm @@ -37,6 +37,7 @@ GenerateCards(user,generated_deck) user.drop_from_inventory(src) user.put_in_active_hand(generated_deck) + generated_deck.update_icon() qdel(src) /obj/item/battle_monsters/wrapped/pro diff --git a/html/changelogs/burgerbb-morefixes.yml b/html/changelogs/burgerbb-morefixes.yml new file mode 100644 index 00000000000..970e0888477 --- /dev/null +++ b/html/changelogs/burgerbb-morefixes.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +################################# + +# Your name. +author: BurgerBB + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixed the battlemonster coin not having a sprite." + - bugfix: "Fixed legendary battlemonster cards not appearing in vendors." + - bugfix: "Fixed new battlemonster decks incorrectly displaying 0 cards." + - bugfix: "Fixed hydroponics having the wrong wood floor tiles." + - bugfix: "Fixed potential looping powernet issue with surface." \ No newline at end of file diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 04e89d7df9c5e6cf7fa8606e1c494b5f8d3bbd6b..e1e6bcfc051708a55f31356b60a2bb5a2ffa0b80 100644 GIT binary patch delta 804 zcmV+<1Ka$hr3Iv=1+bO_e}X|h)T#v2Q7N8B4Y_ctUwz9PEJ;Fd^o5hBdS;aeeF4Jl z9Fb@yN3lEleib~sOCIjl_ZOFmtJt36&i~^f6Z(*dg5SvQz_POrr~;m78VMnD^aA)6Z>QiO zCs>LjR>ykZ+3MIyQLVpYXDE>0BbCFbX{mMn+~TZB{kVQyKmKF@YyzCrG;*qUI2Oz((8ea;e*vL>9JJI^s;&6?P_GgT zaHNfr642W}q*z?g_U6LE8Sp~Gr7urdJ^T`H9v`pDG!)_5s&8#&x29@fV;!)u0vJ8z zBK3CD1&!B}4tztoq|^iFGZt2|(5Md2R0g=Rb)aD_Z#=4I=F%qUWB_YAGeKnyB*}Bm zgCN=UI}=#ie}xe&u0d3j7)*ppC?ki`g4QLxp;fR;Q{f0TW!^~O@h7%EtDdG;pd3Qe zE3)J-NWUUUD2B&a>h+C<#bPp&P>h$l z07|1K6FmV<@iW%U0)O|m$pQW3Y?Fh|c%vZb3?B+cd6ZRnW+FrMIO}du+O-} zGuB#Iz81k67E9D^DM&8phbU;*qKIb`J>{{UM-}l5_aX)+7Y7ZTp~UMPucwX2I>Vvb i@ayW!5nrEIpa1-N`#+hBRxTh=EmVV{2DhOG0Rv2>*OD#( delta 804 zcmV+<1Ka$hr3Iv=1+bO_e*)~GRwZmYD#i1tAs0^dt8aOOB}wRwzHstX&#dyGFF?4R zBNENzD0WBRuYzZH$-~|H{^Bxm728wX`F}iQLLU-Q@Eh43SaujFIG4oNR~vo!!Ktx9 z?Nkb<3}o8}vL3v0Pj=r%&xwN_>d6R(En{Yzcy>vki}dfY!2NcDe}S9r1lKe7Gq|3= zpTWPi!2blYH)m|pxg+3y0J*IsHvGLv=qJeo)NT9Gq+W0FRQP*G-fJ)&QsTcbm{KlC zR(Z0iue%aZxmSunt28S`$9@8ii>ws$J~%-GJo}UA#7GTu4i^ z#?lU`m#{N&Kr%Gjf6#xl4QR9hPTOB(os`Yp53oT$Da&fywa6<|MtTu>*`qB z3Ay#(nPp2?4wHXQ!O^ zjB^{uV!)>I8_tOGVy0Hdc| zq~312pz(Urfo~|6lzQNN#==S#8r9*M$^cik4m7OgjYrkYT-pSk3}8)XCaA1|Bzewx z5G1>PX97#Re=vf@HHc~wgNaZHW#mv=(7J>-v0X2)zkC}ltXBG zMb>`d>Q9Xl8O*+;&W=+@^=}Q1q|pd`j&;Iqn#Rrp=~pBP#qbzQy}q%qSWHF|it$nx zKxx!uq9>p!e#V+v;P2ixIiR1MZF0~VZxjTb;bWmle`)Epyy38zqe0vK+a&7Tr12(h z6xXGeP-3A`K^^p2!y%@b!c{lBKP3}SckBE2zuTL{vjq3!F10%@GZo;d$b;G)_8FIW z###%@*CJTMVu`vf1<3{d5C!d86!C1Lr##m4s3M->Uc|uU;-G;ulz5%v^|bL=XE;a~Ff52DhOG0Rv2LJeEZO diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index e31ec2adbf2..2439bf4fab6 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -3123,9 +3123,6 @@ /turf/simulated/open, /area/maintenance/disposal) "agu" = ( -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 4 - }, /obj/structure/cable/green{ d1 = 4; d2 = 8; @@ -3134,6 +3131,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ dir = 1 }, +/obj/machinery/atmospherics/pipe/manifold/hidden/supply, /turf/simulated/floor/tiled, /area/quartermaster/office) "agv" = ( @@ -5350,6 +5348,19 @@ /obj/machinery/vending/coffee, /turf/simulated/floor/tiled, /area/hallway/primary/central_one) +"akK" = ( +/obj/effect/floor_decal/corner/brown{ + icon_state = "corner_white"; + dir = 5 + }, +/obj/effect/floor_decal/industrial/loading{ + icon_state = "loadingarea"; + dir = 1 + }, +/obj/effect/floor_decal/industrial/outline/yellow, +/obj/machinery/atmospherics/unary/vent_pump/on, +/turf/simulated/floor/tiled, +/area/quartermaster/office) "akN" = ( /obj/structure/morgue{ icon_state = "morgue1"; @@ -63698,18 +63709,6 @@ /obj/item/weapon/material/knife, /turf/simulated/floor/tiled/white, /area/crew_quarters/kitchen) -"cxI" = ( -/obj/effect/floor_decal/corner/brown{ - icon_state = "corner_white"; - dir = 5 - }, -/obj/effect/floor_decal/industrial/loading{ - icon_state = "loadingarea"; - dir = 1 - }, -/obj/effect/floor_decal/industrial/outline/yellow, -/turf/simulated/floor/tiled, -/area/quartermaster/office) "cxJ" = ( /obj/effect/floor_decal/corner/brown{ dir = 10 @@ -89964,7 +89963,7 @@ bWF bWm cih cim -cxI +akK agu cxJ bWm diff --git a/maps/aurora/aurora-6_surface.dmm b/maps/aurora/aurora-6_surface.dmm index 55799b6b218..3283ce235cd 100644 --- a/maps/aurora/aurora-6_surface.dmm +++ b/maps/aurora/aurora-6_surface.dmm @@ -14220,26 +14220,22 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 1 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, /obj/structure/cable/green{ d1 = 2; d2 = 8; icon_state = "2-8" }, -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" - }, /obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 1 + }, +/obj/structure/disposalpipe/junction, /turf/simulated/floor/tiled, -/area/hallway/secondary/entry/fore) +/area/hallway/secondary/entry/aft) "Ad" = ( /obj/machinery/atmospherics/pipe/simple/hidden, /obj/machinery/atmospherics/pipe/simple/hidden/supply{ @@ -15678,6 +15674,22 @@ /obj/structure/disposalpipe/segment, /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) +"Df" = ( +/obj/structure/disposalpipe/segment, +/obj/structure/cable{ + d1 = 1; + d2 = 2; + icon_state = "1-2" + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/structure/cable{ + d1 = 2; + d2 = 4; + icon_state = "2-4" + }, +/turf/simulated/floor/plating, +/area/maintenance/arrivals) "Dg" = ( /obj/structure/bed/padded, /obj/item/weapon/bedsheet/mime, @@ -16667,30 +16679,28 @@ /turf/simulated/floor/tiled, /area/hallway/secondary/entry/aft) "Fe" = ( -/obj/structure/cable/green{ - d1 = 4; - d2 = 8; - icon_state = "4-8" +/obj/effect/floor_decal/corner/red{ + icon_state = "corner_white"; + dir = 9 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 1 +/obj/machinery/atmospherics/pipe/simple/hidden/supply{ + dir = 5 + }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + icon_state = "intact-scrubbers"; + dir = 5 }, /obj/structure/cable/green{ - d1 = 2; - d2 = 8; - icon_state = "2-8" + d1 = 1; + d2 = 2; + icon_state = "1-2" }, -/obj/structure/cable/green{ - d1 = 2; - d2 = 4; - icon_state = "2-4" +/obj/machinery/light{ + dir = 8 }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 1 - }, -/obj/structure/disposalpipe/junction, +/obj/machinery/firealarm/west, /turf/simulated/floor/tiled, -/area/hallway/secondary/entry/aft) +/area/hallway/secondary/exit) "Ff" = ( /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 9; @@ -19025,26 +19035,24 @@ /turf/simulated/open, /area/maintenance/arrivals) "IV" = ( -/obj/structure/disposalpipe/segment, -/obj/structure/cable{ +/obj/structure/cable/green{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, -/obj/machinery/atmospherics/pipe/simple/hidden/supply, -/obj/structure/cable{ - d1 = 1; - d2 = 4; - icon_state = "1-4" +/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ + dir = 8 }, -/obj/structure/cable{ +/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ + dir = 8 + }, +/obj/structure/cable/green{ d1 = 2; d2 = 4; icon_state = "2-4" }, -/turf/simulated/floor/plating, -/area/maintenance/arrivals) +/turf/simulated/floor/tiled, +/area/hallway/secondary/entry/aft) "IW" = ( /obj/random/junk, /obj/structure/disposalpipe/segment, @@ -19134,28 +19142,6 @@ }, /turf/simulated/floor/tiled, /area/hallway/secondary/exit) -"Jf" = ( -/obj/effect/floor_decal/corner/red{ - icon_state = "corner_white"; - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/supply{ - dir = 5 - }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - icon_state = "intact-scrubbers"; - dir = 5 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/light{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/exit) "Jg" = ( /obj/machinery/atmospherics/unary/vent_pump/on{ dir = 8 @@ -20082,25 +20068,6 @@ }, /turf/simulated/floor/plating, /area/sconference_room) -"KX" = ( -/obj/structure/cable/green{ - d1 = 1; - d2 = 2; - icon_state = "1-2" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{ - dir = 8 - }, -/obj/structure/cable/green{ - d1 = 1; - d2 = 4; - icon_state = "1-4" - }, -/obj/machinery/atmospherics/pipe/manifold/hidden/supply{ - dir = 8 - }, -/turf/simulated/floor/tiled, -/area/hallway/secondary/entry/aft) "KY" = ( /obj/machinery/door/firedoor, /obj/structure/grille, @@ -47968,7 +47935,7 @@ DW IO IQ HM -IV +Df HM Ja sU @@ -48908,7 +48875,7 @@ JI ly jx kr -Jf +Fe lB JQ lb @@ -48975,7 +48942,7 @@ DT Dt Dz Dz -Fe +Ac FB FB Gl @@ -49207,7 +49174,7 @@ wy uT yX jv -Ac +iJ oR pZ Bm @@ -49220,7 +49187,7 @@ CW Co Di Co -KX +IV Co Co Co