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

1285 Commits

Author SHA1 Message Date
necromanceranne
33a056b373 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-06 12:29:14 +10: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
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
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
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
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
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
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
Trilbyspaceclone
833841bd7b Update others.dm 2020-03-10 16:48:33 -04:00
Trilbyspaceclone
bd4e32e1c4 Update others.dm 2020-03-10 16:35:04 -04: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
necromanceranne
e0df350579 PD now isn't a HoS taser x3 and has reasonable damage, stimulants actually combat the taser effect instead of you just being completely fucked by the HoS even through adrenals. 2020-03-10 23:21:59 +11: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
Ghommie
59b1a223a3 Ok, done. 2020-03-08 22:51:36 +01:00
keronshb
228012c718 Blob refactor (#43872) 
Ports over Blob Refactor from TG
 2020-03-06 15:58:17 -05:00
kevinz000
6354b48659 fix 2020-03-03 20:58:06 -07:00
Ghom
0b5481f9b9 Merge pull request #11237 from kevinz000/reagent_logging_3 
reagent logging pr attempt 3 but it works
 2020-03-03 21:27:17 +01:00
kevinz000
1e99cd0bfe Merge remote-tracking branch 'citadel/master' into mobility_flags 2020-03-03 03:08:41 -07:00
Ghom
9375113426 Merge pull request #11041 from Arturlang/kills_blood_tomatoe_succ 
Bloodsucker external blood gain rebalancing
 2020-03-02 16:36:22 +01:00
Arturlang
97c5aa1e24 Maintainer suggestions 
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-01 16:48:49 +02:00
Ghom
295cd2991d Merge pull request #11227 from Putnam3145/salbut-jitter 
Gave jittering to salbutamol
 2020-02-29 20:42:03 +01:00
Artur
b536c061fb Reviewer suggestion and co 2020-02-26 16:26:57 +02:00
Persi
5726b848b1 Stopping for the night, chem masters can only dispense smart darts 2020-02-25 04:27:20 -05:00
kevinz000
bbcc9cf4e5 never ever webeditor 2020-02-24 15:15:21 -07:00
kevinz000
672da86c51 NEVERWEBEDITORGUYS 2020-02-24 15:08:08 -07:00
kevinz000
526471510f Merge remote-tracking branch 'citadel/kevinz000-patch-17-1' into kevinz000-patch-17 2020-02-24 15:03:02 -07:00
kevinz000
306b711ab1 Update reagents.dm 2020-02-24 14:30:50 -07:00
kevinz000
2b3e8a64f7 Update holder.dm 2020-02-24 14:23:44 -07:00
Putnam
feaadffd93 Gave jittering to salbutamol. 2020-02-24 11:23:51 -08:00
Persi
f23f347d99 More minor fixes, TODO: sleepers white screen, chem master can't make containers 2020-02-24 04:33:37 -05:00