Skip to content

Commit

Permalink
Adds Nanotrasen, Vigilitas and N+S stamps! (#3641)
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

![obraz](https://github.com/user-attachments/assets/fd5c49bf-72e1-49d4-827f-e7182af60792)

Maps all that crap on both NT ships and NT ruins.
**Generic stamps are for non-command jobs.**
NT logo is temporary until the rename happens, so it sucks.
<!-- 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
Faction stuff or whatever.
<!-- 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:
add: Added Nanotrasen, Vigilitas and N+S 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 authored Nov 2, 2024
1 parent a6f7de5 commit 000a815
Show file tree
Hide file tree
Showing 28 changed files with 161 additions and 46 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -1224,7 +1224,7 @@
"lR" = (
/obj/effect/decal/cleanable/blood/gibs/core,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/stamp/qm{
/obj/item/stamp/nanotrasen/ns/supply{
pixel_x = 7;
pixel_y = 10
},
Expand Down Expand Up @@ -4194,9 +4194,8 @@
"Pv" = (
/obj/structure/table/reinforced,
/obj/machinery/recharger,
/obj/item/stamp/hos{
pixel_x = 10;
pixel_y = -8
/obj/item/stamp/nanotrasen/vigilitas{
pixel_x = 11
},
/obj/effect/turf_decal/corner/opaque/red/border{
dir = 10
Expand Down Expand Up @@ -4525,7 +4524,7 @@
/obj/item/pen/fountain/captain{
pixel_x = 5
},
/obj/item/stamp/captain{
/obj/item/stamp/nanotrasen/captain{
pixel_x = -8
},
/turf/open/floor/carpet/blue,
Expand Down
4 changes: 2 additions & 2 deletions _maps/RandomRuins/RockRuins/rockplanet_budgetcuts.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@
pixel_x = -9;
pixel_y = 3
},
/obj/item/stamp/hos{
/obj/item/stamp/nanotrasen/vigilitas/security{
pixel_x = -9;
pixel_y = 9
},
Expand Down Expand Up @@ -2187,7 +2187,7 @@
pixel_x = 7;
pixel_y = 3
},
/obj/item/stamp/rd{
/obj/item/stamp/nanotrasen/science{
pixel_x = -6;
pixel_y = 12
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2460,7 +2460,7 @@
/obj/structure/railing{
dir = 8
},
/obj/item/stamp/captain{
/obj/item/stamp/nanotrasen/captain{
pixel_x = -6;
pixel_y = 8
},
Expand Down
17 changes: 14 additions & 3 deletions _maps/shuttles/nanotrasen/nanotrasen_delta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1039,14 +1039,23 @@
/area/ship/crew)
"dI" = (
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/folder/yellow,
/obj/item/paper_bin{
pixel_x = 5;
pixel_y = 4
},
/obj/item/folder/yellow{
pixel_x = 5;
pixel_y = 5
},
/obj/item/pen/fountain/captain,
/obj/item/stamp/qm,
/obj/effect/turf_decal/corner/opaque/nsorange,
/obj/effect/turf_decal/corner/opaque/nsorange{
dir = 4
},
/obj/item/stamp/nanotrasen/ns/captain{
pixel_x = -7;
pixel_y = 4
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"dK" = (
Expand Down Expand Up @@ -1324,6 +1333,7 @@
pixel_y = 4
},
/obj/effect/turf_decal/trimline/transparent/white/filled/warning,
/obj/item/stamp/nanotrasen/ns,
/turf/open/floor/plasteel,
/area/ship/cargo)
"jr" = (
Expand Down Expand Up @@ -1413,6 +1423,7 @@
/obj/effect/turf_decal/borderfloor{
dir = 1
},
/obj/item/stamp/nanotrasen,
/turf/open/floor/plasteel,
/area/ship/medical)
"lp" = (
Expand Down
3 changes: 2 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_gecko.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
},
/obj/structure/table/reinforced,
/obj/item/folder/blue,
/obj/item/stamp/captain,
/obj/item/stamp/nanotrasen/captain,
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"an" = (
Expand Down Expand Up @@ -351,6 +351,7 @@
/obj/item/pen/fourcolor,
/obj/item/folder/blue,
/obj/item/megaphone,
/obj/item/stamp/nanotrasen,
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/engineering/communications)
"cG" = (
Expand Down
52 changes: 38 additions & 14 deletions _maps/shuttles/nanotrasen/nanotrasen_harrier.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -598,12 +598,12 @@
/obj/item/paper_bin{
pixel_x = -6
},
/obj/item/stamp/captain{
pixel_x = 6
},
/obj/item/pen/fountain/captain{
pixel_x = -6
},
/obj/item/stamp/nanotrasen/captain{
pixel_x = 6
},
/turf/open/floor/carpet/royalblue,
/area/ship/bridge)
"dA" = (
Expand Down Expand Up @@ -3297,9 +3297,6 @@
/obj/structure/table,
/obj/item/paper_bin,
/obj/item/folder/yellow,
/obj/item/stamp/denied{
pixel_x = 4
},
/obj/item/stamp{
pixel_x = -5;
pixel_y = 9
Expand All @@ -3321,6 +3318,13 @@
/obj/effect/turf_decal/trimline/opaque/nsorange/line{
dir = 8
},
/obj/item/stamp/nanotrasen/ns{
pixel_y = 8;
pixel_x = 8
},
/obj/item/stamp/denied{
pixel_x = 4
},
/turf/open/floor/plasteel,
/area/ship/cargo)
"tI" = (
Expand Down Expand Up @@ -4933,6 +4937,10 @@
/obj/machinery/door/firedoor/border_only{
dir = 1
},
/obj/item/stamp/nanotrasen{
pixel_x = -12;
pixel_y = 4
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
"Bs" = (
Expand Down Expand Up @@ -5865,6 +5873,7 @@
populate = 0
},
/obj/item/stack/tape,
/obj/item/stamp/nanotrasen/ns/supply,
/turf/open/floor/plasteel/tech,
/area/ship/cargo)
"Gy" = (
Expand Down Expand Up @@ -5997,6 +6006,7 @@
/obj/effect/turf_decal/trimline/opaque/vired/line{
dir = 1
},
/obj/item/folder/red,
/turf/open/floor/plasteel/dark,
/area/ship/security)
"Hq" = (
Expand Down Expand Up @@ -6190,6 +6200,10 @@
pixel_x = -8;
pixel_y = 8
},
/obj/item/stamp/nanotrasen{
pixel_x = 6;
pixel_y = 2
},
/turf/open/floor/plasteel/dark,
/area/ship/bridge)
"IM" = (
Expand Down Expand Up @@ -8867,7 +8881,10 @@
/area/ship/bridge)
"VY" = (
/obj/structure/table/wood/reinforced,
/obj/item/paper_bin,
/obj/item/paper_bin{
pixel_x = -5;
pixel_y = 5
},
/obj/item/pen/fountain,
/obj/machinery/light_switch{
dir = 1;
Expand All @@ -8877,21 +8894,27 @@
/obj/machinery/camera{
dir = 10
},
/obj/item/stamp/centcom,
/obj/item/stamp/nanotrasen{
pixel_x = 8;
pixel_y = 10
},
/obj/item/stamp/nanotrasen/central{
pixel_x = 8;
pixel_y = 4
},
/turf/open/floor/carpet/executive,
/area/ship/crew/law_office)
"VZ" = (
/obj/structure/table/reinforced,
/obj/item/paper_bin{
pixel_x = -6
},
/obj/item/stamp/head_of_personnel{
name = "first officer's rubber stamp";
pixel_x = 6
},
/obj/item/pen/fourcolor{
pixel_x = -6
},
/obj/item/stamp/nanotrasen/officer{
pixel_x = 6
},
/turf/open/floor/carpet/blue,
/area/ship/bridge)
"Wa" = (
Expand Down Expand Up @@ -9377,8 +9400,9 @@
/obj/item/paper_bin{
pixel_x = 8
},
/obj/item/folder/red{
pixel_x = 8
/obj/item/stamp/nanotrasen/vigilitas{
pixel_x = 8;
pixel_y = 3
},
/obj/machinery/recharger{
pixel_x = -6
Expand Down
22 changes: 15 additions & 7 deletions _maps/shuttles/nanotrasen/nanotrasen_heron.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1547,6 +1547,10 @@
pixel_y = -1
},
/obj/machinery/firealarm/directional/south,
/obj/item/stamp/nanotrasen{
pixel_y = 11;
pixel_x = -6
},
/turf/open/floor/plasteel/white,
/area/ship/medical)
"gz" = (
Expand Down Expand Up @@ -3058,9 +3062,9 @@
pixel_x = -5;
pixel_y = 3
},
/obj/item/stamp/qm{
pixel_x = 8;
pixel_y = 9
/obj/item/stamp/nanotrasen{
pixel_y = 9;
pixel_x = 8
},
/obj/item/stamp{
pixel_x = 8;
Expand Down Expand Up @@ -8899,7 +8903,7 @@
pixel_x = 6;
pixel_y = 4
},
/obj/item/stamp/hos{
/obj/item/stamp/nanotrasen/vigilitas/security{
pixel_y = 9;
pixel_x = -6
},
Expand Down Expand Up @@ -9156,11 +9160,11 @@
pixel_x = -6;
pixel_y = 4
},
/obj/item/stamp/head_of_personnel{
/obj/item/stamp/nanotrasen/officer{
pixel_x = -6;
pixel_y = 10
},
/obj/item/stamp/captain{
/obj/item/stamp/nanotrasen/captain{
pixel_x = -7;
pixel_y = 4
},
Expand All @@ -9185,6 +9189,10 @@
pixel_x = -5
},
/obj/machinery/airalarm/directional/west,
/obj/item/stamp/nanotrasen/central{
pixel_x = 6;
pixel_y = 10
},
/turf/open/floor/plasteel/tech,
/area/ship/bridge)
"HP" = (
Expand Down Expand Up @@ -12432,7 +12440,7 @@
/obj/item/pen{
pixel_x = -6
},
/obj/item/stamp/qm{
/obj/item/stamp/nanotrasen/ns{
pixel_x = 6;
pixel_y = 9
},
Expand Down
5 changes: 4 additions & 1 deletion _maps/shuttles/nanotrasen/nanotrasen_meta.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,7 @@
pixel_x = -2;
pixel_y = 6
},
/obj/item/stamp/qm{
/obj/item/stamp/nanotrasen/ns/captain{
pixel_x = -6
},
/obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{
Expand Down Expand Up @@ -807,6 +807,7 @@
pixel_x = 21;
pixel_y = 12
},
/obj/item/stamp/nanotrasen/ns,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"cz" = (
Expand Down Expand Up @@ -2685,6 +2686,7 @@
/obj/item/radio/intercom/directional/east,
/obj/effect/spawner/random/maintenance/two,
/obj/item/extinguisher/mini,
/obj/item/stamp/nanotrasen/ns,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"DJ" = (
Expand Down Expand Up @@ -2802,6 +2804,7 @@
},
/obj/machinery/light/small/broken/directional/north,
/obj/effect/decal/cleanable/dirt/dust,
/obj/item/stamp/nanotrasen/ns,
/turf/open/floor/plasteel/dark,
/area/ship/cargo)
"FR" = (
Expand Down
8 changes: 4 additions & 4 deletions _maps/shuttles/nanotrasen/nanotrasen_ranger.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -1203,11 +1203,8 @@
/obj/structure/table/reinforced{
color = "#c1b6a5"
},
/obj/item/stamp/captain{
pixel_x = 7
},
/obj/item/folder/blue{
pixel_x = 8;
pixel_x = -1;
pixel_y = 10
},
/obj/effect/turf_decal/techfloor{
Expand All @@ -1221,6 +1218,9 @@
pixel_x = -7;
pixel_y = -1
},
/obj/item/stamp/nanotrasen/vigilitas/loss_prevention{
pixel_x = 7
},
/turf/open/floor/plasteel/telecomms_floor,
/area/ship/bridge)
"iH" = (
Expand Down
Loading

0 comments on commit 000a815

Please sign in to comment.