cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-30 08:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Battlemonster and other fixes (#5242)

Browse Source 
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.
This commit is contained in:
BurgerLUA
2018-09-09 14:39:37 +03:00
committed by Erki
parent 330865d6bf
commit 8edfdfa156
7 changed files with 111 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/machinery/vending_types.dm
+2 -3
View File
@@ -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
code/modules/battlemonsters/items/deck.dm
+1 -1
View File
@@ -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]
code/modules/battlemonsters/items/wrapped.dm
+1
View File
@@ -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
html/changelogs/burgerbb-morefixes.yml
+41
View File
@@ -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."
icons/obj/items.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 85 KiB

maps/aurora/aurora-4_mainlevel.dmm
+15 -16
View File
@@ -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
maps/aurora/aurora-6_surface.dmm
+51 -84
View File
@@ -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