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
15233cbda3
Merge pull request #4460 from Citadel-Station-13/upstream-merge-33543
...
[MIRROR] Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK
2017-12-21 03:28:46 +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
811cd917aa
Merge pull request #4457 from Citadel-Station-13/upstream-merge-33683
...
[MIRROR] Fixes get admin command
2017-12-21 03:27:32 +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
ShizCalev
b83dd93309
lizard stuff ( #33669 )
2017-12-20 05:55:45 -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
Jordan Brown
e6e197c88a
Adds NAMEOF, VARSET_CALLBACK, and VARSET_LIST_CALLBACK ( #33543 )
...
* Adds NAMEOF and VARSET_CALLBACK
* Fix VARSET_CALLBACK
* Change names, add VARSET_LIST_CALLBACK
* Fix var names
* Additional macro safety. Update commen
* ImprovedName
* Fixing
2017-12-20 00:14:03 -06:00
LetterJay
d6a5ee596b
Update mind.dm
2017-12-19 23:55:36 -06:00
LetterJay
5bd61908a3
Update game_mode.dm
2017-12-19 23:53:36 -06:00
LetterJay
4d5c32ae56
Update game_mode.dm
2017-12-19 22:11:04 -06:00
LetterJay
7dec65ff85
fuck
2017-12-19 20:20:09 -06:00
LetterJay
36ad355f9d
Update mind.dm
2017-12-19 20:08:49 -06:00
LetterJay
a8e36670e2
Update mind.dm
2017-12-19 20:02:03 -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
74bba8aea7
Update cards_ids.dm
2017-12-19 19:31:44 -06:00
LetterJay
2b434438e0
Update telecrystalconsoles.dm
2017-12-19 19:31:17 -06:00
LetterJay
9d90a2bf5b
Update pinpointer.dm
2017-12-19 19:30:54 -06:00
LetterJay
c545ef06cd
Update nuclearbomb.dm
2017-12-19 19:30:23 -06:00
LetterJay
951a540882
Update nuclear.dm
2017-12-19 19:29:27 -06:00
LetterJay
992984388b
Update game_mode.dm
2017-12-19 19:29:04 -06:00
LetterJay
5983d7b13d
Update antag_spawner.dm
2017-12-19 19:27:36 -06:00
LetterJay
614e93b975
Update mind.dm
2017-12-19 19:26:28 -06:00
LetterJay
e6cab75e71
NukeDatum
2017-12-19 19:22:03 -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
f3e031fe2f
Update telecrystalconsoles.dm
2017-12-19 18:02:16 -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
30796ad342
Update cit_arousal.dm
2017-12-19 17:56:06 -06:00
LetterJay
408182758f
Merge branch 'master' into upstream-merge-33498
2017-12-19 17:50:11 -06:00
LetterJay
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
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
Jordan Brown
30e8b2a12d
Merge pull request #33683 from AnturK/getcommandfix
...
Fixes get admin command
2017-12-19 14:30:27 -06:00
deathride58
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
deathride58
65412db421
Update game_options.dm
2017-12-19 14:34:06 -05: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
kevinz000
8149f52777
Adds jousting ( #33531 )
2017-12-18 20:54:21 -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
