cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-30 16:56:26 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
423 Commits
Author SHA1 Message Date
SandPoot e6ba821bdd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-10-07 23:21:27 -03:00
SandPoot 4429bce1e1 yeah 2023-10-07 14:36:26 -03:00
SandPoot 65c38e9828 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-10 02:18:08 -03:00
SandPoot 9e2851b76b donator. 2023-02-06 20:01:47 -03:00
SandPoot 5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot 54192d4d0d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-20 21:35:34 -03:00
LinandGitHub 6dd017fc21 Merge pull request #15933 from LeDrascol/polychromatic-cowboy-hat 
Adds the Polychromatic Cowboy Hat
 2023-01-18 18:11:21 -07:00
SandPoot e76ed6a1ea Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-17 22:26:56 -03:00
Darius aa1b82f0b1 Convert Colorist from quirk to loadout item 
Removes the Colorist quirk, and adds Hair Dye Spray to the loadout under backpack items.
 2023-01-11 14:23:14 -05:00
Darius a8b7cd9c4a Adds the Polychromatic Cowboy Hat 
Adds a new polychromatic variant of the white cowboy hat.
 2023-01-10 20:40:01 -05:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
HatterhatandGitHub 1e1cce6e86 forgor 2022-12-24 11:38:06 -06:00
Hatterhat c54ed0ceda overstepped the scope tbh 2022-12-24 01:44:03 -06:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 723decec2b Merge pull request #15882 from Citadel-Station-13/silicons-patch-16 
updates kate walker's donator item
 2022-12-12 19:13:42 -07:00
Cognition b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
siliconsandGitHub 5b954558da Update __donator.dm 2022-11-03 22:50:56 -07:00
SandPoot 32535e69b6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-23 18:31:23 -03:00
zerothebigboy 44275e7493 i am thoroughly erect 2022-08-14 21:58:48 -04:00
SandPoot da1df79599 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-07-20 23:30:31 -03:00
LetterJay 64bcd694c1 donator blah blah, my head hurts 2022-07-18 00:20:33 -05:00
SandPoot 78b4d94c96 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-07 17:00:44 -03:00
Timothy Teakettle c025a4f36e commit names arent important right? 2022-06-02 20:40:21 +01:00
Timothy Teakettle dad0aa72f0 OH BOY 2022-06-02 19:18:11 +01:00
SandPoot 2806f1ef7f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 15:46:12 -03:00
TrojanCoyote 024e4dade1 Adds kitsune masks to loadout options 
black and white kitsune masks go into loadout
 2022-05-31 07:48:26 -05:00
SandPoot eee01dd764 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-05-15 23:43:09 -03:00
LinandGitHub f2ca3a067d Merge pull request #15617 from timothyteakettle/timothyteakettle-patch-1 
poly alt cloak can now be renamed/dedescriptioned in loadout
 2022-05-16 02:31:01 +00:00
Timothy TeakettleandGitHub 3157a11209 Update neck.dm 2022-05-13 15:36:05 +01:00
SandPoot 45580ae0e2 unused 2022-03-04 13:33:32 -03:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00
SandPoot 22a4a807df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-19 18:01:26 -03:00
Timothy TeakettleandGitHub c9051a6a08 adds polychromic clown outfit and mask (#15359) 
* why

* polyclown

* outfit / loadout / etc

* its not pink what do you mean

* newline

* fixes

* test icon diffs
 2022-02-18 14:38:50 -08:00
SandPoot 2d0637221a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-04 00:59:26 -03:00
Linzolle ab6f305805 Merge branch 'pokerchips' of github.com:Citadel-Station-13/Citadel-Station-13 2022-02-01 21:50:26 -07:00
SandPoot ed053988d8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-24 22:11:23 -03:00
Jay a701aece04 adds space hoodie 
removed dupes in custom_w.dmi
 2021-11-21 19:49:32 -06:00
SandPoot 34900425aa Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-11-17 13:48:32 -03:00
Jay b7a34085a0 adds item for donator - t2 2021-11-14 13:59:10 -06:00
SandPoot 30c43de717 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-28 11:39:58 -03:00
buffyuwu 8209a22ee3 🅰️ 2021-09-20 19:10:03 -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
SandPoot e7d5275a70 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-20 14:32:29 -03: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 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
SandPoot ab9b824ce9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-08-08 14:18:09 -03:00
siliconsandGitHub f327592784 Update __donator.dm 2021-08-04 00:51:37 -07:00
Jay a88e83e579 Adds military gas mask for donator 2021-08-01 18:42:43 -05:00
SandPoot dbf3b3f057 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-07-28 14:22:48 -03:00