Commit Graph

19674 Commits

Author SHA1 Message Date
CitadelStationBot
986e4e893f Automatic changelog generation for PR #8084 [ci skip] 2019-03-10 15:44:35 -05:00
kevinz000
ac8636e127 Merge pull request #8084 from Poojawa/patch-4
Removes specific names from clone pod reports
2019-03-10 13:44:33 -07:00
CitadelStationBot
7b3e6c570a Automatic changelog generation for PR #8070 [ci skip] 2019-03-10 15:44:22 -05:00
kevinz000
4451d8e3ad Merge pull request #8070 from deathride58/consensualcults
Makes bloodcult conversions consensual, similar to Bay.
2019-03-10 13:44:20 -07:00
CitadelStationBot
7a606fadc4 Automatic changelog generation for PR #8091 [ci skip] 2019-03-10 15:43:23 -05:00
kevinz000
7628289ad6 Merge pull request #8091 from deathride58/fixesz1hyperspace
Fixes centcom zlevel hyperspace acting like normal space (and also fixes the title screen while im at it)
2019-03-10 13:43:21 -07:00
CitadelStationBot
23d5d38017 Automatic changelog generation for PR #8058 [ci skip] 2019-03-10 15:43:06 -05:00
kevinz000
0652c32c23 Merge pull request #8058 from deathride58/joggingslipresistance
Makes jogging let you avoid water slips, but only if you have less than 20% staminaloss
2019-03-10 13:43:05 -07:00
CitadelStationBot
598dee6440 Automatic changelog generation for PR #8098 [ci skip] 2019-03-10 15:42:46 -05:00
kevinz000
b143f6f883 Merge pull request #8098 from Coolgat3/patch-2
Equalizes security helmet and beret armor
2019-03-10 13:42:44 -07:00
Coolgat3
45a4693618 Update helmet.dm 2019-03-09 16:42:27 +01:00
Coolgat3
eb786cbfde Update jobs.dm 2019-03-09 16:39:51 +01:00
deathride58
5e6395270b Merge pull request #7889 from Citadel-Station-13/kevinz000-patch-7
Reworks meth
2019-03-08 21:05:20 -05:00
deathride58
d9df0c1f76 Merge pull request #8093 from Trilbyspaceclone/patch-74
[Ready] Makes Fire extinguisher slip need a screwdriver - Frack & Spensara Request Middle ground by Bhijn
2019-03-08 20:54:21 -05:00
deathride58
c2acda5a96 Merge pull request #8073 from Citadel-Station-13/kevinz000-patch-27
bunker bypass now sanitizes ckeys automatically to avoid errors
2019-03-08 20:51:15 -05:00
deathride58
2ae75ccd21 Merge pull request #8078 from Citadel-Station-13/kevinz000-patch-29
Fixes SDQL2 list association recursing/printing
2019-03-08 20:50:50 -05:00
deathride58
e5f5520393 Merge pull request #8075 from BlackMajor/master
More borg sprites
2019-03-08 20:50:33 -05:00
deathride58
aac192752f Merge pull request #8088 from Trilbyspaceclone/patch-69
[MIRROR] - Candle cleanup and fixes #42968
2019-03-08 20:50:13 -05:00
deathride58
6ed81162b3 Merge pull request #8089 from Trilbyspaceclone/patch-70
[MIRROR] - P.A.C.M.A.N code cleaning #42891
2019-03-08 20:49:38 -05:00
deathride58
6aaee476c8 Merge pull request #8079 from Citadel-Station-13/kevinz000-patch-30
Adds wrapper list access index for SDQL2
2019-03-08 20:49:18 -05:00
deathride58
3b3fcb5d19 Merge pull request #8094 from Trilbyspaceclone/patch-75
[MIRROR] Watcher's Wing No Longer Perma-Disarms #41708
2019-03-08 20:48:40 -05:00
deathride58
5aa9dd7c14 Merge pull request #8092 from Trilbyspaceclone/patch-71
More miner point cards
2019-03-08 20:46:57 -05:00
deathride58
df1decf1b1 Merge pull request #8087 from Trilbyspaceclone/QoL-RCD
[MIRROR]  fixes some edge cases in rcd building #42960 TG code
2019-03-08 20:46:19 -05:00
deathride58
1f3821d443 Merge pull request #8082 from Poojawa/patch-2
Removes Mime insulting
2019-03-08 20:45:02 -05:00
deathride58
1c7fc9c699 Merge pull request #8067 from Trilbyspaceclone/patch-67
Makes Dinner for two have loot
2019-03-08 20:44:23 -05:00
deathride58
f7c9b1cd32 Merge pull request #8066 from Citadel-Station-13/kevinz000-patch-23
Fixes the panic bunker
2019-03-08 20:43:42 -05:00
deathride58
2cd9c69ed1 Merge pull request #8083 from Poojawa/patch-3
Fixes genital-less VR people
2019-03-08 20:43:25 -05:00
deathride58
3fc98af157 Merge pull request #8095 from nik707/DINK
Adds new and immersive sound for combat
2019-03-08 20:42:54 -05:00
Coolgat3
af04b72476 Making secberets protect as much as helmets 2019-03-08 17:36:46 +01:00
Trilbyspaceclone
bda18c0770 Update extinguisher.dm 2019-03-06 20:32:40 -05:00
Trilbyspaceclone
7c79484784 Update extinguisher.dm 2019-03-06 20:05:53 -05:00
Trilbyspaceclone
fdad1c30be ? 2019-03-06 17:05:54 -05:00
Trilbyspaceclone
371a4a1a9e Maybe 2019-03-06 16:45:47 -05:00
Trilbyspaceclone
8a5b4414a3 Update extinguisher.dm 2019-03-05 16:37:22 -05:00
nik707
a89ab006c1 Adds new and immersive sound for combat
Dink!
2019-03-05 15:03:08 -06:00
Trilbyspaceclone
1228bb4b11 Update extinguisher.dm 2019-03-05 15:37:27 -05:00
Trilbyspaceclone
a0b38d0ed7 Update extinguisher.dm 2019-03-05 03:34:38 -05:00
deathride58
943cc7d969 Apply suggestions from code review
Co-Authored-By: Poojawa <Poojawa@users.noreply.github.com>
2019-03-05 00:30:06 -06:00
Trilbyspaceclone
33213b0099 Update kinetic_crusher.dm 2019-03-05 01:06:16 -05:00
Trilbyspaceclone
8f02bf0357 Oh I did a goof 2019-03-05 00:33:53 -05:00
Trilbyspaceclone
eb80b6f6cd ? 2019-03-05 00:29:20 -05:00
Trilbyspaceclone
cecf7e251f Update machine_vending.dm 2019-03-05 00:06:33 -05:00
Trilbyspaceclone
0b0bfbac10 Update machine_vending.dm 2019-03-04 23:48:12 -05:00
Trilbyspaceclone
5255a31e3d Update machine_vending.dm 2019-03-04 23:46:42 -05:00
Trilbyspaceclone
c6011bb853 Update extinguisher.dm 2019-03-04 23:35:25 -05:00
Trilbyspaceclone
6a4ce07c0b Update machine_vending.dm 2019-03-04 23:27:38 -05:00
deathride58
64ab4a32a3 Fixes centcom zlevel hyperspace not instantly teleporting mobs out of the z-level (and also fixes the title screen while im at it) 2019-03-04 21:38:34 -05:00
Trilbyspaceclone
1d28a3b035 Update port_gen.dm 2019-03-04 20:52:02 -05:00
Trilbyspaceclone
5f764b7d1b Update candle.dm 2019-03-04 20:33:53 -05:00
kevinz000
bf829a2d79 Merge pull request #8069 from deathride58/spaceoshacompliancepart1
Makes the holodeck control room on boxstation compliant with space OSHA
2019-03-04 13:56:34 -08:00