shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
39,792 Commits 5 Branches 0 Tags
6fea2c2b3a791c4b7e8564edb6fb5f5e72f303fd
Commit Graph

1050 Commits

Author SHA1 Message Date
kevinz000 4d43f2bdf9 Merge pull request #11605 from necromanceranne/ONLY_TRUST_YOUR_FISTS 
PUNCHING: YOU SHOULD BE SCREAMING EDITION
 2020-03-25 12:23:08 -07:00
necromanceranne 2b66eadc5e OW MY LIMBS HURT MORE FROM STAMINA DAMAGE 2020-03-25 09:54:46 +11:00
Ghommie d336bcf259 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit632 2020-03-23 21:02:47 +01:00
Ghommie 76ff0d4931 M/F body preferences. 2020-03-22 19:47:48 +01:00
Ghommie 2103e9975b Oh yea, also a fix. 2020-03-21 02:37:05 +01:00
Ghommie 26e2ec92ca Removes species default_features variable. 2020-03-21 02:04:57 +01:00
Trilbyspaceclone 95e0f0399a Update tools.dm 2020-03-20 01:47:42 -04:00
Ghommie 5e5bdec85d More runtime errors. 2020-03-16 01:55:02 +01:00
kevinz000 69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
kevinz000 e210f7d535 Merge pull request #11391 from Ghommie/Ghommie-cit612 
Porting "Further update_icon splitup"
 2020-03-10 05:58:17 -07:00
kevinz000 bfb75eb26b Merge pull request #11396 from Ghommie/Ghommie-cit613 
Ports "Switches out the three billion args of electrocute act for flags"
 2020-03-10 05:56:28 -07:00
Ghommie 4143c1963c Porting more legcuffs / bola fixes etcetera 2020-03-09 16:20:51 +01:00
Seris02 cccd0e9eef Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-03-09 16:49:32 +08:00
Ghommie ee1eea8874 Ports "Switches out the three billion args of electrocute act for flags" 2020-03-09 04:01:23 +01:00
Ghom 8878733fc1 Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI 
Ports Skyrat's synths (Plus limb rendering overhaul and more)
 2020-03-09 00:26:06 +01:00
Ghommie 59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
deathride58 ee65f070bf fixes runtime with body markings 2020-03-05 23:22:56 -05:00
deathride58 2e35c09dec Merge pull request #10451 from kevinz000/mobility_flags 
Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game
 2020-03-05 20:03:56 -05:00
Ghom 5e603c1cce Merge pull request #11064 from Trilbyspaceclone/more_implants 
3 new arm tool set implants
 2020-03-06 01:25:02 +01:00
deathride58 c5109fa31a addresses review 2020-03-04 21:04:34 -05:00
deathride58 560192c45a Does the thing - PORTS THE BEEPERS! also fixes a bug where body markings dont render if their name doesnt match the iconstate 2020-03-03 15:49:25 -05:00
deathride58 9efdad1d6b Initial commit - lays out the foundation for a more robust limb icon override system. You're welcome. 2020-03-03 13:55:33 -05:00
kevinz000 1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghommie c0ff43f827 ofc, New arguments. 2020-03-01 16:34:43 +01:00
kevinz000 56eab760fc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-27 20:11:36 -07:00
kevinz000 4fc0ef5e74 Merge pull request #11185 from Trilbyspaceclone/J.A.S.O.N 
Makes all IPC organs look robotic!
 2020-02-24 02:24:06 -07:00
kevinz000 493d62c17e Merge pull request #11184 from Trilbyspaceclone/patch-292 
Remember when Kev made IPCs hearts no longer emp? Me ether!
 2020-02-24 02:23:45 -07:00
TrilbySpaceClone c638a83e23 Merge branch 'master' into more_implants 2020-02-22 18:34:02 -05:00
Trilbyspaceclone 18bfde5a0a Update augments_arms.dm 2020-02-22 17:58:50 -05:00
Seris02 c3ec44b0d0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics 2020-02-22 19:54:10 +08:00
Seris02 84d08fe122 firebreath change + update to tg genetics + calc patch 2020-02-22 19:42:33 +08:00
kevinz000 f6542b381c Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 23:29:25 -07:00
Ghommie 8fbfd07692 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-22 00:55:32 +01:00
kevinz000 a784a74ccb Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-21 13:35:26 -07:00
TrilbySpaceClone 7d8f1320b3 it looks nicer 2020-02-21 03:07:42 -05:00
Trilbyspaceclone 58df6486cb Hey hey people, grammar here. 2020-02-21 03:06:38 -05:00
Trilbyspaceclone f35ee95d67 Update heart.dm 2020-02-21 01:54:23 -05:00
Ghom 89f256866d Merge pull request #11033 from kevinz000/cmo_drapes 
gives CMO special surgery drapes that can initiate techweb surgeries without operating console
 2020-02-20 11:24:50 +01:00
kevinz000 c7273c03be Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-19 19:12:27 -07:00
kevinz000 0e4692c63d Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-18 18:16:34 -07:00
Ghommie aba636a44c ok 2020-02-17 00:13:16 +01:00
Trilbyspaceclone 3fde58434f Merge branch 'master' into more_implants 2020-02-16 01:55:19 -05:00
kevinz000 29c422a2e6 Merge pull request #11073 from Ghommie/Ghommie-cit577 
Reduced tongue organ damage and tasting pH message spam.
 2020-02-15 11:45:50 -07:00
Seris02 2d9c8ce8fc fixing merge conflicts 2020-02-15 15:41:52 +08:00
Trilbyspaceclone 71cb8e19cb Update augments_arms.dm 2020-02-14 09:15:47 -05:00
Trilbyspaceclone c38049fbef Update augments_arms.dm 2020-02-14 09:12:48 -05:00
Ghom 4512845fc3 Merge pull request #11062 from Citadel-Station-13/kevinz000-patch-10 
Changes to organ decay rate (tip it's not 15 minutes 0-100 damage and this was lying to you)
 2020-02-14 13:36:39 +01:00
Trilbyspaceclone d6acae3254 ghommie changes 2020-02-13 14:16:55 -05:00
Ghom 28a6384427 Merge pull request #10913 from Feasel/patch-3 
[Balance Pass - Dissection Early Game Buff]
 2020-02-13 16:49:01 +01:00
Ghommie 23f7879057 taste spam 2020-02-13 14:57:08 +01:00