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-10 01:49:19 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,662 Commits 55 Branches 0 Tags
0612451aefc1df1bf6605c91bcce33136d3ec790
Commit Graph

2877 Commits

Author SHA1 Message Date
zerothebigboy
e30a60d0ba a 2020-07-26 23:42:40 -04:00
silicons
1990f75957 Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-25 23:46:27 -07:00
silicons
c4ec1dfdc1 Update neck.dm 2020-07-24 20:50:52 -07:00
silicons
c3be76b529 Update neck.dm 2020-07-24 19:32:51 -07:00
Lin
6fca9af0ed Merge pull request #12848 from silicons/morecolors 
species customization now allows 16 million colors instead of 4 thousand
 2020-07-23 13:28:50 -05:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
e1afca8617 Merge pull request #12845 from YakumoChen/MKUltra-Fix 
Mk ultra fix
 2020-07-22 02:30:43 -07:00
silicons
744b6d6b48 Merge pull request #12851 from zeroisthebiggay/fetishcontentfetishcontent 
maid fetish content pr
 2020-07-21 19:20:52 -07:00
zerothebigboy
fb35248e3b a 2020-07-21 02:24:22 -04:00
silicons
87d53957bf sigh 2020-07-20 20:09:13 -07:00
YakumoChen
8adfe633e3 Fixes MK 2020-07-21 01:27:22 +00:00
silicons
267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
416b989e12 changes 2020-07-20 11:35:10 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
silicons
984796b8c6 sigh 2020-07-20 10:46:52 -07:00
silicons
58e26c540c merge from master 2020-07-20 10:18:44 -07:00
silicons
55f8e37544 sigh 2020-07-18 20:26:11 -07:00
silicons
910869d6bf more 2020-07-18 19:44:12 -07:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry 
Ok ok hear me out: Implements unarmed parry.
 2020-07-18 17:02:02 -05:00
silicons
044525519a Merge pull request #12750 from timothyteakettle/loadout-plushies 
replaces plushies in the loadout menu with a choice box
 2020-07-17 17:10:14 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
DeltaFire
ac2dd85743 runtime fixies 2020-07-14 18:25:13 +02:00
Timothy Teakettle
c3d490a803 very cool 2020-07-12 20:15:57 +01:00
Strazyplus
582be67063 Lawyer-drake when? 
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
 2020-07-12 00:42:46 -04:00
Strazyplus
c9cb29ceea Who feeding the chunkydrakes 2020-07-11 22:57:37 -04:00
Strazyplus
9de192fb99 Caution crushing hazard 2020-07-11 21:43:36 -04:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
BlackMajor
ea98bdeca6 done 2020-07-11 23:52:23 +12:00
BlackMajor
f43bdff603 bet? 2020-07-11 16:58:05 +12:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00
Ghommie
e12c3382de undefined variable. 2020-07-05 03:48:41 +02:00
Ghommie
562b57095d mowing down the experimental cloner copypasta. 2020-07-05 03:04:53 +02:00
Cirno
c2ba973c88 Merge remote-tracking branch 'origin' into emi 2020-07-04 15:59:47 -03:00
Cirno
020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
silicons
434a53340b groan 2020-06-30 20:21:59 -07:00
Ghommie
9dc4b99620 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-30 00:49:06 +02:00
silicons
26fee48cec Merge pull request #12645 from Ghommie/Ghommie-cit825 
More and more fixes.
 2020-06-29 14:18:10 -07:00
Ghom
b280c0f550 Merge pull request #12622 from timothyteakettle/grammar-fixes 
big batch of spelling/grammar corrections
 2020-06-29 21:13:06 +02:00
Lin
1966c6daca Merge pull request #12595 from silicons/squish 
*squish
 2020-06-29 13:11:38 -05:00
Ghom
a749dab2b2 Merge pull request #12623 from Citadel-Station-13/silicons-patch-7 
i would appreciate it if outgoing mentorpms didn't sear my eyes out of my head
 2020-06-29 19:30:49 +02:00
Ghommie
0779dd560e More and more fixes. 2020-06-29 18:52:37 +02:00
silicons
90e9a647ed Update mentorpm.dm 2020-06-26 22:39:17 -07:00
timothyteakettle
76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00
b1tt3r1n0
38153a2cbe Fuck abuse of mechanics, fermi chem edition. 2020-06-25 21:20:58 -04:00
Funce
669120ee72 Add proper deletion to mentor SQL queries 2020-06-25 09:05:09 +12:00
silicons
800825f9f7 squish 2020-06-24 11:02:47 -07:00
silicons
9f6d0ba10b Merge pull request #12570 from NopemanMcHalt/orvilike_bonus 
Adds Kepi and Orvilike Kepi
 2020-06-24 08:43:03 -07:00
Ghommie
de77b7139c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit765 2020-06-23 00:13:14 +02:00