6fc0cdc67e
Merge pull request #4336 from Citadel-Station-13/upstream-merge-33457
...
[MIRROR] Check ticks some more in dock()
2017-12-13 01:22:52 +00:00
a6283110fa
Automatic changelog generation for PR #4340 [ci skip]
2017-12-12 15:09:19 -06:00
259b9c5cf4
Merge pull request #4340 from deathride58/fixesmetabolism
...
Fixes mob metabolism
2017-12-12 15:09:16 -06:00
5535509a65
fixes broken metabolism
2017-12-12 15:15:22 -05:00
c568b313f6
Check ticks some more in dock()
2017-12-12 13:05:49 -06:00
367872f962
Merge pull request #33457 from ninjanomnom/check-your-tick
...
Check ticks some more in dock()
2017-12-12 13:05:49 -06:00
880002ada0
Merge pull request #4332 from Citadel-Station-13/upstream-merge-33446
...
[MIRROR] INVOKE_ASYNC is the exception not the rule!
2017-12-12 03:23:36 +00:00
0caa302fec
Automatic changelog generation for PR #4331 [ci skip]
2017-12-11 21:23:23 -06:00
151ba66ed4
Merge pull request #4331 from Citadel-Station-13/upstream-merge-33425
...
[MIRROR] Makes swarmers check for mobs in objects
2017-12-12 03:23:20 +00:00
b676905694
Merge pull request #4330 from Citadel-Station-13/upstream-merge-33296
...
[MIRROR] Adds "Get" command to movable vv dropdown
2017-12-12 03:23:02 +00:00
ee7d2e826e
INVOKE_ASYNC is the exception not the rule!
2017-12-11 20:39:38 -06:00
2221d854a1
Merge pull request #33446 from tgstation/Cyberboss-patch-3
...
INVOKE_ASYNC is the exception not the rule!
2017-12-11 20:39:38 -06:00
a68f5f7a9e
Makes swarmers check for mobs in objects
2017-12-11 20:38:28 -06:00
1a15772c3a
Makes swarmers check for mobs in objects ( #33425 )
2017-12-11 20:38:28 -06:00
09fd46bf13
Adds "Get" command to movable vv dropdown
2017-12-11 20:35:16 -06:00
c5013d65f6
Adds "Get" command to movable vv dropdown ( #33296 )
2017-12-11 20:35:16 -06:00
ea79750d4e
Automatic changelog generation for PR #4014 [ci skip]
2017-12-11 18:36:41 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
b5600cb91c
Merge pull request #4328 from Citadel-Station-13/upstream-merge-33462
...
[MIRROR] Ordered turfs quickfix
2017-12-11 19:08:09 +00:00
c78d4e85c5
Merge pull request #4323 from Citadel-Station-13/upstream-merge-33445
...
[MIRROR] Adds terry to brain damage lines
2017-12-11 18:20:59 +00:00
ba9fc0ccc5
Merge pull request #4327 from Citadel-Station-13/upstream-merge-33440
...
[MIRROR] Fixes projectile runtime due to click params but no target location (this happens when click catcher catches shoot clicks instead of normal firing.)
2017-12-11 18:20:38 +00:00
36b0f7ecaf
Merge pull request #4326 from Citadel-Station-13/upstream-merge-33443
...
[MIRROR] Corrects the icon_state for an oxygen tank
2017-12-11 18:20:19 +00:00
95c51a1609
Ordered turfs quickfix
2017-12-11 12:15:29 -06:00
9a0961c320
Merge pull request #33462 from ninjanomnom/dont-be-so-negative
...
Ordered turfs quickfix
2017-12-11 12:15:29 -06:00
77d2a95307
Fixes projectile runtime due to click params but no target location (this happens when click catcher catches shoot clicks instead of normal firing.)
2017-12-11 11:31:27 -06:00
d22aee94a1
Fixes nulls ( #33440 )
2017-12-11 11:31:27 -06:00
816f302766
Corrects the icon_state for an oxygen tank
2017-12-11 11:30:16 -06:00
89e8ccba5b
Corrects the icon_state for an oxygen tank ( #33443 )
2017-12-11 11:30:16 -06:00
2e46154344
Merge pull request #4324 from Citadel-Station-13/upstream-merge-33444
...
[MIRROR] Changes captain glove description
2017-12-11 16:24:05 +00:00
81e855d819
Update brain_damage_lines.json
2017-12-11 11:23:53 -05:00
3f7523217c
Changes captain glove description
2017-12-11 08:59:36 -06:00
04ea26f6ee
Merge pull request #33444 from Dorsisdwarf/gloves
...
Changes captain glove description
2017-12-11 08:59:36 -06:00
1628a89402
Adds terry to brain damage lines
2017-12-11 08:57:22 -06:00
c3441ec66a
Merge pull request #4321 from Citadel-Station-13/upstream-merge-33434
...
[MIRROR] Fixes integrated circuit reagent components not working while in mobs, adds new helper procs
2017-12-11 03:19:53 +00:00
0389214c7b
Update reagents.dm
2017-12-10 20:55:08 -05:00
a4129f92df
Fixes integrated circuit reagent components not working while in mobs, adds new helper procs
2017-12-10 19:38:06 -06:00
65cc4a2f16
Merge pull request #4102 from Citadel-Station-13/upstream-merge-33001
...
[MIRROR] Adds a python script to load jsons to prevent any syntax error on them
2017-12-11 01:18:08 +00:00
11b7094dfa
fUCK - fixes compiling errors for real i hope fuck
2017-12-10 20:08:33 -05:00
cb6c0e190d
fixes compiling error
2017-12-10 19:48:40 -05:00
bdcb0ecd6b
Automatic changelog generation for PR #4254 [ci skip]
2017-12-10 18:46:02 -06:00
051b45c680
Merge pull request #4254 from Citadel-Station-13/upstream-merge-33316
...
[MIRROR] Adds games vendor resupply crate
2017-12-11 00:46:00 +00:00
8901b7dc22
Automatic changelog generation for PR #4272 [ci skip]
2017-12-10 18:41:07 -06:00
7e68709634
Merge pull request #4272 from Citadel-Station-13/upstream-merge-33342
...
[MIRROR] [Box] Moves drone dispenser to Robotics maintenance
2017-12-11 00:41:04 +00:00
d3448c7002
Automatic changelog generation for PR #4319 [ci skip]
2017-12-10 18:20:58 -06:00
fdefdef3e7
Merge pull request #4319 from Citadel-Station-13/upstream-merge-33428
...
[MIRROR] Small Rebalance to hardsuit's armor ratings
2017-12-11 00:20:56 +00:00
71c3a8266a
Merge pull request #4318 from Citadel-Station-13/upstream-merge-33424
...
[MIRROR] Standardization of return_ordered_turfs
2017-12-11 00:06:54 +00:00
c211552c9d
Merge pull request #4317 from Citadel-Station-13/upstream-merge-33309
...
[MIRROR] Silver slime extract foods now fry correctly
2017-12-11 00:03:05 +00:00
ccd370328c
Merge branch 'master' into upstream-merge-33316
2017-12-11 00:01:02 +00:00
add4b774e5
fixes map conflicts
2017-12-10 19:00:08 -05:00
cad71813a3
Automatic changelog generation for PR #4241 [ci skip]
2017-12-10 17:55:37 -06:00
deathride58