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
|
86fed404b1
|
Update weldingtool.dm
|
2017-12-21 04:36:01 -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 |
|
ShizCalev
|
92b018bed7
|
Fixes bullets making sounds in space and water (#33672)
* Bullet sounds
* explicit lists
|
2017-12-21 00:09:08 -06:00 |
|
deathride58
|
4d08f9b0bc
|
Merge pull request #4445 from Citadel-Station-13/upstream-merge-33635
[MIRROR] Fixes captain's PDA showing the toggle remote door menu option
|
2017-12-21 03:47:50 +00: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
|
cf80b8a573
|
Merge pull request #4453 from Citadel-Station-13/upstream-merge-33651
[MIRROR] Changelings learn languages from people they absorb
|
2017-12-21 03:30:22 +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
|
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 |
|
LetterJay
|
84f51a8cbb
|
antag team
|
2017-12-20 13:24:06 -06: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 |
|
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 |
|
LetterJay
|
5f69eac050
|
Update mind.dm
|
2017-12-20 00:19:39 -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
|
8a1ed70888
|
Update roundend.dm
|
2017-12-20 00:08:37 -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
|
dfa53390df
|
Update nuclear.dm
|
2017-12-19 19:12:26 -06:00 |
|
LetterJay
|
bcbb4102bf
|
Update disease_outbreak.dm
|
2017-12-19 18:50:43 -06:00 |
|