Commit Graph

20335 Commits

Author SHA1 Message Date
dtfe3 ee6588e562 Merge pull request #2 from dtfe3/dtfe3-patch-1
Fix for the improvised jetpack
2019-05-16 15:20:46 +02:00
dtfe3 d228334cd5 Fix for the improvised jetpack 2019-05-16 15:19:59 +02:00
CitadelStationBot 49a012ea87 Automatic changelog generation for PR #8323 [ci skip] 2019-05-08 03:34:36 -05: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 2b1261ab03 Merge pull request #8284 from Citadel-Station-13/kevinz000-patch-44
adds sdql2 new()/instantiation call so it's easier to fill things with cream pies
2019-05-07 02:19:40 -04: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
CitadelStationBot e22908a0ae Automatic changelog generation for PR #8278 [ci skip] 2019-05-06 21:13:52 -05:00
deathride58 f318ad7d1b Merge pull request #8278 from Trilbyspaceclone/patch-106
Buffs blob Shield armor, as well as weaken state
2019-05-06 22:13:50 -04:00
deathride58 5e2a9669d1 Merge pull request #8285 from Citadel-Station-13/kevinz000-patch-45
vent_clog event now respects vent welding
2019-05-06 22:08:43 -04:00
deathride58 24cfef7329 Merge pull request #8299 from Citadel-Station-13/kevinz000-patch-48
disables skewium due to severe code issues
2019-05-06 22:08:16 -04:00
deathride58 9d6f85d555 Merge pull request #8292 from Citadel-Station-13/kevinz000-patch-47
adds message monitor to telecomms technode
2019-05-06 22:04:12 -04:00
CitadelStationBot 765c84a710 Automatic changelog generation for PR #8306 [ci skip] 2019-05-06 20:58:47 -05: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 aaa06473b7 Merge pull request #8276 from Citadel-Station-13/hahaha
Unironically adds elf ears
2019-05-06 21:23:55 -04:00
deathride58 bb9c479566 Merge pull request #8313 from BurgerLUA/SlurringFix
Fixes a few Slurring bugs
2019-05-06 21:00:33 -04:00
CitadelStationBot e70d9c4928 Automatic changelog generation for PR #8305 [ci skip] 2019-05-06 19:56:30 -05:00
deathride58 1a483f19a2 Merge pull request #8305 from Poojawa/NPR-for-discord
Brings NTPR to the nice discord bot
2019-05-06 20:56:28 -04:00
CitadelStationBot b8841db3bb Automatic changelog generation for PR #8318 [ci skip] 2019-05-06 19:20:00 -05:00
deathride58 c6f56d5a59 Merge pull request #8318 from BurgerLUA/bane-damage
Adds more brain damage text
2019-05-06 20:19:58 -04:00
deathride58 c926320902 Merge pull request #8320 from Citadel-Station-13/kevinz000-patch-50
adds a cell charge line to magrifle description because why would you not make energy guns display this reeeee
2019-05-06 20:18:55 -04:00
Trilbyspaceclone 9aa74f4fc2 Update all_nodes.dm 2019-05-06 19:58:45 -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 5e5c470dc9 Update all_nodes.dm 2019-05-05 06:51:10 -04:00
Trilbyspaceclone 7d310f407b Update inducer.dm 2019-05-05 06:50:22 -04:00
Trilbyspaceclone cc34a8fa4e Update all_nodes.dm 2019-05-05 06:47:03 -04:00
Trilbyspaceclone 5904d1d281 Update power_designs.dm 2019-05-05 06:45:40 -04:00
Trilbyspaceclone 642cad2bb2 Update inducer.dm 2019-05-05 06:40:07 -04:00
Trilbyspaceclone c618e73618 Add files via upload 2019-05-05 06:31:10 -04:00
Trilbyspaceclone 664c8145fe Delete tools.dmi 2019-05-05 06:26:37 -04:00
Trilbyspaceclone b63c3d5301 Merge pull request #39 from Citadel-Station-13/master
updater
2019-05-05 06:25:23 -04:00
CitadelStationBot c039043d0f Automatic changelog generation for PR #8317 [ci skip] 2019-05-05 01:18:38 -05:00
kevinz000 383cae2949 Merge pull request #8317 from deathride58/herewegoagain
[s] Clamps biogen amount to a sane amount
2019-05-04 23:18:36 -07:00
kevinz000 1b387eb5e3 Merge pull request #8314 from Poojawa/mawp
Mawp
2019-05-04 23:18:14 -07:00
CitadelStationBot 1480d53407 Automatic changelog generation for PR #8315 [ci skip] 2019-05-05 01:17:53 -05:00
kevinz000 1caa3ba720 Merge pull request #8315 from Trilbyspaceclone/patch-115
Maybe fixes laser carbine sprites
2019-05-04 23:17:51 -07:00
CitadelStationBot 9cc8ed4bba Automatic changelog generation for PR #8319 [ci skip] 2019-05-05 01:17:20 -05:00
kevinz000 d25a59f567 Merge pull request #8319 from BurgerLUA/Penis-Enlargement-Pills
Adds Penis Enlargement Pills
2019-05-04 23:17:18 -07:00
kevinz000 0bfac54070 Update magweapon_energy.dm 2019-05-04 23:16:27 -07:00
BurgerLua 1557c33008 Adds Penis Enlargement Pills 2019-05-02 14:55:04 -07:00
BurgerLua 6da47ef05f Adds additional brain damage text 2019-05-02 01:35:34 -07:00
deathride58 7dd5e563b0 Clamps biogen amount to a sane amount 2019-05-02 00:21:38 -04:00
Trilbyspaceclone 831e450b3f Update weapon_designs.dm 2019-05-01 16:08:17 -04:00
Trilbyspaceclone 150db880de Update laser.dm 2019-05-01 16:07:11 -04:00
Trilbyspaceclone fd251d3dd2 Update laser.dm 2019-05-01 15:15:29 -04:00
Poojawa faeb4bc22d Mawp
Mawp
2019-05-01 00:58:19 -05:00
BurgerLua b31127bcca Forgot this 2019-04-30 22:26:44 -07:00
Poojawa 9c02505dbd Fixes weird arm/hand overlap 2019-05-01 00:16:37 -05:00
Poojawa be0829af53 cleans up loadout screen, fixes some suits, tweaks a few digi hand-holes 2019-05-01 00:10:27 -05:00
Poojawa 9374e83e7d fixes armor plate oversight 2019-05-01 00:05:14 -05:00