shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,758 Commits 5 Branches 0 Tags
7e6283a3f06fba655e14a35910f03d50d9672bde
Commit Graph
2351 Commits
Author SHA1 Message Date
LetterJayandGitHub 7e6283a3f0 Merge branch 'master' into upstream-merge-32504 2017-11-12 23:11:53 -06:00
LetterJayandGitHub 3ea8808201 Merge pull request #3673 from Citadel-Station-13/upstream-merge-32161 
[MIRROR] 512 forward compatibility merge
 2017-11-12 23:06:55 -06:00
LetterJayandGitHub aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
LetterJayandGitHub de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJayandGitHub 1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJayandGitHub 77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJayandGitHub 298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJayandGitHub 07afeccfe9 Merge pull request #3885 from Citadel-Station-13/upstream-merge-32602 
[MIRROR] Items no longer need to check for tools in attackby
 2017-11-12 08:21:26 -06:00
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 81d1abe64e Update message.dm 2017-11-12 08:09:12 -06:00
LetterJayandGitHub 63fe96fba2 Update honker.dm 2017-11-12 08:08:46 -06:00
LetterJayandGitHub 6ad6cae862 Update navbeacon.dm 2017-11-11 23:09:07 -06:00
LetterJayandGitHub 6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -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
LetterJayandGitHub 545ac04b78 Update simple_vent_controller.dm 2017-11-11 15:55:34 -06:00
LetterJayandGitHub 9dce395c4a Update airlock_controller.dm 2017-11-11 15:55:19 -06:00
LetterJayandGitHub 7b791899b2 Update robot.dm 2017-11-11 15:54:57 -06:00
LetterJayandGitHub 5cf5625568 Update airlock_maker.dm 2017-11-11 15:54:38 -06:00
LetterJayandGitHub eacd5271a2 Update communications.dm 2017-11-11 15:54:17 -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
LeoandCitadelStationBot 73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -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
LetterJayandGitHub b0439afd08 Update ai_monitored.dm 2017-11-09 03:17:59 -06:00
LetterJayandGitHub 45a64018c5 Update motion.dm 2017-11-09 03:17:52 -06:00
kevinz000andCitadelStationBot b44e31951d Weakrefs 2017-11-09 00:49:01 -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