Commit Graph

9021 Commits

Author SHA1 Message Date
Armhulen d9f3c74607 pride and satisfaction 2017-12-24 15:03:07 -06:00
Jordan Brown a111679821 Merge pull request #33801 from AutomaticFrenzy/patch/download
Fix download objective always greentexting
2017-12-24 15:02:57 -06:00
LetterJay e2ba458400 Update roundend.dm 2017-12-24 02:40:05 -06:00
LetterJay d6c1c7ecc9 Merge branch 'master' into upstream-merge-33634 2017-12-24 02:39:35 -06:00
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
LetterJay 709d55bc4a Update pneumaticCannon.dm 2017-12-23 13:50:48 -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
Jordan Brown 7bcf4d466a Merge pull request #33784 from octareenroon91/patch-56
Fix file path to aimalf.ogg
2017-12-23 08:31:23 -06:00
Jordan Brown 2a80a2d6fb Merge pull request #33728 from kevinz000/patch-408
Fixes biodegrading handcuffs
2017-12-23 08:27:09 -06:00
AnturK 34b749d2ca Fixes eminence login 2017-12-23 08:14:44 -06:00
Robustin 17267781b5 Reworked EMP doorshocking (#33741) 2017-12-23 03:18:32 -06:00
Robustin bede61c0ee Fixed empty HUD_List breaking alternate_appearances (#33742)
* Alt Appearance works on empty HUD lists

* Fixes empty list runtime
2017-12-23 01:46:50 -06:00
Jordan Brown 937fc2421c Add a single whitespace (#33746) 2017-12-23 01:43:37 -06:00
Dax Dupont e0118067ec 2 borg metal fixes for the price of one (#33738) 2017-12-22 18: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
kevinz000 bec20087c2 [READY]Clownborgs - ADMIN SPAWN ONLY 2017-12-22 10:58:13 -06: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
Armhulen 716e4da53e cool beans, partner (#33713) 2017-12-22 10:39:14 -06:00
WJohn 6cfd346bdd Tweaks the syndicate infiltrator so it's no longer lopsided. (#33731) 2017-12-22 10:35:47 -06:00
LetterJay b9ec312d94 Update client_procs.dm 2017-12-22 03:16:28 -06:00
kevinz000 a82d0e13ce Fixes RND 2017-12-22 00:58:46 -08:00
LetterJay 1a2ccbbd53 Merge branch 'master' into theprthatbulliesjanitormains 2017-12-22 02:56:10 -06: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
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
AnturK a912e14912 Makes newscaster feedback messages and comments always a list. 2017-12-21 07:13:54 -06:00
Ashe Higgs c5485faee7 Tiles blessed by holy water now block servant warp-in/Eminence snooping (#33584)
* Blessing tiles blocks servant warp

* Removes the color

* Prevents the message from showing on the same turf
2017-12-21 06:37:06 -06: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