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

2627 Commits

Author SHA1 Message Date
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
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
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
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
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
dabfba8a0d Merge pull request #9619 from BlackMajor/Yote 
Buffs engiborg build potential
 2019-10-27 05:38:50 -07:00
kevinz000
8f7270ea3e Update medbot.dm 2019-10-27 05:33:12 -07:00
BlackMajor
a7ecaaf977 Ok but what if light replacer 2019-10-27 15:58:51 +13:00
Ghommie
c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02:00
BlackMajor
f3cbd43d8b What if engiborgs could actually build machines 2019-10-26 22:58:28 +13:00
deathride58
8f479492db Merge pull request #9513 from Citadel-Station-13/kevinz000-patch-98 
medibots are now TOXINLOVER (so slimes) friendly
 2019-10-25 23:17:30 -04:00
kevinz000
4eca1ca5ad Merge pull request #9605 from Ghommie/Ghommie-cit269 
Unmodularize vox sounds
 2019-10-25 20:09:52 -07:00
Ghommie
cb74be29ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit262 2019-10-25 12:40:50 +02:00
kevinz000
bd9443252a Merge pull request #9579 from YakumoChen/shapeshift 
Ports #41638 and #43784, "Wizard Shapeshift now converts damage taken while transformed"
 2019-10-24 19:13:54 -07:00
kevinz000
236cf328d1 Merge pull request #9567 from BlackMajor/Yote 
Clockwork golems can now use guns
 2019-10-24 19:03:49 -07:00
kevinz000
02a1aaea34 Merge pull request #9548 from Ghommie/Ghommie-cit251 
Fixing radio emotes conflict with drunk memes.
 2019-10-24 18:48:33 -07:00
kevinz000
969bc83179 Merge pull request #9586 from BlackMajor/Yeehaw 
Adds posibrains to the spawners menu for ghosts.
 2019-10-24 18:45:57 -07:00
kevinz000
2ae111eaf0 Merge pull request #9587 from Ghommie/Ghommie-cit258 
Porting components updates and fixing phantom thief component.
 2019-10-24 18:38:39 -07:00
Ghommie
ad7101d0aa ports anti-magic component code updates (holymelon not included). 2019-10-25 03:20:42 +02:00
Ghommie
0da6ae549f Unmodularize vox sounds 2019-10-24 23:02:21 +02:00
Ghommie
a50606bb67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit259 2019-10-24 10:10:07 +02:00
Ghommie
4c8d7023c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit258 2019-10-24 09:50:20 +02:00
YakumoChen
3e9dfd6441 i was suggested to try this 2019-10-24 02:59:15 +00:00
YakumoChen
c6939864c1 and this 2019-10-24 02:42:38 +00:00
YakumoChen
5a9f0aa1e4 this too 2019-10-24 02:33:48 +00:00
YakumoChen
3ec63ed12d I think I forgot this 2019-10-24 02:32:21 +00:00
deathride58
f85f110baa Merge pull request #9047 from Poojawa/syntheticbloods 
RGB Blood Reworks + Blood generator
 2019-10-23 20:54:55 -04:00
Ghommie
20d9adaccd Floaty floating. 2019-10-23 20:43:05 +02:00
Ghommie
c882c098cc Porting movespeed modification system updates. 2019-10-23 19:24:34 +02:00
Ghommie
e1928a18f1 Porting GetComponent macros removal, and some related changes. 2019-10-23 15:04:28 +02:00
Ghommie
fc1f10c97f Porting components updates and fixing phantom thief component. 2019-10-23 13:01:31 +02:00
BlackMajor
8b61fe3d72 posibrains on spawn list 2019-10-23 22:46:10 +13:00
YakumoChen
3d63e9aa20 throwing darts at the wall here 2019-10-23 00:50:05 +00:00
YakumoChen
1e0f31ad4a Update damage_procs.dm 2019-10-23 00:14:52 +00:00
YakumoChen
ffd160ebe8 Update pai_defense.dm 2019-10-23 00:13:00 +00:00
YakumoChen
292b997900 Update damage_procs.dm 2019-10-23 00:11:52 +00:00
YakumoChen
6d11e1bd1d Update damage_procs.dm 2019-10-23 00:08:13 +00:00
YakumoChen
13a06aa099 Update damage_procs.dm 2019-10-23 00:05:44 +00:00
YakumoChen
7d9a6d2a34 Update zombies.dm 2019-10-23 00:05:12 +00:00
YakumoChen
c5ec76e24d Update species.dm 2019-10-23 00:04:09 +00:00
YakumoChen
5b321fc821 #43784 2019-10-22 23:50:25 +00:00
YakumoChen
e76f64ce16 #43784 2019-10-22 23:49:29 +00:00
deathride58
68813b6846 Map config improvements - Adds more variables for the map voting system to take into account, allows far greater flexibility for mappers, adds a random chance for the medibot voice to be the station announcer 2019-10-22 19:14:12 -04:00
nik707
9a598a92cb Merge pull request #9561 from Ghommie/Ghommie-cit256 
Fixing some ayy overlays and client images oddities.
 2019-10-22 16:49:07 -05:00
kevinz000
684658b34f Merge pull request #9559 from Ghommie/Ghommie-cit255 
fixes invisible men.
 2019-10-22 02:26:34 -07:00
kevinz000
07670b6644 Update robot_modules.dm 2019-10-21 17:57:30 -07:00