Commit Graph

86 Commits

Author SHA1 Message Date
Kabramen d9ff0a10bb Move the overalls from the kinkmate to the clothesmate 2022-04-26 18:05:42 -03:00
Arctaisia Xiakta f76ca53065 modularises
FINALLY finished modularising the code,,
2022-04-24 15:40:50 +10:00
Arctaisia Xiakta 323ccd7e79 Update megaseed.dm
MORE stuff
2022-04-24 14:09:38 +10:00
Dahlular a17f7756b3 Merge pull request #1512 from quotefox/hairgraid
hair gradients
2021-12-30 09:44:29 -08:00
quotefox 572cc5d486 hair gradients
ported from https://github.com/keronshb/Citadel-Station-13/commit/47078e9a85411807af398aecec4b61ddecb91d24
2021-12-30 17:16:25 +00:00
Archie a96e764c03 allows vending machines to throw items at people when they get hacked to do so 2021-12-30 01:05:49 -03:00
!Moltov! 5ecb809045 Polychromatic Bra+skirt (#18)
bruh
2021-11-15 11:54:59 -03:00
Ghom 7530d45e25 Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20
Sprites, Tweaks, and Snacks, QoL
2021-11-01 15:28:53 -03:00
kevinz000 fa0fc6ffb9 All vending machines get restocks. 2021-10-30 18:29:07 -03:00
Archie f51fb483f2 Fix v1 2021-10-30 17:55:43 -03:00
Archie 436f1b6281 Merge remote-tracking branch 'upstream/master' 2021-10-20 23:26:05 -03:00
!Moltov! 26433c5270 Fixes a fucking punctuation error
fixes something that would break clothesmates
2021-10-13 11:45:14 -04:00
!Moltov! 20f81c5715 adds to vendor 2021-10-13 11:42:00 -04:00
Moltov 27b9098973 puts it in a clothesmate 2021-10-12 22:43:50 -04:00
ArchieBeepBoop d5a37c18a3 Merge pull request #11 from Moltovz/posshim
Adds Posshim's Corpus clothing. Ready To Merge
2021-08-25 19:58:03 -03:00
Moltov 49f862a847 Adds Posshim's Corpus clothing.
DNM
2021-08-24 17:48:50 -04:00
Yipper Yapper ad78cbbeea Added borb seed 2021-08-07 00:17:20 -07:00
AuStation Bot 4e6997922e Adds Unum deck 2021-06-18 14:06:11 -03:00
Kabra_men 6ea19bb7d2 Engislut 2021-06-02 18:20:06 -03:00
Dahlular 550f709ad9 Revert "Ports Vending Machine Tipping" 2021-06-01 04:07:43 -06:00
Dahlular 3218c844bb Revert "Something about taming vending machines" 2021-06-01 04:06:42 -06:00
Archie 725f8f96de And this. 2021-05-31 13:37:50 -03:00
Archie c31112cc72 Also that. 2021-05-31 13:24:52 -03:00
Archie 2ad966435a Something about taming vending machines 2021-05-31 13:15:35 -03:00
Archie b9dabca716 Ports Vending Machine Tipping 2021-05-15 17:21:29 -03:00
SaintHusky ed5f2ba714 Slutty Nurse outfit 2021-05-12 19:53:05 +02:00
Dahlular bee97fa7b4 Adds 4 different flannel types 2021-05-08 02:20:31 -06:00
Dahlular 978748b8d8 Merge pull request #1066 from lyricalpaws/master
We're off to see the wizard
2021-04-17 21:09:27 -06:00
QuoteFox 276a81f026 fluffy half-crop jacket. 2021-04-17 21:21:21 +01:00
Chloe Carver-Brown f6683fbcd3 we're off to see the wizard 2021-04-15 15:12:13 +01:00
Marvin Megavolt ac7a714604 Back for round 2 2021-03-31 21:53:46 -05:00
QuoteFox a4826e6eab Revert "Merge remote-tracking branch 'upstream/master'"
This reverts commit f5cf7f6f5a, reversing
changes made to a32444dae7.
2021-03-27 10:56:34 +00:00
CapnMachaddish 06a38d57a2 Now available from your local interdimensional dragon shopkeeper 2021-03-23 14:25:11 -05:00
lukevale cf48916d8d final touches on the sweater. 2021-03-20 16:28:38 -05:00
DragonTrance 3ebb7488de Merge branch 'master' into plant-adding 2021-02-21 12:06:48 -07:00
DragonTrance c729c61765 added tons of botany changes from citadel (not instability) 2021-02-21 09:57:29 -07:00
DragonTrance 24cb27b67c #5 2021-02-21 08:37:10 -07:00
Vladin 1bfe8bb816 love in the air
no not really thats actually nerve gas
2021-02-13 21:51:56 -05:00
QuoteFox b39881f441 vending fix, wallet fix
vending fix, wallet fix
2021-02-04 23:40:40 +00:00
QuoteFox a40e002595 loose ends.
more prices I missed
2021-02-04 14:20:17 +00:00
QuoteFox 2253473cc5 we dont use this anymore
we dont use this anymore
2021-02-04 12:47:09 +00:00
QuoteFox 5584bb9522 Economy part 2 - Vendors 2021-02-04 12:42:50 +00:00
CygnusB 00abae18ae one more time
ye
2021-01-19 18:54:17 -03:00
Vladin a7ee5f4ce0 requiem
uniform no longer awkwardly caps and shit added to vendor
2021-01-03 20:10:09 -05:00
Poss 9d7e2c785e Update cigarette.dm 2020-11-21 22:47:09 -05:00
Oposshim bb1694f301 Kinaris Corp 1.1.2
another long overdue haul of shit I forgot/was to busy to get the first patch around.
2020-11-21 12:05:56 -05:00
Ghom 28cdb9c5f1 Oh no. 2020-10-30 05:30:15 -03:00
Dahlular ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky
The Spookening: Ports Jacqueline the Pumpqueen event + Dullahan and subsequent Fixes
2020-10-29 22:51:07 -06:00
kevinz000 fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime
[READY] [Spookytime] Adds Jacqueline the Pumpqueen
2020-10-28 16:04:47 -03:00
kevinz000 071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art
Code stuffs + more framework for cargo rework cuz atomic prs are good
2020-10-28 04:52:13 -03:00