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

1623 Commits

Author SHA1 Message Date
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
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
Ghommie
a0294698c0 extra runtime fixes, also porting tgstation#49997 2020-03-19 04:49:01 +01: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
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
0f14fbfdac Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor 
To fixs something?
 2020-03-08 17:51:17 -04:00
Ghom
64215b41a4 Merge pull request #11363 from Ragolution/took-it-and-threw-it-on-the-ground 
Culls irrelevant targeting information on Drink Fling.
 2020-03-08 01:39:41 +01:00
Ragolution
9d1cef2e97 Update code/modules/reagents/reagent_containers.dm 
Drink slide changes recommended by Ghom p.2

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 01:58:17 -05:00
Ragolution
860d6b0827 Update code/modules/reagents/reagent_containers.dm 
Drink slide changes recommended by Ghom p.1

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-03-07 01:58:06 -05:00
keronshb
228012c718 Blob refactor (#43872) 
Ports over Blob Refactor from TG
 2020-03-06 15:58:17 -05:00
Ragolution
1cc7d01a44 Culls irrelevant targeting information. 2020-03-06 11:39:27 -05:00
Ragolution
4857bd120c Fixes bartender drink slide spill 
Forces drink throw call to check for bartender throwing before spilling contents. Feels like a lazy fix, but it works.
 2020-03-06 10:06:59 -05:00
Ghom
f24c7fb142 Merge pull request #11222 from Trilbyspaceclone/ashwalkers 
Ashwalkers now can make a well, got their livestock back and more!
 2020-03-06 13:48:03 +01:00
Ghom
b80acdfaa6 Update glass.dm 2020-03-06 05:39:18 +01: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
Artur
f879316b4e All it lacked is a return. 2020-03-04 23:29:08 +02: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
kevinz000
5144e45ba9 it works now :D 2020-02-24 15:32:46 -07: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
5ad51758e0 fix 2020-02-24 15:04:25 -07:00
kevinz000
388a804add Merge remote-tracking branch 'citadel/kevinz000-patch-15' into kevinz000-patch-17 2020-02-24 15:03:20 -07:00
kevinz000
c739091285 Merge remote-tracking branch 'citadel/kevinz000-patch-11' into kevinz000-patch-17 2020-02-24 15:03:05 -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
kevinz000
5cece42c1a Update glass.dm 2020-02-24 14:20:40 -07:00
kevinz000
23aa38a381 Update reagent_containers.dm 2020-02-24 14:17:48 -07:00