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

4124 Commits

Author SHA1 Message Date
LetterJay
134201d185 Merge pull request #4494 from Citadel-Station-13/upstream-merge-32433 
[MIRROR] [READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-25 21:26:17 -06:00
LetterJay
6205268f7e Merge pull request #4441 from Citadel-Station-13/upstream-merge-33661 
[MIRROR] [HIGH PRIORITY]Hotfix for the monkeylike disability
 2017-12-25 07:28:52 -06:00
LetterJay
62a9649a98 Update disease_outbreak.dm 2017-12-25 05:23:37 -06:00
LetterJay
7b40f3f0e0 Update disease_outbreak.dm 2017-12-25 05:09:21 -06:00
LetterJay
ac5503d338 Merge branch 'master' into upstream-merge-33055 2017-12-25 04:10:34 -06:00
LetterJay
3966774d09 Merge pull request #4440 from Citadel-Station-13/upstream-merge-33655 
[MIRROR] Non movement keys pressed while moving no longer stop movement
 2017-12-24 22:10:15 -06:00
LetterJay
8f6960e1a3 Merge pull request #4522 from Citadel-Station-13/upstream-merge-33579 
[MIRROR] [READY]Circuitry upgrades
 2017-12-24 22:09:42 -06:00
deathride58
d8e25d9501 Merge pull request #4499 from Citadel-Station-13/upstream-merge-33713 
[MIRROR] if the deflection chance is < 100%, it won't say they can never be hit by ranged weapons
 2017-12-24 23:06:28 +00:00
deathride58
9ce056322a Merge pull request #4493 from Citadel-Station-13/upstream-merge-33714 
[MIRROR] Job landmarks now show the mob with the proper job outfit.
 2017-12-24 23:05:36 +00:00
deathride58
6dc2d8f0eb Update reagents.dm 2017-12-24 18:02:13 -05:00
LetterJay
a81e2aa31b Merge pull request #4519 from Citadel-Station-13/upstream-merge-33789 
[MIRROR] Fixes soapstone time.
 2017-12-24 17:00:51 -06:00
LetterJay
0f86dd3f72 Merge pull request #4515 from Citadel-Station-13/upstream-merge-33306 
[MIRROR] Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-24 17:00:06 -06:00
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
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
arsserpentarium
a893559c6b [READY]Circuitry upgrades 2017-12-24 15:03:45 -06:00
FrozenGuy5
0068bb2ed2 adds world.realtime to soapstone 2017-12-24 15:03:22 -06:00
Jordan Brown
af1f13e114 Merge pull request #33306 from coiax/replace-clean-flag-with-component 
Replaces CLEAN_ON_MOVE_1 flag with cleaning component
 2017-12-23 08:36:37 -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
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
Armhulen
716e4da53e cool beans, partner (#33713) 2017-12-22 10:39:14 -06:00
kevinz000
a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
oranges
a89435ac33 Merge pull request #32433 from kevinz000/vector_projectiles 
[READY]Refactors projectile trajectories, fixes piercing projectile inaccuracy and beam rifle visual deflections
 2017-12-21 19:33:42 -06:00
oranges
4e8898d55f Merge pull request #33714 from lzimann/icon 
Job landmarks now show the mob with the proper job outfit.
 2017-12-21 19:27:23 -06:00
Jordan Brown
b188266478 Merge pull request #33709 from uraniummeltdown/linespacing 
Adjustable Chat Line Height
 2017-12-21 14:25:21 -06: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
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
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
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
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
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
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
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
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