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

904 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
ae4aee794e Merge pull request #9592 from Ghommie/Ghommie-cit262 
Porting movespeed modification system updates.
 2019-10-29 21:27:53 -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
8f7270ea3e Update medbot.dm 2019-10-27 05:33:12 -07:00
Ghommie
c0130467db Unmodularize space kiwis and banana spiders. 2019-10-26 18:15:02 +02: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
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
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
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
YakumoChen
1e0f31ad4a Update damage_procs.dm 2019-10-23 00:14:52 +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
Poojawa
6fc750dca0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-21 19:13:19 -05:00
BlackMajor
c901f796f8 Merge pull request #8963 from Citadel-Station-13/kevinz000-patch-61 
healing holoparasites now heals toxlovers
 2019-10-22 10:50:04 +13:00
Poojawa
ffeae20daa Merge remote-tracking branch 'Citadel-Station-13/master' into syntheticbloods 2019-10-18 06:01:52 -05:00
kevinz000
7c4e2c6860 Update medbot.dm 2019-10-17 12:49:49 -07:00
kevinz000
a7a238eafd Merge pull request #9504 from Poojawa/vore-UI-improvements 
Vore fixes and optimizations
 2019-10-17 12:48:01 -07:00
kevinz000
5b5ff67201 Update medbot.dm 2019-10-16 03:51:57 -07:00
Poojawa
184e81eec0 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-16 01:51:51 -05:00
Poojawa
2f9771b1a9 Maybe it's really just as simple as... 2019-10-16 00:48:38 -05:00
Poojawa
1780f1addd animal nom still don't work but runtimes are fixed 
whatever
 2019-10-15 12:11:46 -05:00
Poojawa
4396bd4280 runtime fixings I guess 2019-10-15 07:08:00 -05:00
Poojawa
9308ee517f fixing some belly mode quirks 2019-10-15 06:49:31 -05:00
Poojawa
d5d878e93e moved the values up 2019-10-15 04:09:46 -05:00
Poojawa
ff21b992ad Move files and tweaks vore panel stuff 2019-10-15 03:35:00 -05:00
Poojawa
394c947d14 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-10-11 23:10:45 -05:00
kevinz000
076b2d48fc Update secbot.dm 2019-10-11 20:46:19 -07:00
kevinz000
8c07a79700 Update bot.dm 2019-10-11 20:45:42 -07:00
kevinz000
0643a7b230 Merge pull request #9387 from Sishen1542/goose 
the geese have been unleased
 2019-10-11 12:11:50 -07:00
kevinz000
b0b274762c Merge pull request #9441 from lolman360/whydowehave1000branches 
Ports /tg/ advanced surgerytools and tool defines.
 2019-10-11 12:10:31 -07:00
kevinz000
1896b43c79 Merge pull request #9451 from Ghommie/Ghommie-cit224 
standarizes mobs' can_equip arguments.
 2019-10-11 12:05:12 -07:00
Sishen
c51bfc153b b 2019-10-11 13:24:00 -04:00
kevinz000
3e6415d4b5 Merge pull request #9324 from Linzolle/crusher 
Ports "Adds toggleable light and blinking charging light to crusher" and "Lets the kinetic crusher be one-hand carried"
 2019-10-10 02:23:15 -07:00
kevinz000
f686ea75d3 Merge pull request #8615 from Ghommie/Ghommie-cit45 
Virtual reality componentization.
 2019-10-10 02:09:51 -07:00
Ghommie
9c3e532be7 Fixes lack of arguments on mobs' can_equip. 2019-10-09 00:21:55 +02:00
lolman360
04521551f0 one commit wonder 2019-10-08 19:46:28 +11:00
Ghommie
cac4157894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-10-05 22:03:37 +02:00
Ghommie
32a73b24c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit11 2019-10-05 18:22:43 +02:00
Sishen
f3d373a6b8 loose goose 
honk honk
 2019-10-02 02:27:30 -04:00
Poojawa
f14272e445 Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-27 23:30:05 -05:00
kevinz000
436e01ed0e Merge pull request #9335 from Raptorizer/Guardian_Parasite_Buffs 
Guardian/Holoparasite Buffs
 2019-09-26 19:33:25 -07:00
Poojawa
f57bdc39a2 I still fucking hate components. 2019-09-23 02:03:37 -05:00
Raptorizer
6747918397 Description changes 2019-09-21 19:43:52 -05:00
Raptorizer
82fec870ca Final changes 2019-09-21 19:13:33 -05:00
skoglol
c1e84774ac one-hand shit 2019-09-20 17:28:44 -05:00
Ghommie
c813555697 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit45 2019-09-15 04:05:14 +02:00
Poojawa
53895106dc Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods 2019-09-13 12:58:02 -05:00
Poojawa
2bf4d00d29 Double checking my work 2019-09-12 00:46:18 -05:00
Trilbyspaceclone
8c05b4a1d8 *poor cleanbot* 2019-09-06 19:20:32 -04:00