Commit Graph

2216 Commits

Author SHA1 Message Date
buffyuwu f59bcedc30 updated green jacket 2021-09-21 01:09:39 -04:00
buffyuwu eb43981dea adds 4 loadout jackets
more clothing ported from RP/existing TG assets with minor edits on some. available in loadout for pre-round selection and character customization.

also fixes flannels by porting additional sprites so they can now be closed/opened. note: this changes some of the flannel /obj/ paths from example: /obj/item/clothing/suit/jacket/flannel/brown
TO
/obj/item/clothing/suit/toggle/jacket/flannel/brown

🆑
fix: flannels can now be toggled in style
add: ports more rp and existing tg assets with minor edits into loadout
/🆑
2021-09-20 19:04:47 -04:00
zerothebigboy c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:23:52 -04:00
silicons 97213c94d8 Merge pull request #15178 from zeroisthebiggay/soup
all medipens get inhands
2021-09-19 11:09:01 -07:00
silicons abb89d9af0 Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
2021-09-19 11:07:32 -07:00
silicons 946e718429 Merge pull request #15156 from zeroisthebiggay/canwepretendthattheairplanesinthenightskyareshootingstars
fixes madness mask sprites
2021-09-19 11:07:24 -07:00
buffyuwu 8a207d7ebd three more loadout clothing items
made from (many) edits to the gothcoat and blackwizard clothing items respectively
2021-09-19 03:01:02 -04:00
zerothebigboy 626047d6b8 soup 2021-09-18 18:30:59 -04:00
zerothebigboy 4c82eeeb2a soup 2021-09-18 18:18:04 -04:00
buffyuwu 43cd462d79 saltpr adding more suit slot clothing
adds three suit slot clothing items. the hoodies remade from the unused(?) hoodieskirt asset and the heartcoat comes from a redesign of the bartender's winter coat
2021-09-16 14:19:23 -04:00
zerothebigboy e16324313f sussy branch name moment 2021-09-15 21:22:03 -04:00
zerothebigboy 3c60632312 spiteful 2021-09-14 11:01:20 -04:00
zerothebigboy 68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
zerothebigboy c7e16aabf8 ihatekeroncoats 2021-09-09 04:56:42 -04:00
zerothebigboy 5a8a069cd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern
# Conflicts:
#	icons/mob/clothing/suit.dmi
#	icons/mob/clothing/suit_digi.dmi
#	icons/obj/clothing/suits.dmi
2021-09-09 04:49:30 -04:00
silicons 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
silicons bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
2021-09-08 20:40:20 -07:00
silicons 1fd311b983 Merge pull request #15069 from zeroisthebiggay/flashes
tgifies the cyborg tools
2021-09-08 20:39:59 -07:00
silicons ff28789f27 Merge pull request #15064 from zeroisthebiggay/hammers
tg hammers port uwu
2021-09-08 20:39:46 -07:00
zerothebigboy 3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
keronshb ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
zerothebigboy e1a5fe7894 pain 2021-09-03 07:45:52 -04:00
zerothebigboy e53223a149 unversioned 2021-09-02 23:50:38 -04:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy a220e896e1 flashes 2021-09-02 21:41:16 -04:00
zerothebigboy 111a2e1f4a gommit 2021-09-02 20:25:25 -04:00
zerothebigboy 5206524dd4 gommit 2021-09-02 07:38:48 -04:00
zerothebigboy 94c6fd5bbc hammers 2021-09-02 03:26:09 -04:00
zerothebigboy 9f4f099880 gommit 2021-09-02 03:05:23 -04:00
zerothebigboy 30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy d831a84195 cool 2021-09-01 05:15:22 -04:00
zerothebigboy fe90ea3ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass 2021-09-01 05:14:27 -04:00
zerothebigboy 0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
Cognition fc2e101402 Fixes updates for rechargers & energy guns, ports finish recharging msg 2021-08-28 19:24:29 -07:00
silicons af99dbd5ab Merge pull request #15040 from keronshb/gluerevert
Reverts the Syndicate Glue sprite to the old version
2021-08-26 21:38:10 -07:00
keronshb c65285bb6d Gluerevert 2021-08-26 19:28:52 -04:00
keronshb 47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
keronshb e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
Lin ab7bcd5f4d Merge pull request #15007 from LetterN/revert-14988-openthegates
Old Gateway animation return: now includes less icons
2021-08-21 13:06:22 -05:00
zerothebigboy 06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	code/modules/ninja/suit/suit.dm
2021-08-19 21:55:22 -04:00
WanderingFox95 022e799948 Sprites 2021-08-17 14:20:04 +02:00
Letter N c4d7d61764 Revert "Old Gateway animation return" 2021-08-14 10:48:19 +08:00
Lin 64e13f31a8 Merge pull request #14988 from BlueWildrose/openthegates
Old Gateway animation return
2021-08-08 13:58:13 -05:00
silicons 8b09d98361 Merge pull request #14978 from Citadel-Station-13/mgas-dontoar
Adds military gas mask for donator
2021-08-08 04:08:37 -07:00
Cognition 7b9a661127 Old Gateway animation return 2021-08-07 05:38:28 -07:00
silicons 2192d8a87e Merge pull request #14817 from zeroisthebiggay/endit
[READY] tempgun rebalance (it's not a nerf don't worry)
2021-08-02 17:11:20 -07:00
Jay a88e83e579 Adds military gas mask for donator 2021-08-01 18:42:43 -05:00
silicons 89d0c590e6 Merge pull request #14943 from WanderingFox95/WanderingFox95-custom-kegs
Custom Kegs
2021-07-18 15:06:30 -07:00
silicons 5895eb0d31 Merge pull request #14926 from YakumoChen/human-leather-hats
Human leather hats
2021-07-18 15:06:22 -07:00
WanderingFox95 2bf47b69d7 open keg 2021-07-15 01:48:25 +02:00