Commit Graph

5899 Commits

Author SHA1 Message Date
LetterJay 8effd8c87e Merge pull request #3864 from Citadel-Station-13/upstream-merge-32509
[MIRROR] buffs ripley mining equipment
2017-11-09 03:25:31 -06:00
LetterJay a9d8bf1c7a Merge pull request #3822 from Citadel-Station-13/upstream-merge-32379
[MIRROR] Scale fullscreen overlays to the view size
2017-11-09 03:24:57 -06:00
LetterJay b8fb23c964 Merge pull request #3818 from Citadel-Station-13/upstream-merge-32374
[MIRROR] Fixes canceling cavity implants
2017-11-09 03:24:48 -06:00
LetterJay 460f19297f Merge pull request #3751 from Citadel-Station-13/upstream-merge-32292
[MIRROR] animate sqdl wrapper works now.
2017-11-09 03:20:01 -06:00
LetterJay 3a455b17d3 Merge pull request #3859 from Citadel-Station-13/upstream-merge-32503
[MIRROR] Fixes power_change being called on un-initialized machines
2017-11-09 03:18:42 -06:00
LetterJay 0473aedc1c Merge pull request #3858 from deathride58/boxfixesandothersyncs
Map syncs with upstream + small Boxstation fixes and tweaks
2017-11-09 03:18:34 -06:00
LetterJay f46dc540ed Merge pull request #3846 from Citadel-Station-13/upstream-merge-32442
[MIRROR] Reverts flying mobs passing through people
2017-11-09 03:18:26 -06:00
LetterJay 41b60c6d1e Merge pull request #3845 from Citadel-Station-13/upstream-merge-32441
[MIRROR] Crayon rotation as a type var
2017-11-09 03:18:17 -06:00
Iamgoofball 1e2ecf3ef7 buffs ripley mining equipment (#32509)
* buffs ripley mining equipment

done in separate PR in case people want just this change instead of the others
1. increased range on the drill
2. halved the cooldown on the drill
3. doubled the speed of the ore pulse

* Why argue about this for days when I can just update it myself
2017-11-09 00:44:28 -06:00
Emmett Gaines f1cbf4e0a3 fixes power_change being called on un-initialized machines (#32503) 2017-11-08 19:51:48 -06:00
deathride58 2f21f16b53 initial commit - syncs and fiXES EVERYTHING WRONG ABOUT BOX HOLY FUCK HOW DID NOBODY REPORT ALL THIS SHIT 2017-11-08 17:04:20 -05:00
LetterJay a297f4bc7f Update crayon.dm 2017-11-08 02:22:48 -06:00
LetterJay ea44e4a1d9 Merge pull request #3857 from Citadel-Station-13/upstream-merge-32489
[MIRROR] Global vest lists
2017-11-08 02:21:36 -06:00
LetterJay 448326cd60 Merge pull request #3856 from Citadel-Station-13/upstream-merge-32466
[MIRROR] Fixes turf_decal layering
2017-11-08 02:21:13 -06:00
LetterJay 1abde42c7a Merge pull request #3854 from Citadel-Station-13/upstream-merge-32428
[MIRROR] Fixes spacevines causing negative pressure/temperature
2017-11-08 02:20:42 -06:00
LetterJay 2ec4df456f Merge pull request #3853 from Citadel-Station-13/upstream-merge-32351
[MIRROR] fixes null parent in destroy for components
2017-11-08 01:46:47 -06:00
LetterJay ee4415e864 Merge pull request #3851 from Citadel-Station-13/upstream-merge-32399
[MIRROR] Multiple fixes in RPD and pipe construciton
2017-11-08 01:46:33 -06:00
LetterJay d82ae80e99 Merge pull request #3850 from Citadel-Station-13/upstream-merge-32478
[MIRROR] Editing a variable now logs the old value
2017-11-08 01:46:22 -06:00
LetterJay 9d92ee1226 Merge pull request #3849 from Citadel-Station-13/upstream-merge-32430
[MIRROR] Makes flightsuits far more vulnerable to EMPs
2017-11-08 01:45:49 -06:00
LetterJay db65ced87d Merge pull request #3848 from Citadel-Station-13/upstream-merge-32446
[MIRROR] Xenobio blobbernauts can no longer walk on blob tiles
2017-11-08 01:45:28 -06:00
LetterJay 56415d62d3 Merge pull request #3847 from Citadel-Station-13/upstream-merge-32448
[MIRROR] (Hopefully!) Final clockwork marauder balancing pass
2017-11-08 01:44:51 -06:00
LetterJay d7fcef6e04 Merge pull request #3844 from Citadel-Station-13/upstream-merge-32457
[MIRROR] Allows non-humans to be chem scanned via the health analyzer
2017-11-08 01:44:36 -06:00
ShizCalev 5f5f313551 Global vest lists (#32489)
* Global vest lists

* revised coat

* Fixed duped proc
2017-11-07 23:57:57 -06:00
ShizCalev 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
oranges 0513ce290e Merge pull request #32428 from kevinz000/patch-374
Fixes spacevines causing negative pressure/temperature
2017-11-07 14:36:56 -06:00
Emmett Gaines 8fb5936c30 fixes null parent in destroy for components (#32351)
* fixes parent being null in destroy

* extends qdel
2017-11-07 14:35:46 -06:00
ACCount 0d691189aa Multiple fixes in RPD and pipe construciton (#32399)
* Multiple fixes in RPD and pipe construciton

* Integrates another fix PR to avoid conflicts
2017-11-07 14:26:15 -06:00
Leo 6915acfcd1 Editing a variable now logs the old value (#32478)
* Editing a variable now logs the old value

* Moves the html_encode to log_admin
2017-11-07 14:25:02 -06:00
kevinz000 3253087a0d Makes flightsuits far more vulnerable to EMPs (#32430) 2017-11-07 10:39:42 -06:00
MoreRobustThanYou 4b7970f4f7 Xenobio blobbernauts can no longer walk on blob tiles (#32446) 2017-11-07 10:30:21 -06:00
Ashe Higgs 577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
Leo b48e8da861 Merge pull request #32442 from KorPhaeron/flyingrevert
Reverts flying mobs passing through people
2017-11-07 08:04:43 -06:00
Jordie 5bcaf7a3b1 Crayon rotation as a type var 2017-11-07 08:03:32 -06:00
vuonojenmustaturska 355de66eeb Allows non-humans to be chem scanned via the health analyzer (#32457) 2017-11-07 08:02:22 -06:00
Leo 4bd172f7da Merge pull request #32465 from MoreRobustThanYou/patch-11
Removes some unused clockwork defines
2017-11-07 08:00:05 -06:00
LetterJay 787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437
[MIRROR] Adds an organ storage bag to the syndicate medborg
2017-11-07 04:46:44 -06:00
LetterJay c393addda3 Merge pull request #3839 from Citadel-Station-13/upstream-merge-32046
[MIRROR] Plush Ratvar can now fight plush Nar-Sie
2017-11-07 04:46:32 -06:00
LetterJay f254e6fb9d Merge pull request #3838 from Citadel-Station-13/upstream-merge-32408
[MIRROR] Fixes hand tele losing ranged portal-dispel function
2017-11-07 04:45:52 -06:00
LetterJay 96134f876c Merge pull request #3834 from Citadel-Station-13/upstream-merge-32431
[MIRROR] Monkeys can no longer transmit diseases through hardsuits
2017-11-07 04:45:29 -06:00
LetterJay c3ecdfaade Merge pull request #3831 from Citadel-Station-13/upstream-merge-32425
[MIRROR] Adds admin away gateway.
2017-11-07 04:44:58 -06:00
LetterJay a5adcace3a Merge pull request #3830 from Citadel-Station-13/upstream-merge-32421
[MIRROR] Revert "Adds 'round' chat command"
2017-11-07 04:44:46 -06:00
LetterJay 1f2af245c8 Merge pull request #3829 from Citadel-Station-13/upstream-merge-32424
[MIRROR] Mining zlevel has a bomb cap of three times the configured cap
2017-11-07 04:44:31 -06:00
LetterJay 0ca35e765d Merge pull request #3842 from Citadel-Station-13/upstream-merge-32456
[MIRROR] [s] Removes a handful of ways ghosts can affect the world
2017-11-07 04:44:08 -06:00
LetterJay 3115e59b7e Merge pull request #3827 from Citadel-Station-13/upstream-merge-32133
[MIRROR] Blobbernauts and spores are no longer killed by blob victory
2017-11-07 04:43:17 -06:00
LetterJay 0256aa8881 Merge pull request #3826 from Citadel-Station-13/upstream-merge-32359
[MIRROR] fixes cult hardsuit size
2017-11-07 04:43:02 -06:00
LetterJay ce790ce437 Merge pull request #3825 from Citadel-Station-13/upstream-merge-32418
[MIRROR] Updates cape descriptions
2017-11-07 04:42:30 -06:00
LetterJay 2d07daca49 Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417
[MIRROR] Fixes EMP wire pulsing
2017-11-07 04:41:55 -06:00
LetterJay 48dfeb5f7a Merge pull request #3821 from Citadel-Station-13/upstream-merge-32406
[MIRROR] Refactors and improvements to xenobio slime processor
2017-11-07 04:41:23 -06:00
LetterJay 890ed4b2ba Merge pull request #3820 from Citadel-Station-13/upstream-merge-32276
[MIRROR] PKborgs can no longer activate projectile fields if someone is buckled
2017-11-07 04:41:04 -06:00
LetterJay e420734e3a Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397
[MIRROR] Fixes Ark examine
2017-11-07 04:40:48 -06:00