bcbb4102bf
Update disease_outbreak.dm
2017-12-19 18:50:43 -06:00
63b1b1df88
Update disease_outbreak.dm
2017-12-19 18:40:20 -06:00
f3e031fe2f
Update telecrystalconsoles.dm
2017-12-19 18:02:16 -06:00
56737f32de
Update disease_outbreak.dm
2017-12-19 17:59:55 -06:00
6c39e94bba
Update observer.dm
2017-12-19 17:56:52 -06:00
30796ad342
Update cit_arousal.dm
2017-12-19 17:56:06 -06:00
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
1b6b8a7c00
Update cleanable.dm
2017-12-19 17:46:15 -06:00
a0a4acbc2c
Update nuclear.dm
2017-12-19 17:33:55 -06:00
a98178251d
Merge pull request #4444 from Citadel-Station-13/upstream-merge-33531
...
[MIRROR] [READY]Cyborg jousting with spears!
2017-12-19 17:31:26 -06:00
349b0f4f20
Update spray.dm
2017-12-19 17:19:05 -06:00
fdfdaa230a
Update glass.dm
2017-12-19 17:18:27 -06:00
39b016306c
Update reagent_containers.dm
2017-12-19 17:17:54 -06:00
9e452adcc8
Update holder.dm
2017-12-19 17:16:45 -06:00
5e0ddfce60
Update drinks.dm
2017-12-19 17:15:37 -06:00
0a05b499fd
Update cleanable.dm
2017-12-19 17:14:57 -06:00
516db4851f
Update disease_outbreak.dm
2017-12-19 16:53:21 -06:00
16f1a07b92
diseases
2017-12-19 16:41:09 -06:00
5ed003a0f5
Update client_defines.dm
2017-12-19 15:36:07 -06:00
7d193a5303
Update wizard.dm
2017-12-19 15:35:57 -06:00
a30de42820
Update traitor.dm
2017-12-19 15:35:45 -06:00
2d65e0df49
Update nuclear.dm
2017-12-19 15:35:29 -06:00
61c7080c34
Update game_mode.dm
2017-12-19 15:34:59 -06:00
cb8c6cd5e2
Update changeling.dm
2017-12-19 15:34:38 -06:00
98d752fe21
Update traitor_bro.dm
2017-12-19 15:34:27 -06:00
678762209a
Update ticker.dm
2017-12-19 15:33:31 -06:00
1b9d60c604
Update reagent_containers.dm
2017-12-19 15:29:55 -06:00
b46275079e
Update ammo_casings.dm
2017-12-19 15:29:45 -06:00
a8db6dc9c2
Update mop_bucket.dm
2017-12-19 15:29:36 -06:00
063854e2d0
Update aphasia.dm
2017-12-19 15:28:37 -06:00
d59e85e214
Update weldingtool.dm
2017-12-19 15:20:39 -06:00
30e8b2a12d
Merge pull request #33683 from AnturK/getcommandfix
...
Fixes get admin command
2017-12-19 14:30:27 -06:00
d39b0204fa
Merge pull request #4382 from Citadel-Station-13/upstream-merge-33307
...
[MIRROR] Adds config inclusion system
2017-12-19 19:49:32 +00:00
65412db421
Update game_options.dm
2017-12-19 14:34:06 -05:00
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
4e5671960d
Merge pull request #33651 from coiax/absorb-language
...
Changelings learn languages from people they absorb
2017-12-19 07:55:57 -06:00
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
fabfad270f
Callback security and usr ( #33599 )
...
* Gonna regret writing this one day
* tmp -> temp
* Make PushUsr() a /world proc
* Callbacks now preserve usr
* Fixes PushUsr return value
* Fixes PushUsr invocations
* Update modifyvariables.dm
* Use weakrefs in callback user
* Further fixes
* Whoopsie
2017-12-18 21:41:33 -06:00
8cf30a65fb
dock() re-organization
2017-12-18 21:23:58 -06:00
11856db2fb
Golems can wear labcoats
2017-12-18 21:22:38 -06:00
4840a9c418
Codespeak manual rebalance/recost ( #33638 )
...
🆑 coiax
balance: The codespeak manual now has unlimited uses and costs 3 TC.
fix: Nuke ops can now purchase the codespeak manual, as was intended.
/🆑
It's an item that's just used for communication security, and also light
memeing, so I'll make it cheaper.
Also fixes a bug where I didn't specify the item path for the nuke ops
version, so they couldn't buy it.
2017-12-18 21:22:29 -06:00
ffb04fd070
Removes syndicate door access from Captain's PDA cartridge. ( #33635 )
2017-12-18 21:22:21 -06:00
8149f52777
Adds jousting ( #33531 )
2017-12-18 20:54:21 -06:00
55ee64940f
code improvements from mso and co
2017-12-18 20:50:07 -06:00
6b4099805f
[Ready] Adds abductor Mind Interface Devices, and a gland HUD ( #33209 )
...
* Adds abductor Mind Interface Devices, and a gland HUD
* .
2017-12-18 20:29:37 -06:00
9710f0f842
Merge pull request #4439 from Citadel-Station-13/ServerAPI
...
Updates server API to preoper version
2017-12-18 19:30:26 -06:00
76e6cb4e48
Update server_tools.dm
2017-12-18 17:31:07 -06:00
c9a47bc6f4
Merge pull request #4437 from Citadel-Station-13/upstream-merge-33510
...
[MIRROR] Makes the chemical smoke machine use stock parts for things
2017-12-18 17:28:26 -06:00
cfeea088e8
Update genetic.dm
2017-12-18 17:27:12 -06:00
8fef308d0a
Update living_defense.dm
2017-12-18 17:27:04 -06:00
LetterJay