shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,029 Commits 5 Branches 0 Tags
19c6db6a6e61b9c74fe2cb115cd06dafa4fd79fd
Commit Graph
2859 Commits
Author SHA1 Message Date
deathride58andGitHub 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
QualityVanandCitadelStationBot 5869eae8e9 Fixes some syndicate duffelbags missing inhands 2017-12-20 19:54:56 -06:00
LetterJay 84f51a8cbb antag team 2017-12-20 13:24:06 -06:00
LetterJay 00d3b8f1b7 a lot of shit synced in this one commit. 2017-12-20 02:53:51 -06:00
LetterJayandGitHub 92c347d068 Merge branch 'master' into upstream-merge-33246 2017-12-20 00:27:06 -06:00
Jordan BrownandCitadelStationBot 25d5e5b6b4 Merge pull request #33594 from AnturK/knockoff 
Adds knock off component
 2017-12-20 00:14:36 -06:00
Jordan BrownandCitadelStationBot b305f1bb26 Merge pull request #33664 from optimumtact/darkgenerallordhassnowflakeears 
Halve gun empty sound level
 2017-12-20 00:14:28 -06:00
orangesandCitadelStationBot 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
LetterJayandGitHub 5bd61908a3 Update game_mode.dm 2017-12-19 23:53:36 -06:00
LetterJayandGitHub 4d5c32ae56 Update game_mode.dm 2017-12-19 22:11:04 -06:00
LetterJayandGitHub 74bba8aea7 Update cards_ids.dm 2017-12-19 19:31:44 -06:00
LetterJayandGitHub 2b434438e0 Update telecrystalconsoles.dm 2017-12-19 19:31:17 -06:00
LetterJayandGitHub 9d90a2bf5b Update pinpointer.dm 2017-12-19 19:30:54 -06:00
LetterJayandGitHub c545ef06cd Update nuclearbomb.dm 2017-12-19 19:30:23 -06:00
LetterJayandGitHub 951a540882 Update nuclear.dm 2017-12-19 19:29:27 -06:00
LetterJayandGitHub 992984388b Update game_mode.dm 2017-12-19 19:29:04 -06:00
LetterJayandGitHub 5983d7b13d Update antag_spawner.dm 2017-12-19 19:27:36 -06:00
LetterJayandGitHub dfa53390df Update nuclear.dm 2017-12-19 19:12:26 -06:00
LetterJayandGitHub f3e031fe2f Update telecrystalconsoles.dm 2017-12-19 18:02:16 -06:00
LetterJayandGitHub 408182758f Merge branch 'master' into upstream-merge-33498 2017-12-19 17:50:11 -06:00
LetterJayandGitHub 1b6b8a7c00 Update cleanable.dm 2017-12-19 17:46:15 -06:00
LetterJayandGitHub a0a4acbc2c Update nuclear.dm 2017-12-19 17:33:55 -06:00
LetterJayandGitHub 0a05b499fd Update cleanable.dm 2017-12-19 17:14:57 -06:00
LetterJayandGitHub 7d193a5303 Update wizard.dm 2017-12-19 15:35:57 -06:00
LetterJayandGitHub a30de42820 Update traitor.dm 2017-12-19 15:35:45 -06:00
LetterJayandGitHub 2d65e0df49 Update nuclear.dm 2017-12-19 15:35:29 -06:00
LetterJayandGitHub 61c7080c34 Update game_mode.dm 2017-12-19 15:34:59 -06:00
LetterJayandGitHub cb8c6cd5e2 Update changeling.dm 2017-12-19 15:34:38 -06:00
LetterJayandGitHub 98d752fe21 Update traitor_bro.dm 2017-12-19 15:34:27 -06:00
LetterJayandGitHub a8db6dc9c2 Update mop_bucket.dm 2017-12-19 15:29:36 -06:00
LetterJayandGitHub d59e85e214 Update weldingtool.dm 2017-12-19 15:20:39 -06:00
Jordan BrownandCitadelStationBot 30e8b2a12d Merge pull request #33683 from AnturK/getcommandfix 
Fixes get admin command
 2017-12-19 14:30:27 -06:00
LeoandCitadelStationBot 4e5671960d Merge pull request #33651 from coiax/absorb-language 
Changelings learn languages from people they absorb
 2017-12-19 07:55:57 -06:00
ACCountandCitadelStationBot 522b8383d8 [READY]Refactors reagent container types 2017-12-18 22:54:51 -06:00
Shadowlight213andCitadelStationBot ffb04fd070 Removes syndicate door access from Captain's PDA cartridge. (#33635) 2017-12-18 21:22:21 -06:00
kevinz000andCitadelStationBot 8149f52777 Adds jousting (#33531) 2017-12-18 20:54:21 -06:00
XDTMandCitadelStationBot 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
LetterJayandGitHub 0b75557816 Update shields.dm 2017-12-18 17:24:28 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 97a321bc82 Merge pull request #4414 from Citadel-Station-13/upstream-merge-33553 
[MIRROR] Rebalances Marauder shields
 2017-12-18 15:21:07 -06:00
XDTMandCitadelStationBot 3af0aa2489 [Ready Again]Refactors disabilities into lists, allowing for independent disability sources 2017-12-18 15:19:53 -06:00
LetterJayandGitHub 0643aa4fc0 Merge pull request #4399 from Citadel-Station-13/upstream-merge-33542 
[MIRROR] Fixes mecha drifting.
 2017-12-18 15:19:13 -06:00
ShizCalevandCitadelStationBot 1c142356ff Gun sounds (#33615) 2017-12-18 15:15:25 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
coiaxandCitadelStationBot 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