Commit Graph
1622 Commits
Author SHA1 Message Date
Hatterhat 7fb3666f43 funny hands gaming 2021-10-22 22:05:18 -05:00
keronshb 562c714a1e Fixes the north sprite 2021-10-08 17:36:27 -04:00
keronshb e5f66413c8 fat dart
no idea what this even is
2021-10-08 17:28:25 -04:00
WanderingFox95andGitHub 83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
WanderingFox95andGitHub 84f1b6a7a4 these too 2021-09-24 01:02:27 +02:00
WanderingFox95andGitHub f2075db4df put these in the wrong place. 2021-09-24 01:02:17 +02:00
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
WanderingFox95andGitHub d668c8f3be fixes gloves again 2021-09-20 00:17:26 +02:00
WanderingFox95andGitHub c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95andGitHub 0c3fd273c6 Add files via upload 2021-09-20 00:16:19 +02:00
WanderingFox95andGitHub f2fe5d0c96 unsync 2021-09-20 00:13:45 +02:00
WanderingFox95andGitHub a426388597 And inhands 2021-09-19 21:33:51 +02:00
WanderingFox95andGitHub fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
WanderingFox95andGitHub a0cdc8abb7 please 2021-09-19 21:31:58 +02:00
WanderingFox95andGitHub 45602efbbf Now? 2021-09-19 21:26:46 +02: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
siliconsandGitHub 97213c94d8 Merge pull request #15178 from zeroisthebiggay/soup
all medipens get inhands
2021-09-19 11:09:01 -07:00
siliconsandGitHub abb89d9af0 Merge pull request #15163 from buffyuwu/clothing
saltpr adding more suit slot clothing
2021-09-19 11:07:32 -07:00
siliconsandGitHub 946e718429 Merge pull request #15156 from zeroisthebiggay/canwepretendthattheairplanesinthenightskyareshootingstars
fixes madness mask sprites
2021-09-19 11:07:24 -07:00
siliconsandGitHub a1e27f9ad6 Merge pull request #15144 from zeroisthebiggay/spiteful
bone satchel onmob sprites
2021-09-19 11:05:18 -07:00
siliconsandGitHub d90483c428 Merge pull request #15119 from keronshb/slaughterbuff
Fixes Slaughter Demon, gives it an action button, and a slight buff
2021-09-19 11:03:18 -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 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
keronshb b444afede3 ACTION BUTTON SLAM 2021-09-11 12:06:18 -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
siliconsandGitHub fd785c6abf Merge pull request #15063 from zeroisthebiggay/intern
ports various tg armor resprites and some such
2021-09-10 00:16:54 -07:00
siliconsandGitHub bf08d7e8f2 Merge pull request #15110 from timothyteakettle/arachnid-legs
arachnid legs now show up properly
2021-09-09 17:58:23 -07:00
Timothy Teakettle 65e942ef4e Update arachnid_parts.dmi 2021-09-09 18:15:29 +01:00
zerothebigboy bae9ede2ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into intern 2021-09-09 08:20:05 -04:00
zerothebigboy f14186cec2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into vesties 2021-09-09 08:17:53 -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
siliconsandGitHub 69bd477a72 Merge pull request #15039 from keronshb/gradiantport
Ports Colorist Quirk and Hair Gradients Preferences
2021-09-08 20:41:00 -07:00
siliconsandGitHub bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass
the unatomized hypospray/medbay tools/emergency kits resprite
2021-09-08 20:40:20 -07:00
siliconsandGitHub ff28789f27 Merge pull request #15064 from zeroisthebiggay/hammers
tg hammers port uwu
2021-09-08 20:39:46 -07: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 ccfde52b0d code 2021-09-02 23:45:03 -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 bfcdead4fe bazinga 2021-09-02 04:04:50 -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