Jordan Brown
164db7ae9b
Prefixed all disability defines with DISABILITY_ to fix a name collision
2017-12-24 15:03:30 -06:00
CitadelStationBot
938f409782
[MIRROR] Christmas ( #4491 )
...
* Christmas (#33690 )
* Christmas Event Updates
* Dont recreate the list every time
* Check for drop del
* Changes some things to placate that one guy from FTL
* Christmas
2017-12-22 13:14:25 -08:00
CitadelStationBot
6856fc1be2
[MIRROR] [s] Fixes the frying oil reagent ( #4504 )
...
* Merge pull request #33745 from vuonojenmustaturska/oilfix
[s] Fixes the frying oil reagent
* [s] Fixes the frying oil reagent
2017-12-22 12:32:56 -08:00
kevinz000
a82d0e13ce
Fixes RND
2017-12-22 00:58:46 -08:00
Jordan Brown
b188266478
Merge pull request #33709 from uraniummeltdown/linespacing
...
Adjustable Chat Line Height
2017-12-21 14:25:21 -06:00
deathride58
53e7d47893
Merge pull request #4407 from Citadel-Station-13/upstream-merge-33581
...
[MIRROR] add view range respects widescreen
2017-12-21 20:19:04 +00:00
Matthew
529e839203
dog borgs module icon fix
2017-12-21 13:46:44 -06:00
LetterJay
087c43ab71
Update rdmachines.dm
2017-12-21 12:44:59 -06:00
LetterJay
2d995e3f5a
Update rdconsole.dm
2017-12-21 12:44:16 -06:00
LetterJay
8e6c8fc8b5
Update departmental_lathe.dm
2017-12-21 12:43:21 -06:00
LetterJay
6573aa52e4
Update departmental_circuit_imprinter.dm
2017-12-21 12:42:18 -06:00
CitadelStationBot
ff4c5907a6
[MIRROR] Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round. ( #4484 )
...
* Merge pull request #33730 from kevinz000/patch-409
Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
* Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
2017-12-21 06:04:20 -08:00
LetterJay
346c1bbdd6
Merge pull request #4446 from Citadel-Station-13/upstream-merge-33638
...
[MIRROR] Codespeak manual rebalance/recost
2017-12-21 04:59:45 -06:00
LetterJay
d66b64b1f1
Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf
...
Removes pierce immunity from roundstart xenos
2017-12-21 04:59:00 -06:00
LetterJay
8518a9b3e5
Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703
...
[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 04:58:06 -06:00
LetterJay
ea6b3f9c92
Merge pull request #4477 from Citadel-Station-13/upstream-merge-33704
...
[MIRROR] Fixes Arm Implant EMP Effect
2017-12-21 04:57:19 -06:00
LetterJay
b749977eb9
Merge pull request #4476 from Citadel-Station-13/upstream-merge-33697
...
[MIRROR] Fix smoke machine runtime
2017-12-21 04:57:02 -06:00
LetterJay
8ea38cfde2
Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681
...
[MIRROR] Immovable rod abuse, smite and event trigger.
2017-12-21 04:55:32 -06:00
LetterJay
1a5006dc2f
Merge pull request #4473 from Citadel-Station-13/upstream-merge-33672
...
[MIRROR] Fixes bullets making sounds in space and water
2017-12-21 04:55:16 -06:00
LetterJay
3973b368de
Merge branch 'master' into upstream-merge-33470
2017-12-21 03:24:03 -06:00
LetterJay
56ecc13289
Merge pull request #4325 from Citadel-Station-13/upstream-merge-33246
...
[MIRROR] Roundend report refactor
2017-12-21 03:22:31 -06:00
Jordan Brown
e3a3082596
Merge pull request #33703 from kevinz000/patch-407
...
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
2017-12-21 00:46:48 -06:00
Jordan Brown
82114e753d
Merge pull request #33704 from Fox-McCloud/arm-implant-fix
...
Fixes Arm Implant EMP Effect
2017-12-21 00:43:22 -06:00
MoreRobustThanYou
39ecfd64db
Fix smoke machine runtime ( #33697 )
...
* Fix smoke machine runtime
* Woops.
2017-12-21 00:41:09 -06:00
AnturK
6c4d687db6
Immovable rod abuse, smite and event trigger. ( #33681 )
2017-12-21 00:11:20 -06:00
ShizCalev
92b018bed7
Fixes bullets making sounds in space and water ( #33672 )
...
* Bullet sounds
* explicit lists
2017-12-21 00:09:08 -06:00
deathride58
680e44fb64
Update observer.dm
2017-12-20 22:56:46 -05:00
deathride58
b4321a1dbe
Merge pull request #4435 from Citadel-Station-13/upstream-merge-33636
...
[MIRROR] restores reaction max_reqs checking code
2017-12-21 03:44:57 +00:00
deathride58
59947b4b3b
Merge pull request #4424 from Citadel-Station-13/upstream-merge-33632
...
[MIRROR] properly disables fusion
2017-12-21 03:43:30 +00:00
deathride58
b2187123fb
Merge pull request #4420 from Citadel-Station-13/upstream-merge-33405
...
[MIRROR] [Ready]Brain Trauma additions
2017-12-21 03:42:38 +00:00
deathride58
0be7ea0755
Merge pull request #4451 from Citadel-Station-13/upstream-merge-33599
...
[MIRROR] Callback security and usr
2017-12-21 03:29:13 +00:00
deathride58
17dda62a93
Merge pull request #4461 from Citadel-Station-13/upstream-merge-33622
...
[MIRROR] restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-21 03:28:14 +00:00
deathride58
58f5069180
Merge pull request #4463 from Citadel-Station-13/upstream-merge-33664
...
[MIRROR] Halve gun empty sound level
2017-12-21 03:27:50 +00:00
deathride58
a30bcfa77f
Merge pull request #4465 from Citadel-Station-13/upstream-merge-33669
...
[MIRROR] Makes tails stop wagging when unconscious or stunned
2017-12-21 03:26:00 +00:00
deathride58
2de3b12364
Merge pull request #4464 from Citadel-Station-13/upstream-merge-33594
...
[MIRROR] Adds knock off component
2017-12-21 03:25:41 +00:00
jughu
2c4e5bae9e
Fixes grammer issue ( #33679 )
2017-12-20 12:02:25 -06:00
Michiyamenotehifunana
2be1b5eb29
Removes pierce immunity from roundstart xenos
2017-12-20 23:05:05 +08:00
ShizCalev
b83dd93309
lizard stuff ( #33669 )
2017-12-20 05:55:45 -06:00
LetterJay
00d3b8f1b7
a lot of shit synced in this one commit.
2017-12-20 02:53:51 -06:00
LetterJay
92c347d068
Merge branch 'master' into upstream-merge-33246
2017-12-20 00:27:06 -06:00
Jordan Brown
25d5e5b6b4
Merge pull request #33594 from AnturK/knockoff
...
Adds knock off component
2017-12-20 00:14:36 -06:00
Jordan Brown
b305f1bb26
Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears
...
Halve gun empty sound level
2017-12-20 00:14:28 -06:00
oranges
d960c45e77
Merge pull request #33622 from duncathan/assert_gas
...
restores add_gas(), assert_gas(), and thermal_energy() as wrapper procs
2017-12-20 00:14:13 -06:00
LetterJay
efc41a15d3
Update mob_helpers.dm
2017-12-19 19:36:03 -06:00
LetterJay
9ab75d37b7
Update operative.dm
2017-12-19 19:35:41 -06:00
LetterJay
2148eb021b
Update randomverbs.dm
2017-12-19 19:34:44 -06:00
LetterJay
da2bf6293f
Update one_click_antag.dm
2017-12-19 19:34:02 -06:00
LetterJay
80412ae3b9
Update player_panel.dm
2017-12-19 19:32:18 -06:00
LetterJay
bcbb4102bf
Update disease_outbreak.dm
2017-12-19 18:50:43 -06:00
LetterJay
63b1b1df88
Update disease_outbreak.dm
2017-12-19 18:40:20 -06:00
