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-13 19:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,166 Commits 55 Branches 0 Tags
f81aff681b38e416f45609bb03a5efc49d63ecaa
Commit Graph

2294 Commits

Author SHA1 Message Date
LetterJay
f81aff681b Update browserOutput.dm 2017-06-22 22:15:28 -05:00
CitadelStationBot
9ee0d6aa6d Makes oldchat show while goonchat loads, sends preload messages there. 2017-06-22 19:50:15 -05:00
LetterJay
42b910b768 Merge pull request #1742 from Citadel-Station-13/upstream-merge-28682 
[MIRROR] Fixes a comment typo
 2017-06-22 19:22:57 -05:00
LetterJay
5168f5d03f Merge pull request #1740 from Citadel-Station-13/upstream-merge-28674 
[MIRROR] Fixes an error message
 2017-06-22 19:22:38 -05:00
LetterJay
b81b9a4f61 Merge pull request #1739 from Citadel-Station-13/upstream-merge-28673 
[MIRROR] Readds sprites for grey & nanotrasen bedsheets
 2017-06-22 19:22:23 -05:00
LetterJay
84cd74bc4b Merge pull request #1738 from Citadel-Station-13/upstream-merge-28677 
[MIRROR] Areas.dm cleanup + new icons
 2017-06-22 19:21:59 -05:00
LetterJay
9f52f1cea2 Merge pull request #1737 from Citadel-Station-13/upstream-merge-28486 
[MIRROR] Stamina projectiles no longer set off grenades and flamethrowers
 2017-06-22 19:21:30 -05:00
LetterJay
61e8a6a290 Merge pull request #1736 from Citadel-Station-13/upstream-merge-28664 
[MIRROR] Fixes swarmers dying to radiation
 2017-06-22 19:20:14 -05:00
CitadelStationBot
fd3cc10b55 Fixes a comment typo 2017-06-22 14:34:12 -05:00
CitadelStationBot
8375a2dcf9 Fixes an error message 2017-06-22 11:03:29 -05:00
CitadelStationBot
d0d1ae1e01 Readds sprites for grey & nanotrasen bedsheets 2017-06-22 11:03:26 -05:00
CitadelStationBot
7ce0be3ab6 Areas.dm cleanup + new icons 2017-06-22 11:02:21 -05:00
CitadelStationBot
f919e995dc Stamina projectiles no longer set off grenades and flamethrowers 2017-06-22 11:00:13 -05:00
CitadelStationBot
c98248cf7e Fixes swarmers dying to radiation 2017-06-22 10:59:03 -05:00
CitadelStationBot
389203023f Fixes spriteless empty paperbins 2017-06-22 10:58:57 -05:00
LetterJay
20486e0184 🆑 
sounddel: Removes oof
/🆑
 2017-06-22 08:59:33 -05:00
LetterJay
d04001c09d another huge sync 2017-06-21 18:00:00 -05:00
LetterJay
0719541100 Merge pull request #1721 from Citadel-Station-13/upstream-merge-28640 
[MIRROR] Lavaland's default atmos is now a define
 2017-06-21 15:45:34 -05:00
CitadelStationBot
d587d692c6 Flame thrower plasma tanks can be removed easily. 2017-06-21 13:21:31 -05:00
CitadelStationBot
df815e99bd Lavaland's default atmos is now a define 2017-06-21 08:32:00 -05:00
Poojawa
df64469de1 Removed vore sound falloff 2017-06-21 07:27:54 -05:00
LetterJay
b84426d8fa Merge pull request #1712 from Citadel-Station-13/upstream-merge-28618 
[MIRROR] Fixes shining lights into peoples eyes
 2017-06-20 20:30:24 -05:00
LetterJay
8ae2ceda05 Merge pull request #1713 from Citadel-Station-13/panicbunkerhotfix 
Hotfix for panic bunker
 2017-06-20 20:29:18 -05:00
LetterJay
b1df8322b2 remove double set 2017-06-20 20:08:59 -05:00
CitadelStationBot
4102d88802 Fixes shining lights into peoples eyes 2017-06-20 20:06:25 -05:00
CitadelStationBot
39ad327fab Fixes grenade belt and bandolier UI obscuring half the screen 2017-06-20 15:37:20 -05:00
CitadelStationBot
f0dc32ef4f Space cash descriptions are more descriptive (#1651) 2017-06-20 08:04:28 -07:00
CitadelStationBot
e1c8973f82 Fixes things getting unbuckled in nullspace (#1606) 2017-06-20 08:04:01 -07:00
CitadelStationBot
68498b3597 RADIMMUNE species can no longer be used for radiation free DNA research (#1553) 2017-06-20 08:02:38 -07:00
CitadelStationBot
72d329cf31 Makes RADIMMUNE species incompatible with radiation based DNA injectors (#1518) 2017-06-20 08:00:21 -07:00
CitadelStationBot
35ac6c40e0 Remember to test your PRs, kids! - Rebalances matter cartridge cost redux (#1652) 2017-06-20 07:59:04 -07:00
CitadelStationBot
30d3a42db6 Minor telecom code cleanup (#1691) 2017-06-20 07:58:53 -07:00
LetterJay
cd590e7fb1 Merge pull request #1686 from Citadel-Station-13/LOOCFix 
fixes LOOC
 2017-06-20 02:01:32 -05:00
LetterJay
b28677414e Update looc.dm 2017-06-20 01:47:52 -05:00
LetterJay
62e4580fd2 Merge pull request #1684 from Citadel-Station-13/upstream-merge-28579 
[MIRROR] Chisel messages will be below objects
 2017-06-20 01:30:53 -05:00
LetterJay
35df3ca80e Merge pull request #1683 from Citadel-Station-13/upstream-merge-28583 
[MIRROR] Adds framework for equip delays and adds it to the straight jacket
 2017-06-20 01:30:32 -05:00
LetterJay
592b4ed5d7 Merge pull request #1680 from Citadel-Station-13/upstream-merge-28577 
[MIRROR] Freezers and heaters now drop the correct materials (Fixes #28560)
 2017-06-20 01:30:04 -05:00
LetterJay
a8b498a2a9 Merge pull request #1666 from Citadel-Station-13/upstream-merge-28407 
[MIRROR] [READY]Adds examine tooltips
 2017-06-20 01:29:44 -05:00
LetterJay
4775f0b9c5 Update looc.dm 2017-06-20 01:27:05 -05:00
LetterJay
9f40c381a4 fixes looc 2017-06-20 01:25:48 -05:00
CitadelStationBot
0ef0ccf127 Chisel messages will be below objects 2017-06-19 22:07:23 -05:00
CitadelStationBot
989b991b05 Adds framework for equip delays and adds it to the straight jacket 2017-06-19 22:06:18 -05:00
CitadelStationBot
595f50c95e Freezers and heaters now drop the correct materials (Fixes #28560) 2017-06-19 21:27:30 -05:00
LetterJay
f97540247f Merge pull request #1667 from Citadel-Station-13/upstream-merge-28580 
[MIRROR] Fix cid reconnect message not showing
 2017-06-19 21:02:56 -05:00
LetterJay
84c42c073a Merge pull request #1678 from Citadel-Station-13/ExamineFix 
Fixes certain people unable to be examined
 2017-06-19 21:02:32 -05:00
LetterJay
cd06b77e01 Delete preferences_savefile.dm.rej 2017-06-19 20:54:04 -05:00
LetterJay
13078c1130 Update preferences_savefile.dm 2017-06-19 20:52:25 -05:00
LetterJay
cc9101aedf Merge pull request #1669 from Citadel-Station-13/upstream-merge-28552 
[MIRROR] Bonfires light up in lavaland atmos
 2017-06-19 20:48:21 -05:00
LetterJay
3e6a5f2d06 Merge pull request #1670 from Citadel-Station-13/upstream-merge-28549 
[MIRROR] Makes gender change potions more noticeable
 2017-06-19 20:47:56 -05:00
LetterJay
f358cc8649 Merge pull request #1676 from Citadel-Station-13/upstream-merge-28572 
[MIRROR] Reduces the size of the zombie revival flavor text (Fixes #28568)
 2017-06-19 20:47:29 -05:00