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
LetterJay
56737f32de
Update disease_outbreak.dm
2017-12-19 17:59:55 -06:00
LetterJay
6c39e94bba
Update observer.dm
2017-12-19 17:56:52 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
349b0f4f20
Update spray.dm
2017-12-19 17:19:05 -06:00
LetterJay
fdfdaa230a
Update glass.dm
2017-12-19 17:18:27 -06:00
LetterJay
39b016306c
Update reagent_containers.dm
2017-12-19 17:17:54 -06:00
LetterJay
9e452adcc8
Update holder.dm
2017-12-19 17:16:45 -06:00
LetterJay
5e0ddfce60
Update drinks.dm
2017-12-19 17:15:37 -06:00
LetterJay
516db4851f
Update disease_outbreak.dm
2017-12-19 16:53:21 -06:00
LetterJay
16f1a07b92
diseases
2017-12-19 16:41:09 -06:00
LetterJay
5ed003a0f5
Update client_defines.dm
2017-12-19 15:36:07 -06:00
LetterJay
1b9d60c604
Update reagent_containers.dm
2017-12-19 15:29:55 -06:00
LetterJay
b46275079e
Update ammo_casings.dm
2017-12-19 15:29:45 -06:00
LetterJay
063854e2d0
Update aphasia.dm
2017-12-19 15:28:37 -06:00
duncathan salt
0f2fd05e87
removes silly garbage defines
2017-12-19 08:02:18 -06:00
ACCount
522b8383d8
[READY]Refactors reagent container types
2017-12-18 22:54:51 -06:00
Jordan Brown
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
Emmett Gaines
8cf30a65fb
dock() re-organization
2017-12-18 21:23:58 -06:00
coiax
11856db2fb
Golems can wear labcoats
2017-12-18 21:22:38 -06:00
coiax
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
Armhulen
55ee64940f
code improvements from mso and co
2017-12-18 20:50:07 -06:00
XDTM
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
LetterJay
9710f0f842
Merge pull request #4439 from Citadel-Station-13/ServerAPI
...
Updates server API to preoper version
2017-12-18 19:30:26 -06:00
LetterJay
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
LetterJay
cfeea088e8
Update genetic.dm
2017-12-18 17:27:12 -06:00
LetterJay
8fef308d0a
Update living_defense.dm
2017-12-18 17:27:04 -06:00
LetterJay
64f003d3b1
Update living.dm
2017-12-18 17:26:25 -06:00
LetterJay
0d137f82d4
Update life.dm
2017-12-18 17:26:10 -06:00
LetterJay
8b56d1ccdd
Update combat.dm
2017-12-18 17:26:01 -06:00
LetterJay
078c8744e0
Update species.dm
2017-12-18 17:25:47 -06:00
LetterJay
e4d6f4110f
Update human_defense.dm
2017-12-18 17:25:33 -06:00
LetterJay
10eaeed06b
Update carbon.dm
2017-12-18 17:25:09 -06:00
LetterJay
fa0bcde791
Update disease_outbreak.dm
2017-12-18 17:24:49 -06:00
LetterJay
f650d8bb5e
Update mousetrap.dm
2017-12-18 17:24:42 -06:00
LetterJay
c9e131883d
Merge branch 'master' into ServerAPI
2017-12-18 17:22:10 -06:00
XDTM
13dd125e28
[HIGH PRIORITY]Hotfix for the monkeylike disability
2017-12-18 16:11:27 -06:00
LetterJay
5f237c595b
Merge pull request #4436 from Citadel-Station-13/upstream-merge-33615
...
[MIRROR] Adds reloading sounds to guns
2017-12-18 15:51:06 -06:00
oranges
7c282037ba
Non movement keys pressed while moving no longer stop movement
2017-12-18 15:31:35 -06:00
