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

SUNS sprites wave 1. Clothing #2439

Closed
wants to merge 67 commits into from
Closed
Show file tree
Hide file tree
Changes from 27 commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
12aaad2
initial commit
GenericDM Sep 14, 2023
1786298
more
GenericDM Sep 14, 2023
7b09ef1
MORE
GenericDM Sep 14, 2023
a9c985d
mroe stufs
GenericDM Sep 14, 2023
91f74e2
MORE ICONS
GenericDM Sep 15, 2023
ed39a13
what if they were ingame
GenericDM Sep 15, 2023
693bd5a
yeah
GenericDM Sep 23, 2023
4885c8b
AAaaaa
Draggeru Oct 13, 2023
28c4ada
I need an adult
Draggeru Oct 29, 2023
ae21efc
I REALLY need an adult
Draggeru Oct 29, 2023
3610a4c
AAAAAAA
Draggeru Oct 29, 2023
7f11f31
fixes suns_sterile
Draggeru Oct 29, 2023
ea5243c
eeee
Draggeru Oct 29, 2023
a14f94b
A?
Draggeru Oct 29, 2023
f4af562
Merge remote-tracking branch 'upstream/master' into su(n)s-shit
Draggeru Oct 29, 2023
19cf467
Fixes the doctors coat?
Draggeru Oct 29, 2023
7372be0
Merge branch 'master' into su(n)s-shit
Draggeru Oct 30, 2023
19866e5
Fixes and additions
Draggeru Oct 31, 2023
07092ff
Merge branch 'su(n)s-shit' of https://github.com/Draggeru/ShiptestDra…
Draggeru Oct 31, 2023
ed827fd
More thiiings
Draggeru Oct 31, 2023
0ef5914
Merge branch 'master' into su(n)s-shit
Draggeru Oct 31, 2023
183e04a
Merge remote-tracking branch 'upstream/master' into su(n)s-shit
Draggeru Nov 1, 2023
e473753
Fixxx?
Draggeru Nov 1, 2023
83265fe
Fixes the vacsuit?
Draggeru Nov 1, 2023
a628e84
reconciles icondiffs i hope
Higgin Nov 1, 2023
8fbc54c
Merge pull request #2 from Higgin/higgin-drag-suns-fork
Draggeru Nov 1, 2023
f633e0c
Please dont break
Draggeru Nov 1, 2023
48e0427
Update code/modules/clothing/gloves/color.dm
Draggeru Nov 5, 2023
e0c6ad4
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
a0613db
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
632fe7b
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
c4332ce
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
bce98e4
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
8ae2ca5
Update code/modules/clothing/under/accessories.dm
Draggeru Nov 5, 2023
2d449e4
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
bc06949
Update code/modules/clothing/gloves/color.dm
Draggeru Nov 5, 2023
a1842d9
Update code/modules/clothing/suits/labcoat.dm
Draggeru Nov 5, 2023
74b580f
Update code/modules/clothing/under/accessories.dm
Draggeru Nov 5, 2023
821d34a
Update code/modules/clothing/under/accessories.dm
Draggeru Nov 5, 2023
1cb48fd
Update code/modules/clothing/under/accessories.dm
Draggeru Nov 5, 2023
93decaa
Update code/modules/clothing/head/berets.dm
Draggeru Nov 5, 2023
a5b4d3d
Update code/modules/clothing/head/jobs.dm
Draggeru Nov 5, 2023
d0824cd
Update code/modules/clothing/head/misc.dm
Draggeru Nov 5, 2023
7385fcc
Update code/modules/clothing/head/misc.dm
Draggeru Nov 5, 2023
45fd034
Update code/modules/clothing/head/misc_special.dm
Draggeru Nov 5, 2023
db0146f
Update code/modules/clothing/suits/jobs.dm
Draggeru Nov 5, 2023
3501f82
Update code/modules/clothing/head/misc_special.dm
Draggeru Nov 5, 2023
29050d7
Update code/modules/clothing/masks/breath.dm
Draggeru Nov 5, 2023
ed304de
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
de6d845
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
70be216
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
4ecb3aa
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
92db119
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
5f4f666
Update code/modules/clothing/spacesuits/hardsuit.dm
Draggeru Nov 5, 2023
896384c
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
c900506
Update code/modules/clothing/suits/armor.dm
Draggeru Nov 5, 2023
d8f1395
Update code/modules/clothing/suits/cloaks.dm
Draggeru Nov 5, 2023
20b39f9
Update code/modules/clothing/suits/cloaks.dm
Draggeru Nov 5, 2023
de4cb40
Update code/modules/clothing/suits/cloaks.dm
Draggeru Nov 5, 2023
7cbb97a
Update code/modules/clothing/suits/hoodies.dm
Draggeru Nov 5, 2023
bf53b1f
Update code/modules/clothing/suits/hoodies.dm
Draggeru Nov 5, 2023
7b8b434
Update code/modules/clothing/suits/jobs.dm
Draggeru Nov 5, 2023
9a3f899
Update TGS DMAPI
actions-user Nov 8, 2023
bfbc2a4
AAaa?
Draggeru Nov 8, 2023
2919f95
marge branch
Draggeru Nov 8, 2023
c55352a
Fuck
Draggeru Nov 8, 2023
13390e2
Merge remote-tracking branch 'upstream/tgs-dmapi-update' into su(n)s-…
Draggeru Nov 8, 2023
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
6 changes: 6 additions & 0 deletions code/modules/clothing/glasses/_glasses.dm
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,12 @@
custom_price = 250
supports_variations = VOX_VARIATION

/obj/item/clothing/glasses/science/suns //This needs a sprite/lense in the eye of the mask to show its science goggles
name = "eye mask science goggles"
desc = "A fancy looking mask to help against chemical spills. Fitted with an analyzer for scanning items and reagents."
icon_state = "suns_sciencemask"
item_state = "suns_sciencemask"

/obj/item/clothing/glasses/science/item_action_slot_check(slot)
if(slot == ITEM_SLOT_EYES)
return 1
Expand Down
10 changes: 10 additions & 0 deletions code/modules/clothing/glasses/hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@
hud_trait = TRAIT_MEDICAL_HUD
glass_colour_type = /datum/client_colour/glass_colour/lightblue

/obj/item/clothing/glasses/hud/health/suns //I need to figure out a way to make the masks toggleable for #style points.
name = "eye mask health scanner HUD"
desc = "A peculiar looking mask commnly seen at academic functions. This one has a health hud lense in it."
icon_state = "suns_doctormask_hud"

/obj/item/clothing/glasses/hud/health/night
name = "night vision health scanner HUD"
desc = "An advanced medical head-up display that allows doctors to find patients in complete darkness."
Expand Down Expand Up @@ -101,6 +106,11 @@
hud_trait = TRAIT_SECURITY_HUD
glass_colour_type = /datum/client_colour/glass_colour/red

/obj/item/clothing/glasses/hud/security/suns
name = "eye mask security HUD"
desc = "A peculiar looking mask commnly seen at academic functions. This one gives a heads-up display that scans the humanoids in view and provides accurate data about their ID status and security records."
icon_state = "suns_pkmask_hud"

/obj/item/clothing/glasses/hud/security/chameleon
name = "chameleon security HUD"
desc = "A stolen security HUD integrated with Syndicate chameleon technology. Provides flash protection."
Expand Down
30 changes: 30 additions & 0 deletions code/modules/clothing/gloves/color.dm
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
custom_price = 1200
custom_premium_price = 1200

/obj/item/clothing/gloves/color/yellow/suns
desc = "Padded academic gloves that hopefully keep students out of the nurses office."
name = "insulated gloves"
icon_state = "suns_insulated"
item_state = "suns_insulated"

/obj/item/toy/sprayoncan
name = "spray-on insulation applicator"
desc = "What is the number one problem facing our society today?"
Expand Down Expand Up @@ -202,6 +208,24 @@
strip_delay = 60
armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 50)

/obj/item/clothing/gloves/color/captain/suns
desc = "Fancy black gloves for trusted SUNS members. Sports a complex lining that prevents the wearer from being shocked."
name = "SUNS captain's gloves"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_captaingloves"
item_state = "suns_captaingloves"

/obj/item/clothing/gloves/color/sunsxo
name = "Academic staff gloves"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "White gloves that offer a good grip with writing utensils."
icon_state = "suns_xogloves"
item_state = "suns_xogloves"

/obj/item/clothing/gloves/fingerless/suns
desc = "These gloves offer style, purely and plainly."
name = "stitched fingerless gloves"
icon_state = "suns_glovesfingerless"
item_state = "suns_glovesfingerless"

/obj/item/clothing/gloves/color/latex
name = "latex gloves"
desc = "Cheap sterile gloves made from latex. Transfers minor paramedic knowledge to the user via budget nanochips."
Expand Down Expand Up @@ -237,6 +261,12 @@
icon_state = "nitrile_evil"
item_state = "nitrile_evil"

/obj/item/clothing/gloves/color/latex/nitrile/evil/suns
name = "white nitrile gloves"
desc = "Thick sterile white gloves that reach up to the elbows. The nanochips that transfer basic paramedic knowledge are disabled during finals week."
icon_state = "suns_latexgloves"
item_state = "suns_latexgloves"

/obj/item/clothing/gloves/color/latex/nitrile/infiltrator
name = "infiltrator gloves"
desc = "Specialized combat gloves for carrying people around. Transfers tactical kidnapping knowledge into the user via nanochips."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/gloves/tacklers.dm
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,12 @@
min_distance = 2
skill_mod = -2

/obj/item/clothing/gloves/tackler/dolphin/suns
name = "peacekeeper tackle gloves"
desc = "Sleek tackle gloves that allows the user to sail through the air. The main cause of accidents during finals week."
icon_state = "suns_longglovesblack"
item_state = "suns_longglovesblack"

/obj/item/clothing/gloves/tackler/combat
name = "gorilla gloves"
desc = "Premium quality combative gloves, heavily reinforced to give the user an edge in close combat tackles, though they are more taxing to use than normal gripper gloves. Fireproof to boot!"
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/head/berets.dm
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,11 @@
armor = list("melee" = 25, "bullet" = 15, "laser" = 25, "energy" = 35, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50)
strip_delay = 90

/obj/item/clothing/head/beret/hop/suns
name = "academic staff beret"
desc = "A soft beret sporting a discontinued inkwell quill feather. If only it could hold ink once more"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_xoberet"

/obj/item/clothing/head/beret/hop
name = "head of personnel beret"
desc = "A lovely blue Head of Personnel's beret with a silver and white insignia. It smells faintly of paper and dogs."
Expand Down
5 changes: 5 additions & 0 deletions code/modules/clothing/head/hardhat.dm
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,11 @@
item_state = "hardhat_solgov"
dog_fashion = null

/obj/item/clothing/head/safety_helmet/suns
desc = "A piece of headgear used in dangerous working conditions to protect the head."
icon_state = "suns_workerhelmet"
item_state = "suns_workerhelmet"

/obj/item/clothing/head/hardhat/atmos
icon_state = "hardhat_atmos"
item_state = "hardhat_atmos"
Expand Down
9 changes: 9 additions & 0 deletions code/modules/clothing/head/helmet.dm
Original file line number Diff line number Diff line change
Expand Up @@ -552,6 +552,15 @@
dog_fashion = null
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)

/obj/item/clothing/head/sunscaptain
name = "\improper SUNS bicorne hat"
desc = "A unique bicorne hat given to SUNS Captains to display academic seniority."
icon_state = "suns_captainbicorne"
item_state = "suns_captainbicorne"
worn_y_offset = 2
dog_fashion = null
armor = list("melee" = 40, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 30, "acid" = 60)

/obj/item/clothing/head/helmet/space/plasmaman/solgov
name = "\improper SolGov envirosuit helmet"
desc = "A generic white envirohelmet with a secondary blue."
Expand Down
6 changes: 6 additions & 0 deletions code/modules/clothing/head/jobs.dm
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,12 @@
name = "syndicate cap"
desc = "A black cap fit for a high ranking syndicate officer."

/obj/item/clothing/head/HoS/syndicate/suns //remind me to make this something to buy
name = "peacekeeper cap"
desc = "A black cap worn by the more essentric peacekeepers."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_pkcap"
item_state = "suns_pkcap"

/obj/item/clothing/head/HoS/beret/syndicate
name = "syndicate beret"
desc = "A black beret with thick armor padding inside. Stylish and robust."
Expand Down
11 changes: 11 additions & 0 deletions code/modules/clothing/head/misc.dm
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,12 @@
icon_state = "plaguedoctor"
permeability_coefficient = 0.01

/obj/item/clothing/head/sunscmo //I was told I get one plauge doctor outfit and I'm using it
name = "medical instructor hat"
desc = "A hat worn by the more essentric medical staff."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_doctorhat"
permeability_coefficient = 0.01

/obj/item/clothing/head/hasturhood
name = "hastur's hood"
desc = "It's <i>unspeakably</i> stylish."
Expand Down Expand Up @@ -530,3 +536,8 @@
name = "SolGov surgery cap"
desc = "It's a surgery cap utilized by solarian doctors."
icon_state = "solgov_surgery"

/obj/item/clothing/head/suns_surgery
name = "Suns surgery cap"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A surgery cap used by academic students and profesionals alike."
icon_state = "suns_doctorcap"
15 changes: 15 additions & 0 deletions code/modules/clothing/head/misc_special.dm
Original file line number Diff line number Diff line change
Expand Up @@ -378,3 +378,18 @@
. = ..()
if(!warped)
warp_up()

//SUNS lets you larp better than starfield ever will
/obj/item/clothing/head/welding/suns
name = "Peackeeper Visor"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A head-mounted helmet designed to protect those on the field from bright lights, while also allowing a life support connection. The warnings on this helmet suggest it is not space proof."
icon_state = "sunsvisor"
item_state = "sunsvisor"
tint = 0
clothing_flags = BLOCK_GAS_SMOKE_EFFECT | ALLOWINTERNALS //Why? Because I'm not giving PK's sec masks nor hud sunglasses.

/obj/item/clothing/head/welding/suns/hos
name = "Gilded Peackeeper Visor"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A head-mounted helmet designed to protect those on the field, this one had a gold lining to indicate rank. The warnings on this helmet suggest it is not space proof."
icon_state = "sunslpkvisor"
item_state = "sunslpkvisor"
6 changes: 6 additions & 0 deletions code/modules/clothing/masks/breath.dm
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,9 @@
item_state = "m_mask"
permeability_coefficient = 0.01
equip_delay_other = 10

/obj/item/clothing/mask/breath/suns
desc = "A close-fitting mask that covers JUST enough to connect an air supply"
name = "SUNS half face mask"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_captainmask"
item_state = "suns_captainmask"
6 changes: 6 additions & 0 deletions code/modules/clothing/masks/gasmask.dm
Original file line number Diff line number Diff line change
Expand Up @@ -273,3 +273,9 @@
item_state = "hunter"
resistance_flags = FIRE_PROOF | ACID_PROOF
flags_inv = HIDEFACIALHAIR|HIDEFACE|HIDEEYES|HIDEEARS|HIDEHAIR

/obj/item/clothing/mask/gas/suns //someone mentioned they were interested in using this sprite as the regular gasmask re-sprite, I forgor who so we'll deal with that when I PR this
name = "black gas mask"
desc = "A black face covering that allows the user to connect to a personal gas supply. Suprisingly not great at preventing gas inhalation."
icon_state = "suns_gasmask"
item_state = "suns_gasmask"
6 changes: 6 additions & 0 deletions code/modules/clothing/masks/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
/obj/item/clothing/mask/surgical/attack_self(mob/user)
adjustmask(user)

/obj/item/clothing/mask/surgical/suns
name = "purple sterile mask"
desc = "A sterile mask designed to help prevent the spread of diseases. Now pretty in purple!"
icon_state = "suns_sterile"
item_state = "suns_sterile"

/obj/item/clothing/mask/fakemoustache
name = "fake moustache"
desc = "Warning: moustache is fake."
Expand Down
29 changes: 29 additions & 0 deletions code/modules/clothing/shoes/miscellaneous.dm
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,12 @@
name = "mime shoes"
icon_state = "mime"

/obj/item/clothing/shoes/sneakers/suns
name = "white clogs"
desc = "Comftorble clogs for general use."
icon_state = "suns_doctorclogs"
item_state = "suns_doctorclogs" //I know what the state says, I'm not fixing it.

/obj/item/clothing/shoes/combat //basic syndicate combat boots for nuke ops and mob corpses
name = "combat boots"
desc = "High speed, low drag combat boots."
Expand All @@ -20,6 +26,12 @@
lace_time = 12 SECONDS
greyscale_icon_state = "boots"

/obj/item/clothing/shoes/combat/suns
name = "fancy combat boots"
desc = "Decent traction combat boots worn by high ranking academic staff."
icon_state = "suns_captainboots"
item_state = "suns_captainboots"

/obj/item/clothing/shoes/combat/sneakboots
name = "sneakboots"
desc = "These boots have special noise cancelling soles. Perfect for stealth, if it wasn't for the color scheme."
Expand Down Expand Up @@ -158,6 +170,18 @@
can_be_tied = FALSE
greyscale_icon_state = "boots"

/obj/item/clothing/shoes/jackboots/suns
name = "work safe jackboots"
desc = "Academic issued steel toed boots. For those with physically demanding majors."
icon_state = "suns_jackboots"
item_state = "suns_jackboots"

/obj/item/clothing/shoes/jackboots/sunslong
name = "peacekeeper longboots"
desc = "Longboots worn by academic security staff and trainees."
icon_state = "suns_longboots"
item_state = "suns_longboots"

/obj/item/clothing/shoes/jackboots/fast
slowdown = -1

Expand Down Expand Up @@ -236,6 +260,11 @@
icon_state = "laceups"
equip_delay_other = 50

/obj/item/clothing/shoes/laceup/suns
name = "academy laceup shoes"
desc = "Standard issue laceups from the syndicates resident academy."
icon_state = "suns_laceups"

/obj/item/clothing/shoes/roman
name = "roman sandals"
desc = "Sandals with buckled leather straps on it."
Expand Down
40 changes: 40 additions & 0 deletions code/modules/clothing/spacesuits/hardsuit.dm
Original file line number Diff line number Diff line change
Expand Up @@ -1336,3 +1336,43 @@
armor = list("melee" = 50, "bullet" = 40, "laser" = 40, "energy" = 35, "bomb" = 50, "bio" = 100, "rad" = 100, "fire" = 100, "acid" = 100)
desc = "The Quixote metaspacial mobility suit is the magnum opus of dimensional navigation equipment, combining durable composite armor with high mobility thrusters and defensive plating rated for all manner of exotic particles."
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/quixote/dimensional

//Suns hardsuits
/obj/item/clothing/head/helmet/space/hardsuit/security/suns
name = "\improper SUNS Peacekeeper hardsuit helmet"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "hardsuit0-suns_pk"
item_state = "hardsuit0-suns_pk"
hardsuit_type = "suns_pk"

/obj/item/clothing/suit/space/hardsuit/security/suns
name = "\improper SUNS Peacekeeper hardsuit"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_pkhardsuit"
item_state = "suns_pkhardsuit"
hardsuit_type = "suns_pk"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/security/suns

/obj/item/clothing/head/helmet/space/hardsuit/mining/suns
name = "\improper SUNS Industrial hardsuit helmet"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "hardsuit0-suns_mining"
item_state = "hardsuit0-suns_mining"
hardsuit_type = "suns_mining"

/obj/item/clothing/suit/space/hardsuit/mining/suns
name = "\improper SUNS Industrial hardsuit"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_miningsuit"
item_state = "suns_miningsuit"
hardsuit_type = "suns_mining"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/mining/suns

/obj/item/clothing/head/helmet/space/hardsuit/solgov/suns //Stealing ur subtype lel
name = "\improper SUNS Captains helmet"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_commandhelm"
item_state = "suns_commandhelm"
desc = "An armored spaceproof helmet, the white glass on the side signifies a captain level rank."

/obj/item/clothing/suit/space/hardsuit/solgov/suns
name = "\improper SUNS Captains hardsuit"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A well decorated space proof suit. The design was co-created by SolGov and SUNS academics."
icon_state = "suns_commandsuit"
item_state = "suns_commandsuit"
helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/suns
12 changes: 12 additions & 0 deletions code/modules/clothing/spacesuits/syndi.dm
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,18 @@
item_state = "syndicate-black"
allowed = list(/obj/item/gun, /obj/item/ammo_box, /obj/item/ammo_casing, /obj/item/melee/baton, /obj/item/tank/internals, /obj/item/storage/firstaid, /obj/item/healthanalyzer, /obj/item/stack/medical)

//Suns space suit and helmet
/obj/item/clothing/head/helmet/space/syndicate/suns
name = "SUNS space helmet"
icon_state = "suns_vachelm"
item_state = "suns_vachelm"
desc = "An academic standard spacesuit helmet. Normally reserved for low budget tasks in space."

/obj/item/clothing/suit/space/syndicate/suns
name = "SUNS spacesuit"
icon_state = "suns_vacsuit"
item_state = "suns_vacsuit"
desc = "An academic standard spacesuit. Normally reserved for low budget tasks in space."

//Black-orange syndicate space suit
/obj/item/clothing/head/helmet/space/syndicate/black/orange
Expand Down
30 changes: 30 additions & 0 deletions code/modules/clothing/suits/armor.dm
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,36 @@
. = ..()
allowed |= list(/obj/item/gun/ballistic/automatic/assault/swiss_cheese, /obj/item/tank)

/obj/item/clothing/suit/armor/vest/bulletproof/sunsehos //remind me to make this something to buy
name = "\improper Peacekeeper Greatcoat"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A funky armored coat worn by essentric peacekeepers. Closing the coat is socially impropper."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_greatcoat"
item_state = "suns_greatcoat"

/obj/item/clothing/suit/armor/vest/bulletproof/suns
name = "Peacekeeper Plating"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A funky armored coat worn by essentric peacekeepers. Closing the coat is socially impropper."
icon_state = "suns_pkarmor"
item_state = "suns_pkarmor"

/obj/item/clothing/suit/armor/vest/bulletproof/sunshos
name = "Gilded Peacekeeper Plating"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "A funky armored coat worn by essentric peacekeepers. Closing the coat is socially impropper."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_lpkarmor"
item_state = "suns_lpkarmor"

/obj/item/clothing/suit/armor/vest/bulletproof/suns/captain
name = "\improper Decorated academic coat"
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
desc = "An armored coat intended for SUNS Captains on the frontier. Go forth, and spread the message of the academy."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_captaincoat"
item_state = "suns_captaincoat"

/obj/item/clothing/suit/armor/vest/bulletproof/suns/xo
name = "academic staff coat"
desc = "A white coat used by Suns acedemic staff. It designates the second in command on the ship."
Draggeru marked this conversation as resolved.
Show resolved Hide resolved
icon_state = "suns_xojacket"
item_state = "suns_xojacket"

/obj/item/clothing/suit/armor/vest/hop
name = "head of personnel's parade jacket"
desc = "For when an armoured vest isn't fashionable enough."
Expand Down
Loading