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
22,073 Commits 55 Branches 0 Tags
70d7ebbb453ee6f64831a579ceccb78ab57b73d1
Commit Graph

13780 Commits

Author SHA1 Message Date
kevinz000
70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134 
Fixing a reagent ID typo.
 2019-07-17 14:44:54 -07:00
kevinz000
b134d23ea3 Merge pull request #8882 from Trilbyspaceclone/slaggy 
Adds discount plushies and a way to get random plushies at shift start
 2019-07-17 00:50:21 -07:00
kevinz000
61bc43a0d7 Merge pull request #8693 from Ghommie/Ghommie-cit70 
Ports "clothes burning only spam You of Your clothes"
 2019-07-14 14:52:29 -07:00
kevinz000
628244c0ba Merge pull request #8869 from Ghommie/Ghommie-cit129 
Ports "Show codewords on round end screen"
 2019-07-14 14:49:11 -07:00
kevinz000
c06d495731 Merge pull request #8877 from BurgerLUA/REMOVE-C8A5DC 
REMOVE #C8A5DC. COLOR STRONG.
 2019-07-14 14:48:49 -07:00
kevinz000
1564f38ff8 Merge pull request #8725 from Trilbyspaceclone/meme_tools 
Adds more bronze tools
 2019-07-14 14:48:27 -07:00
kevinz000
2c41141d2f Merge pull request #8676 from Trilbyspaceclone/patch-176 
Adds a Rapier for 8 Trilby cats
 2019-07-14 14:46:44 -07:00
kevinz000
9de885da32 Merge pull request #8880 from CameronWoof/air-alarms-should-be-green 
Makes Air Alarms Green
 2019-07-14 14:20:54 -07:00
kevinz000
705b12fc50 Merge pull request #8724 from Trilbyspaceclone/Rnd_brakeup 
Brakes up Blue space Rnd tech nodes
 2019-07-14 14:20:03 -07:00
kevinz000
102bede4be Merge pull request #7544 from deathride58/nanitepoolnerf 
Nerfs nanite pools
 2019-07-14 14:15:53 -07:00
kevinz000
da8b43f054 Merge pull request #8785 from Trilbyspaceclone/Just_Smile! 
Makes Clowns and HonkMother Chaplins smile!
 2019-07-14 14:11:09 -07:00
kevinz000
2ec5d3f02e Merge pull request #8886 from Ghommie/Ghommie-cit137 
Ports "Refactors NODROP flag into TRAIT_NODROP"
 2019-07-14 14:05:20 -07:00
kevinz000
a573689101 Merge pull request #8887 from Poojawa/last-word-hearing-psychics 
Gang victory news report and last words for discord bot
 2019-07-14 14:04:20 -07:00
Ghommie
a3a2fb03b6 My bad, my bad. 2019-07-14 14:21:28 +02:00
kevinz000
b153294a24 Merge pull request #8857 from Ghommie/Ghoomie-cit127 
Refactoring underwear to allow custom color preferences.
 2019-07-14 03:38:45 -07:00
kevinz000
44474ddbd0 Merge pull request #8873 from Ghommie/Ghommie-cit131 
Ports "Fixes clockwork armor armor"
 2019-07-14 03:38:04 -07:00
kevinz000
d5f156925d Merge pull request #8884 from Ghommie/Ghommie-cit135 
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
 2019-07-14 03:37:36 -07:00
kevinz000
735fc5fab6 Merge pull request #8845 from Ghommie/Ghommie-cit121 
Tweaking the 🅱️ emoji icon.
 2019-07-14 03:35:33 -07:00
kevinz000
2259ea2e1c Merge pull request #8874 from Ghommie/Ghommie-cit132 
Ports the Chem Master choose your pill PR plus post-improvements
 2019-07-14 03:33:37 -07:00
Poojawa
245bd3e650 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into last-word-hearing-psychics 2019-07-13 10:18:13 -05:00
Poojawa
4d895ae6c0 Gang victory news report and last words for discord bot 
also slight improvement to gangster greetings
 2019-07-13 08:38:19 -05:00
Ghommie
129ca9d71f Ports "Refactors NODROP flag into TRAIT_NODROP" 2019-07-13 10:27:39 +02:00
Ghommie
71720f8a32 missed bits. 2019-07-13 07:12:37 +02:00
Ghommie
8f410429de Ports "Renames SSsqueak to SSminor_mapping" 2019-07-13 07:08:03 +02:00
Ghommie
31bd9104bb Ports "Adds blueshirt items to sectech and defines them better." 2019-07-13 06:42:09 +02:00
TrilbySpaceClone
b2345b19ce critcal 2019-07-12 21:21:52 -04:00
Ghommie
b7c8909a18 Fixing a reagent ID typo. 2019-07-13 02:12:01 +02:00
CameronWoof
d944c0bb27 Normalizes Air Alarms 2019-07-12 15:04:43 -07:00
kevinz000
c012418cf7 Merge pull request #8734 from Ghommie/Ghommie-cit84 
Sort of porting "Changes the type pathing of some "random" items"
 2019-07-12 07:43:12 -07:00
kevinz000
13b1e5d409 Merge pull request #8812 from Sishen1542/surgery-hugboxing 
Using the wrong tool during surgery won't hit the patient with it. Also stops medical borgs from attacking with surgical tools outside of harm intent.
 2019-07-12 07:42:11 -07:00
kevinz000
280aa9da08 Merge pull request #8860 from Trilbyspaceclone/Zelus_oil 
Zelus oil - CWC gear
 2019-07-12 07:41:28 -07:00
kevinz000
53642c5104 Merge pull request #8842 from UristMcAstronaut/master 
allows pais to activate holoform while in a pai connector
 2019-07-12 07:36:48 -07:00
kevinz000
57891813db Merge pull request #8847 from Ghommie/Ghommie-cit123 
Porting in two bar signs.
 2019-07-12 07:36:29 -07:00
kevinz000
650842b384 Merge pull request #8854 from Ghommie/Ghommie-cit126 
Stamina damage melee weaponry fixes.
 2019-07-12 07:36:01 -07:00
kevinz000
e5d445c4d3 Merge pull request #8846 from Ghommie/Ghommie-cit122 
Rubber toolboxes.
 2019-07-12 07:35:25 -07:00
kevinz000
e26277b67c Merge pull request #8872 from deathride58/lightermops 
Janitors are no longer diabetic - nerfs mop stamina usage to be in-line with how much effort mopping takes IRL
 2019-07-12 07:35:04 -07:00
kevinz000
1eaddd3ebf Merge pull request #8853 from Ghommie/Ghommie-cit125 
Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant"
 2019-07-12 07:34:19 -07:00
kevinz000
aeb2216551 Merge pull request #8843 from Coolgat3/tacticoolness 
Makes combat boots look T A C T I C O O L
 2019-07-12 07:33:36 -07:00
kevinz000
bb568d633b Merge pull request #8852 from Tupinambis/CursedPlush 
Removes a plush representing the character of an underage player.
 2019-07-12 07:32:29 -07:00
BurgerLua
5bd2f28d69 Removed #C8A5DC 2019-07-12 01:02:43 -07:00
Ghommie
d36bae06a7 Ports the Chem Master choose your pill PR plus post-improvements 2019-07-12 07:39:17 +02:00
Ghommie
ed9213066c Speedports "Fixes clockwork armor armor" 2019-07-12 06:09:16 +02:00
Tupinambis
cc901128c4 Oops I broke descriptions and sounds. Let me fix that. 2019-07-11 18:03:32 -05:00
deathride58
8d4c3b8ce9 Janitors are no longer diabetic - nerfs mop stamina usage to be more in-line with how much effort mopping takes IRL 2019-07-11 18:37:59 -04:00
kevinz000
c76f6b8a54 Merge pull request #8862 from BlackMajor/Burgit-Branch-2 
Admin cream pie smite no longer makes its victims fat
 2019-07-11 04:57:50 -07:00
Ghommie
92fadcf230 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit84 2019-07-11 09:07:11 +02:00
Ghommie
6fa454dfe7 r 2019-07-11 09:01:57 +02:00
Ghommie
bef0027287 In a haste, we forget thousand things. 2019-07-11 08:50:47 +02:00
Ghommie
26ab7cc522 Ports "Show codewords on round end screen" 2019-07-11 08:40:11 +02:00
Ghommie
081c07098f randomizing colors. 2019-07-11 08:08:07 +02:00