shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,684 Commits 5 Branches 0 Tags
76314e463e250bccedfcba3415d71ea38e8e69db
Commit Graph

7927 Commits

Author SHA1 Message Date
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
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
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
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
Ghommie
d8024ef36f lazyinitlist. 2019-05-25 16:32:17 +02:00
deathride58
9d240d3375 [s] fixes concatenator circuits being able to crash the server 2019-05-24 13:37:53 -04:00
CalamaBanana
d9cc539948 Removed color whitelist 2019-05-24 17:46:48 +02:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
deathride58
cf1acdf058 can my post-testing optimizations please at least work? 2019-05-23 13:12:31 -04:00
deathride58
4e989038e2 Fixes blob shields being completely invulnerable to all forms of damage after reaching a weakened state. 2019-05-23 12:37:46 -04:00
UntoldTactics
0cf0d4d8ed Update runes.dm 2019-05-23 18:37:17 +10:00
Trilbyspaceclone
fb6eca8d46 How did this even compile? 2019-05-22 21:28:16 -04:00
Trilbyspaceclone
717398213b Update pirates.dm 2019-05-22 18:52:15 -04:00
kevinz000
b900815e90 Merge pull request #8400 from dtfe3/watcher-trophy 
Watcher Wing Trophy Effect increase
 2019-05-22 10:42:25 -07:00
Carlen White
1bddf2d5ae Added comment 
For whoever comes across this code and wonders what am I doing.
 2019-05-22 09:32:25 -04:00
Poojawa
25463f22b2 Fixes species getting genitals at all if NOGENITAL'd 
Holy FUCK this code is bad.
 2019-05-21 23:52:19 -05:00
Carlen White
bb2a8bdd59 Fixes flavor text from being removed when canceled. 
This was because canceling really just sent a empty string and not null which caused it to set the flavor text to an empty string.
 2019-05-22 00:38:18 -04:00
Poojawa
ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
Carlen White
e9c450bf17 Flavor text with special characters don't get partially unescaped 
Copying the text that was escaped would occasionally trim an escaping character. Now it's decoded, copied, then encoded to prevent it.
 2019-05-21 22:04:14 -04:00
CdrCross
82d308eb5e Defibrillator Upgrades Proofread 
My first ever contribution to Citadel, and first ever real GitHub Commit. This PR is a simple exercise in fixing and standardising some flavour text across Trilby's otherwise excellent defibrillator upgrades. (PR#8173)
No stats or gameplay elements have been adjusted.
 2019-05-21 23:37:28 +02:00