diff --git a/cev_eris.dme b/cev_eris.dme index 2e1403df454..f399f799d4b 100644 --- a/cev_eris.dme +++ b/cev_eris.dme @@ -849,7 +849,6 @@ #include "code\game\objects\effects\decals\Cleanable\robots.dm" #include "code\game\objects\effects\decals\Cleanable\tracks.dm" #include "code\game\objects\effects\decals\posters\asters.dm" -#include "code\game\objects\effects\decals\posters\bs12.dm" #include "code\game\objects\effects\decals\posters\erisposters.dm" #include "code\game\objects\effects\decals\posters\tgposters.dm" #include "code\game\objects\effects\map_effects\portals.dm" diff --git a/code/game/objects/effects/decals/posters/bs12.dm b/code/game/objects/effects/decals/posters/bs12.dm deleted file mode 100644 index 0efd9ab9c22..00000000000 --- a/code/game/objects/effects/decals/posters/bs12.dm +++ /dev/null @@ -1,35 +0,0 @@ -// baystation12 posters -/datum/poster/bay_31 - icon_state="bsposter31" - name = "Donut Corp" - desc = "This is an advertisement for Donut Corp, the new innovation in donut technology!" - -/datum/poster/bay_32 - icon_state="bsposter32" - name = "Eat!" - desc = "A poster depicting a hamburger. The poster orders you to consume the hamburger." - -/datum/poster/bay_33 - icon_state="bsposter33" - name = "Tools, tools, tools" - desc = "You can never have enough tools, thats for sure!" - -/datum/poster/bay_34 - icon_state="bsposter34" - name = "Power Up!" - desc = "High reward, higher risk!" - -/datum/poster/bay_35 - icon_state="bsposter35" - name = "Lamarr" - desc = "This is a poster depicting the pet and mascot of the science department." - -/datum/poster/bay_36 - icon_state="bsposter36" - name = "Fancy Borg" - desc = "A poster depicting a cyborg using the service module. 'Fancy Borg' is written on it." - -/datum/poster/bay_37 - icon_state="bsposter37" - name = "Fancier Borg" - desc = "A poster depicting a cyborg using the service module. 'Fancy Borg' is written on it. This is even fancier than the first poster." diff --git a/code/game/objects/effects/decals/posters/erisposters.dm b/code/game/objects/effects/decals/posters/erisposters.dm index 784fa7c65f5..05a55072548 100644 --- a/code/game/objects/effects/decals/posters/erisposters.dm +++ b/code/game/objects/effects/decals/posters/erisposters.dm @@ -19,3 +19,19 @@ name = "Roachburger" desc = "So crunchy, so juicy, so toxic, yum!" icon_state = "roachburger" + +/datum/poster/erisposters/paramedic + name = "Paramedic" + desc = "I got you covered!" + icon_state = "paramedic" + +/datum/poster/erisposters/chrome + name = "Chrome Up!" + desc = "About time you chromed the fuck up!" + icon_state = "chrome" + +/datum/poster/erisposters/stonks + name = "Stock Market" + desc = "Buy the dip, trust me." + icon_state = "stonks" + diff --git a/code/game/objects/effects/decals/posters/tgposters.dm b/code/game/objects/effects/decals/posters/tgposters.dm index cea704431f3..a09a0c05126 100644 --- a/code/game/objects/effects/decals/posters/tgposters.dm +++ b/code/game/objects/effects/decals/posters/tgposters.dm @@ -1,24 +1,4 @@ // /tg/ posters. -/datum/poster/tg_1 - name = "Free Tonto" - desc = "A framed shred of a much larger flag, colors bled together and faded from age." - icon_state="poster1" - -/datum/poster/tg_2 - name = "Atmosia Declaration of Independence" - desc = "A relic of a failed rebellion" - icon_state="poster2" - -/datum/poster/tg_3 - name = "Fun Police" - desc = "A poster condemning the station's security forces." - icon_state="poster3" - -/datum/poster/tg_5 - name = "Mercenary Recruitment Poster" - desc = "See the galaxy! Shatter corrupt megacorporations! Join today!" - icon_state="poster5" - /datum/poster/tg_6 name = "Clown" desc = "Honk." @@ -28,18 +8,3 @@ name = "Smoke" desc = "A poster depicting a carton of cigarettes." icon_state="poster7" - -/datum/poster/tg_8 - name = "Grey Tide" - desc = "A rebellious poster symbolizing assistant solidarity." - icon_state="poster8" - -/datum/poster/tg_9 - name = "Missing Gloves" - desc = "This poster is about the uproar that followed Nanotrasen's financial cuts towards insulated-glove purchases." - icon_state="poster9" - -/datum/poster/tg_10 - name = "Hacking Guide" - desc = "This poster details the internal workings of the common Nanotrasen airlock." - icon_state="poster10" diff --git a/code/modules/core_implant/cruciform/rituals/group.dm b/code/modules/core_implant/cruciform/rituals/group.dm index 328667c28fe..91b4411d1f7 100755 --- a/code/modules/core_implant/cruciform/rituals/group.dm +++ b/code/modules/core_implant/cruciform/rituals/group.dm @@ -124,7 +124,7 @@ stat_buff = STAT_ROB /datum/ritual/group/cruciform/stat/vigilance - name = "Canto of Courage" + name = "Chant of Observance" desc = "Boosts Vigilance stat to 3 + 2 for each participant." phrase = "Vigilia exemplum imitari debemus." phrases = list( diff --git a/code/modules/mechs/equipment/utility.dm b/code/modules/mechs/equipment/utility.dm index 202c8c88188..083d3879a6e 100644 --- a/code/modules/mechs/equipment/utility.dm +++ b/code/modules/mechs/equipment/utility.dm @@ -903,7 +903,7 @@ platform.forceMove(src) /obj/item/mech_equipment/forklifting_system/Destroy() - if(currentlyLifting) + if(!QDELETED(currentlyLifting)) ejectLifting(get_turf(src)) if(platform) QDEL_NULL(platform) diff --git a/html/changelogs/archive/2024-07.yml b/html/changelogs/archive/2024-07.yml index a0a46ba8309..e7d5805d4da 100644 --- a/html/changelogs/archive/2024-07.yml +++ b/html/changelogs/archive/2024-07.yml @@ -9,3 +9,11 @@ Twomoon: - rscadd: Added new posters - imageadd: added some posters icons +2024-07-20: + MLGTASTICa: + - bugfix: Fixed a runtime relating to forklift bars + Twomoon: + - rscadd: Added posters + - rscdel: Removed some old posters + - imageadd: added 3 new posters + - imagedel: deleted some old posters diff --git a/icons/obj/contraband.dmi b/icons/obj/contraband.dmi index cefa537bd6f..e4e5924f3c9 100644 Binary files a/icons/obj/contraband.dmi and b/icons/obj/contraband.dmi differ diff --git a/maps/CEVEris/_CEV_Eris.dmm b/maps/CEVEris/_CEV_Eris.dmm index 188abc233c8..51ed06b2e9c 100644 --- a/maps/CEVEris/_CEV_Eris.dmm +++ b/maps/CEVEris/_CEV_Eris.dmm @@ -2276,6 +2276,10 @@ dir = 10 }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, +/obj/item/contraband/poster/placed{ + icon_state = "ironhammer"; + pixel_x = 32 + }, /turf/floor/wood, /area/eris/command/commander) "afJ" = ( @@ -3350,6 +3354,10 @@ /area/eris/crew_quarters/sleep) "aih" = ( /obj/machinery/atmospherics/unary/vent_pump/on, +/obj/item/contraband/poster/placed{ + icon_state = "ironhammer2"; + pixel_x = 32 + }, /turf/floor/tiled/dark, /area/eris/security/exerooms) "aii" = ( @@ -23205,6 +23213,10 @@ d2 = 4; icon_state = "0-4" }, +/obj/item/contraband/poster/placed{ + icon_state = "chrome"; + pixel_x = -32 + }, /turf/floor/plating, /area/eris/maintenance/substation/section2) "bfd" = ( @@ -25651,6 +25663,10 @@ "bkM" = ( /obj/structure/table/standard, /obj/item/storage/box/bodybags, +/obj/item/contraband/poster/placed{ + icon_state = "chrome"; + pixel_x = 32 + }, /turf/floor/tiled/white/brown_perforated, /area/eris/rnd/lab) "bkN" = ( @@ -32174,6 +32190,10 @@ /obj/spawner/pack/gun_loot, /obj/spawner/pack/rare/low_chance, /obj/spawner/pack/rare/low_chance, +/obj/item/contraband/poster/placed{ + icon_state = "stonks"; + pixel_x = 32 + }, /turf/floor/plating/under, /area/eris/maintenance/section3deck1central) "bAP" = ( @@ -44054,6 +44074,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/blue{ dir = 6 }, +/obj/item/contraband/poster/placed{ + icon_state = "chrome"; + pixel_y = 32 + }, /turf/floor/plating/under, /area/eris/maintenance/section3deck4central) "cdG" = ( @@ -48684,6 +48708,10 @@ /obj/machinery/atmospherics/pipe/simple/hidden/supply{ dir = 5 }, +/obj/item/contraband/poster/placed{ + icon_state = "roachburger"; + pixel_x = -32 + }, /turf/floor/plating/under, /area/eris/maintenance/section3deck4central) "coO" = ( @@ -51919,6 +51947,10 @@ /area/eris/maintenance/section4deck3port) "cxy" = ( /obj/spawner/material/resources/rare/low_chance, +/obj/item/contraband/poster/placed{ + icon_state = "founders"; + pixel_x = -32 + }, /turf/floor/tiled/techmaint, /area/eris/maintenance/oldtele) "cxz" = ( @@ -97691,6 +97723,16 @@ /obj/structure/disposalpipe/segment, /turf/floor/tiled/dark/golden, /area/eris/neotheology/churchcorridor) +"grn" = ( +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, +/obj/spawner/junk/low_chance, +/obj/spawner/junk/low_chance, +/obj/item/contraband/poster/placed{ + icon_state = "founders"; + pixel_y = 32 + }, +/turf/floor/plating/under, +/area/eris/maintenance/section4deck1central) "grN" = ( /obj/machinery/door/airlock/maintenance_common{ name = "Service Maintenance"; @@ -102167,6 +102209,13 @@ }, /turf/floor/tiled/steel, /area/eris/hallway/side/section3starboard) +"oYo" = ( +/obj/item/contraband/poster/placed{ + icon_state = "paramedic"; + pixel_y = -32 + }, +/turf/floor/tiled/white/techfloor, +/area/eris/medical/medeva) "oYV" = ( /obj/spawner/junk/low_chance, /obj/spawner/pack/machine, @@ -103490,6 +103539,15 @@ /obj/machinery/shield_diffuser, /turf/floor/hull, /area/eris/engineering/wastingroom) +"rKX" = ( +/obj/structure/bed/padded, +/obj/item/bedsheet/blue, +/obj/item/contraband/poster/placed{ + icon_state = "ironhammer"; + pixel_y = 32 + }, +/turf/floor/tiled/dark/gray_platform, +/area/eris/security/barracks) "rLq" = ( /obj/structure/table/standard, /obj/machinery/cooking_with_jane/grill, @@ -103761,6 +103819,14 @@ /obj/machinery/disposal, /turf/floor/tiled/dark/gray_platform, /area/eris/crew_quarters/janitor) +"seZ" = ( +/obj/spawner/junk/low_chance, +/obj/item/contraband/poster/placed{ + icon_state = "excel2"; + pixel_y = 32 + }, +/turf/floor/tiled/techmaint, +/area/eris/maintenance/section2deck1port) "sfs" = ( /obj/machinery/power/nt_obelisk, /turf/floor/grass, @@ -105443,6 +105509,17 @@ }, /turf/floor/tiled/steel/gray_platform, /area/eris/engineering/engine_room) +"vaH" = ( +/obj/spawner/scrap/dense/low_chance, +/obj/spawner/scrap/dense/low_chance, +/obj/spawner/scrap/dense/low_chance, +/obj/spawner/scrap/dense/low_chance, +/obj/item/contraband/poster/placed{ + icon_state = "excel1"; + pixel_x = 32 + }, +/turf/floor/tiled/techmaint, +/area/eris/maintenance/section2deck1port) "vci" = ( /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ dir = 4 @@ -171497,7 +171574,7 @@ aad aaa aaa aaf -aRP +rKX aSE aSQ aTr @@ -241852,7 +241929,7 @@ eFc eCf doo dpt -dpt +oYo dvi abF abF @@ -283867,7 +283944,7 @@ anQ anQ anQ anQ -aof +seZ ezf dQZ dNZ @@ -284268,7 +284345,7 @@ anQ anQ anQ anQ -dAJ +vaH dAJ anQ dWy @@ -289165,7 +289242,7 @@ ekg ekW elw elE -elG +grn elG elG elG