Commit Graph

4525 Commits

Author SHA1 Message Date
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
733bb498ca Merge pull request #8376 from Poojawa/oracle-cloning
Ports Oracle's cloning tube
2019-05-20 23:31:38 -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
deathride58
426033ab9d Merge pull request #8377 from Poojawa/crusher-nerf
Improves Recycler code by making it respect indestructible resistance
2019-05-19 14:14:25 -04:00
CalamaBanana
de841761b2 Charter apostrophes fixed, too 2019-05-18 16:19:25 +02:00
Poojawa
aeac0134ec Improves Recycler code by making it respect indestructable resistance 2019-05-17 07:33:24 -05:00
Poojawa
601b9d9c65 Ports Oracle's cloning tube 2019-05-17 06:58:36 -05: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
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
0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -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
Poojawa
9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00
Trilbyspaceclone
3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
Trilbyspaceclone
a9aa855305 Update recharger.dm 2019-04-28 21:25:18 -04:00
Trilbyspaceclone
8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
Trilbyspaceclone
59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04:00
kevinz000
fd7c5a9568 Merge pull request #8279 from Trilbyspaceclone/patch-107
Fixes deathriplys armor being halfed
2019-04-25 04:34:09 -07: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
Trilbyspaceclone
823dd1a98a Update ripley.dm 2019-04-23 04:40:21 -04:00
kevinz000
64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000
f05b326f15 Merge pull request #8250 from Trilbyspaceclone/patch-100
[Fix] Lowers pda sounds as well as make them respect ringer off
2019-04-22 21:31:38 -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
Poojawa
f767069dc2 Custom Species names 2019-04-15 13:50:21 -05:00
Poojawa
12d17f6f52 usr 2019-04-15 11:28:42 -05:00
Poojawa
25d77bac91 Adds a can_inject check to IV Drips
Syringes and hyposprays check, so too do IV needles.
2019-04-15 01:01:16 -05:00
kevinz000
637b92a88a Merge pull request #8228 from Coolgat3/ripley
Making the Ripley mech not useless (More info inside)
2019-04-13 00:22:10 -07:00
Poojawa
3304875e38 Buffs defib users by making them stop pulling automatically 2019-04-11 14:36:41 -05:00
Cyprian
5434c20781 Changing the ripley 2019-04-09 17:09:07 +02:00
kevinz000
8eb8cafa2a Merge pull request #8195 from deathride58/clickdragitems
Adds the ability to quickly use an unequipped item on something by click-dragging it with an empty hand
2019-04-07 15:13:16 -07:00