diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 3000a8ec2e8..80a7f4a86fe 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -18,36 +18,51 @@ /area/ruin/space) "an" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/food/meatball, +/obj/item/toy/plush/pkplush{ + pixel_y = 17 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) "ao" = ( -/obj/effect/decal/cleanable/dirt, -/turf/open/floor/iron/dark/airless{ - icon_state = "bus" +/obj/machinery/telecomms/server{ + pixel_y = 12; + layer = 2.91; + name = "tgsv3"; + desc = "It's, uh... pending an upgrade." }, +/turf/closed/mineral/ash_rock, /area/ruin/space) "ap" = ( /obj/structure/fluff/bus/passable/seat{ pixel_y = 15 }, +/obj/item/toy/plush/lizard_plushie/green{ + pixel_y = 17 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) "aq" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/food/meatball, /obj/effect/decal/cleanable/dirt, +/obj/item/clothing/head/helmet/knight{ + pixel_y = 16 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) "ar" = ( /obj/structure/fluff/bus/passable/seat, -/obj/item/food/grown/cherry_bomb, +/obj/item/grown/novaflower{ + pixel_y = 25 + }, +/obj/item/food/grown/watermelon{ + pixel_y = 17 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, @@ -55,7 +70,15 @@ "as" = ( /obj/structure/fluff/bus/passable/seat/driver, /obj/effect/decal/cleanable/dirt, -/obj/item/food/grown/citrus/orange, +/obj/item/toy/plush/moth{ + pixel_y = 28 + }, +/obj/item/food/grown/citrus/orange{ + pixel_y = 19 + }, +/obj/item/toy/talking/ai{ + pixel_y = 16 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, @@ -117,7 +140,13 @@ "aU" = ( /obj/structure/fluff/bus/passable/seat, /obj/effect/decal/cleanable/dirt, -/obj/item/food/meatball, +/obj/item/bodypart/arm/right{ + pixel_y = 26; + pixel_x = -4 + }, +/obj/item/food/meat/slab/penguin{ + pixel_y = 13 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, @@ -132,29 +161,38 @@ "aW" = ( /obj/structure/fluff/bus/passable/seat/driver, /obj/effect/decal/cleanable/dirt, +/obj/item/banhammer{ + pixel_y = 22 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) "aZ" = ( /obj/structure/fluff/bus/passable, -/obj/effect/decal/cleanable/dirt, -/obj/item/food/meatball, +/obj/structure/sacrificealtar, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) "ba" = ( -/obj/structure/fluff/bus/passable, -/obj/item/banhammer, +/obj/structure/fluff/bus/passable/seat, +/obj/effect/decal/cleanable/dirt, +/obj/effect/decal/cleanable/ants{ + pixel_y = 8; + pixel_x = 9 + }, +/obj/item/food/grown/tomato{ + pixel_y = 25 + }, +/obj/item/food/donut/plain{ + pixel_y = 16; + pixel_x = 1 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, /area/ruin/space) -"dI" = ( -/obj/item/food/meatball, -/turf/open/misc/asteroid/airless, -/area/ruin/space) "iE" = ( /obj/structure/table, /obj/item/pai_card, @@ -239,6 +277,21 @@ }, /turf/open/misc/asteroid/airless, /area/ruin/space) +"FZ" = ( +/obj/effect/decal/cleanable/dirt, +/obj/machinery/telecomms/server{ + pixel_y = 12; + layer = 2.91; + name = "tgsv3"; + desc = "It's, uh... pending an upgrade." + }, +/obj/item/toy/plush/awakenedplushie{ + pixel_y = 27 + }, +/turf/open/floor/iron/dark/airless{ + icon_state = "bus" + }, +/area/ruin/space) "Gf" = ( /obj/effect/decal/remains/human, /obj/item/clothing/suit/space, @@ -317,7 +370,13 @@ "XA" = ( /obj/structure/fluff/bus/passable/seat, /obj/effect/decal/cleanable/dirt, -/obj/item/toy/plush/awakenedplushie, +/obj/item/toy/singlecard{ + pixel_y = 25; + pixel_x = 0 + }, +/obj/item/food/grown/potato{ + pixel_y = 15 + }, /turf/open/floor/iron/dark/airless{ icon_state = "bus" }, @@ -379,10 +438,10 @@ ab yY Bw yY -dI +yY Ne -aU -az +am +aZ ER yY yY @@ -402,7 +461,7 @@ yY yY Ne am -aZ +ax Xj yY yY @@ -422,7 +481,7 @@ Bw yY Ne aV -ba +az IQ yY yY @@ -436,12 +495,12 @@ ab Gt yY Ne -am +FZ ax ER yY Ne -aU +am az KK yY @@ -496,7 +555,7 @@ ab ab yY Ne -ao +ba aA KK uO @@ -576,7 +635,7 @@ ab Ds yY Ne -am +aU aD KK yY @@ -601,7 +660,7 @@ aE ud yY yY -dI +yY yY aa aa @@ -697,7 +756,7 @@ ab ab ab ab -ab +ao yY yY yY diff --git a/code/__DEFINES/toys.dm b/code/__DEFINES/toys.dm index b13b1d18f1d..ffa3ea38861 100644 --- a/code/__DEFINES/toys.dm +++ b/code/__DEFINES/toys.dm @@ -5,3 +5,8 @@ #define DICE_BASICALLY_RIGGED 2 /// Dice has a 100% chance to land on a rigged value #define DICE_TOTALLY_RIGGED 3 + +/// card is considered face down +#define CARD_FACEDOWN 0 +/// card is considered face up +#define CARD_FACEUP 1 diff --git a/code/modules/cards/singlecard.dm b/code/modules/cards/singlecard.dm index 37524b343e6..adaa5cb328b 100644 --- a/code/modules/cards/singlecard.dm +++ b/code/modules/cards/singlecard.dm @@ -1,6 +1,3 @@ -#define CARD_FACEDOWN 0 -#define CARD_FACEUP 1 - /obj/item/toy/singlecard name = "card" desc = "A playing card used to play card games like poker." @@ -24,7 +21,7 @@ /// The name of the card var/cardname = "Ace of Spades" /// Is the card flipped facedown (FALSE) or flipped faceup (TRUE) - var/flipped = FALSE + var/flipped = CARD_FACEDOWN /// The card is blank and can be written on with a pen. var/blank = FALSE /// The color used to mark a card for cheating (by pens or crayons) @@ -48,6 +45,9 @@ if(parent_deck.holodeck) flags_1 |= HOLOGRAM_1 parent_deck.holodeck.spawned += src + if(mapload) + //maploaded card needs to be faceup anyways, and doing this will give it its name and appearance properly + Flip(CARD_FACEUP) register_context() @@ -109,11 +109,11 @@ * Flips the card over * * * Arguments: - * * orientation (optional) - Sets flipped state to CARD_FACEDOWN or CARD_FACEUP if given orientation (otherwise just invert the flipped state) + * * is_face_up (optional) - Sets flipped state to CARD_FACEDOWN or CARD_FACEUP if given (otherwise just invert the flipped state) */ -/obj/item/toy/singlecard/proc/Flip(orientation) - if(!isnull(orientation)) - flipped = orientation +/obj/item/toy/singlecard/proc/Flip(is_face_up) + if(!isnull(is_face_up)) + flipped = is_face_up else flipped = !flipped