Commit Graph
573 Commits
Author SHA1 Message Date
ariaworld 275a5f989f Fix: subcategory placement thingie 2023-11-23 01:01:57 +01:00
ariaworld 3c7f6a3112 Restore: Old non-modular costs 2023-11-23 00:55:06 +01:00
ariaworld 3805388363 Modularize, RAHHHH! 2023-11-19 03:03:30 +01:00
ariaworld 0c2be63a85 Add: Milk decal + organize stripper outfits. 2023-11-18 17:58:53 +01:00
ariaworld e98019e91e Push, push, push. 2023-11-17 21:34:27 +01:00
ariaworld 1594bd360e Merge branch 'spooktober-update' of https://github.com/ariaworld/S.P.L.U.R.T-Station-13 into spooktober-update 2023-10-31 14:03:41 +01:00
ariaworld 23f141965e First draft. 2023-10-31 14:03:34 +01:00
BongaTheProto a6b7bab389 Merge remote-tracking branch 'upstream/master' into hate-upstream 2023-10-22 21:26:12 -05:00
SandPoot cb24bd8256 Quickly makes lawsets per character and defaults on server default 2023-10-22 19:39:50 -03:00
BongaTheProtoandGitHub 4742a61480 Merge branch 'Sandstorm-Station:master' into master 2023-10-08 02:36:51 -05:00
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
BongaTheProtoandGitHub 33c2ac71ba Update preferences_savefile.dm 2023-04-23 14:08:46 -05:00
BongaTheProto 525741658b shaft beast? Like hype beast but with cocks? 2023-04-23 13:55:45 -05:00
BongaTheProto d08cb554e9 Merge branch 'master' into pr/660 2023-02-13 14:09:17 -05:00
BongaTheProtoandGitHub d9d617bf8d Merge branch 'Sandstorm-Station:master' into master 2023-02-10 16:53:13 -05: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
BongaTheProto 8a53e33271 Merge branch 'master' into pr/660 2023-01-28 22:11:29 -05:00
BongaTheProto 620380e188 Merge remote-tracking branch 'upstream/master' 2023-01-21 13:15:29 -05: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
BongaTheProto 21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05: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
BongaTheProto ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Neyusha 580bd31e12 Stowaways Role 2022-12-27 11:45:20 +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
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05: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
BongaTheProto fb66dc2035 Merge remote-tracking branch 'upstream/master' 2022-08-23 20:30:19 -05: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
BongaTheProto a72b79f56c Merge remote-tracking branch 'upstream/master' 2022-07-20 21:41:02 -05: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
BongaTheProto 6d385f2b2e Merge remote-tracking branch 'upstream/master' 2022-06-07 19:10:13 -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
BongaTheProto 53fa6873d1 Merge remote-tracking branch 'upstream/master' 2022-06-02 09:57:31 -05: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