Skip to content

Commit

Permalink
Tweaks to/removal of some indie stamps. (#4133)
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
- Captain's stamp - 

![obraz](https://github.com/user-attachments/assets/97a7c09a-c6e4-4622-afec-e73884f5253c)
- Head of Personel's stamp - replaced with a "First Officer" stamp
- Chaplain's stamp - repathed to `/roumain`, as that's the only place
where it's used - no other changes though
- Law stamp - removed, as it's unused and I don't think _will_ be used.
- Mime and clown stamps - reduced to atoms.
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

## Changelog

:cl:
fix: Captain's stamp no longer talks about stations.
tweak: Replaced HOP's stamp with FO's stamp.
code: Repathed chaplain's stamp into roumain stamp - no other changes
though.
del: Removed law, clown and mime stamps.
/: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
@Sadhorizon
Sadhorizon authored Feb 5, 2025
1 parent 7540157 commit 32e6a54
Show file tree
Hide file tree
Showing 24 changed files with 21 additions and 62 deletions.
2 changes: 0 additions & 2 deletions _maps/map_files/generic/CentCom.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -475,7 +475,6 @@
},
/obj/item/clipboard,
/obj/item/folder/blue,
/obj/item/stamp/law,
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
"akI" = (
Expand Down Expand Up @@ -535,7 +534,6 @@
/obj/structure/table/wood,
/obj/item/clipboard,
/obj/item/folder/blue,
/obj/item/stamp/law,
/turf/open/floor/plasteel/grimy,
/area/centcom/control)
"ala" = (
Expand Down
2 changes: 1 addition & 1 deletion _maps/shuttles/independent/independent_rigger.dmm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2590,7 +2590,7 @@
/obj/item/folder/blue{
pixel_x = 3
},
/obj/item/stamp/head_of_personnel{
/obj/item/stamp/officer{
name = "first mate's rubber stamp";
pixel_x = 8;
pixel_y = 7
Expand Down
4 changes: 0 additions & 4 deletions code/game/objects/items/storage/briefcase.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@
/obj/item/storage/briefcase/lawyer
folder_path = /obj/item/folder/blue

/obj/item/storage/briefcase/lawyer/PopulateContents()
new /obj/item/stamp/law(src)
..()

/obj/item/storage/briefcase/sniperbundle
desc = "Its label reads \"genuine hardened Captain leather\", but suspiciously has no other tags or branding. Smells like L'Air du Temps."
force = 10
Expand Down
5 changes: 1 addition & 4 deletions code/modules/asset_cache/asset_list_items.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,17 @@
/datum/asset/spritesheet/simple/paper
name = "paper"
assets = list(
"stamp-clown" = 'icons/stamp_icons/large_stamp-clown.png',
"stamp-deny" = 'icons/stamp_icons/large_stamp-deny.png',
"stamp-ok" = 'icons/stamp_icons/large_stamp-ok.png',
"stamp-void" = 'icons/stamp_icons/large_stamp-void.png',
"stamp-hop" = 'icons/stamp_icons/large_stamp-hop.png',
"stamp-fo" = 'icons/stamp_icons/large_stamp-fo.png',
"stamp-cmo" = 'icons/stamp_icons/large_stamp-cmo.png',
"stamp-ce" = 'icons/stamp_icons/large_stamp-ce.png',
"stamp-hos" = 'icons/stamp_icons/large_stamp-hos.png',
"stamp-rd" = 'icons/stamp_icons/large_stamp-rd.png',
"stamp-cap" = 'icons/stamp_icons/large_stamp-cap.png',
"stamp-qm" = 'icons/stamp_icons/large_stamp-qm.png',
"stamp-law" = 'icons/stamp_icons/large_stamp-law.png',
"stamp-chap" = 'icons/stamp_icons/large_stamp-chap.png',
"stamp-mime" = 'icons/stamp_icons/large_stamp-mime.png',
"stamp-syndicate" = 'icons/stamp_icons/large_stamp-syndicate.png',
"stamp-solgov" = 'icons/stamp_icons/large_stamp-solgov.png',
"stamp-inteq" = 'icons/stamp_icons/large_stamp-inteq.png',
Expand Down
7 changes: 1 addition & 6 deletions code/modules/clothing/outfits/factions/independent.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@
duffelbag = /obj/item/storage/backpack/duffelbag/captain
courierbag = /obj/item/storage/backpack/messenger/com

chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/officer)

/datum/outfit/job/independent/hop/western
name = "Independent - Head of Personnel (Western)"
Expand Down Expand Up @@ -720,8 +720,6 @@
l_hand = /obj/item/storage/briefcase/lawyer
l_pocket = /obj/item/clothing/accessory/lawyers_badge

chameleon_extras = /obj/item/stamp/law

// Curator

/datum/outfit/job/independent/curator
Expand Down Expand Up @@ -771,15 +769,12 @@
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/chaplain
backpack_contents = list(
/obj/item/stamp/chap = 1,
/obj/item/camera/spooky = 1
)

backpack = /obj/item/storage/backpack/cultpack
satchel = /obj/item/storage/backpack/cultpack

chameleon_extras = /obj/item/stamp/chap

// Chemist

/datum/outfit/job/independent/chemist
Expand Down
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/factions/minutemen.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
/obj/item/melee/classic_baton/telescopic=1,
/obj/item/modular_computer/tablet/preset/advanced = 1)

chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/officer)

/datum/outfit/job/clip/doctor
name = "CLIP - Doctor"
Expand Down
4 changes: 1 addition & 3 deletions code/modules/clothing/outfits/factions/nanotrasen.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@

chameleon_extras = list(
/obj/item/gun/energy/e_gun,
/obj/item/stamp/head_of_personnel,
/obj/item/stamp/nanotrasen/officer,
)

// Head of Security
Expand Down Expand Up @@ -430,8 +430,6 @@
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/clothing/accessory/lawyers_badge

chameleon_extras = /obj/item/stamp/law

// Corp. Rep
/datum/outfit/job/nanotrasen/lawyer/corporaterepresentative
name = "Nanotrasen - Corporate Representative"
Expand Down
6 changes: 3 additions & 3 deletions code/modules/clothing/outfits/factions/roumain.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
satchel = /obj/item/storage/backpack/cultpack

backpack_contents = list(/obj/item/book/manual/srmlore=1,
/obj/item/stamp/chap = 1,
/obj/item/stamp/roumain = 1,
/obj/item/melee/classic_baton/telescopic=1,
)
chameleon_extras = null
Expand All @@ -75,7 +75,7 @@
satchel = /obj/item/storage/backpack/cultpack

backpack_contents = list(/obj/item/book/manual/srmlore=1,
/obj/item/stamp/chap = 1,
/obj/item/stamp/roumain = 1,
/obj/item/melee/classic_baton/telescopic=1,
)
chameleon_extras = null
Expand Down Expand Up @@ -164,5 +164,5 @@
satchel = /obj/item/storage/backpack/cultpack

backpack_contents = list(/obj/item/book/manual/srmlore=1,
/obj/item/stamp/chap = 1,
/obj/item/stamp/roumain = 1,
)
2 changes: 1 addition & 1 deletion code/modules/clothing/outfits/factions/solgov.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
backpack_contents = list(/obj/item/storage/box/ids=1,\
/obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1)

chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/officer)

/datum/outfit/job/solgov/doctor
name = "SolGov - Medical Doctor"
Expand Down
5 changes: 0 additions & 5 deletions code/modules/food_and_drinks/food/snacks_egg.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,6 @@

to_chat(usr, "<span class='notice'>You colour [src] with [W].</span>")
icon_state = "egg-[clr]"
else if(istype(W, /obj/item/stamp/clown))
var/clowntype = pick("grock", "grimaldi", "rainbow", "chaos", "joker", "sexy", "standard", "bobble", "krusty", "bozo", "pennywise", "ronald", "jacobs", "kelly", "popov", "cluwne")
icon_state = "egg-clown-[clowntype]"
desc = "An egg that has been decorated with the grotesque, robustable likeness of a clown's face. "
to_chat(usr, "<span class='notice'>You stamp [src] with [W], creating an artistic and not remotely horrifying likeness of clown makeup.</span>")
else
..()

Expand Down
3 changes: 0 additions & 3 deletions code/modules/jobs/job_types/chaplain.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,8 @@
ears = /obj/item/radio/headset/headset_srv
uniform = /obj/item/clothing/under/rank/civilian/chaplain
backpack_contents = list(
/obj/item/stamp/chap = 1,
/obj/item/camera/spooky = 1
)

backpack = /obj/item/storage/backpack/cultpack
satchel = /obj/item/storage/backpack/cultpack

chameleon_extras = /obj/item/stamp/chap
3 changes: 0 additions & 3 deletions code/modules/jobs/job_types/clown.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
mask = /obj/item/clothing/mask/gas/clown_hat
l_pocket = /obj/item/bikehorn
backpack_contents = list(
/obj/item/stamp/clown = 1,
/obj/item/reagent_containers/spray/waterflower = 1,
/obj/item/reagent_containers/food/snacks/grown/banana = 1,
/obj/item/instrument/bikehorn = 1,
Expand All @@ -38,8 +37,6 @@

box = /obj/item/storage/box/hug/survival

chameleon_extras = /obj/item/stamp/clown

/datum/outfit/job/clown/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()
if(visualsOnly)
Expand Down
2 changes: 1 addition & 1 deletion code/modules/jobs/job_types/head_of_personnel.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,4 +47,4 @@
duffelbag = /obj/item/storage/backpack/duffelbag/captain
courierbag = /obj/item/storage/backpack/messenger/com

chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/head_of_personnel)
chameleon_extras = list(/obj/item/gun/energy/e_gun, /obj/item/stamp/officer)
2 changes: 0 additions & 2 deletions code/modules/jobs/job_types/lawyer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,3 @@
l_hand = /obj/item/storage/briefcase/lawyer
l_pocket = /obj/item/laser_pointer
r_pocket = /obj/item/clothing/accessory/lawyers_badge

chameleon_extras = /obj/item/stamp/law
3 changes: 0 additions & 3 deletions code/modules/jobs/job_types/mime.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,13 @@
head = /obj/item/clothing/head/frenchberet
suit = /obj/item/clothing/suit/toggle/suspenders
backpack_contents = list(
/obj/item/stamp/mime = 1,
/obj/item/book/mimery = 1,
/obj/item/reagent_containers/food/drinks/bottle/bottleofnothing = 1
)

backpack = /obj/item/storage/backpack/mime
satchel = /obj/item/storage/backpack/mime

chameleon_extras = /obj/item/stamp/mime

/datum/outfit/job/mime/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE)
..()

Expand Down
1 change: 0 additions & 1 deletion code/modules/mob/living/silicon/robot/robot_modules.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -745,7 +745,6 @@
/obj/item/assembly/flash/cyborg,
/obj/item/toy/crayon/rainbow,
/obj/item/instrument/bikehorn,
/obj/item/stamp/clown,
/obj/item/bikehorn,
/obj/item/bikehorn/airhorn,
/obj/item/paint/anycolor,
Expand Down
23 changes: 4 additions & 19 deletions code/modules/paperwork/stamps.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,14 @@
icon_state = "stamp-qm"
dye_color = DYE_QM

/obj/item/stamp/law
name = "law office's rubber stamp"
icon_state = "stamp-law"
dye_color = DYE_LAW

/obj/item/stamp/captain
name = "captain's rubber stamp"
icon_state = "stamp-cap"
dye_color = DYE_CAPTAIN

/obj/item/stamp/head_of_personnel
name = "head of personnel's rubber stamp"
icon_state = "stamp-hop"
/obj/item/stamp/officer
name = "first officer's rubber stamp"
icon_state = "stamp-fo"
dye_color = DYE_FO

/obj/item/stamp/hos
Expand Down Expand Up @@ -66,17 +61,7 @@
icon_state = "stamp-deny"
dye_color = DYE_REDCOAT

/obj/item/stamp/clown
name = "clown's rubber stamp"
icon_state = "stamp-clown"
dye_color = DYE_CLOWN

/obj/item/stamp/mime
name = "mime's rubber stamp"
icon_state = "stamp-mime"
dye_color = DYE_MIME

/obj/item/stamp/chap
/obj/item/stamp/roumain
name = "chaplain's rubber stamp"
icon_state = "stamp-chap"
dye_color = DYE_CHAP
Expand Down
Binary file modified icons/obj/bureaucracy.dmi
View file
Binary file not shown.
Binary file modified icons/stamp_icons/large_stamp-cap.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed icons/stamp_icons/large_stamp-clown.png
View file
Binary file not shown.
Binary file added icons/stamp_icons/large_stamp-fo.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed icons/stamp_icons/large_stamp-hop.png
View file
Binary file not shown.
Binary file removed icons/stamp_icons/large_stamp-mime.png
View file
Binary file not shown.
7 changes: 7 additions & 0 deletions tools/UpdatePaths/Scripts/4133_indie_stamps.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# repaths chaplain's stamp, tweaks HOP stamp, removes clown mime and law stamps

/obj/item/stamp/chaplain : /obj/item/stamp/roumain {@OLD}
/obj/item/stamp/head_of_personnel : /obj/item/stamp/officer {@OLD}
/obj/item/stamp/clown : @DELETE
/obj/item/stamp/mime : @DELETE
/obj/item/stamp/law : @DELETE

0 comments on commit 32e6a54

Please sign in to comment.