Skip to content

Commit

Permalink
Inteq-ening (#2748)
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
Self-explanatory title! This was originally a PR that was going to
merely change how the Vanguard and the Master At Arms looked like, but
it mutated into a near full-blown visual rework!


![image](https://github.com/shiptest-ss13/Shiptest/assets/77556824/a4fc0ac1-9bce-400c-a763-9f089f8e41fb)

<!-- 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
Inteq is no longer rotting.
<!-- 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: PositiveEntropy
imageadd: Inteq has now received a visual overhaul!
/: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
Imaginos16 authored Feb 20, 2024
1 parent b479208 commit 156ce9e
Show file tree
Hide file tree
Showing 17 changed files with 18 additions and 14 deletions.
6 changes: 2 additions & 4 deletions _maps/shuttles/inteq/inteq_colossus.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -832,17 +832,15 @@
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/warden/drill{
desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
name = "master at arms' campaign hat"
},
/obj/item/megaphone/sec,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
},
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/storage/belt/military/assault,
/obj/item/reagent_containers/spray/pepper,
/obj/item/clothing/head/warden/inteq,
/obj/item/clothing/suit/armor/vest/security/warden/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"iT" = (
Expand Down
6 changes: 2 additions & 4 deletions _maps/shuttles/inteq/inteq_talos.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1920,16 +1920,14 @@
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/warden/drill{
desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
name = "master at arms' campaign hat"
},
/obj/item/megaphone/sec,
/obj/structure/sign/poster/contraband/eoehoma{
pixel_y = -32
},
/obj/item/storage/belt/security/webbing/inteq/alt,
/obj/item/storage/belt/security/webbing/inteq,
/obj/item/clothing/head/warden/inteq,
/obj/item/clothing/suit/armor/vest/security/warden/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"ms" = (
Expand Down
6 changes: 2 additions & 4 deletions _maps/shuttles/inteq/inteq_vaquero.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1971,10 +1971,6 @@
/obj/effect/turf_decal/corner/opaque/yellow,
/obj/effect/decal/cleanable/dirt,
/obj/item/clothing/suit/armor/vest/bulletproof,
/obj/item/clothing/head/warden/drill{
desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection.";
name = "master at arms' campaign hat"
},
/obj/item/megaphone/sec,
/obj/effect/turf_decal/corner/opaque/brown{
dir = 4
Expand All @@ -1986,6 +1982,8 @@
},
/obj/machinery/power/apc/auto_name/directional/east,
/obj/machinery/light/small/directional/south,
/obj/item/clothing/head/warden/inteq,
/obj/item/clothing/suit/armor/vest/security/warden/inteq,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Eh" = (
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,11 @@

dog_fashion = /datum/dog_fashion/head/cowboy

/obj/item/clothing/head/warden/inteq
name = "master at arms' campaign hat"
desc = "A special armored campaign hat with the IRMG insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
icon_state = "maahat"

/obj/item/clothing/head/warden/drill
name = "warden's campaign hat"
desc = "A special armored campaign hat with the security insignia emblazoned on it. Uses reinforced fabric to offer sufficient protection."
Expand Down
4 changes: 2 additions & 2 deletions code/modules/clothing/outfits/factions/inteq.dm
Original file line number Diff line number Diff line change
Expand Up @@ -188,12 +188,12 @@
job_icon = "warden"

ears = /obj/item/radio/headset/inteq/alt
head = /obj/item/clothing/head/warden/inteq
uniform = /obj/item/clothing/under/syndicate/inteq
head = /obj/item/clothing/head/beret/sec/hos/inteq
glasses = /obj/item/clothing/glasses/hud/security/sunglasses/inteq
mask = /obj/item/clothing/mask/gas/sechailer/inteq
belt = /obj/item/storage/belt/military/assault
suit = /obj/item/clothing/suit/armor/vest/alt
suit = /obj/item/clothing/suit/armor/vest/security/warden/inteq
dcoat = /obj/item/clothing/suit/hooded/wintercoat/security/inteq
shoes = /obj/item/clothing/shoes/combat
gloves = /obj/item/clothing/gloves/combat
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,11 @@
resistance_flags = FLAMMABLE
dog_fashion = null

/obj/item/clothing/suit/armor/vest/security/warden/inteq
name = "master at arms' armored coat"
desc = "A brown armored coat with a bulletproof vest over it, usually worn by the Master At Arms of the IRMG."
icon_state = "maacoat"

/obj/item/clothing/suit/armor/vest/security/warden/alt
name = "warden's armored jacket"
desc = "A white jacket with silver rank pips and body armor strapped on top."
Expand Down
Binary file modified icons/mob/clothing/belt.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/eyes.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/head.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/suits/armor.dmi
Binary file not shown.
Binary file modified icons/mob/clothing/under/syndicate.dmi
Binary file not shown.
Binary file modified icons/mob/species/misc/digitigrade.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/belts.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/glasses.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/hats.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/suits/armor.dmi
Binary file not shown.
Binary file modified icons/obj/clothing/under/syndicate.dmi
Binary file not shown.

0 comments on commit 156ce9e

Please sign in to comment.