shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,014 Commits 5 Branches 0 Tags
1a87a9d051bcdb1ca495bc7fb4e12aa976c119cb
Commit Graph

13061 Commits

Author SHA1 Message Date
kevinz000
1a87a9d051 Update damage_procs.dm 2020-03-02 07:24:02 -07:00
Ghom
28c2d27860 Merge pull request #11287 from monster860/patch-1 
Allow moaning while in soft crit
 2020-03-02 00:13:27 +01:00
Ghom
20a5ab895f Merge pull request #11268 from raspyosu/vamp-revamp 
ongoing vampire ability balance/rework attempt
 2020-03-01 14:39:03 +01:00
raspyosu
d00596b49d fix cloak not restoring initial move intent sometimes (maybe) 2020-03-01 00:24:56 -05:00
monster860
899f1bbd88 Allow moaning while in soft crit 2020-02-29 21:02:37 -05:00
Ghom
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
Ghom
295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter 
Gave jittering to salbutamol
 2020-02-29 20:42:03 +01:00
Lin
70e2563579 Merge pull request #11266 from Ghommie/Ghommie-cit593 
Fixing another couple mob holder oversights.
 2020-02-29 00:13:58 -06:00
Lin
5ba6320f5e Merge pull request #11261 from Ghommie/Ghommie-cit591 
Fixing escaped characters in flavor texts.
 2020-02-29 00:12:35 -06:00
Lin
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
kevinz000
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
kevinz000
e39d7fa49d Merge pull request #11259 from Ghommie/Ghommie-cit590 
Porting update_icon improvements.
 2020-02-28 04:30:12 -07:00
kevinz000
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
Ghommie
11f767d412 A couple mob holder oversights. Again? 2020-02-27 16:16:21 +01:00
Ghom
eb3f985434 Update drinks_recipes.dm 2020-02-27 14:16:39 +01:00
Ghom
d85563367e Whoopsie 2020-02-27 12:39:01 +01:00
Ghom
bfe3bbb6d5 Update paramedic.dm 2020-02-27 12:34:13 +01:00
kevinz000
b854cb5980 Merge pull request #11262 from YakumoChen/LMAO-2CAT!!1 
Adds 2cat, again
 2020-02-27 01:22:25 -07:00
YakumoChen
f6c170d31b Update tails.dm 2020-02-27 08:15:27 +00:00
YakumoChen
e682845ebf Update tails.dm 2020-02-27 08:09:34 +00:00
kevinz000
b0018a246c Merge pull request #11248 from Putnam3145/lick-pref 
Made lick prefs actually save
 2020-02-27 01:05:56 -07:00
YakumoChen
2cb95e200a Update tails.dm 2020-02-27 08:04:32 +00:00
kevinz000
19962493a9 Merge pull request #11241 from Arturlang/Solar_updates 
Ports TGs Solar updates.
 2020-02-27 01:03:52 -07:00
YakumoChen
e0c7c98253 Update tails.dm 2020-02-27 08:01:13 +00:00
kevinz000
924c7e0d05 Merge pull request #11235 from Detective-Google/if-it-compiles-it-works 
unfucks paramedics access + PDA
 2020-02-27 01:00:45 -07:00
kevinz000
f00a2c1cd3 Merge pull request #11202 from Hatterhat/beegions-but-actual-bees 
Beegions, But With Actual Bees
 2020-02-27 00:59:57 -07:00
kevinz000
40c36213df Merge pull request #11244 from Ghommie/Ghommie-cit589 
Fixing virology cause someone didn't covert ALL mob/species biotypes to flags.
 2020-02-27 00:57:54 -07:00
kevinz000
a8a8e242d8 Merge pull request #11219 from YakumoChen/LMAO-2CAT!!1 
Adds 2cat (tail)
 2020-02-27 00:54:47 -07:00
kevinz000
648e304ef8 Merge pull request #11240 from Trilbyspaceclone/patch-297 
Raises blob point cap by 150 (aka they can store 250 now)
 2020-02-27 00:53:10 -07:00
Ghommie
a91464bf64 Fixing escaped characters in flavor texts. 2020-02-27 02:29:44 +01:00
Ghommie
fc76cd9a9b Porting update_icon improvements. Part 1. 2020-02-27 01:21:03 +01:00
Ghom
954f03f4e0 Merge pull request #11150 from raspyosu/master 
Bloodsucker Abilities Tweaks/Rebalances
 2020-02-27 00:54:41 +01:00
Artur
27b6469c67 Forgot a var 2020-02-26 16:42:38 +02:00
Putnam
c906f8f17f lickable. 2020-02-25 20:49:01 -08:00
Putnam
0a698d1eeb oy. 2020-02-25 20:07:07 -08:00
Ghommie
e02a6f6dea Fixing virology cause someone didn't covert ALL mob/species biotypes to flags. 2020-02-25 15:37:02 +01:00
Ghom
56d5899bbc Merge pull request #11236 from bunny232/master 
Sentience event preference xenomorph to sentience potion
 2020-02-25 15:19:28 +01:00
Artur
00403a39c6 Reverts tracker changes somewhat 2020-02-25 15:47:15 +02:00
Kraseo
170e092a24 this is going to end well 2020-02-25 13:14:18 +01:00
Artur
f8469c89a4 Conflict fix 2020-02-25 10:46:20 +02:00
Trilbyspaceclone
2aeb1e1b4a Update overmind.dm 2020-02-25 00:32:45 -05:00
Trilbyspaceclone
cf23018b6a Update snacks_cake.dm 2020-02-24 22:51:43 -05:00
bunny232
53d5328c0c Update sentience.dm 2020-02-24 18:49:34 -05:00