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

2418 Commits

Author SHA1 Message Date
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
e8742a4937 Merge pull request #8402 from CdrCross/AdvDefibProofread 
Defibrillator Upgrades Proofread
 2019-05-25 11:17:34 -07:00
BlackMajor
f94cbe94f6 Ports TG firebots 2019-05-24 23:58:39 +12:00
Trilbyspaceclone
ed23f9834a Update jetpack.dm 2019-05-22 22:19:32 -04:00
Trilbyspaceclone
e47598be8b Update jetpack.dm 2019-05-22 18:39:51 -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
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
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
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
kevinz000
d8579b2e2d Merge pull request #8372 from Poojawa/paws-of-life-needs-more-fixing 
Unfucks borg defibs
 2019-05-19 12:47:03 -07:00
CalamaBanana
de841761b2 Charter apostrophes fixed, too 2019-05-18 16:19:25 +02:00
Poojawa
eb717645bd M.emote("scream") 2019-05-17 05:16:53 -05:00
Poojawa
751166cfbe Unfucks borg defibs 2019-05-17 04:59:53 -05:00
deathride58
50bdbcc46f Merge branch 'master' into kevinz000-patch-41 2019-05-17 00:29:31 -04:00
Useroth
7712b51fd0 Tweaks n' shit. 2019-05-17 04:49:39 +02:00
Trilbyspaceclone
c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -04:00
kevinz000
4f12a762f3 Merge pull request #8342 from BurgerLUA/Cult-Improvements-and-Fixes 
Adds EMP Defensive Traps to Clockcult
 2019-05-11 22:19:46 -07:00
kevinz000
cd87e81a6a Merge pull request #8334 from dtfe3/music-maxlines-increase 
Increased music maxlines from 300 to 600
 2019-05-11 22:17:08 -07:00
kevinz000
9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding 
Satchel of Holding!
 2019-05-11 22:14:15 -07:00
kevinz000
4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden 
Golden toolboxes.
 2019-05-11 22:13:18 -07:00
BurgerLua
4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua
d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Trilbyspaceclone
4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
Sishen
c3df1b354e Satchel of holding 
fashion creep
 2019-05-09 20:44:07 -04:00
dtfe3
0e0dff14b9 Increased music maxlines from 300 to 600 
Allows players to play longer and more advanced songs on the instruments.
 2019-05-09 14:10:43 +02:00
kevinz000
a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer 
Makes a new COMBAT inducer! - Admin only
 2019-05-08 01:34:33 -07:00
deathride58
a3317ffe89 Merge pull request #8280 from Citadel-Station-13/kevinz000-patch-43 
ASIMOV: human being --> "person of a NT approved crew species"
 2019-05-07 02:19:28 -04:00
deathride58
8abd98cec7 Merge pull request #8162 from Trilbyspaceclone/patch-87 
[Ready] Makes Cursed Katana's be Cursed once more
 2019-05-06 19:24:38 -04:00
Trilbyspaceclone
fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
Trilbyspaceclone
7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone
642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04:00
BurgerLua
1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
Useroth
5d8cf0cabe Let's give adrenals the one more small touch of love. 2019-04-28 16:13:07 +02:00
Useroth
8ab82e0853 Fixed two leftovers from a feature that I will do in another PR. 2019-04-28 06:23:36 +02:00
Useroth
56b2e7150c Back to the point of entry. 2019-04-28 06:21:03 +02:00
Useroth
41a8177f34 Adjustments v2. 2019-04-27 13:53:04 +02:00
Useroth
c1ffffa4f1 Adjustments. 2019-04-27 13:50:23 +02:00
Useroth
9c17845e0f Buffed changeling adrenals too. 2019-04-26 21:34:50 +02:00
Useroth
3563fef4c0 Makes adrenals work pretty much like they used to pre combat rework. 2019-04-26 16:47:31 +02:00
kevinz000
5c54bacddb Update AI_modules.dm 2019-04-23 16:02:47 -07:00
kevinz000
776b0fad4b Update AI_modules.dm 2019-04-23 15:59:29 -07:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race 
Custom Species names
 2019-04-22 21:41:31 -07:00
kevinz000
b5df78419a Update holy_weapons.dm 2019-04-20 19:28:58 -07:00
Trilbyspaceclone
ed608ac32c Bhijn... 2019-04-16 20:26:24 -04:00
Trilbyspaceclone
df880c6723 Update PDA.dm 2019-04-16 16:07:52 -04:00
Trilbyspaceclone
1b970e7ce0 Update PDA.dm 2019-04-16 15:08:45 -04:00
Trilbyspaceclone
2b57db57ab Update PDA.dm 2019-04-16 15:07:51 -04:00
Trilbyspaceclone
5c0c8aa4c9 Update PDA.dm 2019-04-15 23:43:36 -04:00