shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,557 Commits 5 Branches 0 Tags
b0671ed78a3df033b2aa367dda35015601cd1c32
Commit Graph

2743 Commits

Author SHA1 Message Date
LetterJay
b0671ed78a Update eminence_spire.dm 2017-12-24 02:38:47 -06:00
LetterJay
aec1142ca1 Update _eminence.dm 2017-12-24 02:38:37 -06:00
Ashe Higgs
a3323c1b95 (probably?) Fixes being able to create two Eminences at a time + other Eminence issues 2017-12-21 00:01:50 -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
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
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
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
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
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
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
f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJay
408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
Jordan Brown
30e8b2a12d Merge pull request #33683 from AnturK/getcommandfix 
Fixes get admin command
 2017-12-19 14:30:27 -06:00
Leo
4e5671960d Merge pull request #33651 from coiax/absorb-language 
Changelings learn languages from people they absorb
 2017-12-19 07:55:57 -06:00
Shadowlight213
ffb04fd070 Removes syndicate door access from Captain's PDA cartridge. (#33635) 2017-12-18 21:22:21 -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
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
LetterJay
06617159b7 Merge pull request #4428 from Citadel-Station-13/upstream-merge-33419 
[MIRROR] Lollipop dispensers can push lollipops into people's hands
 2017-12-18 15:27:03 -06:00
LetterJay
da58957c23 Merge pull request #4425 from Citadel-Station-13/upstream-merge-33607 
[MIRROR] Dance Machine now obeys instrument preference
 2017-12-18 15:26:33 -06:00
LetterJay
4a835b47ce Merge pull request #4417 from Citadel-Station-13/upstream-merge-33586 
[MIRROR] Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-18 15:25:46 -06:00
LetterJay
97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 
[MIRROR] Rebalances Marauder shields
 2017-12-18 15:21:07 -06:00
LetterJay
0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542 
[MIRROR] Fixes mecha drifting.
 2017-12-18 15:19:13 -06:00
ShizCalev
1c142356ff Gun sounds (#33615) 2017-12-18 15:15:25 -06:00
LetterJay
bd1c186111 Merge pull request #4377 from Citadel-Station-13/upstream-merge-33181 
[MIRROR] All-In-One grinder results are now defined by type, not by huge lists
 2017-12-17 21:26:08 -06:00
LetterJay
3895eb9eac Merge pull request #4375 from Citadel-Station-13/upstream-merge-33519 
[MIRROR] Finishes the forceMove port
 2017-12-17 20:28:07 -06:00
LetterJay
eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
coiax
a2dbbac703 Lollipop dispensers can push lollipops into people's hands (#33419) 
* Lollipop dispensers can push lollipops into people's hands

🆑 coiax
add: A lollipop dispenser in "dispense lollipops" mode can push the
lollipop straight into the targets hand, rather than getting it dirty on
the floor first.
/🆑

Also tidied up and around the robot_items.dm file.

This is a good idea because then you can give people lollipops as a
cyborg that has the lollipop dispenser module.

* Integers instead of numbers
 2017-12-17 16:17:28 -06:00
LetterJay
4bf535f808 Update weldingtool.dm 2017-12-17 15:57:23 -06:00
LetterJay
75ccc3b354 Update anomalies.dm 2017-12-17 15:57:02 -06:00
LetterJay
f377aa441f Update telecrystalconsoles.dm 2017-12-17 15:56:54 -06:00
oranges
ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
XDTM
962f135957 [Ready]Brain Trauma additions 2017-12-17 11:11:10 -06:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
Leo
a536831bbb Merge pull request #33586 from Xhuis/power_alerts 
Disables clockcult power alerts to ghosts when it's not clockcult
 2017-12-17 07:36:10 -06:00
Robustin
e71fa098ae Shield balance (#33553) 
Rebalances Marauder shields
 2017-12-17 04:11:24 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
AnturK
ce22210b47 Fixes mecha drifting. (#33542) 
* Fixes mecha drifting.
 2017-12-16 04:09:03 -06:00