Commit Graph
4738 Commits
Author SHA1 Message Date
Useroth 7712b51fd0 Tweaks n' shit. 2019-05-17 04:49:39 +02:00
TrilbyspacecloneandGitHub c9f6b02a0e Update briefcase.dm 2019-05-12 21:23:40 -04:00
kevinz000andGitHub 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
kevinz000andGitHub 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
kevinz000andGitHub 9b135ed56b Merge pull request #8338 from Sishen1542/satchel-holding
Satchel of Holding!
2019-05-11 22:14:15 -07:00
kevinz000andGitHub 4276f53338 Merge pull request #8341 from Trilbyspaceclone/golden
Golden toolboxes.
2019-05-11 22:13:18 -07:00
Fermi ddad7a173d All compiling errors fixed!! I did it!! 2019-05-11 15:47:58 +01:00
Fermi f7655cad25 All compiling errors fixed, except for a few weird ones that I need help 2019-05-11 15:40:06 +01:00
ThalpyandGitHub 926bd65392 Merge branch 'master' into FermiChem 2019-05-11 14:14:20 +01:00
BurgerLua 4aba11739b Finishing touches. 2019-05-10 19:15:42 -07:00
BurgerLua d97bf47b95 Added 2019-05-10 18:12:36 -07:00
Fermi 29d4a2fdde Finished MCchem, now to fix compling errors. 2019-05-11 00:14:04 +01:00
TrilbyspacecloneandGitHub 4c0caa3aae Update toolbox.dm 2019-05-10 14:51:49 -04:00
Fermi cb0e50be0a Missed / in last pr 2019-05-10 03:12:28 +01:00
Fermi ac8b7be45c Merges old penis enlargement pills into prexisiting Fermichem ones. (master (#8319) by BurgerLUA) 2019-05-10 03:10:42 +01:00
Sishen c3df1b354e Satchel of holding
fashion creep
2019-05-09 20:44:07 -04:00
dtfe3andGitHub 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
kevinz000andGitHub a7192734dd Merge pull request #8323 from Trilbyspaceclone/inducer
Makes a new COMBAT inducer! - Admin only
2019-05-08 01:34:33 -07:00
deathride58andGitHub 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
deathride58andGitHub 0d65e3d1ab Merge pull request #8306 from Poojawa/helmet-fiasco
Muzzled Medical hardsuit fix and sprite organization
2019-05-06 21:58:44 -04:00
deathride58andGitHub 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
TrilbyspacecloneandGitHub fda9883bae Update inducer.dm 2019-05-06 14:48:16 -04:00
TrilbyspacecloneandGitHub 7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
TrilbyspacecloneandGitHub 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
TrilbyspacecloneandGitHub 3eeafbb975 Merge branch 'master' into hell 2019-04-28 21:54:55 -04:00
TrilbyspacecloneandGitHub a9aa855305 Update recharger.dm 2019-04-28 21:25:18 -04:00
TrilbyspacecloneandGitHub 8055d21c0c Update recharger.dm 2019-04-28 16:46:33 -04:00
TrilbyspacecloneandGitHub 59226233f8 Update recharger.dm 2019-04-28 14:52:46 -04: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
kevinz000andGitHub fd7c5a9568 Merge pull request #8279 from Trilbyspaceclone/patch-107
Fixes deathriplys armor being halfed
2019-04-25 04:34:09 -07:00
kevinz000andGitHub 5c54bacddb Update AI_modules.dm 2019-04-23 16:02:47 -07:00
kevinz000andGitHub 776b0fad4b Update AI_modules.dm 2019-04-23 15:59:29 -07:00
TrilbyspacecloneandGitHub 823dd1a98a Update ripley.dm 2019-04-23 04:40:21 -04:00
kevinz000andGitHub 64202b1444 Merge pull request #8247 from Poojawa/custom-race
Custom Species names
2019-04-22 21:41:31 -07:00
kevinz000andGitHub 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
kevinz000andGitHub b5df78419a Update holy_weapons.dm 2019-04-20 19:28:58 -07:00
TrilbyspacecloneandGitHub ed608ac32c Bhijn... 2019-04-16 20:26:24 -04:00
TrilbyspacecloneandGitHub df880c6723 Update PDA.dm 2019-04-16 16:07:52 -04:00
TrilbyspacecloneandGitHub 1b970e7ce0 Update PDA.dm 2019-04-16 15:08:45 -04:00
TrilbyspacecloneandGitHub 2b57db57ab Update PDA.dm 2019-04-16 15:07:51 -04:00
TrilbyspacecloneandGitHub 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