shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
20,590 Commits 5 Branches 0 Tags
aab5a4ae0a7c75ce2d0a49600139b135169b34e3
Commit Graph
20590 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
kevinz000andGitHub aab5a4ae0a Merge pull request #8407 from Poojawa/sprite-fixing 
Female Gendered markings and leg sprite fixes
 2019-05-25 11:20:23 -07:00
kevinz000andGitHub e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread 
Defibrillator Upgrades Proofread
 2019-05-25 11:17:34 -07:00
CitadelStationBot 2bc0caa7fe Automatic changelog generation for PR #8409 [ci skip] 2019-05-25 13:13:58 -05:00
kevinz000andGitHub 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
kevinz000andGitHub 16310a9aea Merge pull request #8425 from BlackMajor/Dunga 
Ports TG firebots.
 2019-05-25 11:13:29 -07:00
CitadelStationBot 3bf6c84779 Automatic changelog generation for PR #8420 [ci skip] 2019-05-25 13:10:22 -05:00
kevinz000andGitHub 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
CitadelStationBot 80d95f2297 Automatic changelog generation for PR #8429 [ci skip] 2019-05-24 12:48:34 -05:00
kevinz000andGitHub c68f4324b1 Merge pull request #8429 from deathride58/fuckconcats 
[s] fixes a major exploit involving concatenators
 2019-05-24 10:48:32 -07: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
BlackMajorandGitHub e2e070d307 Merge pull request #8 from Citadel-Station-13/master 
Unga me sync
 2019-05-24 22:40:38 +12:00
CitadelStationBot 99372ace45 Automatic changelog generation for PR #8411 [ci skip] 2019-05-23 15:32:16 -05:00
kevinz000andGitHub 05d38cc016 Merge pull request #8411 from Trilbyspaceclone/patch-134 
Makes mag guns fire 3 mags before running out of power
 2019-05-23 13:32:12 -07: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
CitadelStationBot 4c3a51a620 Automatic changelog generation for PR #8400 [ci skip] 2019-05-22 13:50:58 -05:00
kevinz000andGitHub b900815e90 Merge pull request #8400 from dtfe3/watcher-trophy 
Watcher Wing Trophy Effect increase
 2019-05-22 10:42:25 -07:00
TrilbyspacecloneandGitHub 3bf667ba36 Update magweapon_energy.dm 2019-05-22 12:42:28 -04:00
TrilbyspacecloneandGitHub 005647d4f6 Update magweapon_energy.dm 2019-05-22 12:12:06 -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
Poojawa e3fa48c715 Fixes Slime and mammal legs to match Humans 
Because they were both with excess pixels.
 2019-05-21 23:01:33 -05:00
Poojawa ae939c4344 Female Gendered markings 2019-05-21 22:51:00 -05:00
CdrCrossandCdrCross 8b950ae722 Revert "Delete tgstation.dme" 
This reverts commit d051ae173f.
 2019-05-22 00:20:06 +02:00
CdrCrossandGitHub d051ae173f Delete tgstation.dme 
No clue why this snuck in here, but I'm removing it from my PR.
 2019-05-21 23:57:29 +02: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
dtfe3andGitHub 0085a69d31 Watcher Wing Trophy Effect increase 2019-05-21 18:12:42 +02:00
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
deathride58andGitHub 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
kevinz000andGitHub 55dca0bd41 Merge pull request #8139 from Trilbyspaceclone/patch-82 
Makes mind shields bomb proof
 2019-05-21 00:00:28 -07:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub a9cbcdf74e Merge pull request #8179 from Trilbyspaceclone/BShonker 
[Ready]Makes a blue space bike horn HONK
 2019-05-20 23:40:17 -07:00
CitadelStationBot 0f0ed91a62 Automatic changelog generation for PR #8370 [ci skip] 2019-05-21 01:36:58 -05:00
kevinz000andGitHub a949295022 Merge pull request #8370 from Trilbyspaceclone/patch-130 
Adds a few more mime names
 2019-05-20 23:36:56 -07:00
CitadelStationBot f568c727d0 Automatic changelog generation for PR #8368 [ci skip] 2019-05-21 01:36:44 -05:00
kevinz000andGitHub d5f2fc156c Merge pull request #8368 from Trilbyspaceclone/patch-128 
Adds more clothing to venders
 2019-05-20 23:36:42 -07:00
CitadelStationBot 9109445613 Automatic changelog generation for PR #8369 [ci skip] 2019-05-21 01:36:27 -05:00
kevinz000andGitHub cccf1e1291 Merge pull request #8369 from Trilbyspaceclone/patch-129 
Adds more shuttle curse texts
 2019-05-20 23:36:25 -07:00
kevinz000andGitHub 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
CitadelStationBot 54bef402bd Automatic changelog generation for PR #8393 [ci skip] 2019-05-21 01:34:40 -05:00
kevinz000andGitHub 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
CitadelStationBot 43c1dd4aec Automatic changelog generation for PR #8366 [ci skip] 2019-05-21 01:33:30 -05:00
kevinz000andGitHub b5918080c0 Merge pull request #8366 from Poojawa/cryopod-mapping-fixes 
Cryopod mapping fixes and additions
 2019-05-20 23:33:28 -07:00
kevinz000andGitHub 3ae9661866 Merge pull request #8390 from CalamaBanana/station-charter-apostrophes 
Captain's Charter no longer turns apostrophes into "'", too
 2019-05-20 23:32:50 -07:00
kevinz000andGitHub bcf78736ba Merge pull request #8385 from BlackMajor/Dunga 
Adds a cream pie smite.
 2019-05-20 23:32:27 -07:00
kevinz000andGitHub 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