shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,758 Commits 5 Branches 0 Tags
854eb129f6d0fc86a5f04437bb536144ce94fb91
Commit Graph

7963 Commits

Author SHA1 Message Date
kevinz000
854eb129f6 Merge pull request #8462 from Trilbyspaceclone/patch-156 
Makes brainwash disks cost 3 tc not 5
 2019-05-31 17:43:53 -07:00
kevinz000
1efdfd38e0 Merge pull request #8436 from Trilbyspaceclone/patch-137 
Allows bio genes to make synth meat
 2019-05-31 17:43:22 -07:00
kevinz000
f678741a0e Merge pull request #8470 from Ghommie/Ghommie-cit19 
Undunks pepper spray & teargas.
 2019-05-31 17:42:28 -07:00
kevinz000
ca16cd9467 Merge pull request #8488 from Trilbyspaceclone/ERT_SUITS 
[Ready] High alarm ERT suits
 2019-05-31 17:41:39 -07:00
kevinz000
a96e414d2f Merge pull request #8486 from BlackMajor/Ooga 
Supermatter no longer works while inside of a turf.
 2019-05-31 17:40:30 -07:00
kevinz000
f5b3484e92 Merge pull request #8295 from Trilbyspaceclone/T_T 
[Ready] Nerfs(Not really) Engi printing and organized many designs
 2019-05-30 11:12:35 -07:00
Trilbyspaceclone
a8ec60d9c1 Update miscellaneous.dm 2019-05-30 13:51:55 -04:00
Trilbyspaceclone
39700503f9 Update miscellaneous.dm 2019-05-30 11:40:37 -04:00
Trilbyspaceclone
618c2c070c Update ert.dm 2019-05-30 11:36:20 -04:00
BlackMajor
0d06605662 Supermatter eats the closed turf it's inside. 
Because /turf/closed doesn't respect atmos and an SM engine in a plasmafire unharmed because it's inside a turf is questionable.
 2019-05-30 16:17:33 +12:00
Ghommie
cc334b9a57 honestly if they don't wear a gas mask, they do deserve the stunlock... 
But ok.
 2019-05-28 00:43:54 +02:00
Ghommie
b5c4a44f01 pepper spray & teargas de-dunked. 2019-05-28 00:30:55 +02:00
kevinz000
aca63ebea3 Merge pull request #8408 from Ghommie/Ghommie-cit13 
Fixing cult rounds potentially stalling if the sac target is erased from this realm.
 2019-05-27 15:09:11 -07:00
kevinz000
76314e463e Merge pull request #8443 from deathride58/stripfix 
Item stripping no longer gets interrupted by changes in your actively held item
 2019-05-27 14:08:04 -07:00
kevinz000
ff82569c6f Merge pull request #8404 from WhiteHusky/flavor-text-bugfix 
Flavor text with special characters don't get partially unescaped
 2019-05-27 03:31:49 -07:00
kevinz000
843bfc3a3e Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits 
Removes color-whitelist blocking custom-colored circuit blueprints from being imported
 2019-05-27 03:30:07 -07:00
kevinz000
45146b28c8 Merge pull request #8456 from Trilbyspaceclone/patch-151 
suppressors now only cost 1 tc
 2019-05-27 03:27:22 -07:00
kevinz000
433d6cae4b Merge pull request #8455 from Trilbyspaceclone/patch-150 
Binary Translator Key costs 2 from 5
 2019-05-27 03:26:45 -07:00
kevinz000
625901bfe3 Merge pull request #8454 from Trilbyspaceclone/patch-149 
Adv Syndicate Surgery Duffel Bag tweaks
 2019-05-27 03:26:26 -07:00
kevinz000
2f79f36a38 Merge pull request #8448 from Trilbyspaceclone/patch-143 
Makes laser scatter shot cost 4 not 5
 2019-05-27 03:25:56 -07:00
kevinz000
b718460cf6 Merge pull request #8460 from Trilbyspaceclone/patch-154 
ultra clown fireing pins
 2019-05-27 03:24:47 -07:00
kevinz000
e20206a6cb Merge pull request #8450 from Trilbyspaceclone/patch-145 
Reduces FRAME cart by 2tc
 2019-05-27 03:23:33 -07:00
Trilbyspaceclone
962c5c7a17 Update uplink_items.dm 2019-05-26 22:53:00 -04:00
Trilbyspaceclone
21ade7bb2c Update uplink_items.dm 2019-05-26 22:49:07 -04:00
Trilbyspaceclone
b28e374640 Update uplink_items.dm 2019-05-26 22:35:12 -04:00
Trilbyspaceclone
ea6b538d0b Update uplink_items.dm 2019-05-26 22:32:10 -04:00
Trilbyspaceclone
4138748616 Update uplink_items.dm 2019-05-26 22:29:55 -04:00
Trilbyspaceclone
a633d3202a It was 2019-05-26 22:22:31 -04:00
kevinz000
fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix 
Ass Fix
 2019-05-26 19:19:13 -07:00
Trilbyspaceclone
5a0c7df824 Update uplink_items.dm 2019-05-26 21:59:01 -04:00
Trilbyspaceclone
06bacf3436 Update uplink_items.dm 2019-05-26 21:52:28 -04:00
kevinz000
d4026d70ff Merge pull request #8435 from Ghommie/Ghommie-cit17 
lazyinitlist on IAA targets stealing.
 2019-05-26 17:23:05 -07:00
kevinz000
e204cdc84e Merge pull request #8419 from UntoldTactics/Cult-Changes 
Rewords Blood Cult 'offer' rune click here prompt.
 2019-05-26 17:22:43 -07:00
deathride58
375965d731 Item stripping no longer gets interrupted by changes in your actively held item 2019-05-26 16:22:15 -04:00
Trilbyspaceclone
5b549f030d huh... 2019-05-26 04:50:19 -04:00
BurgerLua
125db4c6b4 Added 2019-05-25 21:21:52 -07:00
UntoldTactics
49351fe909 Update code/modules/antagonists/cult/runes.dm 
Co-Authored-By: deathride58 <deathride58@users.noreply.github.com>
 2019-05-26 12:23:35 +10:00
Trilbyspaceclone
c8734cebdc Update biogenerator_designs.dm 2019-05-25 16:35:50 -04:00
CalamaBanana
fc5b617ca0 Input-check for the color 2019-05-25 21:18:17 +02:00
kevinz000
0dba89c4e7 Merge pull request #8325 from Trilbyspaceclone/patch-118 
[Ready] Cleaner looking autolathen organization
 2019-05-25 11:51:17 -07:00
kevinz000
90a3199315 Merge pull request #8417 from Trilbyspaceclone/patch-136 
Gives space queen's men void jet packs + tweeks
 2019-05-25 11:34:55 -07:00
kevinz000
a4b2aa0420 Merge pull request #8296 from Trilbyspaceclone/patch-112 
Nerfs Synda NPC block Rng to 25%
 2019-05-25 11:31:30 -07:00
kevinz000
d0819246bc Merge pull request #8384 from nero1024/footstepB 
Ports new footstep sounds from base /tg/
 2019-05-25 11:30:57 -07:00
kevinz000
e434b9ceb5 Merge pull request #8397 from WhiteHusky/arousal-related-styling-fixes 
Changed arousal message styling.
 2019-05-25 11:30:18 -07:00
kevinz000
deffcb3226 Merge pull request #8398 from BurgerLUA/AntiAssSlap 
Nerfs Ass Slapping, or how a meme PR made me butthurt, or how I'm now resorting to making degenerate PRs such as this since my permaban from Aurora
 2019-05-25 11:28:39 -07:00
kevinz000
aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing 
Female Gendered markings and leg sprite fixes
 2019-05-25 11:20:23 -07:00
kevinz000
e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread 
Defibrillator Upgrades Proofread
 2019-05-25 11:17:34 -07:00
kevinz000
97609fb84e Merge pull request #8409 from Poojawa/why-is-arousal-code-is-bad 
Fixes species getting genitals at all if NOGENITAL'd
 2019-05-25 11:13:55 -07:00
kevinz000
16310a9aea Merge pull request #8425 from BlackMajor/Dunga 
Ports TG firebots.
 2019-05-25 11:13:29 -07:00
kevinz000
104d3c1f37 Merge pull request #8420 from deathride58/fixesblobs 
Fixes shield blobs being completely invulnerable to all forms of damage after reaching a weakened state.
 2019-05-25 11:10:19 -07:00