Skip to content

Commit

Permalink
NT Sprite Overhaul (#2881)
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
Overhauls our Nanotrasen sprites via the work of Imaginos

This may need some work as well as descriptions.
<!-- 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:
imageadd: Nanotrasen outfits have a new coat of paint
/: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
thgvr authored May 1, 2024
1 parent 6dda4a3 commit ce6e0a4
Show file tree
Hide file tree
Showing 37 changed files with 784 additions and 407 deletions.
10 changes: 5 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1092,16 +1092,16 @@
req_access = list(20)
},
/obj/item/clothing/suit/hooded/wintercoat/captain,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/nanotrasen/captain/skirt,
/obj/item/clothing/under/nanotrasen/captain,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/head/caphat/nt,
/obj/item/clothing/head/nanotrasen/captain/peaked,
/obj/item/clothing/head/nanotrasen/captain,
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser,
/obj/item/megaphone/command,
/obj/machinery/light/small/directional/east,
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/clothing/suit/armor/nanotrasen/captain,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"fy" = (
Expand Down
6 changes: 4 additions & 2 deletions _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -3394,8 +3394,10 @@
},
/obj/item/stock_parts/cell/gun,
/obj/item/gun/energy/laser,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/head/caphat/nt,
/obj/item/clothing/under/nanotrasen/captain/skirt,
/obj/item/clothing/under/nanotrasen/captain,
/obj/item/clothing/suit/armor/nanotrasen/captain,
/obj/item/clothing/head/nanotrasen/captain/peaked,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/glasses/sunglasses,
/obj/effect/turf_decal/borderfloor{
Expand Down
11 changes: 6 additions & 5 deletions _maps/shuttles/nanotrasen/nanotrasen_osprey.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1027,9 +1027,10 @@
/obj/item/storage/backpack/satchel/cap,
/obj/item/storage/backpack/captain,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/under/nanotrasen/captain/skirt,
/obj/item/clothing/under/nanotrasen/captain,
/obj/item/clothing/suit/armor/nanotrasen/captain,
/obj/item/clothing/suit/armor/nanotrasen/captain/parade,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/head/caphat/nt,
/obj/item/storage/belt/sabre,
Expand Down Expand Up @@ -5257,8 +5258,8 @@
/obj/item/storage/backpack,
/obj/item/storage/backpack/satchel/leather,
/obj/item/clothing/shoes/laceup,
/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
/obj/item/clothing/under/rank/command/head_of_personnel/nt,
/obj/item/clothing/under/nanotrasen/officer/skirt,
/obj/item/clothing/under/nanotrasen/officer,
/obj/item/clothing/suit/armor/vest/hop,
/obj/item/clothing/gloves/color/white,
/obj/item/clothing/glasses/sunglasses,
Expand Down
17 changes: 9 additions & 8 deletions _maps/shuttles/nanotrasen/nanotrasen_skipper.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1510,8 +1510,8 @@
pixel_y = 32
},
/obj/effect/turf_decal/siding/wood,
/obj/item/clothing/under/rank/command/head_of_personnel/nt,
/obj/item/clothing/under/rank/command/head_of_personnel/nt/skirt,
/obj/item/clothing/under/nanotrasen/officer,
/obj/item/clothing/under/nanotrasen/officer/skirt,
/turf/open/floor/wood,
/area/ship/crew/crewthree)
"lg" = (
Expand Down Expand Up @@ -5490,15 +5490,16 @@
/obj/item/storage/belt/sabre,
/obj/item/clothing/glasses/sunglasses,
/obj/item/clothing/suit/armor/vest/capcarapace,
/obj/item/clothing/under/rank/command/captain/parade,
/obj/item/clothing/shoes/laceup,
/obj/item/door_remote/captain,
/obj/item/clothing/suit/armor/vest/capcarapace/alt,
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/clothing/under/rank/command/captain/nt/skirt,
/obj/item/clothing/under/rank/command/captain/nt,
/obj/item/clothing/head/caphat/parade,
/obj/item/clothing/head/caphat/nt,
/obj/item/clothing/suit/armor/nanotrasen/captain,
/obj/item/clothing/suit/armor/nanotrasen/captain/parade,
/obj/item/clothing/gloves/color/captain/nt,
/obj/item/clothing/under/nanotrasen/captain/skirt,
/obj/item/clothing/under/nanotrasen/captain,
/obj/item/clothing/head/nanotrasen/captain/peaked,
/obj/item/clothing/head/nanotrasen/captain,
/turf/open/floor/wood,
/area/ship/crew/crewtwo)
"UN" = (
Expand Down
2 changes: 1 addition & 1 deletion code/controllers/subsystem/traumas.dm
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ SUBSYSTEM_DEF(traumas)
/obj/item/clothing/under/rank/command/head_of_personnel, /obj/item/clothing/under/rank/rnd/research_director,
/obj/item/clothing/under/rank/security/head_of_security/alt,//WS Edit - Better security jumpsuit sprites
/obj/item/clothing/under/rank/rnd/research_director/alt, /obj/item/clothing/under/rank/rnd/research_director/turtleneck,
/obj/item/clothing/under/rank/command/captain/parade, /obj/item/clothing/under/rank/security/head_of_security/parade,
/obj/item/clothing/under/rank/security/head_of_security/parade,
/obj/item/clothing/under/rank/security/head_of_security/parade/female, //WS Edit - Better Command Uniforms
/obj/item/clothing/head/helmet/abductor, /obj/item/clothing/suit/armor/abductor/vest, /obj/item/melee/baton/abductor,
/obj/item/storage/belt/military/abductor, /obj/item/gun/energy/alien, /obj/item/abductor/silencer,
Expand Down
8 changes: 0 additions & 8 deletions code/game/objects/items/religion.dm
Original file line number Diff line number Diff line change
Expand Up @@ -206,14 +206,6 @@
/obj/item/banner/command/check_inspiration(mob/living/carbon/human/H)
return HAS_TRAIT(H, TRAIT_MINDSHIELD) //Command is stalwart but rewards their allies.

/datum/crafting_recipe/command_banner
name = "Command Banner"
result = /obj/item/banner/command/mundane
time = 40
reqs = list(/obj/item/stack/rods = 2,
/obj/item/clothing/under/rank/command/captain/parade = 1)
category = CAT_MISC

/obj/item/banner/red
name = "red banner"
icon_state = "banner-red"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@
new /obj/item/clothing/under/rank/command/captain/skirt(src)
new /obj/item/clothing/suit/armor/vest/capcarapace(src)
new /obj/item/clothing/head/caphat(src)
new /obj/item/clothing/under/rank/command/captain/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/alt(src)
new /obj/item/clothing/head/caphat/parade(src)
new /obj/item/clothing/suit/armor/vest/capcarapace/captunic(src)
new /obj/item/clothing/head/crown/fancy(src)
Expand Down
1 change: 0 additions & 1 deletion code/modules/clothing/factions/gezena.dm
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//Jumpsuits
//thgvr TODO: Make more stuff (backpacks, headsets, doodads, part 2?)
/obj/item/clothing/under/gezena
name = "gezenan navywear"
desc = "Made of a slick synthetic material that is both breathable, and resistant to scale and thorn alike."
Expand Down
Loading

0 comments on commit ce6e0a4

Please sign in to comment.