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

7164 Commits

Author SHA1 Message Date
LetterJay
244b68b17b Merge pull request #4505 from Citadel-Station-13/upstream-merge-33737 
[MIRROR] Gibber rebalance
 2017-12-24 16:52:14 -06:00
LetterJay
e43ab5686f Merge pull request #4501 from Citadel-Station-13/upstream-merge-33723 
[MIRROR] Adds round ID to Show Server Revision
 2017-12-24 16:51:45 -06:00
LetterJay
258910c731 Merge pull request #4500 from Citadel-Station-13/upstream-merge-33732 
[MIRROR] Fixes message spam when proccalls are delayed due to another admin's proccalls running
 2017-12-24 16:51:35 -06:00
coiax
f40d74e52f Gibber rebalance (#33737) 
🆑 coiax
balance: The kitchen gibber must be anchored in order to use.
balance: The gibber requires bodies to have no external items or
equipment.
/🆑

Unanchoring the gibber, running around with it, ebowing people, then
shoving them in is not fun.

As a double check, you REALLY should be stripping them of all that
cloth, it'll jam up the gears.

- Removes the abiotic() proc, it's literally used only in the gibber.
 2017-12-22 18:03:38 -06:00
CitadelStationBot
938f409782 [MIRROR] Christmas (#4491) 
* Christmas (#33690)

* Christmas Event Updates

* Dont recreate the list every time

* Check for drop del

* Changes some things to placate that one guy from FTL

* Christmas
 2017-12-22 13:14:25 -08:00
CitadelStationBot
6856fc1be2 [MIRROR] [s] Fixes the frying oil reagent (#4504) 
* Merge pull request #33745 from vuonojenmustaturska/oilfix

[s] Fixes the frying oil reagent

* [s] Fixes the frying oil reagent
 2017-12-22 12:32:56 -08:00
Jordan Brown
f20622cc54 Adds round ID to Show Server Revision (#33723) 2017-12-22 10:43:37 -06:00
kevinz000
454c073d22 Fixes message spam when proccalls are delayed due to another admin's proccalls running (#33732) 
* Fixes proccall block message spam

* One thread
 2017-12-22 10:40:25 -06:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
deathride58
baedc87c0a Merge pull request #4488 from Citadel-Station-13/upstream-merge-33606 
[MIRROR] Everyone gains antag HUD at round end
 2017-12-21 21:37:33 +00:00
Jordan Brown
b188266478 Merge pull request #33709 from uraniummeltdown/linespacing 
Adjustable Chat Line Height
 2017-12-21 14:25:21 -06:00
Jordan Brown
3f78bdcf59 Merge pull request #33606 from coiax/antaghud-on-end 
Everyone gains antag HUD at round end
 2017-12-21 14:24:49 -06:00
deathride58
2350486542 Merge pull request #4433 from Citadel-Station-13/upstream-merge-33614 
[MIRROR] Decal rotation fix
 2017-12-21 20:19:52 +00:00
deathride58
53e7d47893 Merge pull request #4407 from Citadel-Station-13/upstream-merge-33581 
[MIRROR] add view range respects widescreen
 2017-12-21 20:19:04 +00:00
Matthew
529e839203 dog borgs module icon fix 2017-12-21 13:46:44 -06:00
LetterJay
087c43ab71 Update rdmachines.dm 2017-12-21 12:44:59 -06:00
LetterJay
2d995e3f5a Update rdconsole.dm 2017-12-21 12:44:16 -06:00
LetterJay
8e6c8fc8b5 Update departmental_lathe.dm 2017-12-21 12:43:21 -06:00
LetterJay
6573aa52e4 Update departmental_circuit_imprinter.dm 2017-12-21 12:42:18 -06:00
LetterJay
06c309fb0c Merge branch 'master' into upstream-merge-33562 2017-12-21 11:30:58 -06:00
LetterJay
abced738bd Revert "[MIRROR] Db schema version check by simplification" 2017-12-21 09:52:42 -06:00
CitadelStationBot
ff4c5907a6 [MIRROR] Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round. (#4484) 
* Merge pull request #33730 from kevinz000/patch-409

Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.

* Fixes chat SDQL permanently disabling all admin sdql and proccalls for the round.
 2017-12-21 06:04:20 -08:00
LetterJay
8750d93126 Merge branch 'master' into upstream-merge-33614 2017-12-21 05:02:21 -06:00
LetterJay
f29a3f89d0 Merge pull request #4421 from Citadel-Station-13/upstream-merge-33591 
[MIRROR] fixes magic mirrors letting you be robustin zombies
 2017-12-21 05:01:50 -06:00
LetterJay
57646f2e08 Merge pull request #4412 from Citadel-Station-13/upstream-merge-33549 
[MIRROR] Removes the visible messages from crossing vitality matrices
 2017-12-21 05:01:32 -06:00
LetterJay
e4fe687bd5 Merge pull request #4404 from Citadel-Station-13/upstream-merge-33582 
[MIRROR] Db schema version check by simplification
 2017-12-21 05:00:51 -06:00
LetterJay
346c1bbdd6 Merge pull request #4446 from Citadel-Station-13/upstream-merge-33638 
[MIRROR] Codespeak manual rebalance/recost
 2017-12-21 04:59:45 -06:00
LetterJay
d66b64b1f1 Merge pull request #4466 from Michiyamenotehifunana/xeno-nerf 
Removes pierce immunity from roundstart xenos
 2017-12-21 04:59:00 -06:00
LetterJay
3156382d2e Merge pull request #4470 from Citadel-Station-13/upstream-merge-33700 
[MIRROR] Fixes some syndicate duffelbags missing inhands
 2017-12-21 04:58:46 -06:00
LetterJay
e4d2234537 Merge pull request #4481 from Citadel-Station-13/upstream-merge-33706 
[MIRROR] Fixes some mecha code.
 2017-12-21 04:58:33 -06:00
LetterJay
74232f6373 Merge pull request #4480 from Citadel-Station-13/upstream-merge-33550 
[MIRROR] Adds instanceless component dupe mode
 2017-12-21 04:58:20 -06:00
LetterJay
8518a9b3e5 Merge pull request #4479 from Citadel-Station-13/upstream-merge-33703 
[MIRROR] Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
 2017-12-21 04:58:06 -06:00
LetterJay
ea6b3f9c92 Merge pull request #4477 from Citadel-Station-13/upstream-merge-33704 
[MIRROR] Fixes Arm Implant EMP Effect
 2017-12-21 04:57:19 -06:00
LetterJay
b749977eb9 Merge pull request #4476 from Citadel-Station-13/upstream-merge-33697 
[MIRROR] Fix smoke machine runtime
 2017-12-21 04:57:02 -06:00
LetterJay
97f427b5ee Merge pull request #4475 from Citadel-Station-13/upstream-merge-33689 
[MIRROR] Fix pulling things across space transitions
 2017-12-21 04:56:35 -06:00
LetterJay
8ea38cfde2 Merge pull request #4474 from Citadel-Station-13/upstream-merge-33681 
[MIRROR] Immovable rod abuse, smite and event trigger.
 2017-12-21 04:55:32 -06:00
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
Jordan Brown
14942fb582 Merge pull request #33706 from AnturK/dumbmechacode 
Fixes some mecha code.
 2017-12-21 01:37:53 -06:00
Jordan Brown
09c802f984 Merge pull request #33550 from ninjanomnom/instanceless-component-dupe 
Adds instanceless component dupe mode
 2017-12-21 00:51:02 -06:00
Jordan Brown
e3a3082596 Merge pull request #33703 from kevinz000/patch-407 
Integrated circuit smoke circuit now requires atleast 10 units of reagents to generate smoke
 2017-12-21 00:46:48 -06:00
Jordan Brown
82114e753d Merge pull request #33704 from Fox-McCloud/arm-implant-fix 
Fixes Arm Implant EMP Effect
 2017-12-21 00:43:22 -06:00
MoreRobustThanYou
39ecfd64db Fix smoke machine runtime (#33697) 
* Fix smoke machine runtime

* Woops.
 2017-12-21 00:41:09 -06:00
Tad Hardesty
30fb3f8f5c Fix pulling things across space transitions (#33689) 2017-12-21 00:33:52 -06:00
AnturK
6c4d687db6 Immovable rod abuse, smite and event trigger. (#33681) 2017-12-21 00:11:20 -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
680e44fb64 Update observer.dm 2017-12-20 22:56:46 -05: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