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 09:54:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,581 Commits 55 Branches 0 Tags
2fe23b67dbdd2d4e95ace083605dbaf7a59f318f
Commit Graph

28581 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ghommie
2fe23b67db fug 2020-01-18 03:37:30 +01:00
Ghommie
224146ee1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit444 2020-01-18 03:36:09 +01:00
kevinz000
fd440ac379 Merge pull request #10592 from Ghommie/Ghommie-cit508 
Kevinz let some files fall back to CRLF.
 2020-01-17 17:34:13 -07:00
CitadelStationBot
61804e4147 Automatic changelog generation for PR #10579 [ci skip] 2020-01-17 18:32:32 -06:00
Ghom
f848b58f2c Merge pull request #10579 from r4d6/map-fix 
Fix Cyborgs spawns on all maps
 2020-01-18 01:32:29 +01:00
CitadelStationBot
201f234364 Automatic changelog generation for PR #10591 [ci skip] 2020-01-17 18:25:37 -06:00
Ghom
da8b29dd23 Merge pull request #10591 from Citadel-Station-13/kevinz000-patch-12 
Removes blood duplication via virus mix
 2020-01-18 01:25:34 +01:00
Ghommie
eaff51ff40 Kevinz let some files fall back to CRLF. 2020-01-17 23:26:05 +01:00
CitadelStationBot
eb3597ecc3 Automatic changelog generation for PR #10125 [ci skip] 2020-01-17 16:15:12 -06:00
kevinz000
aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
CitadelStationBot
32c496f70e Automatic changelog generation for PR #10570 [ci skip] 2020-01-17 15:34:40 -06:00
Ghom
34872f6969 Merge pull request #10570 from kevinz000/map_network_helpers 
Power cable + atmos pipe auto mapping helpers
 2020-01-17 22:34:38 +01:00
kevinz000
eddb6fda68 Update others.dm 2020-01-17 14:32:51 -07:00
kevinz000
3c2e6a959d whitespace renormalize 2020-01-17 14:25:29 -07:00
CitadelStationBot
7c3d671eb1 Automatic changelog generation for PR #10569 [ci skip] 2020-01-17 15:24:15 -06:00
kevinz000
05e2b6a441 Merge pull request #10569 from keronshb/RemoteMoodResearch 
Ports the Nanite Remote, Nanite Mood Programs + Rebalance, and the Research Generating Nanites
 2020-01-17 14:24:13 -07:00
kevinz000
edccfa3523 Update others.dm 2020-01-17 14:15:08 -07:00
kevinz000
e69253bf87 Update others.dm 2020-01-17 14:12:51 -07:00
CitadelStationBot
541a9cf9e7 Automatic changelog generation for PR #10375 [ci skip] 2020-01-17 10:36:45 -06:00
Ghom
72a83f05b5 Merge pull request #10375 from r4d6/radsuit 
Add a Radiation Hardsuit
 2020-01-17 17:36:43 +01:00
CitadelStationBot
1a604e6d9e Automatic changelog generation for PR #10584 [ci skip] 2020-01-17 10:16:39 -06:00
Ghom
eaca04a1c2 Merge pull request #10584 from AffectedArc07/patch-1 
Hotfix for CI line endings
 2020-01-17 17:16:36 +01:00
AffectedArc07
835500980b Hotfix for CI line endings 2020-01-17 16:00:15 +00:00
CitadelStationBot
7c77e30a2e Automatic changelog generation for PR #10582 [ci skip] 2020-01-17 07:44:07 -06:00
Ghom
e7b925e779 Merge pull request #10582 from Putnam3145/more_flavor 
Made temp flavor "more" pop up with actual temp flavor
 2020-01-17 14:44:04 +01:00
r4d6
98bb9397ea fix cyborgs spawns 2020-01-16 21:05:51 -05:00
Ghom
c1e9618757 Merge pull request #10565 from Citadel-Station-13/revert-10379-tg-47443-shotgunpbs 
Revert "shotgun pointblanking people actually throws them"
 2020-01-16 23:18:37 +01:00
CitadelStationBot
1860d553e4 Automatic changelog generation for PR #10347 [ci skip] 2020-01-16 15:51:40 -06:00
kevinz000
d110d7bae9 Merge pull request #10347 from deathride58/stambufferbuff 
[experimental] Buffs the stamina buffer by making it recharge for free.
 2020-01-16 14:51:38 -07:00
keronshb
4dc85dd4ef the compile file for this 2020-01-16 16:28:11 -05:00
keronshb
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
CitadelStationBot
1108de8c37 Automatic changelog generation for PR #10456 [ci skip] 2020-01-16 06:30:34 -06:00
Ghom
ca13be3c92 Merge pull request #10456 from Putnam3145/arousal-bad 
Removes arousal damage and replaces it with simpler systems
 2020-01-16 13:30:31 +01:00
kevinz000
88d6c1a166 OKFINE 2020-01-15 22:02:07 -07:00
kevinz000
327c1e04e0 s 2020-01-15 22:00:08 -07:00
Putnam
fa0080d8d6 made climax with partner require EXPLICIT consent 2020-01-15 20:55:39 -08:00
Putnam
253a3a44ba moved "aphro" magic string to a define 2020-01-15 20:15:40 -08:00
Putnam
a1922a459e Moved Arousal tab stuff to IC tab 2020-01-15 20:14:23 -08:00
Putnam
de4e65c467 Savefile conversion for inesct 2020-01-15 20:13:09 -08:00
kevinz000
512b112154 happythink 2020-01-15 20:45:05 -07:00
kevinz000
925dc0185e dme 2020-01-15 19:36:56 -07:00
kevinz000
ab0c1f3f59 oh it's a list 2020-01-15 19:36:20 -07:00
kevinz000
4f665930cc a a 2020-01-15 19:32:38 -07:00
CitadelStationBot
04f4cf5c36 Automatic changelog generation for PR #10417 [ci skip] 2020-01-15 20:21:51 -06:00
Ghom
7d9f4f9fe5 Merge pull request #10417 from kevinz000/nightshift_1 
Nightshift improvements: public area settings/levels, nightshift auth requirement change, config changes, etc etc
 2020-01-16 03:21:49 +01:00
Ghom
70c1b0635a early returns. 2020-01-16 03:14:39 +01:00
kevinz000
b42de8d457 compile 2020-01-15 18:49:29 -07:00
kevinz000
c710c332e4 compile 2020-01-15 18:37:09 -07:00
kevinz000
e8d8d32a33 ree 2020-01-15 18:34:16 -07:00
kevinz000
6c2c9008c0 more dmemania 2020-01-15 18:30:48 -07:00