shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,014 Commits 5 Branches 0 Tags
bb05b47ead8a42af5234bfd3fe83c4d523064a95
Commit Graph
31014 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LinandGitHub bb05b47ead fix flypeople nutrition 2020-03-01 23:35:16 +00:00
CitadelStationBot a78d95c866 Automatic changelog generation for PR #11287 [ci skip] 2020-03-01 17:13:31 -06:00
GhomandGitHub 28c2d27860 Merge pull request #11287 from monster860/patch-1 
Allow moaning while in soft crit
 2020-03-02 00:13:27 +01:00
GhomandGitHub e464d3ba1a Merge pull request #11293 from Citadel-Station-13/kevinz000-patch-21 
alright maybe subtler is a bit too subtler if it hides from logs
 2020-03-01 15:40:55 +01:00
kevinz000andGitHub 9a3ddaaf7b Update logging.dm 2020-03-01 07:08:04 -07:00
CitadelStationBot 769662394f Automatic changelog generation for PR #11268 [ci skip] 2020-03-01 07:39:06 -06:00
GhomandGitHub 20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp 
ongoing vampire ability balance/rework attempt
 2020-03-01 14:39:03 +01:00
CitadelStationBot 77fcd7f804 Automatic changelog generation for PR #11279 [ci skip] 2020-03-01 06:55:07 -06:00
GhomandGitHub 3ec80872f0 Merge pull request #11279 from Hatterhat/tg-45232-lavariver 
tgstation 45232 - lava rivers can no longer be plasma'd for basalt
 2020-03-01 13:55:03 +01:00
raspyosu d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
monster860andGitHub 899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
CitadelStationBot 3224391079 Automatic changelog generation for PR #11242 [ci skip] 2020-02-29 16:03:56 -06:00
GhomandGitHub 609dc0e792 Merge pull request #11242 from Kraseo/green-thumb 
Adds reagent traits to Lavaland flora + a botany QOL change
 2020-02-29 23:03:53 +01:00
GhomandGitHub eeb8ec0b90 Merge pull request #11276 from kevinz000/gc_debug 
adds and improves some gc debugging stuff
 2020-02-29 22:53:58 +01:00
CitadelStationBot 41d36691bf Automatic changelog generation for PR #11227 [ci skip] 2020-02-29 13:42:05 -06:00
GhomandGitHub 295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter 
Gave jittering to salbutamol
 2020-02-29 20:42:03 +01:00
Hatterhat 727ec433f3 funny story my byond crashes every compile 2020-02-29 01:47:59 -06:00
LinandGitHub d32cc370ad Merge pull request #11177 from Citadel-Station-13/Ghommie-patch-1 
Broom shenanigeans.
 2020-02-29 00:22:24 -06:00
LinandGitHub 5ee4a355c1 Merge pull request #11178 from Citadel-Station-13/Ghommie-patch-2 
Fixing refrigerators locking when closed
 2020-02-29 00:21:43 -06:00
CitadelStationBot ee7d443aa6 Automatic changelog generation for PR #11200 [ci skip] 2020-02-29 00:15:48 -06:00
LinandGitHub 252c64f23b Merge pull request #11200 from Hatterhat/boxes 
blue boxes are now actually blue, and red boxes are actually red
 2020-02-29 00:15:45 -06:00
LinandGitHub 70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593 
Fixing another couple mob holder oversights.
 2020-02-29 00:13:58 -06:00
LinandGitHub 5ba6320f5e Merge pull request #11261 from Ghommie/Ghommie-cit591 
Fixing escaped characters in flavor texts.
 2020-02-29 00:12:35 -06:00
LinandGitHub a3eef43445 Merge pull request #11263 from Citadel-Station-13/Ghommie-patch-3 
Removes extra unwarranted paramedic access.
 2020-02-29 00:11:16 -06:00
Hatterhat 1577a00ab5 tg 45232 2020-02-28 21:54:55 -06:00
kevinz000 4b9dfdf476 types 2020-02-28 13:24:39 -07:00
CitadelStationBot 8414f58b89 Automatic changelog generation for PR #11265 [ci skip] 2020-02-28 13:41:08 -06:00
kevinz000andGitHub c5edeb9913 Merge pull request #11265 from Citadel-Station-13/Ghommie-patch-4 
Cogchamp mixing sound made less annoyingly long.
 2020-02-28 12:41:05 -07:00
raspyosu 5b6da0b350 ok 
changes that artur suggested guess it makes no sense to add too much flavor
 2020-02-28 13:29:36 -05:00
CitadelStationBot ea612b13cf Automatic changelog generation for PR #11251 [ci skip] 2020-02-28 11:00:22 -06:00
GhomandGitHub c1907bda37 Merge pull request #11251 from Trilbyspaceclone/changlog_messing4 
Changlog updating #5
 2020-02-28 18:00:19 +01:00
kevinz000andGitHub e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590 
Porting update_icon improvements.
 2020-02-28 04:30:12 -07:00
CitadelStationBot 70bf885968 Automatic changelog generation for PR #11260 [ci skip] 2020-02-28 05:29:24 -06:00
kevinz000andGitHub 25f86c18d1 Merge pull request #11260 from Kraseo/i-hate-gangs 
Removes soporific sniper rifle rounds from gang uplinks
 2020-02-28 04:29:22 -07:00
kevinz000andGitHub d0eebdbb02 Merge pull request #11273 from Arturlang/blob_broacast_exploit 
[s] Fixes blob broadcast HTML Injection.
 2020-02-28 04:28:41 -07:00
Artur c6fcffe949 Made the same mistake... 2020-02-28 13:19:27 +02:00
Artur d6e402aa5d Damned 2020-02-28 13:06:28 +02:00
raspyosu 8953877a69 makes mesmerize not shitcode 
woooooooo
 2020-02-28 01:01:45 -05:00
raspyosu 43e4877a34 rearrange mesmerize end code 
linzolle pointed out it doesn't work which is correct and this seems to work just fine now
 2020-02-28 00:07:14 -05:00
raspyosu bc882b2126 nerf mesmerize range 
lunge should have more range than mesmerize imo so let's just yoink
 2020-02-27 19:10:31 -05:00
raspyosu 9ec828f1f2 lunge & mesmerize tweaks 
lunge nerfed (holy FUCK)
- windup reverted to 0.7s
- range reverted to 3
- adjacency check fixed (must've been tired)
mesmerize
- now can be broken via line of sight breaking (checks for LoS every 0.5s there is probably a better way of doing this)
 2020-02-27 16:29:15 -05:00
raspyosu 39e25935c7 how do i github 
idk my fork is freaking out because of this one linechange so poggers
 2020-02-27 16:03:01 -05:00
GhomandGitHub 879032c52f Merge pull request #11255 from deathride58/sprintconfigdefaults 
Makes the default sprint config options match live's actual config
 2020-02-27 16:23:27 +01:00
Ghommie 11f767d412 A couple mob holder oversights. Again? 2020-02-27 16:16:21 +01:00
GhomandGitHub eb3f985434 Update drinks_recipes.dm 2020-02-27 14:16:39 +01:00
CitadelStationBot 721f4f6bff Automatic changelog generation for PR #11249 [ci skip] 2020-02-27 05:40:43 -06:00
GhomandGitHub ebe16768d4 Merge pull request #11249 from Trilbyspaceclone/patch-298 
Corrects bar stool name
 2020-02-27 12:40:41 +01:00
GhomandGitHub d85563367e Whoopsie 2020-02-27 12:39:01 +01:00
GhomandGitHub bfe3bbb6d5 Update paramedic.dm 2020-02-27 12:34:13 +01:00
kevinz000andGitHub b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1 
Adds 2cat, again
 2020-02-27 01:22:25 -07:00