shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,978 Commits 5 Branches 0 Tags
166370fb6c62beb8cc8488710c9ffbf9c511ff1c
Commit Graph

1666 Commits

Author SHA1 Message Date
Artur
f910a0fd32 Conflict fixes 2020-04-14 09:27:54 +03:00
kevinz000
8604297dcd Merge pull request #11811 from Ghommie/Ghommie-cit671 
Fixes and standarizes a few liver troubles. Re-enables liver failure.
 2020-04-12 17:01:50 -07:00
Ghom
b00e97b848 Merge pull request #10732 from kevinz000/eldritch_affairs 
Eldritch Affairs
 2020-04-12 20:47:19 +02:00
spookydonut
230e5fca20 fix everything 2020-04-11 15:32:09 +08:00
Ghommie
af55880794 Fixes and standarizes a few liver troubles. Re-enables liver failure. 2020-04-10 17:22:34 +02:00
necromanceranne
d1e77ab087 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:31:16 +10:00
necromanceranne
33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10:00
kevinz000
adad236997 Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1 
What was I hoping for again?
 2020-04-04 07:16:20 -07:00
kevinz000
1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
Ghom
1b8b3f28c3 Update reagent_dispenser.dm 2020-04-03 18:18:12 +02:00
Ghom
150c0769ad Update reagent_dispenser.dm 2020-04-03 15:54:48 +02:00
Ghom
50ec842752 Update reagent_dispenser.dm 2020-04-03 15:53:09 +02:00
necromanceranne
0c46c151f9 Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage. 2020-04-03 19:42:25 +11:00
Artur
2cf7a1f6ba Merge remote-tracking branch 'origin/master' into Garlic 2020-04-02 20:41:58 +03:00
Ghommie
519ebd5ed8 Porting the mutation conflict system, and resizing quantum realm fix. 2020-04-01 15:29:35 +02:00
Persi
304b2c68bf Finished, after a way too long break! 2020-03-29 09:36:40 -04:00
Persi
0bc6a3d4b6 Updating 
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into medicalTGUINext
 2020-03-29 08:35:15 -04:00
kevinz000
c39dd52b5f Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-27 21:32:40 -07:00
Artur
7d22cb00d0 Mixes and fixes 2020-03-25 19:32:46 +02:00
Artur
fdc6a02eea Hm 2020-03-25 12:46:42 +02:00
necromanceranne
c0029612a3 SO YOU DON'T HAVE HORRIBLE MATH PROBLEMS 2020-03-25 08:53:30 +11:00
necromanceranne
3c548a3819 YES OFFICER I DO HAVE A DEADLY WEAPON THESE HANDS 2020-03-25 08:33:23 +11:00
Timothy Teakettle
b789cd246a frying changes with bad chems (#11580) 
* Update toxin_reagents.dm

* Update snacks_bread.dm

* Update toxin_reagents.dm
 2020-03-24 20:03:49 +01:00
Artur
9bb7529a49 Progress 2020-03-24 16:55:46 +02:00
Trilbyspaceclone
f8147e5a85 Ports over Mortars and Pestles (#11546) 
* 2 ports for the commit of 1!

ports -[ready]ghetto grinder
#43600
ports - Mortar and Pestle Fixes #48086
Links -
https://github.com/tgstation/tgstation/pull/43600
https://github.com/tgstation/tgstation/pull/48086

* what if we didnt have that...

* Apply suggestions from code review

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-24 14:03:31 +01:00
Artur
c6a8515297 Merge remote-tracking branch 'Citadel-Station-13/master' into Garlic 2020-03-24 12:36:21 +02:00
kevinz000
ea7c1058b5 Merge pull request #11524 from Ghommie/Ghommie-cit627 
More or less ports "Clothing /under repath"
 2020-03-23 10:40:31 -07:00
kevinz000
cc80d463b7 Merge pull request #11536 from Trilbyspaceclone/patch-316 
Water and Unholy water tweaks
 2020-03-23 10:40:19 -07:00
kevinz000
fbe77495e8 Merge pull request #11576 from Owai-Seek/strawberryjuice3-21-2020 
Porting Juices, Drinks, and Salami [READY]
 2020-03-23 10:36:44 -07:00
Winter Flare
0effeb6ed5 Ports Hyper Drinks 
Ports Drinks from Hyper
https://github.com/quotefox/Hyper-Station-13/pull/121
https://github.com/quotefox/Hyper-Station-13/pull/192
 2020-03-22 19:33:50 -04:00
Winter Flare
cd3f8f5df5 Porting More Stuff 
Ports Moana Lou
https://github.com/tgstation/tgstation/pull/46539
Ports Moscow Mule, Sol Dry
https://github.com/tgstation/tgstation/pull/48466
Ports Hivemind Eraser
https://github.com/tgstation/tgstation/pull/49325
 2020-03-22 15:13:00 -04:00
Winter Flare
5c3037b5d0 Fixed Several Foods, Strawberry Juice 
Add Strawberry Juice
Port Salami
https://github.com/tgstation/tgstation/pull/48817
https://github.com/tgstation/tgstation/pull/49228
Ports some TG Drinks
https://github.com/tgstation/tgstation/pull/48783

Made lizards like:
Egg Wrap

Tweaked Soda Dispenser
Moved Egg Wraps
Tweaked Strawberry Tea and Strawberry Milk recipies.
 2020-03-22 00:19:28 -04:00
Ghommie
86898cc451 Force pushed updates 2020-03-22 01:43:19 +01:00
Auris456852
7c94b555ae Kills screen-wide EMPs (#11375) 
* Kills screen-wide EMPs

This makes a small line change to make the EMP reaction's size be determined logarithmically, rather than linearly. That meaning, there's diminishing returns on EMPs. As a consequence, there's not TOO much reason to try to make a very big EMP, like with maxcaps (before toxins became research, anyway), though I'm sure some of you, who like to get the largest numbers on things possible, can still reach some ungodly numbers with payloads. You're welcome to reach for new heights, but you shouldn't be able to lolEMP the entire station.

* EMP shrinking 2
 2020-03-21 16:09:24 +01:00
Trilbyspaceclone
f58bad79ec Update other_reagents.dm 2020-03-21 02:18:57 -04:00
kevinz000
8b0600a7fa Merge pull request #11527 from Ghommie/Ghommie-cit628 
More bug reports yee'd their last haw.
 2020-03-19 18:56:32 -07:00
Trilbyspaceclone
d499db2fe4 Update other_reagents.dm 2020-03-19 16:58:45 -04:00
Ghommie
a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01:00
Artur
ba972cf0eb Argh 2020-03-18 22:41:21 +02:00
Lin
1649f42570 bruh 2020-03-18 01:24:54 +00:00
Ghom
a24a67e489 Update reagent_containers.dm 2020-03-16 17:07:30 +01:00
Ghom
d47c24a8d0 Fixing right click / verb set_APTFT 2020-03-16 16:44:15 +01:00
Trilbyspaceclone
888f67c4bc Update borghydro.dm 2020-03-13 18:21:12 -04:00
kevinz000
78aa46d8de Merge pull request #11416 from Trilbyspaceclone/patch-306 
Makes Bluespace and Urianium reagents be able to be turned into sheets
 2020-03-12 09:49:26 -07:00
Trilbyspaceclone
b4f57a8885 Update others.dm 2020-03-12 10:56:25 -04:00
Ghom
442eb13e75 Merge pull request #11425 from Citadel-Station-13/kevinz000-patch-3 
fixes synthflesh/rezadone dehusk threshold check
 2020-03-12 14:20:49 +01:00
kevinz000
69c21f4b76 Merge pull request #10327 from Seris02/tggenetics 
ports tg genetics
 2020-03-11 17:01:37 -07:00
Ghom
9f681e9a76 Merge pull request #11409 from necromanceranne/taser_nerf 
Particle Defender no longer just the HoS taser but a shotgun/Stimulants protect against the tased effect.
 2020-03-12 00:30:52 +01:00
kevinz000
bb45117c92 Update medicine_reagents.dm 2020-03-10 23:37:14 -07:00
kevinz000
ce8de536b5 Merge remote-tracking branch 'citadel/master' into eldritch_affairs 2020-03-10 17:24:09 -07:00