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,625 Commits 55 Branches 0 Tags
760bbfa8b665e85256a4a46ab4bde4b0ebbaef11
Commit Graph

18330 Commits

Author SHA1 Message Date
Lin
760bbfa8b6 Merge pull request #10571 from Ghommie/Ghommie-cit507 
Riot foam dart design cost consistency.
 2020-01-18 20:46:16 +00:00
Ghom
d709edb1c2 Merge pull request #10578 from r4d6/Mining 
Port TG's Mining changes
 2020-01-18 20:32:14 +01:00
Ghom
ce2fc37df3 Merge pull request #10501 from Putnam3145/more-atmos 
Adds a couple relief valves
 2020-01-18 20:16:30 +01:00
Ghom
9f2bc48d74 Merge pull request #10600 from Kraseo/ricetriangles 
Fixes sprinkles on jelly donuts + lack of berry juice
 2020-01-18 18:52:14 +01:00
Ghom
07b3bac674 Merge pull request #10580 from Putnam3145/craft-log 
Craft logging
 2020-01-18 17:47:31 +01:00
Ghom
c00be1a9b1 Merge pull request #10586 from Tupinambis/RLDNerf 
Nerfs RLDs because they hard counter nightmares and night ops.
 2020-01-18 17:42:30 +01:00
Ghom
29c3e72335 You jelly. 2020-01-18 17:41:31 +01:00
Ghom
5a613809f5 Merge pull request #10599 from Putnam3145/gibtonite-explosion-fix 
Fixed gibtonite instantly exploding on pick mining
 2020-01-18 16:54:52 +01:00
Kraseo
6708607073 fixes jelly donuts not having sprinkle sprites, fixes jelly donuts not having berry jelly 2020-01-18 15:05:07 +01:00
Putnam
b30948a60a Fixed gibtonite instantly exploding on pick mining 2020-01-18 04:37:44 -08:00
Putnam
3788bc6676 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into more-atmos 2020-01-17 21:33:13 -08:00
r4d6
0d3706b7f9 Make public shuttle not require access 2020-01-17 22:15:29 -05: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
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
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
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
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
Tupinambis
22dbd3d265 Nerfs RLDs in general. You know I had to do it to em. 2020-01-17 12:23:13 -06:00
Ghom
72a83f05b5 Merge pull request #10375 from r4d6/radsuit 
Add a Radiation Hardsuit
 2020-01-17 17:36:43 +01: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
Putnam
5ace1df9af better logging, that also works 2020-01-16 19:09:13 -08:00
Putnam
a4cc73f219 some craft logging 2020-01-16 18:40:00 -08: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
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
69b5164103 Merge branch 'master' into RemoteMoodResearch 2020-01-16 15:50:11 -05:00
r4d6
ce16c91b2f Code changes 2020-01-16 14:08:14 -05: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
253a3a44ba moved "aphro" magic string to a define 2020-01-15 20:15:40 -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
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
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
Ghommie
9c526d0348 riot foam dart design cost consistency. 2020-01-16 02:56:58 +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
90be124730 Merge remote-tracking branch 'citadel/master' into map_network_helpers 2020-01-15 18:30:14 -07:00
kevinz000
2a4e2204c5 no definemania then.. 2020-01-15 18:29:45 -07:00
kevinz000
8f7460ff96 definemania 2020-01-15 18:24:13 -07:00
kevinz000
c5b95ff5d0 Mapping helpers 2020-01-15 18:22:43 -07:00
kevinz000
554f23e790 aight bet 2020-01-15 18:04:05 -07:00