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

12828 Commits

Author SHA1 Message Date
kevinz000
fa4e1f44ff Merge pull request #8438 from BurgerLUA/AssFix 
Ass Fix
 2019-05-26 19:19:13 -07: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
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
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
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
ed23f9834a Update jetpack.dm 2019-05-22 22:19:32 -04: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
Trilbyspaceclone
e47598be8b Update jetpack.dm 2019-05-22 18:39:51 -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
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
Poojawa
ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05: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
nero1024
732bb6575b tweak footstep frequency 2019-05-21 14:49:15 -05:00
dtfe3
0085a69d31 Watcher Wing Trophy Effect increase 2019-05-21 18:12:42 +02:00
deathride58
d40d9791c4 Merge pull request #8271 from Citadel-Station-13/kevinz000-patch-41 
the chaplain can now choose a weakened Eutactic energy sword as a holy weapon
 2019-05-21 08:06:21 -04:00
deathride58
4a17f192e8 Merge pull request #8201 from Citadel-Station-13/kevinz000-patch-19 
Changes OD thresholds to match RP server and only trigger when you /exceed/ it per definition of threshold
 2019-05-21 08:05:54 -04:00
deathride58
eb099ecbc4 Merge pull request #7704 from Citadel-Station-13/kevinz000-patch-6 
Adds manual play internet sound for when youtube-dl is too out of date to play Rasputin automatically
 2019-05-21 08:05:22 -04:00
deathride58
efe8d73372 Merge pull request #8269 from Citadel-Station-13/kevinz000-patch-39 
adds variant of podpersons with 20% brute/burn heal and 70% toxheal and 75% nutrition/light factor of normal for roundstart pod species
 2019-05-21 08:04:57 -04:00
deathride58
f3116baa08 Merge pull request #8253 from Citadel-Station-13/kevinz000-patch-37 
Removes firing pins from preprinted gravity guns
 2019-05-21 08:04:26 -04:00
kevinz000
55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82 
Makes mind shields bomb proof
 2019-05-21 00:00:28 -07:00
kevinz000
b2c873edc0 Merge pull request #8371 from Useroth/desword 
A weight tweak to d-esword and baseball bat, to make them catch up with the stamina rework.
 2019-05-20 23:56:10 -07:00
kevinz000
dc548c06b5 Merge pull request #8293 from Useroth/ninja-adrenals 
Adrenal implant, as well as ling and ninja adrenals buff (or rather, making them function like pre-rework (or even slightly better))
 2019-05-20 23:40:52 -07:00
kevinz000
a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
kevinz000
d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128 
Adds more clothing to venders
 2019-05-20 23:36:42 -07:00
kevinz000
cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129 
Adds more shuttle curse texts
 2019-05-20 23:36:25 -07:00
kevinz000
999bb87b4a Merge pull request #8378 from Useroth/nutcracker 
Nutcracker. Yes, it's big enough to crush heads.
 2019-05-20 23:35:33 -07:00
kevinz000
e941901165 Merge pull request #8393 from WhiteHusky/sleeper-blood-levels 
Sleepers now show blood level and type for occupants.
 2019-05-20 23:34:38 -07:00
kevinz000
3ae9661866 Merge pull request #8390 from CalamaBanana/station-charter-apostrophes 
Captain's Charter no longer turns apostrophes into "&#39;", too
 2019-05-20 23:32:50 -07:00
kevinz000
bcf78736ba Merge pull request #8385 from BlackMajor/Dunga 
Adds a cream pie smite.
 2019-05-20 23:32:27 -07:00
kevinz000
dff600f1e5 Merge pull request #8389 from CalamaBanana/vote-sound 
Plays a harmless sound when a vote is started
 2019-05-20 23:31:56 -07:00
kevinz000
733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning 
Ports Oracle's cloning tube
 2019-05-20 23:31:38 -07:00
kevinz000
a6a1de2f2f Merge pull request #8386 from BlackMajor/Ooga 
Ling hivemind no longer turns apostrophes into &#39;
 2019-05-20 23:30:48 -07:00