Skip to content

Commit

Permalink
Everything we need from Nova Sector to bring blueshift to life (#2262)
Browse files Browse the repository at this point in the history
* Update camera.dm

* we are straight up merge conflicting everything

* Update melee.dm

* kirby plants stuff

* adds missing icons

* a metric ton new stuff including new ashwalkers

* more stuff is done

* fix perhaps

* war never changes

* whoops

* adds the forge and glass blowing fixes

* Update wooden_rack.dm

* more stuff

* ash chisel adds bows and assembly benches

* more changes

* secure briefcase change

* changes

* redoes bane

* Update aquarium.dm

* Update colony.dm

* missing icons

* fixes

* Update thermomachine.dm

* replaces KILO JOULES with KW

* fixes

* Update apc_main.dm

* Update computer_power.dm

* Update multi_charger.dm

* decals

* Adds digital clocks (#75751)

* Update tgstation.dme

* compiling

* Adds a photobooth (#82105)

Adds a photobooth machine to the HoP line which can be used to update
your security records photo.
It updates the records of the person's name, which means hiding your
identity and wearing an ID will let you change other people's photos. If
you aren't hiding your identity and are wearing someone else's ID, it
won't update at all because it will be unable to find your record.
There's 2 variants of this machine, one at the HoP line that's tied
behind Law Office access (so Lawyers have an extra thing they can help
out with if no one's available, but maybe it would be better behind
Library access since Curators are our "photographer" role?), and the
Security one that requires Security access.
The Security one has a special feature that it adds a height chart
behind the player.

![image](https://github.com/tgstation/tgstation/assets/53777086/c4eb0661-d752-4052-8006-2898af78c528)

This machine is used by either right-clicking on it or by pressing a
button, so the HoP can do it remotely from their line (except on Tram
where it's in the library), and after a few delays it'll update your
records automatically to how you look like.

Emagging the machine will remove its access restrictions but every time
it updates your photos it will spam camera flashing and blind you.

Sprites

Open

![image](https://github.com/tgstation/tgstation/assets/53777086/d5e97d84-46d8-40b5-995f-c0ef5c7f18ac)
Closed

![image](https://github.com/tgstation/tgstation/assets/53777086/520e88ed-4630-40d8-9039-4c6dd85a9872)
Security version on the left, has a red tint on it

![image](https://github.com/tgstation/tgstation/assets/53777086/ef71a092-8d1b-4776-bdb4-6718308967c7)

Video demonstration (old sprites):

https://github.com/tgstation/tgstation/assets/53777086/a2e59f08-2d58-4f5b-b081-e137c7606d35

Current security records has no way to change your photo ID, something
that was a feature before it was moved to TGUI. The only alternative is
to fully delete your record and make a new one with a photo and the same
name, but this shares a major issue with the HTML UI: You're immediately
sold out by the fact you have a background. No matter how well you try
to cover your tracks, any security officer looking at records will see
you are the only photo on the manifest that has a background and even a
camera in your hand, which makes it impossible to get away with it
unless security essentially takes pity on you.
This opens up the ability to fully mask yourself in records, finally.

This is also better even for non antagonists because you can now
properly update your photos to match what you look like in the event of
an appearance change or even just a job change, which makes it a benefit
for HoPs who likes to keep records as up-to-date as possible.

:cl: JohnFulpWillard, Twox
add: Added a new photobooth machine to the HoP's line.
fix: Things checking for access now checks your off hand, too.
/:cl:

---------

Co-authored-by: Ghom <[email protected]>

* compiles

* secure briefcase

* tons of new stuff

* Enhanced delam/tram counter (#75699)

Gives a makeover to the delam and tram hit counters and adds some new
functionality.

![image](https://github.com/tgstation/tgstation/assets/83487515/cbbeb0df-d205-47ed-be6e-e49cea8c4f12)

![image](https://github.com/tgstation/tgstation/assets/83487515/e042d5e8-cb8b-4feb-b3f0-02365cd8fdbf)

![image](https://github.com/tgstation/tgstation/assets/83487515/c2831f7f-639d-40a8-a74f-d4894a4f67c6)

https://github.com/tgstation/tgstation/assets/83487515/871fb0fd-8b92-45c5-877b-c122a034608c

- The signs now remember your last 'best' score and show the crew if
they're trending in the right or wrong direction since the last
incident.
- Safety Moth PSA panel. In the future this will dynamically change
based on the current events, or function as a status display.
- Tram hit counters no longer waste processing every tram hit.
Previously each sign independently managed tracking, which meant that
deconstructing or constructing a sign would reset it to 0 and it would
become out of sync with the other signs.
- Can be repaired, EMP'd

Provide a little motivation to reach for that high score. The PSA
changing to for example, find a locker during a delam event.

:cl: LT3
image: Delam and tram flipsigns have been replaced with information
displays
fix: Tram hit count is centrally managed instead of independently on
each sign, so they won't get out of sync
/:cl:

* more fixes

* more stuff

* guh

* whop

* more

* maps

* whoops

* adds new things to vending, adds a modular addition for vending machines

* Update tramstation.dmm

* a large amount of purchasable clothes

* Update gags.dm

* Update gags.dm

* Update gags.dm

* more stuff

* replaces surgical and coroner duffels with surgery trays and medical carts, resprites razor (#77975)

replaces all instances of surgical duffels with surgery trays, and all
coroner duffels with morgue surgical trays.
they contain about the same items, with surgical trays/carts also having
bone gel and tape, since their list of holdable items is much more
limited.
the surgery tray is a diagetic storage unit that displays any surgery
tool it's holding in a small, almost world-state esque form on top of
it. it can be carried around by dragging it on to yourself, but it will
slow you down like an unzipped duffel would. it can also be deployed by
activating it, and pulled around, but it will roll noisily in the
process.
currently, all tool tiers are supported - from alien, to advanced, to
cruel, to normal.

![image](https://github.com/tgstation/tgstation/assets/110322848/5b31767e-de27-4352-b2bf-89cde06a7b5c)
here you can see just a few of the possible combinations of tools -
default, default morgue, advanced, and alien. but any combination of
these tools should work together somewhat cleanly, as you can see here:

![image](https://github.com/tgstation/tgstation/assets/110322848/12ae3501-44bc-41a5-b4f4-d01c05cc6038)
also adds a medical razor variant, because otherwise they wouldn't fit
with the look of the other tools on the tray, before and after here:

![image](https://github.com/tgstation/tgstation/assets/110322848/c71af9ed-e9bb-40ff-81b8-0395d8afdf5a)
having constantly visible tool storage like this means you don't have to
worry about the one tool you need from the bag being stolen - if it is,
you can see it before an operation starts, and plan around that! it also
gives a little flexibility to mappers - if they'd like a more mobile
cart for their medbay, or if they'd like the somewhat stationary tray.
it also plain looks cool, and isn't quite as clunky as a duffelbag would
be.
:cl:
add: adds medical carts and surgery trays
image: gives the surgery razor a unique sprite
/:cl:

---------

Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: JohnFulpWillard <[email protected]>
Co-authored-by: Jacquerel <[email protected]>

* more stuff

* even more new items

* Update nova_costume.dm

* holy fuck its blueshift

* all the items

* fixes

* moves bitrunning

* has bulb varient

* nova arrivals

* whoops

* shuttle fix I think

* replaces merge conflicts

* more tweaks

* tons of changes

* Create AmmoWorkbench.tsx

* ammoworkbench to js fuck shit fuck

* more stuff

* Update Blueshift.dmm

* Update Blueshift.dmm

* modular laser rifles

* Update Blueshift.dmm

* fixes labour, mining, and darkens some of blueshifts sec halls

* new virology

* Update Blueshift.dmm

* some minor fixes

* Update human_defence.dm

* Update alien_infestation.dm

* more sec stuff

* Update Blueshift.dmm

* Update Blueshift.dmm

* Update Blueshift.dmm

* cargo crates

* soul catchers

* damage tweaks

* fixes LockedSafe missing error

* Update Blueshift.dmm

* more fixes

* Update Blueshift.dmm

* forgot nifpanel

* fixes

* ptl rooom

* adds mapping helpers to lockers

* Update Blueshift.dmm

* changes

* guns for all

* Update Blueshift.dmm

* whoops

* Update soulcatcher_base.dm

* changes

* Update __projectile_changes.dm

* Update Blueshift.dmm

* stops colony_lathe from setting local size to 0

* makes the colony lathe hard drop everything on destroy

* some simple bloom tweaks

* adds in ranch, lowers ecost of auto disabler, lowers stamina damage by 30%

* adds multi-typing to ammo_boxes which makes the ammo_bench far better

* Update Blueshift.dmm

* opfor and optin antagonists

* irn fixes

* Update antag_optin.tsx

* Update Blueshift.dmm

* Update loadout.dm

* fixes

* Update OpposingForcePanel.js

* Update roundend.dm

* whoops

* womp

* Update Blueshift.dmm

* contextless fixes

* yipee

* fixes

* flatpacked meteor shield

* yipee

* Update Blueshift.dmm

* Update Blueshift.dmm

* Update Blueshift.dmm

* job title specific spawnpoints

* Update NifPanel.jsx

* fixes

* media manager volume

* shits fucked

* adds in message_high_admins which messages only admins with R_BAN

* should fix enemy roles

* Update cult.dm

* fixes

* Update electrical_storm.dm

* fixes

* Update nuclear_operative.dm

* Update nuclear_operative.dm

* Update kahraman.dm

* no longer true and needed

* Update Blueshift.dmm

* Update Blueshift.dmm

* linter stuff

* shit

* more stuff

* linters

* Update cargo_nova.dmm

* fixes

* Update Blueshift.dmm

---------

Co-authored-by: carlarctg <[email protected]>
Co-authored-by: John Willard <[email protected]>
Co-authored-by: Ghom <[email protected]>
Co-authored-by: lessthanthree <[email protected]>
Co-authored-by: Lamb <[email protected]>
Co-authored-by: MrMelbert <[email protected]>
Co-authored-by: Jacquerel <[email protected]>
  • Loading branch information
8 people authored Jun 24, 2024
1 parent a15e278 commit fe85697
Show file tree
Hide file tree
Showing 1,214 changed files with 327,101 additions and 5,355 deletions.
3,078 changes: 1,734 additions & 1,344 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm

Large diffs are not rendered by default.

4,811 changes: 4,811 additions & 0 deletions _maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker2.dmm

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions _maps/RandomRuins/SpaceRuins/anomaly_research.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@
/obj/structure/fireplace{
pixel_x = -32
},
/obj/item/kirbyplants/fullysynthetic{
/obj/item/kirbyplants/random/fullysynthetic{
pixel_x = 10;
pixel_y = 19
},
Expand Down Expand Up @@ -1237,7 +1237,7 @@
/turf/open/floor/iron/dark,
/area/misc/anomaly_research)
"Gi" = (
/obj/item/kirbyplants/fullysynthetic{
/obj/item/kirbyplants/random/fullysynthetic{
pixel_x = -8;
pixel_y = 21
},
Expand Down
18 changes: 9 additions & 9 deletions _maps/RandomRuins/SpaceRuins/russian_derelict.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -839,7 +839,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/secure_storage)
"kA" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/obj/effect/mapping_helpers/broken_floor,
/obj/machinery/light/small/directional/north,
/turf/open/floor/plating/airless,
Expand Down Expand Up @@ -997,7 +997,7 @@
/area/ruin/space/ks13/hallway/central)
"mp" = (
/obj/structure/sign/departments/medbay/alt/directional/west,
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/hallway/central)
"mq" = (
Expand Down Expand Up @@ -3912,7 +3912,7 @@
"Cn" = (
/obj/structure/sign/departments/medbay/alt/directional/east,
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/hallway/central)
"Co" = (
Expand Down Expand Up @@ -4285,7 +4285,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/tool_storage)
"Eg" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/hallway/central)
"Ei" = (
Expand Down Expand Up @@ -4642,7 +4642,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/grav_gen)
"Ge" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ks13/security/court)
Expand Down Expand Up @@ -6126,7 +6126,7 @@
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/science/rnd)
"Og" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron,
/area/ruin/space/ks13/security/court)
"Oh" = (
Expand Down Expand Up @@ -6519,7 +6519,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/engineering/singulo)
"PT" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/obj/effect/decal/cleanable/dirt,
/turf/open/floor/iron,
/area/ruin/space/ks13/command/bridge)
Expand Down Expand Up @@ -7293,7 +7293,7 @@
/turf/open/floor/plating/airless,
/area/ruin/space/ks13/security/sec)
"TA" = (
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron,
/area/ruin/space/ks13/command/bridge_hall)
"TB" = (
Expand Down Expand Up @@ -8024,7 +8024,7 @@
/area/ruin/space/ks13/science/genetics)
"Xs" = (
/obj/effect/decal/cleanable/dirt,
/obj/item/kirbyplants/dead,
/obj/item/kirbyplants/random/dead,
/turf/open/floor/iron/airless,
/area/ruin/space/ks13/service/cafe)
"Xt" = (
Expand Down
32 changes: 32 additions & 0 deletions _maps/blueshift.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"version": 1,
"map_name": "Blueshift",
"map_path": "map_files/Blueshift",
"map_file": "Blueshift.dmm",
"shuttles": {
"cargo": "cargo_nova",
"ferry": "ferry_nova",
"whiteship": "whiteship_blueshift",
"emergency": "emergency_nova"
},
"traits": [
{
"Up": true,
"Linkage": "Cross"
},
{
"Down": true,
"Baseturf": "/turf/open/openspace",
"Linkage": "Cross"
}
],
"orbit_shift_replacement": "Attention crew, it appears that someone has shifted your ship into more dangerous territory.",
"job_changes": {
"Cook": {
"additional_cqc_areas": ["/area/station/service/kitchen/diner"]
},
"Captain": {
"special_charter": "ship"
}
}
}
Loading

0 comments on commit fe85697

Please sign in to comment.