shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
31,597 Commits 5 Branches 0 Tags
d3306e2eeccdf9fbc06df57731ff4caf198c2ea0
Commit Graph

828 Commits

Author SHA1 Message Date
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
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
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
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
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
Ghommie
747b84d255 Thank you fermis very cool 2020-02-13 14:47:53 +01:00
Ghommie
d8415aa634 Fixing tongue organ damage spam. 2020-02-13 14:44:08 +01:00
kevinz000
14add89a5e Update heart.dm 2020-02-13 01:52:00 -07:00
TrilbySpaceClone
75844930b4 new implants! 2020-02-13 03:42:59 -05:00
kevinz000
eca0e0f2dc Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-13 00:39:20 -07:00
kevinz000
70e752dbc9 this is totally not laggy 2020-02-11 23:45:22 -07:00
kevinz000
9cb4c3c062 replace can_start 2020-02-11 23:25:18 -07:00
Winter Flare
bb641fecf8 Sprites, Tweaks, and Snacks 
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder.
-Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same.
-Adds Bacon and Eggs Sprite and Food Item
-Adds Unique Sprite for Drying Agent bottle.
-Adds Chocolate Bar to the... Chocolate Vendor.
-Allows Trash Bag to fit Limbs (Not Heads)
-Allows Mops to be Printable
-Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants.

Ports the following from TG:
Printable Mops
https://github.com/tgstation/tgstation/pull/44141
Makes Limbs Small Weight (To Fit in Trashbags)
https://github.com/tgstation/tgstation/pull/44730
 2020-02-09 23:07:32 -05:00
Ghom
3a2eb8c1ad Update experimental_dissection.dm 2020-02-09 22:50:43 +01:00
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +01:00
Feasel
10c2248577 [Balance Pass - Dissection Early Game Buff] 
Doing this so science has some real ways to do science point generation.

Normal bodies are low enough in value that by the time you do a body normally, passive gen has already beaten too far.
So I just guaranteed success with better tools, but left a tiny bit off just for memes/ayylmao tools must be best.

Scapel - 90% success from 45% 

Advanced - 99% success from 65% success

Ayylmao - 100% Because ayylmao. 

Knife and shard adopt old-ish values because ghetto man should have a fun option (45% and 25%)

Now go gather dem bodies for SCIENCE!!!
 2020-02-05 02:54:55 -06:00
Ghommie
5dc1de1d04 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229 2020-02-05 04:34:54 +01:00
Ghom
b4ba381b59 Merge pull request #10739 from r4d6/Dwarven_Language 
Add a Dwarf Language
 2020-02-05 02:03:42 +01:00
kevinz000
6a8a606f97 Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-02-04 16:01:25 -07:00
kevinz000
275b1f73e0 Merge pull request #10849 from Ghommie/Ghommie-cit547 
Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable
 2020-02-04 03:39:14 -07:00