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
21,970 Commits 55 Branches 0 Tags
8f410429dec22c19bec1a73085a3e20458bff4d6
Commit Graph

13723 Commits

Author SHA1 Message Date
Ghommie
8f410429de Ports "Renames SSsqueak to SSminor_mapping" 2019-07-13 07:08:03 +02: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
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
Trilbyspaceclone
27a8876e99 I dont care anymore, It works in testing to function fine 
I dont see a problem is this, kinda would like citation on were Clockies will get added in the last else claim.
 2019-07-11 01:15:39 -04:00
kevinz000
564904adf0 Merge pull request #8761 from Trilbyspaceclone/patch-187 
[Ready] Tweaks shields
 2019-07-10 22:02:19 -07:00
Trilbyspaceclone
146276014c Update other_reagents.dm 2019-07-10 20:42:12 -04:00
Trilbyspaceclone
48e15307c5 Update other_reagents.dm 2019-07-10 19:14:57 -04:00
Trilbyspaceclone
ac9c672fa8 I guess this is better 2019-07-10 18:56:32 -04:00
Trilbyspaceclone
ed89ac874b this was fine 2019-07-10 18:44:14 -04:00
Trilbyspaceclone
baf4529e52 Update other_reagents.dm 2019-07-10 18:32:10 -04:00
Trilbyspaceclone
d53d11de6b Apply suggestions from code review 
Grammer and such

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-07-10 18:21:03 -04:00
BlackMajor
2717590e9f No more fat smites 2019-07-10 21:01:41 +12:00
Trilbyspaceclone
c9e13f8d62 better wording* 2019-07-10 02:43:18 -04:00
TrilbySpaceClone
54c28b19af Zelus indeed 2019-07-10 02:29:42 -04:00
Trilbyspaceclone
e1ed96f419 Update other_reagents.dm 2019-07-09 23:08:11 -04:00
Trilbyspaceclone
b03c197d0e forgot the var 2019-07-09 22:58:13 -04:00
Trilbyspaceclone
6240222ed7 Update other_reagents.dm 2019-07-09 21:58:22 -04:00
kevinz000
b5cb68fc68 Merge pull request #8844 from Ghommie/Ghommie-cit120 
Fixes rocket launchers, buffing their accuracy etc.
 2019-07-09 08:30:44 -07:00
Ghommie
9cf2dea999 Grille spam. 2019-07-09 08:35:32 +02:00
Ghommie
3546ed9799 Stamina damtype weaponry fixes. 2019-07-09 08:33:43 +02:00
Ghommie
490ae9daf2 Ports "Cleans up saycode by removing random hook stubs and using a signal where relevant" 2019-07-09 07:58:22 +02:00
Tupinambis
8c0c80fc39 Removes references to the character of another underage player. 2019-07-09 00:02:16 -05:00
Tupinambis
0057ac7c5c Removed a plush representing the character of a player that was banned for being underaged. 2019-07-08 22:23:16 -05:00
Ghommie
5b97a7533d it only affects maploaded items anyway. 2019-07-09 04:34:13 +02:00
Trilbyspaceclone
22cb46cb22 Update shields.dm 2019-07-08 20:30:46 -04:00
deathride58
e56fc559ed Merge pull request #8748 from Citadel-Station-13/kevinz000-patch-15 
Raises corpse miasma generation by 5x. Lowers miasma disease chance per mole by 10x. Miasma now does absolutely nothing unless there's enough of it in the air to actually flow into scrubbers so there's no invisible pockets of disease stuck everywhere.
 2019-07-08 18:15:20 -04:00
deathride58
9c0c4c8f59 Merge pull request #8683 from Citadel-Station-13/kevinz000-patch-3 
Fixes end of round notify command, makes it so everyone can use it rather than just staff
 2019-07-08 18:14:08 -04:00
deathride58
b8229b365c Merge pull request #8655 from Citadel-Station-13/kevinz000-patch-2 
Fixes RLD icon
 2019-07-08 18:12:02 -04:00
deathride58
42cee552fe Merge pull request #8709 from Trilbyspaceclone/Fel_port_1 
Ports "Fixes every issue in the slimes milestone. #44450"
 2019-07-08 18:10:46 -04:00
deathride58
b8e34d1cab Merge pull request #8704 from Citadel-Station-13/kevinz000-patch-12 
[s] RCD logging
 2019-07-08 18:07:27 -04:00
deathride58
59577f8818 Merge pull request #8750 from Arturlang/Nanite_Brain_Damage_Fix 
Fixes trauma healing nanites.
 2019-07-08 18:07:04 -04:00
deathride58
d218739bf8 Merge pull request #8740 from Ghommie/Ghommie-cit87 
ports "More variety for dorms bedsheets" + 3 new bed sheets.
 2019-07-08 18:06:11 -04:00
deathride58
947d33129c Merge pull request #8771 from Citadel-Station-13/kevinz000-patch-20 
buffs wheelchair movespeeds/changes a floor in the equation to a round
 2019-07-08 18:05:15 -04:00
deathride58
82d527b760 Merge pull request #8765 from Ghommie/Ghommie-cit91 
Merging the end-of-shift and its shuttle autocall announcements into one.
 2019-07-08 18:04:27 -04:00
deathride58
e19c622b08 Merge pull request #8837 from Citadel-Station-13/revert-8244-iv-dripper-punctures 
Revert "Adds a can_inject check to IV Drips"
 2019-07-08 17:57:30 -04:00
deathride58
e391995b8e Merge pull request #8792 from Citadel-Station-13/kevinz000-patch-51 
Buffs integrated circuitry advanced lights
 2019-07-08 17:56:12 -04:00
deathride58
840cfb8ac0 Merge pull request #8818 from Citadel-Station-13/kevinz000-patch-53 
fixes stimulum by changing one number
 2019-07-08 17:54:56 -04:00