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

13099 Commits

Author SHA1 Message Date
Kraseo
edfe50579e ACTUALLY fixes null runtimes + double contracts 2020-03-04 13:17:24 +01:00
Kraseo
4315a4d1b7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 23:06:29 +01:00
Ghom
c984cd7677 Merge pull request #11270 from ancientpower/paramedic-tweaks 
Paramedic tweaks (sprites/access/stuff for future use)
 2020-03-02 22:46:49 +01:00
Kraseo
50a1feeb89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-02 17:38:08 +01:00
Ghom
00bc635d27 Merge pull request #11296 from Putnam3145/supermatter-hardcap 
Proper supermatter tweaks
 2020-03-02 16:36:58 +01:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Ghom
782f992c8c Merge pull request #11271 from Citadel-Station-13/kevinz000-patch-19 
Pushing stuff now checks for Process_Spacemove on the automatic step
 2020-03-02 16:34:18 +01:00
Ghom
4ed92ff03a Merge pull request #11283 from Trilbyspaceclone/patch-299 
Makes most winter coats and hoods have their own desc
 2020-03-02 16:18:47 +01:00
Kraseo
e5e05d5d61 handles cases where stripping plasmamen would not give them what they need to not die 2020-03-02 11:47:44 +01: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
Kraseo
648f7793d3 proving to the world i'm retarded one commit line at a time 2020-03-01 23:56:34 +01:00
Kraseo
ad8013d839 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties 2020-03-01 23:39:16 +01:00
Putnam
aba8828fd4 Proper supermatter tweaks. 2020-03-01 14:20:15 -08:00
Kraseo
5da4e5fbcd parte 5: tgui and javascript torture 2020-03-01 22:57:39 +01:00
Kraseo
e3c77f2f5a part 4: the one where i slowly go insane 2020-03-01 22:05:35 +01:00
ancientpower
56ba8ef127 requested changes 2020-03-01 12:45:00 -06:00
Kraseo
ab48a6fa16 part 3: do people even read commit logs 2020-03-01 19:14:05 +01:00
Kraseo
d93ade7e03 part 2: bloody tendency 2020-03-01 17:37:18 +01:00
Kraseo
38f7821dd6 part 1: battle stream 2020-03-01 16:56:13 +01:00
Arturlang
97c5aa1e24 Maintainer suggestions 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-01 16:48:49 +02: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
Trilbyspaceclone
cdd97e8547 she 2020-03-01 00:12:45 -05:00
Trilbyspaceclone
e2b706961a Turns out this is Rag's PR and not mine 
Neet

Co-Authored-By: Ragolution <bloodlust3333@gmail.com>
 2020-03-01 00:11:32 -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
Trilbyspaceclone
3c9d592b8a Update miscellaneous.dm 2020-02-29 09:51:40 -05:00
ancientpower
f44908dc2e forgot icon state changes 2020-02-29 02:03:25 -06:00
ancientpower
5c5ec541ae Merge branch 'master' into paramedic-tweaks 2020-02-29 01:55:46 -06:00
ancientpower
f48e56fe44 thanks mapdiffbot 2020-02-29 01:49:42 -06:00
ancientpower
c4113824f7 more fixes 2020-02-29 01:47:19 -06: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
ancientpower
ed320046c5 fixes icons 2020-02-28 11:42:15 -06: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
kevinz000
a2970b5746 Update living.dm 2020-02-28 02:40:51 -07:00
ancientpower
23c3e5b328 tweaks for the tweaks 2020-02-28 00:17:28 -06:00
raspyosu
8953877a69 makes mesmerize not shitcode 
woooooooo
 2020-02-28 01:01:45 -05:00
ancientpower
12ba71f588 paramedic tweaks 2020-02-27 23:23:44 -06: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