shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,717 Commits 5 Branches 0 Tags
9b406f88a7767887443d6296567f6de63e76df13
Commit Graph
2329 Commits
Author SHA1 Message Date
LetterJayandGitHub 9b406f88a7 Merge pull request #3879 from Citadel-Station-13/upstream-merge-32400 
[MIRROR] Assmos tweaks/minor additions.
 2017-11-12 08:21:09 -06:00
LetterJayandGitHub 1c8ae63808 Merge pull request #3836 from Citadel-Station-13/upstream-merge-32453 
[MIRROR] Little change. More the same
 2017-11-12 08:20:01 -06:00
LetterJayandGitHub 7eccc3b2db Merge pull request #3875 from Citadel-Station-13/upstream-merge-32445 
[MIRROR] ok now i kinda tested the ark examine
 2017-11-12 08:19:30 -06:00
LetterJayandGitHub 5a7ea4de92 Merge pull request #3892 from Citadel-Station-13/upstream-merge-32584 
[MIRROR] Fixes some cases where changeturf were called incorrectly
 2017-11-11 15:56:45 -06:00
LetterJayandGitHub e28a6eb82a Merge pull request #3890 from Citadel-Station-13/upstream-merge-32578 
[MIRROR] Fixes AIs being unable to place robotics factories
 2017-11-11 15:56:22 -06:00
LetterJayandGitHub 5af478fa05 Merge pull request #3889 from Citadel-Station-13/upstream-merge-32574 
[MIRROR] Fix portable turrets attacking some heads and sec
 2017-11-11 15:56:01 -06:00
Emmett GainesandCitadelStationBot c2d1a16954 Fixes some cases where changeturf were called incorrectly (#32584) 2017-11-11 14:32:13 -06:00
LeoandCitadelStationBot 6993018d9f Merge pull request #32578 from YPOQ/factoryfix 
Fixes AIs being unable to place robotics factories
 2017-11-11 14:31:54 -06:00
LeoandCitadelStationBot e4793153d8 Merge pull request #32574 from AutomaticFrenzy/patch/turret-access 
Fix portable turrets attacking some heads and sec
 2017-11-11 14:31:46 -06:00
Jordan BrownandCitadelStationBot bd88488c39 Updates the clockwork slab description (#32610) 
* Updates the clockwork slab description

* Adds period to the end of clockwork slab description
 2017-11-11 14:31:21 -06:00
LetterJayandGitHub 108e04e525 Merge pull request #3884 from Citadel-Station-13/upstream-merge-32567 
[MIRROR] [s] Fixes RPDs qdel'ing girders and causing runtimes
 2017-11-11 12:40:24 -06:00
LetterJayandGitHub 35a49d5178 Merge pull request #3873 from Citadel-Station-13/upstream-merge-32516 
[MIRROR] removes pipe construction cache
 2017-11-11 12:38:45 -06:00
LetterJayandGitHub 4fedb15f3b Merge pull request #3871 from Citadel-Station-13/upstream-merge-32526 
[MIRROR] Fix bluespace shelters smoothing with non-shelter walls
 2017-11-11 12:38:21 -06:00
LetterJayandGitHub fc04d94a29 Merge pull request #3870 from Citadel-Station-13/upstream-merge-32530 
[MIRROR] Makes editing movements delay configs have an effect again
 2017-11-11 12:37:59 -06:00
LetterJayandGitHub a3ba99a7e8 Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531 
[MIRROR] Fixes word crimes
 2017-11-11 12:37:43 -06:00
LetterJayandGitHub 9071fde91b Merge pull request #3860 from Citadel-Station-13/upstream-merge-32515 
[MIRROR] Process_Spacemove proc improvement
 2017-11-11 12:36:35 -06:00
deathride58andCitadelStationBot 59f654f8b9 [s] Fixes RPDs qdel'ing girders and causing runtimes (#32567) 
* fixes qdeling girders and lattices with RPDs and other weird edge cases

* thanks mom the shitcode's cleaner now

* 👍
 2017-11-10 17:55:12 -06:00
as334andCitadelStationBot 7f9800e8fa Assmos tweaks/minor additions. (#32400) 
* Adds pluoxium formation, makes fusion radioactive and nerfs it, makes noblium cost more energy.

* Review response.

* tanks now melt above 1 Million degrees Kelvin.
 2017-11-10 01:31:16 -06:00
MoreRobustThanYouandCitadelStationBot ecf49cd0a0 ok now i kinda tested the ark examine (#32445) 
* No, I did NOT test the Ark examine.

* Update countdown.dm

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm

* OK JOAN FIXED

* Update ark_of_the_clockwork_justicar.dm
 2017-11-09 20:57:39 -06:00
duncathan saltandCitadelStationBot 3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -06:00
Tad HardestyandCitadelStationBot 5f8d368d9f Fix bluespace shelters smoothing with non-shelter walls (#32526) 2017-11-09 11:07:15 -06:00
Jordan BrownandCitadelStationBot 248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
swindlyandCitadelStationBot 3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
IamgoofballandCitadelStationBot 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
Blute1andCitadelStationBot e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -06:00
Emmett GainesandCitadelStationBot 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
LetterJayandGitHub a297f4bc7f Update crayon.dm 2017-11-08 02:22:48 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
ShizCalevandCitadelStationBot 88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
ACCountandCitadelStationBot 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
MoreRobustThanYouandCitadelStationBot 4b7970f4f7 Xenobio blobbernauts can no longer walk on blob tiles (#32446) 2017-11-07 10:30:21 -06:00
Ashe HiggsandCitadelStationBot 577d1b7d20 Marauder balancing pass (#32448) 2017-11-07 09:57:26 -06:00
JordieandCitadelStationBot 5bcaf7a3b1 Crayon rotation as a type var 2017-11-07 08:03:32 -06:00
vuonojenmustaturskaandCitadelStationBot 355de66eeb Allows non-humans to be chem scanned via the health analyzer (#32457) 2017-11-07 08:02:22 -06:00
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub 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
LetterJayandGitHub e420734e3a Merge pull request #3819 from Citadel-Station-13/upstream-merge-32397 
[MIRROR] Fixes Ark examine
 2017-11-07 04:40:48 -06:00
LetterJayandGitHub 472576dd1f Merge pull request #3816 from Citadel-Station-13/upstream-merge-32401 
[MIRROR] Fixes flamethrower icon not updating on plasma tank removal
 2017-11-07 04:39:37 -06:00