shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,436 Commits 5 Branches 0 Tags
5f237c595bfc382bdd32ce507646729aed2baeb5
Commit Graph
6995 Commits
Author SHA1 Message Date
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 f8efa8fe9e Merge pull request #4432 from Citadel-Station-13/upstream-merge-33605 
[MIRROR] Adds repeated message squashing to chat.
 2017-12-18 15:28:17 -06:00
LetterJayandGitHub 7f75b114b4 Merge pull request #4431 from Citadel-Station-13/upstream-merge-33613 
[MIRROR] deep fryers are quieter now...
 2017-12-18 15:27:57 -06:00
LetterJayandGitHub e933d69a22 Merge pull request #4429 from Citadel-Station-13/upstream-merge-33302 
[MIRROR] Spinning resin or laying eggs on vents prompts the user if they're sure
 2017-12-18 15:27:12 -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 6e5bd180fa Merge pull request #4427 from Citadel-Station-13/upstream-merge-33598 
[MIRROR] Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking
 2017-12-18 15:26:42 -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 7df9c3b5fc Merge pull request #4416 from Citadel-Station-13/upstream-merge-33566 
[MIRROR] Fixes race swap ruining rounds
 2017-12-18 15:25:33 -06:00
LetterJayandGitHub ba5306c8fe Merge pull request #4415 from Citadel-Station-13/upstream-merge-33568 
[MIRROR] Fixes zombie stun immunity, more pep in their step
 2017-12-18 15:25:13 -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
LetterJayandGitHub 3df26e3be6 Merge pull request #4413 from Citadel-Station-13/upstream-merge-33569 
[MIRROR] Fixes a brain login runtime
 2017-12-18 15:20:48 -06:00
LetterJayandGitHub 8662e4a53c Merge pull request #4411 from Citadel-Station-13/upstream-merge-33050 
[MIRROR] Mi-go
 2017-12-18 15:20:00 -06:00
LetterJayandGitHub 629c0de334 Merge pull request #4406 from Citadel-Station-13/upstream-merge-33501 
[MIRROR] Quick access hotkeys for backpack and belt
 2017-12-18 15:19:33 -06:00
LetterJayandGitHub 75fe7bfa65 Merge pull request #4402 from Citadel-Station-13/upstream-merge-33578 
[MIRROR] Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-18 15:19:22 -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
LetterJayandGitHub 5636d9dad3 Merge pull request #4397 from Citadel-Station-13/upstream-merge-33433 
[MIRROR] Adds two new Integrated Circuit components: hsv2hex converter and rgb2hex converter.
 2017-12-18 15:17:49 -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 21a9b09bf5 Merge pull request #4389 from Michiyamenotehifunana/NEB-consolidation 
Consolidates NEB code into a modular package
 2017-12-17 21:25:42 -06:00
LetterJayandGitHub 91a26e66cf Merge pull request #4396 from Citadel-Station-13/upstream-merge-33513 
[MIRROR] ahelp chat command is silent on success
 2017-12-17 21:24:24 -06:00
LetterJayandGitHub 781f40926c Merge pull request #4394 from Citadel-Station-13/upstream-merge-33530 
[MIRROR] Fix shuttle autocalls when the round is already over
 2017-12-17 21:24:12 -06:00
LetterJayandGitHub 78dcad12e4 Merge pull request #4391 from Citadel-Station-13/upstream-merge-33527 
[MIRROR] Adds some permission checks to admin/topic
 2017-12-17 21:23:42 -06:00
AnturKandCitadelStationBot ea47d74997 Adds repeated message squashing to chat. (#33605) 
* Adds repeated message squashing to chat.

* Forgot to actually use the pref

* Drops some unnecessary css

* No trimming same thing three times

* Increases size of repeats up to 24px, fixes scrolling
 2017-12-17 20:45:37 -06:00
LetterJayandGitHub 6aa1a86f88 Merge pull request #4390 from Citadel-Station-13/upstream-merge-33529 
[MIRROR] Removed drone light in favor of night vision
 2017-12-17 20:37:39 -06:00
LetterJayandGitHub f3390aee98 Merge branch 'master' into NEB-consolidation 2017-12-17 20:37:34 -06:00
LetterJayandGitHub 52701ebfee Merge pull request #4388 from Citadel-Station-13/upstream-merge-33517 
[MIRROR] SSinput tweaks to address server side lag
 2017-12-17 20:37:17 -06:00
LetterJayandGitHub 1319ba6a21 Merge pull request #4386 from Citadel-Station-13/upstream-merge-33512 
[MIRROR] Fixes gateway ignoring exile implants in simple mobs
 2017-12-17 20:36:55 -06:00
LetterJayandGitHub 4fe21eb44d Merge pull request #4384 from EtheoBoxxman/Bhijnbutt 
Ash walker tendril no longer spawns chasm on death
 2017-12-17 20:36:17 -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
LeoandCitadelStationBot 2578484644 Merge pull request #33613 from Armhulen/patch-32 
deep fryers are quieter now...
 2017-12-17 20:22:00 -06:00
coiaxandCitadelStationBot e93bb49994 Spinning resin or laying eggs on vents prompts the user if they're sure (#33302) 
add: Aliens (and humans with alien organs) are unable to create resin
structures or lay eggs atop vents or scrubbers.

This stops stupid aliens from obscuring entrances to the very helpful
and useful atmospheric piping system.
 2017-12-17 19:27:45 -06:00
LetterJayandGitHub 1c380e3ed4 Update verbs.dm 2017-12-17 17:50:05 -06:00
LetterJayandGitHub 3c5632bad2 Update pill.dm 2017-12-17 17:38:51 -06:00
LetterJayandGitHub 67e7f62416 Update shock_kit.dm 2017-12-17 17:38:17 -06:00
LetterJayandGitHub eb9260c8bf Update implantcase.dm 2017-12-17 17:38:09 -06:00
LetterJayandGitHub 5c3b500ba9 Update camera.dm 2017-12-17 17:38:00 -06:00
LetterJayandGitHub 8d6d561950 Update beebox.dm 2017-12-17 17:37:53 -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
Ashe HiggsandCitadelStationBot 5b107f3922 Microwave sound loops now stop in all cases where it should, such as being interrupted or breaking (#33598) 
* Stops microwave sound loops when it should

* rogue sound!
 2017-12-17 16:16:17 -06:00
orangesandCitadelStationBot ac95eb06e8 Dance Machine now obeys instrument preference (#33607) 2017-12-17 15:02:31 -06:00
LeoandCitadelStationBot 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
RobustinandCitadelStationBot 7d1485643e Fixes race swap (#33566) 2017-12-17 04:11:40 -06:00
RobustinandCitadelStationBot be6a0e82ff Slightly faster, more stunnable (#33568) 2017-12-17 04:11:32 -06:00
RobustinandCitadelStationBot e71fa098ae Shield balance (#33553) 
Rebalances Marauder shields
 2017-12-17 04:11:24 -06:00
vuonojenmustaturskaandCitadelStationBot 3fc98677a0 Fixes a brain login runtime (#33569) 
* Fixes a silly brain meme

* better
 2017-12-17 04:11:17 -06:00
ArmhulenandCitadelStationBot 8a0aa32335 Mi-go 2017-12-17 04:11:01 -06:00
Emmett GainesandCitadelStationBot e038319ba2 Quick access hotkeys for backpack and belt 2017-12-17 04:10:20 -06:00
Jordan BrownandCitadelStationBot 6a09d5c981 Merge pull request #33578 from lzimann/job 
Changes manage job slots to use a browser datum, also lets it be used before roundstart
 2017-12-17 04:09:45 -06:00
LetterJayandGitHub 7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00