shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,656 Commits 5 Branches 0 Tags
fc04d94a293342355a2a00a26fcd186b2000e072
Commit Graph

2310 Commits

Author SHA1 Message Date
LetterJay
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
LetterJay
a3ba99a7e8 Merge pull request #3869 from Citadel-Station-13/upstream-merge-32531 
[MIRROR] Fixes word crimes
 2017-11-11 12:37:43 -06:00
LetterJay
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
Jordan Brown
248d63fa3a Makes editing movements delay configs have an effect again (#32530) 2017-11-09 11:06:03 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -06:00
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
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
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
Blute1
e6031b0d5c Process_Spacemove proc improvement 2017-11-08 19:51:57 -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
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
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
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
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -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
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
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
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
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
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
LetterJay
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
LetterJay
f3ffc7434a Merge pull request #3814 from Citadel-Station-13/upstream-merge-32411 
[MIRROR] removes search_contents_for proc
 2017-11-07 04:39:16 -06:00
LetterJay
b11ae3b119 Merge pull request #3796 from Citadel-Station-13/upstream-merge-32375 
[MIRROR] Fixed required images being in the config folder
 2017-11-07 03:50:16 -06:00
LetterJay
9e28d79b8c Merge pull request #3775 from Citadel-Station-13/upstream-merge-32334 
[MIRROR] Adds around 30 new ambience sounds, and changes ambience code a little bit
 2017-11-07 03:49:46 -06:00
LetterJay
83c6690721 Update closed.dm 2017-11-07 03:24:50 -06:00
oranges
1068b8f22d Merge pull request #32456 from vuonojenmustaturska/ghostmemes 
[s] Removes a handful of ways ghosts can affect the world
 2017-11-06 21:48:42 -06:00
Ashe Higgs
31dfd7e8fb Plush Ratvar can now fight plush Nar-Sie (#32046) 
* Plush Ratvar can fight plush Nar-Sie

* Maintainer review

* Qdeleted checks
 2017-11-06 14:44:25 -06:00
kevinz000
42deca4f72 Fixes hand tele losing ranged portal-dispel function (#32408) 
* Fixes hand teles not dispelling at range
 2017-11-06 14:43:14 -06:00
MoreRobustThanYou
9cdf151a60 Blobbernauts and spores are no longer killed by blob victory (#32133) 
* Blobbernauts and spores are no longer killed by blob victory

* Update overmind.dm

* Update overmind.dm

* Update overmind.dm

* Update overmind.dm
 2017-11-05 12:07:12 -06:00
imsxz
705ade984a Make cult hardsuit bulky sized (#32359) 2017-11-05 12:05:01 -06:00
kevinz000
044384d0b1 1# This is a combination of 2 commits. (#32276) 
can no longer turn on projectile dampener with buckled mobs
 2017-11-05 04:28:51 -06:00
MoreRobustThanYou
0f5f748bf5 Fixes Ark examine (#32397) 
* Fixes Ark examine

Fixes my own problem!

* WOOPS

* Update ark_of_the_clockwork_justicar.dm

* SECONDS!

* That looks a bit cleaner tbh

* Update ark_of_the_clockwork_justicar.dm

* Update ark_of_the_clockwork_justicar.dm
 2017-11-05 02:11:06 -06:00
ACCount
ceece097bf Fixes flamethrower icon not updating on plasma tank removal (#32401) 2017-11-05 02:08:36 -06:00
Emmett Gaines
5bcc90d3c1 removes search_contents_for proc (#32411) 2017-11-05 02:07:16 -06:00
LetterJay
52f45b998b Merge pull request #3809 from Citadel-Station-13/upstream-merge-32322 
[MIRROR] Frog masks [Feature] [ready]
 2017-11-04 22:54:23 -05:00
LetterJay
065dcb6eab Merge pull request #3806 from Citadel-Station-13/upstream-merge-32381 
[MIRROR] Restores buckling sanity.
 2017-11-04 22:53:54 -05:00
LetterJay
290daedf9a Merge pull request #3801 from Citadel-Station-13/upstream-merge-32378 
[MIRROR] Fixes using RPDs on catwalks and allows using on lattices
 2017-11-04 22:51:33 -05:00
LetterJay
7d0ac85ec6 Merge pull request #3798 from Citadel-Station-13/upstream-merge-32316 
[MIRROR] Wall damage decal overhaul
 2017-11-04 22:50:29 -05:00
LetterJay
3f1d478c27 Merge pull request #3795 from Michiyamenotehifunana/secskirt 
Security Skirts and more!
 2017-11-04 22:49:14 -05:00