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
22,118 Commits 55 Branches 0 Tags
28ac38d800c646396bca2e458a373dc360e3549c
Commit Graph

13816 Commits

Author SHA1 Message Date
kevinz000
28ac38d800 Merge pull request #8910 from Ghommie/Ghommie-cit144 
Ports "Removes some getflaticon calls from things that don't draw browser interfaces"
 2019-07-17 15:08:36 -07:00
deathride58
7b39c0935c Merge pull request #8415 from Citadel-Station-13/sprint_stamina 
Adds a sprint buffer - 35 tiles, regen 2 tiles/second (always active), 0.3 stamcost per tile if empty (as old) directly applied to staminaloss rather than stamina action buffer (unlike old)
 2019-07-17 18:07:57 -04:00
kevinz000
884299e152 Merge pull request #8915 from Ghommie/Ghommie-cit148 
Gives cult conversions an alert popup and four extra seconds wait time.
 2019-07-17 15:07:38 -07:00
deathride58
edbcabdce4 Merge pull request #8836 from Citadel-Station-13/kevinz000-patch-55 
nanite metabolic synthesis now drains you until you're starving
 2019-07-17 17:55:27 -04:00
deathride58
adaac8322c Merge pull request #8589 from Citadel-Station-13/kevinz000-patch-47 
buffs pepperspray to hardstun (knockdown + drop items) for 0.1 ds because for some reason we don't have a standalone knockdown without hardstun when are we porting the /tg/ mobility flags that I made?
 2019-07-17 17:53:39 -04:00
deathride58
77360259ae Merge pull request #8855 from Citadel-Station-13/kevinz000-patch-15 
Fixes and buffs nano-boost symptom
 2019-07-17 17:53:02 -04:00
deathride58
7e12cfc9ff Merge pull request #8868 from Citadel-Station-13/kevinz000-patch-57 
Nanites in non /livings are no longer immune to EMPs
 2019-07-17 17:51:15 -04:00
deathride58
80b1383362 Merge pull request #8865 from Citadel-Station-13/kevinz000-patch-53 
adds an adminspawned nanite hub that draws from admin techweb datum instead
 2019-07-17 17:50:46 -04:00
deathride58
51665f0d5f Merge pull request #8863 from Citadel-Station-13/kevinz000-patch-51 
Makes aggressive replication not useless
 2019-07-17 17:49:08 -04:00
deathride58
d7cbbfc8a4 Merge pull request #8866 from Citadel-Station-13/kevinz000-patch-54 
Fixes nanites getting instant nuked by EMPs and shocks and removes the random drain in favor of a scaled drain
 2019-07-17 17:48:38 -04:00
deathride58
8f41a29697 Merge pull request #8867 from Citadel-Station-13/kevinz000-patch-56 
Nerfs chain detonation (removes dev radius)
 2019-07-17 17:47:36 -04:00
deathride58
9ebdad68b7 Merge pull request #8892 from Citadel-Station-13/kevinz000-patch-61 
Fixes RPD infinite transit tube stacking
 2019-07-17 17:47:09 -04:00
deathride58
c36f25144b Merge pull request #8890 from Citadel-Station-13/kevinz000-patch-59 
Nerfs nanite armor
 2019-07-17 17:46:41 -04:00
kevinz000
70d7ebbb45 Merge pull request #8881 from Ghommie/Ghommie-cit134 
Fixing a reagent ID typo.
 2019-07-17 14:44:54 -07:00
Ghommie
9384af188e Gives cult conversions an alert popup and a couple extra seconds. 2019-07-17 17:50:54 +02: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
Ghommie
676186ee36 Ports "Removes some getflaticon calls from things that don't draw browser interfaces" 2019-07-16 23:15:52 +02: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
33250dfcbe buffs it a bit 2019-07-14 14:16:44 -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
395b89d0a1 Update RPD.dm 2019-07-14 03:42:26 -07: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
kevinz000
0adb33474d Update buffing.dm 2019-07-14 03:24:59 -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