Skip to content

Commit

Permalink
Removes edgy joke (#2635)
Browse files Browse the repository at this point in the history
<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Removes the edgy human trafficking joke poster. It was originally my
addition and I will politely request that I would prefer to not have it
exist in the codebase anymore if it is somehow deemed that this removal
is otherwise inappropriate.

<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Why It's Good For The Game
It was never that funny actually.
<!-- Please add a short description of why you think these changes would
benefit the game. If you can't justify it in words, it might not be
worth adding. -->

## Changelog

:cl:
del: Removed the edgy human trafficking/SGT joke poster
/:cl:

<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->
  • Loading branch information
tiramisuapimancer authored Jan 11, 2024
1 parent 7cf73b9 commit 8cf6030
Show file tree
Hide file tree
Showing 11 changed files with 9 additions and 14 deletions.
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3387,7 +3387,7 @@
"Zw" = (
/obj/structure/bed,
/obj/item/bedsheet/brown,
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/rilena/random{
pixel_y = 32
},
/obj/structure/spider/stickyweb,
Expand Down
2 changes: 1 addition & 1 deletion _maps/RandomRuins/SpaceRuins/spacemall.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3034,7 +3034,7 @@
/obj/effect/turf_decal/corner/transparent/lime{
dir = 4
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/retro/random{
pixel_y = 30
},
/obj/structure/table,
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_56x20.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@
pixel_x = 6;
pixel_y = 17
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/retro/random{
pixel_x = 32
},
/turf/open/floor/carpet/red,
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/hangar/nt_asteroid_56x40.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1147,7 +1147,7 @@
pixel_x = 6;
pixel_y = 17
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/retro/random{
pixel_x = 32
},
/turf/open/floor/carpet/red{
Expand Down
2 changes: 1 addition & 1 deletion _maps/outpost/nanotrasen_asteroid.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -14154,7 +14154,7 @@
pixel_y = 19;
pixel_x = 15
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/retro/random{
pixel_x = 32
},
/turf/open/floor/wood,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_beluga.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -4427,7 +4427,7 @@
/area/ship/crew/cryo)
"QA" = (
/obj/machinery/blackbox_recorder,
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/official/moth/epi{
pixel_x = 32
},
/obj/machinery/button/door{
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_tranquility.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1782,7 +1782,7 @@
/obj/effect/turf_decal/siding/wood{
dir = 6
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/rilena/random{
pixel_x = 32
},
/turf/open/floor/wood/walnut,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@
/obj/item/mop,
/obj/item/reagent_containers/glass/bucket,
/obj/machinery/firealarm/directional/west,
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/official/wtf_is_co2{
pixel_y = 32
},
/obj/effect/decal/cleanable/dirt/dust,
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -7848,7 +7848,7 @@
/obj/effect/turf_decal/corner/opaque/mauve{
dir = 8
},
/obj/structure/sign/poster/official/sgt{
/obj/structure/sign/poster/official/random{
pixel_x = -32
},
/obj/machinery/firealarm/directional/north,
Expand Down
5 changes: 0 additions & 5 deletions code/game/objects/effects/contraband.dm
Original file line number Diff line number Diff line change
Expand Up @@ -721,11 +721,6 @@
desc = "This informational poster teaches the viewer what carbon dioxide is."
icon_state = "poster_co2"

/obj/structure/sign/poster/official/sgt
name = "Sapient Trafficking Awareness"
desc = "A poster calling for an end to sapient trafficking. Over sixty percent of victims are jellywomen."
icon_state = "poster_sgt" // Maybe this will be what finally fixes it.

/obj/structure/sign/poster/official/focus
name = "Focus! Motivational Poster"
desc = "\"Focus! Let your energy be pinpointed!\""
Expand Down
Binary file modified icons/obj/contraband.dmi
Binary file not shown.

0 comments on commit 8cf6030

Please sign in to comment.