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 18:02:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
40,235 Commits 55 Branches 0 Tags
37c3bbbd9c2a38b873de9c4b76d2ac7d25c07fb6
Commit Graph

253 Commits

Author SHA1 Message Date
Putnam
467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
YakumoChen
8adfe633e3 Fixes MK 2020-07-21 01:27:22 +00:00
silicons
526d257410 fix 2020-07-20 11:48:08 -07:00
silicons
434a53340b groan 2020-06-30 20:21:59 -07:00
Ghommie
50171db408 Makes fermichem properly logged in the reagents logs, tiny astrogen fix. 2020-05-21 03:04:26 +02:00
kevinz000
a533906f73 Merge pull request #11992 from Ghommie/Ghommie-cit703 
reagents value nerf and standardization.
 2020-04-25 16:54:14 -07:00
Ghommie
0beb28d3bb reagents value nerf and standardization. 2020-04-23 19:52:22 +02:00
Ghommie
63870cc9d1 Movespeed modifiers refactor port. 2020-04-22 22:01:39 +02:00
Ghommie
3c42e9eefd Moderately unoriginal PR title about runtime errors. 2020-03-26 23:22:51 +01:00
kevinz000
0e3193e929 relatively small 71 file 700 lines changed refactor/rework to combat mode/sprint and some miscellaneous things that totally aren't important (#11376) 
* combat refactoring

* i hate this

* mobility flags part 2 time xd

* whew

* stuff

* a

* ok

* changes

* Wew

* k

* add flags

* FUCKYOUVORE

* fixes

* typo

* no using this in hard stamcrit

* update icon

* woopsy

* . = ..()

* sigh

* Update living_combat.dm

* wew

* wups

* fix

* i hate you

* wrong button

* k

* ok

* bet

* k

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Update code/modules/mob/living/living_combat.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* early returns

* skreee

* agony

* k

* k

* k

* k

* wack

* compile

* wack

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-21 16:04:26 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
Putnam
7626750c49 hypno tweaks 2020-01-28 23:03:29 -08:00
kevinz000
7bcb37c5d1 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-01-16 21:12:56 -07:00
kevinz000
9ef4cbfa76 refactor tags 2020-01-16 20:58:00 -07:00
kevinz000
b22e1a1cb4 compile 2020-01-16 02:27:35 -07:00
kevinz000
1acac87da3 compile 2020-01-15 23:54:30 -07:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
Lin
fb94bf5fa0 Merge pull request #10482 from kappa-sama/modularthing 
modular citadel file destruction but only slightly
 2020-01-11 00:30:58 +00:00
kappa-sama
ba20618bd0 this file does literally nothing 2020-01-08 10:00:33 -05:00
kappa-sama
3dac4e568d begone 2020-01-08 09:45:49 -05:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
kevinz000
7378d91684 ([\W\.])Knockdown\( 2020-01-06 03:39:20 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie
49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Ghommie
e74339ce8b Jfc that's a lot of work! 2019-12-23 04:24:13 +01:00
Putnam
c810145fc1 also adds aphrodisiacs, slaps, all hypno as prefs 2019-12-20 14:47:09 -08:00
Putnam
f2b46f0951 ROBUST OPTING MECHANICS 2019-12-19 11:14:02 -08:00
Putnam
9ec2c8a7f1 MKUltra made double opt-in 2019-12-19 09:54:34 -08:00
kappa-sama
02d807f67c begone thot 2019-12-09 10:11:17 -05:00
Ghommie
77ef3dabea Demodularize moodlets. 2019-12-04 23:10:39 +01:00
GrayRachnid
de43339d56 made it actually compile 2019-11-27 16:42:28 -05:00
GrayRachnid
47e3cd346f Fixes codewords and MKUltra enthrall hearing. 2019-11-27 16:36:19 -05:00
Fermi
ba4fa1ef67 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 03:06:08 +00:00
Fermi
aeb8606ce0 Revert "Revert "PLASE"" 
This reverts commit 00601a0c87.
 2019-11-24 03:04:52 +00:00
Fermi
25fe5ec14b Revert "Revert "Alright"" 
This reverts commit 505e15a3e1.
 2019-11-24 03:04:37 +00:00
Fermi
6729a62200 Revert "Revert "Well"" 
This reverts commit df5814c30e.
 2019-11-24 03:04:25 +00:00
Fermi
c8b206a4cf Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 03:04:04 +00:00
Fermi
4c1c257035 Revert "Revert "pls"" 
This reverts commit b23f2a4460.
 2019-11-24 03:02:21 +00:00
Fermi
9eaed4ea8e Revert "pls2" 
This reverts commit 0eb635b908.
 2019-11-24 03:02:04 +00:00
Fermi
0eb635b908 pls2 
ugh
 2019-11-24 02:52:17 +00:00
Fermi
b23f2a4460 Revert "pls" 
This reverts commit 8c97511871.
 2019-11-24 02:49:20 +00:00
Fermi
8c97511871 pls 
ugh
 2019-11-24 02:47:52 +00:00
Fermi
df5814c30e Revert "Well" 
This reverts commit e44c8c0a4a.
 2019-11-24 02:44:36 +00:00
Fermi
505e15a3e1 Revert "Alright" 
This reverts commit b756f37ff6.
 2019-11-24 02:44:10 +00:00
Fermi
00601a0c87 Revert "PLASE" 
This reverts commit 8af225e6e3.
 2019-11-24 02:44:00 +00:00
Fermi
8af225e6e3 PLASE 2019-11-24 02:41:21 +00:00
Fermi
b756f37ff6 Alright 2019-11-23 01:05:42 +00:00
Fermi
e44c8c0a4a Well 
I guess
 2019-11-23 00:18:45 +00:00
Fermi
b404e18b15 Merge branch 'master' into FERMICHEMCurTweaks 2019-11-23 00:10:33 +00:00