Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adds in a signal technician wintercoat + garment bag #551

Merged
merged 2 commits into from
Nov 8, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@
pda_slot = ITEM_SLOT_LPOCKET
skillchips = list(/obj/item/skillchip/job/engineer)

l_hand = /obj/item/storage/bag/garment/signal_technician // TANNHAUSER ADDITION -- NTSL

backpack_contents = list(
/obj/item/paper/monitorkey,
)
Expand Down
46 changes: 46 additions & 0 deletions modular_tannhauser/modules/NTSL/code/clothing.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
/obj/item/storage/bag/garment/signal_technician
name = "old telecomms specialist's garment bag"
desc = "A bag for storing extra clothes and shoes. This one clothes for telecomms specialists originally rejected from production due to green paint costs."

/obj/item/storage/bag/garment/signal_technician/PopulateContents()
new /obj/item/clothing/under/rank/engineering/signal_tech(src)
new /obj/item/clothing/head/helmet/space/plasmaman/signal_tech(src)
new /obj/item/clothing/under/plasmaman/engineering/signal_tech(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/signal_tech(src)

/obj/item/clothing/under/rank/engineering/signal_tech
name = "signal technician's jumpsuit"
desc = "It's an orange high visibility jumpsuit with green strips worn by signal technicians. Made from fire resistant materials."
icon = 'modular_tannhauser/modules/NTSL/icons/clothing_object.dmi'
worn_icon = 'modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi'
icon_state = "signal_tech"

/obj/item/clothing/head/helmet/space/plasmaman/signal_tech
name = "signal technician plasma envirosuit helmet"
desc = "A space-worthy helmet specially designed for signal technician plasmamen, the usual purple stripes being replaced by a unique bright green."
icon = 'modular_tannhauser/modules/NTSL/icons/clothing_object.dmi'
worn_icon = 'modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi'
icon_state = "signal_tech_envirohelm"
inhand_icon_state = null
armor_type = /datum/armor/space_plasmaman/engineering_atmos

/obj/item/clothing/under/plasmaman/engineering/signal_tech
name = "signal technician plasma envirosuit"
desc = "An air-tight suit designed to be used by plasmamen employed as signal technicians, the usual purple stripes being replaced by a unique bright green. It protects the user from fire and acid damage."
icon = 'modular_tannhauser/modules/NTSL/icons/clothing_object.dmi'
worn_icon = 'modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi'
icon_state = "signal_tech_envirosuit"

/obj/item/clothing/suit/hooded/wintercoat/engineering/signal_tech
name = "signal technician's winter coat"
desc = "A surprisingly heavy yellow winter coat with reflective green stripes. It has a small antennae for its zipper tab, and the inside layer is covered with a radiation-resistant silver-nylon blend. Because heat insulation is clearly not a priority."
icon = 'modular_tannhauser/modules/NTSL/icons/clothing_object.dmi'
worn_icon = 'modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi'
icon_state = "coat_signal_tech"
hoodtype = /obj/item/clothing/head/hooded/winterhood/engineering/signal_tech

/obj/item/clothing/head/hooded/winterhood/engineering/signal_tech
desc = "A yellow winter coat hood. Definitely not enough to keep you warm near the telecommunications servers."
icon = 'modular_tannhauser/modules/NTSL/icons/clothing_object.dmi'
worn_icon = 'modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi'
icon_state = "winterhood_signal_tech"
22 changes: 0 additions & 22 deletions modular_tannhauser/modules/NTSL/code/signal_technician/clothing.dm

This file was deleted.

Binary file modified modular_tannhauser/modules/NTSL/icons/clothing_mob.dmi
Binary file not shown.
Binary file modified modular_tannhauser/modules/NTSL/icons/clothing_object.dmi
Binary file not shown.
2 changes: 1 addition & 1 deletion tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -8602,6 +8602,7 @@
#include "modular_tannhauser\modules\CitOwOChems\code\mob\plushie.dm"
#include "modular_tannhauser\modules\CitOwOChems\code\obj\plushies.dm"
#include "modular_tannhauser\modules\NTSL\code\achievements.dm"
#include "modular_tannhauser\modules\NTSL\code\clothing.dm"
#include "modular_tannhauser\modules\NTSL\code\filter.dm"
#include "modular_tannhauser\modules\NTSL\code\global.dm"
#include "modular_tannhauser\modules\NTSL\code\logging.dm"
Expand Down Expand Up @@ -8629,7 +8630,6 @@
#include "modular_tannhauser\modules\NTSL\code\machinery\overrides.dm"
#include "modular_tannhauser\modules\NTSL\code\machinery\server.dm"
#include "modular_tannhauser\modules\NTSL\code\machinery\traffic_control.dm"
#include "modular_tannhauser\modules\NTSL\code\signal_technician\clothing.dm"
#include "modular_tannhauser\modules\Shuttles\tourist_shuttle.dm"
#include "modular_tannhauser\modules\TannhauserEmotes\code\emote.dm"
#include "modular_tannhauser\modules\ZestyStatue\code\zesty.dm"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { BooleanLike } from 'common/react';
// import { BooleanLike } from 'common/react'; -- Uncomment when .tsx files dont error

import { useBackend, useLocalState } from '../backend';
import {
Expand All @@ -14,6 +14,7 @@ import {
import { RADIO_CHANNELS } from '../constants';
import { Window } from '../layouts';

/* -- Uncomment when .tsx files dont error
type Data = {
admin_view: BooleanLike;
emagged: BooleanLike;
Expand All @@ -30,6 +31,7 @@ type Server_Data = {
server: string;
server_name: string;
};
*/

export const NTSLCoding = (props) => {
// Make sure we don't start larger than 50%/80% of screen width/height.
Expand All @@ -53,7 +55,7 @@ export const NTSLCoding = (props) => {
};

const ScriptEditor = (props) => {
const { act, data } = useBackend<Data>();
const { act, data } = useBackend();
const { stored_code, user_name } = data;
return (
<Box width="100%" height="100%">
Expand All @@ -80,22 +82,18 @@ const ScriptEditor = (props) => {
};

const MainMenu = (props) => {
const { act, data } = useBackend<Data>();
const { act, data } = useBackend();
const { emagged, user_name, admin_view } = data;
const [tabIndex, setTabIndex] = useLocalState('tab-index', 1);
return (
<>
{/* admin_view === 1 ? ( For now commented out, i do not think its good for tannhauser
<Button
icon="power-off"
color="red"
onClick={() => act('admin_reset')}
>
{admin_view === 1 ? (
<Button icon="power-off" color="red" onClick={() => act('admin_reset')}>
!!!(ADMIN) reset code and compile!!!
</Button>
) : (
''
)*/}
)}
<Section width="240px">
{user_name ? (
<Stack>
Expand Down Expand Up @@ -144,7 +142,7 @@ const MainMenu = (props) => {
};

const CompilerOutput = (props) => {
const { act, data } = useBackend<Data>();
const { act, data } = useBackend();
const { compiler_output } = data;
return (
<>
Expand All @@ -166,7 +164,7 @@ const CompilerOutput = (props) => {
};

const ServerList = (props) => {
const { act, data } = useBackend<Data>();
const { act, data } = useBackend();
const { network, server_data } = data;
return (
<>
Expand Down Expand Up @@ -209,7 +207,7 @@ const ServerList = (props) => {
};

const LogViewer = (props) => {
const { act, data } = useBackend<Data>();
const { act, data } = useBackend();
const { access_log } = data;
// This is terrible but nothing else will work
return (
Expand Down
Loading