shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,404 Commits 5 Branches 0 Tags
a8fb8afecb9a795baddfc5f2c29068ffccc62508
Commit Graph

1578 Commits

Author SHA1 Message Date
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
SandPoot
45ef0fe5ca closes #15278 2021-10-17 21:40:39 -03:00
SandPoot
1561138350 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-16 14:11:00 -03:00
SandPoot
f77ff24a6f Update tacklers.dm 2021-10-07 12:59:25 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02: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
WanderingFox95
c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +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
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
buffyuwu
7dbcc81fd3 whoops 2021-09-16 14:23:21 -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
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
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
bb7ee63eae Merge pull request #15058 from zeroisthebiggay/headass 
the unatomized hypospray/medbay tools/emergency kits resprite
 2021-09-08 20:40:20 -07:00
keronshb
ea3b248e6c Ports Parade outfit changes 2021-09-05 14:17:52 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
5206524dd4 gommit 2021-09-02 07:38:48 -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
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
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
BlueWildrose
cfc3a12a26 these don't have alternate sprites so therefore... 2021-08-01 07:24:36 -07:00
BlueWildrose
f747f76bd4 fix kimonos 2021-08-01 07:18:45 -07:00
BlueWildrose
fb886778b2 fix bathrobe 2021-08-01 07:17:29 -07:00
BlueWildrose
1b31e4d626 let's fix some grammar while we're here. 2021-07-31 05:31:21 -07:00
BlueWildrose
698969933e fixing qipao women fitted states 2021-07-31 05:18:50 -07:00
BlueWildrose
ef413f5d2b fix miscellaneous female fittings 2021-07-31 05:15:46 -07:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Putnam3145
ebb8d278a1 Runtime fix; need to update auxmos or it's lies 2021-07-25 18:45:17 -07:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
WanderingFox95
e5e8faec30 Applying suggestions from the review 
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
 2021-07-21 19:46:18 +02:00
WanderingFox95
cdc6fe1cd4 Goliath Gloves 2021-07-20 18:50:47 +02:00
YakumoChen
bff3c840c0 human skin hats 2021-07-05 05:04:18 +00:00
YakumoChen
2d8ba411a4 human leather hat 2021-07-05 04:57:14 +00:00
zerothebigboy
fb32aa1248 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-06-20 03:29:50 -04:00
silicons
c1928c9446 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-16 19:04:16 -07:00
Lin
1e66357706 Merge pull request #14851 from Vynzill/spritinghell 
Extended Armwraps
 2021-06-16 11:30:01 -07:00
Vynzill
df72710cae herewego 2021-06-14 17:19:05 -05:00
silicons
8595e05ad9 Merge remote-tracking branch 'citadel/master' into combat_v7 2021-06-13 15:37:35 -07:00
silicons
a91d5111c4 Merge pull request #14837 from zeroisthebiggay/trojancoyoteskirt 
(held against my will) adds a onesleeved croptop
 2021-06-13 15:19:37 -07:00
silicons
2dd0d014b9 Merge pull request #14813 from SandPoot/small-issues 
Fixes some small issues with cosmetic syndicate clothing (loadout clothing)
 2021-06-13 15:15:32 -07:00
zerothebigboy
a395fc1b52 a 2021-06-12 19:58:53 -04:00
zerothebigboy
1a90c96e4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/feet.dmi
#	icons/mob/clothing/feet_digi.dmi
#	icons/mob/clothing/head.dmi
#	icons/mob/clothing/mask.dmi
#	icons/mob/clothing/mask_muzzled.dmi
#	icons/obj/clothing/hats.dmi
#	icons/obj/clothing/masks.dmi
#	icons/obj/items_and_weapons.dmi
 2021-06-09 17:40:28 -04:00
SandPoot
d70a35a48d upload syndicate.dm 2021-06-09 15:49:57 -03:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
1a800cc470 modifications 2021-06-07 19:40:16 -07:00