shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
27,831 Commits 5 Branches 0 Tags
07a5f052d36bdc33ccef0f5ef4141d94d280c5fb
Commit Graph

11491 Commits

Author SHA1 Message Date
Ghommie
065fbdf0cb Fixing gibspawner runtimes, how gruesome... 2019-11-02 19:37:35 +01:00
Ghommie
f4587b4260 This is very unprofessional. Yet I'm no google architect. 2019-11-02 16:47:25 +01:00
Ghommie
50fc1004ba Actually holopads, so they won't end up in maintenance... 2019-11-02 16:46:02 +01:00
Ghommie
3193e3ce20 fix. 2019-11-02 16:12:37 +01:00
Ghommie
a949f84557 missing bits. 2019-11-02 16:00:48 +01:00
Ghommie
1bf10c0435 Improving Jacqueen's teleportation area selection. 2019-11-02 15:50:54 +01:00
Ghommie
ad0e8ec4be Yea, all good now. 2019-11-02 13:41:20 +01:00
Ghommie
986c4e11c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit245 2019-11-02 02:32:23 +01:00
Ghommie
edfdcce52f INITIALIZED_1 4 life 2019-11-01 20:54:22 +01:00
Ghommie
e08da877a5 whops. 2019-11-01 18:56:55 +01:00
Ghommie
a204fddc4b Fixing some issues with dullahans. 2019-11-01 18:51:06 +01:00
Anonymous
537ac0f6ca Merge branch 'master' into assu 2019-11-01 19:05:53 +03:00
Winter Flare
eb5f014382 Travis is mean. 2019-11-01 05:24:20 -04:00
kevinz000
4f9f8f98bf Update wizard.dm 2019-10-31 22:58:24 -07:00
Winter Flare
7a9f48302d Reworked a bit of bounty stuff. 2019-11-01 01:38:27 -04:00
Fermi
37bfb31ee0 Merge branch 'master' into Superbases-goodbye 2019-11-01 00:55:55 +00:00
kevinz000
587e6b9262 Update aooc.dm 2019-10-31 17:30:29 -07:00
kevinz000
d9c38d0589 Merge pull request #8948 from Ghommie/Ghommie-cit156 
Cleaning up the arousal module.
 2019-10-31 17:27:03 -07:00
Thalpy
642b27a10f Ghommie 2019-11-01 00:26:22 +00:00
Ghommie
6cf35a67b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290 2019-10-31 23:17:39 +01:00
Ghommie
b653595702 Ports "Replaces the rpg loot datum with a component and makes some suffixes have real effects" & co 2019-10-31 22:40:11 +01:00
Ghommie
17e794bd59 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit281 2019-10-31 01:43:44 +01:00
Ghommie
b17346a44e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit220 2019-10-30 14:46:42 +01:00
Anonymous
5930389cb6 Merge branch 'master' into assu 2019-10-30 15:18:39 +03:00
Ghommie
b86c5059d5 [s] modkit uninstall() calling forceMove() calling loc.Exited() calling modkit.uninstall() calling f... 2019-10-30 13:17:12 +01:00
Linzolle
4d4ff4239c unused 2019-10-30 00:10:53 -05:00
Linzolle
52b6e659c1 Merge branch 'abductor-update' of https://github.com/Linzolle/Citadel-Station-13 into abductor-update 2019-10-29 23:59:16 -05:00
Linzolle
266f1ff958 Merge remote-tracking branch 'upstream/master' into abductor-update 2019-10-29 23:58:01 -05:00
Weblure
4ca5841828 Fixed an invalid variable call in a string 
[p_theyre()] to [M.p_theyre()]
 2019-10-29 21:45:36 -07:00
kevinz000
6dc6159f4a Merge pull request #9578 from deathride58/mapsubsystemimprovements 
Map config system improvements - Fixed and expanded map vote restrictions, map-specific announcer framework, and more
 2019-10-29 21:42:32 -07:00
kevinz000
fb936a5319 Merge pull request #9598 from deathride58/runtimefixpass 
various runtime fixes - plasmaman tongues no longer have a maxHealth of "alien" and more
 2019-10-29 21:41:11 -07:00
kevinz000
e6046d62d6 Merge pull request #9528 from Ghommie/Ghommie-cit244 
Fixes some peculiarities with hands layer overlapping stuff
 2019-10-29 21:38:24 -07:00
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
kevinz000
57f848ab01 Merge branch 'master' into kevinz000-patch-85 2019-10-29 21:19:49 -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