cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,384 Commits 55 Branches 0 Tags
fce73c84c70c75eb37d108a4b3b6e3c12f01bc93
Commit Graph

211 Commits

Author SHA1 Message Date
Xantholne
903e59d6ed Merge branch 'master' into xantholne-christmas03 2020-01-12 22:29:59 -07:00
Unknown
6cc856d9af Loadout Menu 2020-01-08 22:44:04 -07:00
Unknown
0b02439b08 Puts an end to the Christmas Menace 2020-01-02 03:53:04 -07:00
kevinz000
3f4594d78e Merge pull request #10312 from Commandersand/prayfornoconflictslel 
ports rp dresses/pants/chaps, available through loadout or vendors(without breaking my github branch)
 2019-12-30 00:07:32 -08:00
Commandersand
60905cc09b loadout 2019-12-27 12:44:08 -06:00
Ghom
5873ee8ea8 Merge pull request #10264 from Seris02/wintercoatsagain 
Makes cultist coats hold respective items, can actually make them and adds cosmetic versions to the loadout
 2019-12-27 13:27:04 +01:00
Lin
9bdbb55b57 Merge pull request #10139 from Citadel-Station-13/donator 
Donator Item - Ready For Review
 2019-12-23 05:29:06 +00:00
LetterJay
98f9c9bf73 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:10 -06:00
LetterJay
28e909ad74 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:05 -06:00
LetterJay
1d933dd0f3 Update modular_citadel/code/modules/client/loadout/__donator.dm 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-12-22 14:37:00 -06:00
LetterJay
4def28ddf9 Update __donator.dm 2019-12-22 14:16:40 -06:00
Seris02
18481ec253 more coat stuff yes yes 2019-12-22 12:19:58 +08:00
Jay
29b25841b9 FUUUUUUUUUCK v2 2019-12-21 20:58:50 -06:00
Jay
0670db4e63 initial push for a large request - DNM 2019-12-10 08:03:00 -06:00
Unknown
97e686cf23 Merge branch 'master' into xantholne-christmas01 2019-12-06 17:21:08 -07:00
Seris02
0c5a1b900b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into wintercoattide 2019-12-05 21:09:38 +08:00
Putnam3145
8d09f5a082 Merge branch 'master' into tinytweaks 2019-12-01 23:24:56 -08:00
Seris02
9afbabb55e removes cult coat for now, adds coats to places 2019-12-01 05:42:43 +08:00
loginsandylogout
67754daf22 Fixed 2019-11-29 10:57:51 -06:00
loginsandylogout
7ddaaea267 Cats 2019-11-29 10:56:18 -06:00
loginsandylogout
88bd7678b1 Eee 2019-11-29 10:55:00 -06:00
loginsandylogout
a608003555 Equals 2019-11-29 10:53:57 -06:00
loginsandylogout
c8bc6941eb "don't copy paste code" 2019-11-29 02:46:31 -06:00
loginsandylogout
0da35fdde5 again 2019-11-29 02:33:33 -06:00
loginsandylogout
f9d8c41c3e newline needed apparently 2019-11-29 02:32:47 -06:00
Commandersand
2c2f3ea8aa mandatory meme 2019-11-29 02:03:31 -06:00
Commandersand
60cee5814a keyholesweater 2019-11-29 01:59:34 -06:00
Commandersand
22d0dbc05b sundress and stripper 2019-11-29 01:56:47 -06:00
Commandersand
5b7bf08d10 sundress 2019-11-29 01:47:41 -06:00
Commandersand
b715c088f6 add athletic shorts to loadout 2019-11-29 01:27:15 -06:00
Commandersand
57af7ba8af add plaid skirt,multipen,fountainpen to loadout 2019-11-29 01:24:24 -06:00
Unknown
33854e8fd8 Adds a huge amount of Christmas clothes 2019-11-27 20:07:39 -07:00
Winter Flare
e7523862eb Added Newspaperr to Loadout 2019-11-25 06:02:50 -05:00
Anonymous
1bb8ff1c0c Fixes loadout name, adds DAB outfit crate to cargo 
For "recruitment" on-station.
 2019-11-17 15:08:30 +03:00
kevinz000
2f4562a63b Merge pull request #9656 from Ghommie/Ghommie-cit290 
Purging a lot of space indention in favor of tabs.
 2019-11-14 15:55:04 -07:00
Anonymous
837052740a Merge branch 'master' into assu 
# Conflicts Resolved:
#	icons/mob/head.dmi
#	icons/obj/clothing/hats.dmi
 2019-11-13 11:59:53 +03:00
Ghommie
e977ba6729 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-11-10 23:17:58 +01:00
nik707
12a69dcee5 Merge pull request #9574 from r4d6/patch-4 
Add departemental Winter Coats to loadout
 2019-11-05 13:52:48 -06:00
r4d6
0114b7fbe2 Comment out Sec coat 2019-11-03 16:51:07 -05:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
Jay
9d830610bb onion necklace 2019-10-27 11:52:38 -05:00
r4d6
cdb9d40bae Add departemental Winter Coats to loadout 2019-10-22 14:38:09 -04:00
Anonymous
6a73abfe32 Adds ASSU suit+helmet and loadout stuff 
Also adds newlines reeeeeeeeeeee
 2019-10-20 23:52:06 +03:00
Linzolle
1690596047 you asked for this kevin 2019-10-16 15:53:11 -05:00
kevinz000
11a93d41de Merge pull request #9499 from r4d6/patch-1 
Add a Blindfold to the loadout list
 2019-10-15 22:57:02 -07:00
r4d6
a824998b89 Add a Blindfold to the loadout list 2019-10-14 11:48:14 -04:00
Jay
02b78a2817 changes donator item from glasses to a hat 2019-10-13 17:47:11 -05:00
Jay
e0b8d28386 donator item 2019-09-30 22:16:27 -05:00
kevinz000
fb2971e3e6 Merge remote-tracking branch 'origin/master' into donator_grouping 2019-08-15 14:40:44 -07:00