shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
25,836 Commits 5 Branches 0 Tags
6d6cc93e50ed1ab15fa4040739f64efef7eec6a0
Commit Graph

10561 Commits

Author SHA1 Message Date
kevinz000
631961121f Merge pull request #9521 from MrJWhit/cult-robe-change 
Increases bomb resistance in blood cult robes
 2019-10-29 21:38:00 -07:00
kevinz000
5aee9b0142 Merge pull request #9494 from Ghommie/Ghommie-cit235 
Fixes the "gear" harness.
 2019-10-29 21:37:11 -07:00
kevinz000
05a84985d4 Merge pull request #9469 from deathride58/vampyawn 
Small vampire balance tweaks - Bat ventcrawling requires starvation, chapel is no longer instant death
 2019-10-29 21:36:21 -07:00
kevinz000
b172c5f691 Merge pull request #9501 from deathride58/stronksecborgs 
Borg buffs - Allows jaws to incapacitate, gives secborg a taser, and more! (wall of text in desc)
 2019-10-29 21:29:12 -07:00
kevinz000
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -07:00
kevinz000
0064529362 Merge pull request #9610 from Ghommie/Ghommie-cit273 
ports anti-magic component code updates (holymelon sold separately).
 2019-10-29 21:26:03 -07:00
kevinz000
9998a2c898 Merge pull request #9651 from Thalpy/Thalpy-patch-1 
[Upstream migration] Fixes widescreen tooltips
 2019-10-29 21:23:55 -07:00
kevinz000
df715d6cbc Merge pull request #9650 from Hatterhat/patch-3 
<b>hey did you guys hear about that one cursed image with the skylar ahegao</b>
 2019-10-29 21:23:26 -07:00
kevinz000
96364ea075 Merge pull request #9645 from Ghommie/Ghommie-cit285 
Fixing invisible blackberry n strawberry chocolate cake slices.
 2019-10-29 21:21:54 -07:00
kevinz000
fc073748ec Merge pull request #9644 from Ghommie/Ghommie-cit284 
Fixes a few issues with PKA mods.
 2019-10-29 21:21:42 -07:00
kevinz000
bc3dd51db3 Merge pull request #9626 from Ghommie/Ghommie-cit278 
Unmodularize space kiwis and banana spiders.
 2019-10-29 21:21:14 -07:00
BlackMajor
852a405ab8 Merge pull request #9631 from Citadel-Station-13/kevinz000-patch-98 
Medibots now ACTUALLY heal slimes, rather than just not killing them (or how I learned binary logic the hard way)
 2019-10-30 15:55:29 +13:00
Ghommie
c6022518a7 Shameless late game crew nerf. 2019-10-30 03:25:50 +01:00
Trilbyspaceclone
bbd3c55fbc Update halloween.dm 2019-10-29 21:37:44 -04:00
Ghommie
005c87bdf6 I'm making a joke title, don't ban me github. 2019-10-30 01:31:29 +01:00
Trilbyspaceclone
ec4b94c3c0 Update embalming.dm 2019-10-29 20:22:44 -04:00
Ghommie
1b8bda7040 Fixes some average runtimes, how null... 2019-10-30 00:48:51 +01:00
Ghommie
54f8c29005 Fixing riding component runtimes, how drifting... 2019-10-29 23:33:35 +01:00
Ghommie
9f00423bbd Fixing the deep space gorilla. 2019-10-29 21:51:00 +01:00
Anonymous
23202e8524 Merge branch 'master' into assu 2019-10-29 17:53:16 +03:00
Ghommie
a5b37b658b Purging a lot of space indention in favor of tabs. 2019-10-29 15:46:31 +01:00
Ghommie
a5086d5813 3 seconds penalties fix 2019-10-29 13:16:36 +01:00
BlackMajor
edfa1d0bae Merge pull request #9649 from Thalpy/JacqFixes 
[Expedite][Halloween] Damnit Jacq stop bothering the AI
 2019-10-29 21:48:35 +13:00
Fermi
be470c2d18 Oranges are high 2019-10-29 08:07:11 +00:00
Fermi
5356afa9e6 Barthhhh 2019-10-29 06:14:31 +00:00
Thalpy
2636398e60 WEBEDITS 2019-10-29 03:50:49 +00:00
Hatterhat
ebd05a3fb1 today i will make a one line fix and steal it from sishen 2019-10-28 22:39:46 -05:00
Thalpy
e71dc54594 i-- 2019-10-29 03:29:56 +00:00
Thalpy
a1e611e7aa Heck 2019-10-29 03:23:46 +00:00
Thalpy
39f7116353 Oops 2019-10-29 03:22:21 +00:00
BlackMajor
ba9c99644d Merge pull request #9640 from Linzolle/hat-toss 
I broke hats oops
 2019-10-29 10:00:52 +13:00
Ghommie
3b51c3c5be Fixing invisible blackberry n strawberry chocolate cake slices. 2019-10-28 18:20:58 +01:00
Ghommie
8c4e031a1b atom/movable's Destroy() calls MoveToNullSpace() which calls Exited(), thus handle_atom_del() is redunant. 2019-10-28 17:59:32 +01:00
Ghommie
68b1583a1a Fixing PKA mod double installation et similars. 2019-10-28 17:47:29 +01:00
Ghommie
a2f9aaf899 Porting "Adjacent Atmos subsystem revival" 2019-10-28 17:04:31 +01:00
Anonymous
ad00e6b36a Merge branch 'master' into assu 2019-10-28 19:02:48 +03:00
Ghommie
f54449bc7c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-28 16:41:50 +01:00
BlackMajor
cc3eefff29 Merge pull request #9570 from Citadel-Station-13/kevinz000-patch-105 
Gives peacekeeper cyborgs a megaphone
 2019-10-28 17:02:34 +13:00
BlackMajor
6a7a121d56 Merge pull request #8856 from Citadel-Station-13/magrifles_again 
Security Gun Rebalancing Electric Boogaloo - overhauls magrifles/magpistols, burst fire autorifles, nerfs laser carbines, resprites energy guns
 2019-10-28 16:47:02 +13:00
BlackMajor
5ed6de4e26 Merge pull request #9639 from Ghommie/Ghommie-cit283 
Quickfixing hypospray missin icons.
 2019-10-28 16:30:36 +13:00
deathride58
c1742c0572 applies ghommie's suggested change 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2019-10-27 20:41:44 -04:00
Ghommie
13e06cdef3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit244 2019-10-28 01:37:10 +01:00
Ghommie
9f0e534a55 only add once. 2019-10-28 01:26:41 +01:00
kevinz000
84c15af767 Merge pull request #9590 from Ghommie/Ghommie-cit260 
Ports "All font size spans scale" and cleans up the many browserOutput stylesheets
 2019-10-27 17:22:35 -07:00
kevinz000
329f86cea0 Merge pull request #9612 from Linzolle/blood-overlay-again 
fix blood overlays again
 2019-10-27 17:21:55 -07:00
Ghommie
96e20f4769 fixing one mistake, and it's ready. 2019-10-28 01:04:31 +01:00
Linzolle
24e5905c38 fuck 2019-10-27 19:02:26 -05:00
Ghommie
2d8e383b9c Quickfixing hypospray missin icons. 2019-10-28 00:52:47 +01:00
Ghommie
80cd4902ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit273 2019-10-28 00:49:22 +01:00
kevinz000
fae47c58ed Merge pull request #9635 from Thalpy/JacqFixes 
[Expedite] [Halloween] A few fixes for Jacqueline and Barth.
 2019-10-27 16:41:06 -07:00