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 03:13:51 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,738 Commits 55 Branches 0 Tags
d8c07bed4d734cae939e7862dd4f60b51ec62a0d
Commit Graph

1243 Commits

Author SHA1 Message Date
LetterJay
d8c07bed4d Merge pull request #966 from Citadel-Station-13/upstream-merge-27221 
[MIRROR] Fixes the ore redemption machine's sheet amount upgrade
 2017-05-17 10:48:23 -04:00
LetterJay
6d8aa16c45 Merge pull request #917 from Citadel-Station-13/upstream-merge-27119 
[MIRROR] Wraiths now refund part of Phase Shift's cooldown by attacking
 2017-05-17 10:47:06 -04:00
LetterJay
c8a8f77be8 Merge pull request #1023 from Citadel-Station-13/upstream-merge-27333 
[MIRROR] Stops people from beating a dead horse (revenant)
 2017-05-17 10:45:38 -04:00
LetterJay
5730df22d0 Merge pull request #1022 from Citadel-Station-13/upstream-merge-27321 
[MIRROR] Fixes spelling on the EM Pulse action
 2017-05-17 10:45:27 -04:00
LetterJay
ce925fa04c Merge pull request #1024 from Citadel-Station-13/upstream-merge-27360 
[MIRROR] Prepends object names with 'The' in speech
 2017-05-17 10:45:04 -04:00
CitadelStationBot
242bff4288 Prepends object names with 'The' in speech 2017-05-17 05:13:47 -05:00
LetterJay
1948b007d1 fix roundstart/rej cleanup 2017-05-17 05:08:51 -05:00
LetterJay
932f323e39 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-26974 2017-05-17 05:06:23 -05:00
CitadelStationBot
bf3b6702c3 Stops people from beating a dead horse (revenant) 2017-05-17 05:03:31 -05:00
CitadelStationBot
013101bd48 Fixes spelling on the EM Pulse action 2017-05-17 05:01:25 -05:00
LetterJay
2d66148b44 Update holocall.dm 2017-05-17 04:30:52 -05:00
LetterJay
1ee7686a5b Update holocall.dm 2017-05-17 04:26:16 -05:00
LetterJay
bdbedd33f4 Merge branch 'master' into upstream-merge-26776 2017-05-17 05:14:18 -04:00
LetterJay
e121ad79c9 commit 2017-05-17 04:03:54 -05:00
LetterJay
ff21afdcbd Merge pull request #744 from Citadel-Station-13/upstream-merge-26828 
[MIRROR] Moves tongues to `mutanttongue` var
 2017-05-17 04:50:52 -04:00
LetterJay
f978e3d56e rej cleanup 2017-05-17 03:50:34 -05:00
LetterJay
fe62f7b737 Merge pull request #734 from Citadel-Station-13/upstream-merge-26780 
[MIRROR] Draconic language, for lizards
 2017-05-17 04:49:13 -04:00
LetterJay
a3cc3087b3 warrghhlbrarrggll 2017-05-16 23:55:38 -05:00
LetterJay
e03b4b7905 ooga booga lizard 2017-05-16 23:46:37 -05:00
LetterJay
46f5c4bb1b commit 2017-05-16 23:35:54 -05:00
LetterJay
45c283a935 applies the previous fixes for cult on a closed PR 2017-05-16 22:59:41 -05:00
LetterJay
be1702ff0d Revert "CultFix" 
This reverts commit f3e8cd3e2d.
 2017-05-16 22:49:23 -05:00
LetterJay
f3e8cd3e2d CultFix 2017-05-16 21:36:07 -05:00
LetterJay
4710beca0e Merge pull request #807 from Citadel-Station-13/upstream-merge-26631 
[MIRROR] 2017 Cult Overhaul P1:  Cult Master and Datum Cult
 2017-05-16 17:13:30 -04:00
LetterJay
296ae25734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2017-05-16 15:27:46 -05:00
LetterJay
42d354f9c8 cryo pod icon fix 2017-05-16 15:27:30 -05:00
CitadelStationBot
59b609c79d Reverts favoring empty positions 2017-05-15 10:36:56 -05:00
cebutris
fc628bcb89 adds the holoparasite box, and adds it to traitor uplinks (#913) 2017-05-14 20:36:22 -07:00
CitadelStationBot
176c2003f9 [MIRROR] Enable Ambrosia Gaia, attempt balance (#962) 
* Enable Ambrosia Gaia, attempt balance

* Update ambrosia.dm

* Delete ambrosia.dm.rej
 2017-05-14 20:34:15 -07:00
CitadelStationBot
148666efed Disables Gaia mutation (#928) 2017-05-14 20:30:29 -07:00
CitadelStationBot
040ac1236d [MIRROR] woops i forgot to check tick cannons fill proc. (#968) 
* woops i forgot to check tick cannons fill proc.

* Delete pneumaticCannon.dm.rej

* Update pneumaticCannon.dm
 2017-05-14 20:23:39 -07:00
CitadelStationBot
41f110380c [MIRROR] [READY]Gives the clown a pie cannon, also improves pneumatic cannons (#935) 
* [READY]Gives the clown a pie cannon, also improves pneumatic cannons

* Delete gang.dm.rej
 2017-05-14 20:18:02 -07:00
CitadelStationBot
b95d4e0459 [MIRROR] Land Claim Flag (#951) 
* Land Claim Flag

* Delete charter.dm.rej

* Update charter.dm
 2017-05-14 20:16:17 -07:00
CitadelStationBot
226fdf9040 Remaps seed vault, adds bees and changes cherry to cherry bomb in random seed spawn (#973) 2017-05-14 20:12:00 -07:00
CitadelStationBot
45a81d32a4 Adds round ID to MC panel (#846) 2017-05-14 20:10:22 -07:00
CitadelStationBot
b7adb8cd93 SMES units now accept charge even if the available input is less than the input rate. (#969) 2017-05-14 20:07:20 -07:00
CitadelStationBot
fde364e82f The punisher! (#967) 2017-05-14 20:06:13 -07:00
CitadelStationBot
230b2e6fc8 Fixes the ore redemption machine's sheet amount upgrade 2017-05-14 18:43:32 -05:00
LetterJay
6c4a355379 Merge pull request #850 from Citadel-Station-13/upstream-merge-26980 
[MIRROR] Small Click refactor.
 2017-05-14 16:40:30 -04:00
LetterJay
96e128ecb7 Merge pull request #854 from Citadel-Station-13/upstream-merge-27036 
[MIRROR] Add Slime Scanner to Autolathe
 2017-05-14 16:39:28 -04:00
LetterJay
7748c04f60 Merge pull request #871 from Citadel-Station-13/upstream-merge-27073 
[MIRROR] Fixes some things not using log_world
 2017-05-14 16:38:49 -04:00
LetterJay
c05c7334a5 Merge pull request #923 from Citadel-Station-13/upstream-merge-27151 
[MIRROR] Adds a visible message to teleport runes being teleported to
 2017-05-14 16:36:49 -04:00
LetterJay
051de8da99 Merge pull request #936 from Citadel-Station-13/upstream-merge-27184 
[MIRROR] Explosion flame_range now defaults to light range instead of zero
 2017-05-14 16:33:00 -04:00
LetterJay
bf26c247e0 Merge pull request #931 from Citadel-Station-13/upstream-merge-27167 
[MIRROR] Ports dakimakuras from HippieStation.
 2017-05-14 16:32:40 -04:00
LetterJay
6718ea096d Merge pull request #937 from Citadel-Station-13/upstream-merge-27148 
[MIRROR] Buffs honey
 2017-05-14 16:30:51 -04:00
LetterJay
e681a4b25f Merge pull request #938 from Citadel-Station-13/upstream-merge-27169 
[MIRROR] Adds Several Butter-filled Foods
 2017-05-14 16:30:35 -04:00
LetterJay
42bb7a5ccd Merge pull request #941 from Citadel-Station-13/upstream-merge-27166 
[MIRROR] Fixes the recycler gibbing brainmobs
 2017-05-14 16:29:59 -04:00
LetterJay
c329a74c4b Merge pull request #942 from Citadel-Station-13/upstream-merge-27173 
[MIRROR] Fixes something not using create_reagents
 2017-05-14 16:29:44 -04:00
LetterJay
5bdeefb050 Merge pull request #944 from Citadel-Station-13/upstream-merge-27175 
[MIRROR] Fixes pizza box icons
 2017-05-14 16:29:18 -04:00
LetterJay
505a6c7124 Merge pull request #945 from Citadel-Station-13/upstream-merge-27180 
[MIRROR] Fixes an overlays runtime
 2017-05-14 16:29:01 -04:00