Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes edgy joke #2635

Merged
merged 2 commits into from
Jan 11, 2024
Merged

Removes edgy joke #2635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
43f456c
begone edge
tiramisuapimancer Jan 9, 2024
fb2f62b
removes mapped in ones
tiramisuapimancer Jan 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion _maps/RandomRuins/JungleRuins/jungle_abandoned_library.dmm
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
Binary file not shown.