shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,778 Commits 5 Branches 0 Tags
bf6256350788d059cf993ea6104dfaf4838e9abd
Commit Graph

841 Commits

Author SHA1 Message Date
Ghom 7a3f0d140c Merge pull request #10468 from Citadel-Station-13/stop-ghosting 
ghosting no longer makes it so you don't count for abductors
 2020-01-21 02:26:25 +01:00
kevinz000 088e586b47 Merge pull request #9601 from Ghommie/Ghommie-cit265 
Ports move force and move resist, movement/pushing/pulling tweaks & co.
 2020-01-19 16:10:56 -07:00
Ghom 4a0c85e0c0 Merge pull request #10594 from chefferz/chefferz-abductor1 
Removes shrink rays from abductor console.
 2020-01-19 16:12:51 +01:00
chefferz 54a2b32f42 Update console.dm 2020-01-17 23:55:44 -05:00
Ghommie 9c0b78bc09 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-18 01:23:08 +01:00
kevinz000 aea0de30d1 Merge pull request #10125 from Ghommie/Ghommie-cit449 
Ports a few projectile code updates by ke:b:inz.
 2020-01-17 15:15:08 -07:00
Ghom 77bdc8ee58 Merge pull request #10558 from DeltaFire15/clockfixes 
Slimepeople can no longer just chill on vitality matrixes
 2020-01-14 13:51:03 +01:00
Ghommie 1d948907f6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-13 23:26:21 +01:00
Arturlang f98bc85db0 Merge branch 'master' into mesmerize_quickfiz 2020-01-13 09:44:17 +02:00
Artur 1b852b3a03 Fixes mesmerize 2020-01-13 09:34:40 +02:00
Ghommie c14439494a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-12 19:18:03 +01:00
Ghommie 02fbbd4f95 Ouch. 2020-01-12 16:54:08 +01:00
AffectedArc07 16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000 ddff903532 Merge pull request #10518 from Seris02/explosionport 
ports the explosion rework thingamajig
 2020-01-12 00:38:43 -08:00
kevinz000 af562d1421 Update bloodsucker_life.dm 2020-01-11 06:54:29 -08:00
Seris02 29b66db9e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport 2020-01-11 11:29:30 +08:00
Seris02 0b0b80f174 explosions 2020-01-11 11:22:59 +08:00
Lin e5e2e4f012 Merge pull request #10329 from Ghommie/Ghommie-cit490 
Ports reagents id removal and typepath usage.
 2020-01-10 01:34:39 +00:00
Lin c4cb06f8f0 Merge pull request #10112 from Ghommie/Ghommie-cit447 
Refactors that mess of a code for alternate worn clothing sprites for digitigrade and taurs.
 2020-01-10 01:31:20 +00:00
Ghommie 825b4f01c2 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-10 02:26:19 +01:00
DeltaFire 9361fe6d8e 😂 
Vitaly matrixes weren't actually succing slimes.. nice.
 2020-01-09 21:03:09 +01:00
kevinz000 2944a902c6 Merge pull request #10447 from Arturlang/Bloodsucker_tweaks 
[READY] Bloodsucker tweaks
 2020-01-08 13:36:24 -08:00
Arturlang cc174d91ec Reviewer suggestion 
Co-Authored-By: Lin <linzolle@gmail.com>
 2020-01-08 22:02:50 +02:00
Putnam 26064e0992 crap 2020-01-07 17:37:57 -08:00
Artur cff6a094d7 Aaand buffs stakes 2020-01-07 21:21:12 +01:00
Artur 97a9ad4714 Nerfs cloak some more 2020-01-07 19:22:39 +01:00
Artur 81f1349cea Nerf Stamina and cloneloss 2020-01-07 18:41:17 +01:00
Artur 7141223f49 All ready now, forgot how stat worked 2020-01-07 18:39:13 +01:00
kevinz000 91c8bb2e95 Update experiment.dm 2020-01-07 02:17:56 -08:00
Artur d283532d97 Removes tresspass handcuff removal 2020-01-06 20:49:14 +01:00
Artur 41f96c0dc9 Whoopsie 2020-01-06 20:31:55 +01:00
Artur 4fc6aa10be Adds a cooldown for revival 2020-01-06 20:29:10 +01:00
Artur 8a193304ee Buffs torpor without coffin 2020-01-06 20:22:39 +01:00
Artur b0cb6aab5c Final commit hopefully 2020-01-06 17:26:36 +01:00
Artur 00d0d8c415 Whoops indentation 2020-01-06 12:31:54 +01:00
Artur c438d39eb3 Initial Commit 2020-01-05 22:32:29 +01:00
Ghommie 686a76dd1d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2020-01-04 13:35:05 +01:00
Ghommie f5b251db66 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-03 18:24:39 +01:00
Putnam adf87c7595 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2020-01-02 22:52:24 -08:00
nik707 0f9c3350cd Merge pull request #10189 from Putnam3145/storytellers 
n word
 2020-01-02 22:01:19 -06:00
Lin b1ccd512db Merge pull request #10215 from Ghommie/Ghommie-cit473 
Ports "Fixes ChangeTurf CHANGETURF_INHERIT_AIR flag and add it to all calls."
 2020-01-03 00:00:51 +00:00
Ghommie 4d06d231f8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2020-01-02 17:49:01 +01:00
Lin b651bbcdb3 Merge branch 'master' into Ghommie-cit367 2019-12-31 22:37:59 +00:00
Arturlang c4caa54608 Oh god oh fuck 2019-12-31 03:23:14 +02:00
Putnam 71fcd23f1f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 13:31:15 -08:00
Ghom d3bf4bbb8c Merge pull request #10306 from Arturlang/patch-2 
Removes most of vampire armor and removes stun scaling, and associates the buffs with physiology
 2019-12-30 20:11:34 +01:00
Arturlang 0776cade21 Ghommies fixes 2019-12-30 20:18:49 +02:00
Ghommie 80e716eeaf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-30 18:14:47 +01:00
Ghommie 49f1176170 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit490 2019-12-30 16:06:16 +01:00
Putnam 418e4c21ef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into dojo-ghostrole 2019-12-30 01:56:59 -08:00