shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29,915 Commits 5 Branches 0 Tags
bb641fecf8bcc3ca96d268f5acca82fef7186180
Commit Graph

768 Commits

Author SHA1 Message Date
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
Ghommie
ab06c23a2b runtime is forever, errors are eternal. 2020-02-05 23:48:17 +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
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
kevinz000
97583bd98f Merge pull request #10853 from Ghommie/Ghommie-cit549 
A PR about runtime errors
 2020-02-04 03:20:34 -07:00
Ghom
6f66d76680 Merge pull request #10705 from kevinz000/revert_poojawa_blood_1 
Cleanup/Partial revert of RGB blood ""rework""
 2020-02-02 19:08:57 +01:00
kevinz000
33577e0d82 Merge pull request #10813 from Ghommie/Ghommie-cit540 
Unicode support updates from tgstation.
 2020-02-02 01:47:24 -07:00
Ghommie
fedb05b3be A PR about runtime errors 2020-02-02 05:43:38 +01:00
Ghommie
8de11845d5 Removing a troublesome argument from organ/Remove() in favor or using the 'owner' variable 2020-02-02 03:39:49 +01:00
Ghom
d523cfd95e Merge pull request #10806 from Feasel/master 
[Balance Patch - Tend Wounds Edition]
 2020-02-01 18:54:18 +01:00
Ghommie
7f14fa3c71 not-so-wip now. 2020-01-31 19:20:59 +01:00
Feasel
a70d893580 [Balance Patch - Tend Wounds Edition] 
Seriously why the fuck is this doing such little healing and taking so much time to do?

Like, it's literally useless with our synthflesh+silver sulf... meta

Fuckin hell, even bicardine/kelotane heals faster than this shit.

Not anymore.

Today, I'm dramatically improving the healing and giving a decent time reduction to doing this surgery.

I still see the code where it's less efficient on dead bodies, but ehh... price for being dead and this might be stupid good as is.

--------

PATCH NOTES

- Doubled healing on all Tend Wounds

- Roughly around 40% reduction to time needed to do the step that actually heals.
 2020-01-31 03:46:57 -06:00
Ghommie
188f726ffd unicode support port wip 2020-01-31 05:32:00 +01:00
r4d6
2c8d12aa37 Make people actually able to speak dwarf 2020-01-26 15:50:13 -05:00
kevinz000
2acb52fb56 Merge pull request #10690 from Ghommie/Ghommie-cit525 
Additional runtime fixes.
 2020-01-25 05:54:35 -07:00
kevinz000
9827b15466 Unused variables wasting my memory 2020-01-24 23:05:59 -07:00
kevinz000
d86af199f5 initialize 2020-01-24 21:22:59 -07:00
kevinz000
78b901f66f spacing is a pet peeve 2020-01-24 21:18:51 -07:00
kevinz000
24cbe67f27 optimizations, unnecessary crap, undocumented ipc change 2020-01-24 21:18:19 -07:00
Ghommie
a6c3917bfc M H M H 2020-01-24 05:01:51 +01:00
Ghommie
95a2479c6a Additional runtime fixes. 2020-01-24 04:59:56 +01:00
Ghommie
67f58b8a59 A few more runtime fixes. 2020-01-24 03:30:34 +01:00
kevinz000
593e626233 Merge pull request #10346 from deathride58/limbstamlossnerf 
Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further
 2020-01-19 23:11:02 -07: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
Putnam
d29603ad77 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-15 15:57:32 -08: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
AffectedArc07
16a37e2769 Standardises all files from CRLF to LF 2020-01-12 14:28:01 +00:00
kevinz000
fe720dbb9c Merge pull request #10500 from rossark/robo 
ports fast augmentation surgery pr from /tg/
 2020-01-12 00:41:30 -08:00
Putnam
48fadffbfb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-10 17:57:03 -08:00
rosko
e1f524fc03 ports fast augmentation pr from /tg/ 
https://github.com/tgstation/tgstation/pull/47721
 2020-01-10 03:53:27 +02: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
Ghom
dd6e85ddac Merge pull request #10483 from Putnam3145/fix_limbs 
Fix limb damage
 2020-01-09 03:04:44 +01:00
Putnam
244d46ee41 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad 2020-01-08 17:08:01 -08:00
Putnam
df572996b3 fix limb damage 2020-01-08 15:40:35 -08:00
Putnam
cd35e516ac back by popular demand: maso/nympho 2020-01-07 17:01:14 -08:00
Putnam
d75a525b3c let's fix arousal huh 2020-01-05 19:10:48 -08:00
Ghommie
dcb2ae77fa Porting some runtime fixes. 2020-01-06 02:14:25 +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
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
kevinz000
74edd7b13f Merge pull request #10243 from Putnam3145/lewdchem-better-options 
Lewd chem sanity pass/"ERP preferences"
 2019-12-30 00:09:18 -08:00
kevinz000
310d343242 Merge pull request #10095 from Ghommie/Ghommie-cit443 
Buffs clown ops by removing their clumsiness and adding a new trait to be used in place of several clown role checks.
 2019-12-30 00:03:21 -08:00
deathride58
9ea99d4c81 nerfs limb stamcrit by doubling the base limb stam regen, making limbs regen stam at double the rate when disabled, and adding stam multiplier mechanics to limb stamloss 2019-12-29 20:01:21 -05:00
Ghommie
b4c0433d6d more work. 2019-12-27 17:45:19 +01:00
Ghommie
53d142b4c0 more work. 2019-12-25 01:34:33 +01:00
Ghommie
864b768c67 Fixes digitigrades. 2019-12-23 19:36:47 +01:00
Ghommie
d88f50ac15 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit265 2019-12-23 05:02:31 +01:00
Ghommie
b75349bebf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit447 2019-12-23 04:32:09 +01:00