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

1150 Commits

Author SHA1 Message Date
LetterJay
298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
LetterJay
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
LetterJay
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
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
deathride58
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
duncathan salt
3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -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
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
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
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
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
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
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
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
ACCount
ceece097bf Fixes flamethrower icon not updating on plasma tank removal (#32401) 2017-11-05 02:08:36 -06: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
LetterJay
6c1347366a Merge pull request #3792 from Citadel-Station-13/upstream-merge-32342 
[MIRROR] Fixes golem shells breaking spawners menu
 2017-11-04 22:47:59 -05:00
Leo
0af8cf0329 Merge pull request #32381 from AnturK/ridingdatumsneveragain 
Restores buckling sanity.
 2017-11-04 13:08:19 -05:00
YPOQ
b5cdfe5070 Fixes using RPDs on catwalks and allows using on lattices (#32378) 2017-11-04 10:10:00 -05:00
nicbn
46c62b6293 overhaul (#32316) 2017-11-03 23:40:27 -05:00
Michiyamenotehifunana
6446b7f126 Security Skirts and more! 2017-11-04 10:22:45 +08:00
AnturK
bd42e162c5 Fixes golem shells breaking spawners menu (#32342) 2017-11-03 17:37:20 -05:00
ShizCalev
6e90fd9f6d fixes pie cannon bug (#32360) 2017-11-03 15:54:11 -05:00
LetterJay
73f54f340f Merge pull request #3770 from Citadel-Station-13/upstream-merge-32328 
[MIRROR] Refactors the RCD code a tiny bit. One minor balance change
 2017-11-03 00:14:58 -05:00
LetterJay
f2ff0e1ad3 Merge pull request #3769 from Citadel-Station-13/upstream-merge-32313 
[MIRROR] Hotel Security spellchecked
 2017-11-03 00:14:43 -05:00
LetterJay
02a0da9c38 Merge pull request #3765 from Citadel-Station-13/upstream-merge-31640 
[MIRROR] [Ready]Ghosts can now Health Scan
 2017-11-03 00:13:58 -05:00
LetterJay
8d1a80d047 Merge pull request #3763 from Citadel-Station-13/upstream-merge-32270 
[MIRROR] You can now use banhammers as a weapon
 2017-11-03 00:13:17 -05:00
LetterJay
8006c60784 Merge pull request #3762 from Citadel-Station-13/upstream-merge-32284 
[MIRROR] Fix a few syntactic aberrations
 2017-11-03 00:13:00 -05:00
LetterJay
57655dfd60 Merge pull request #3760 from Citadel-Station-13/upstream-merge-32290 
[MIRROR] fixes being able to recharge an object with an inducer while inside the object
 2017-11-03 00:12:22 -05:00
LetterJay
5b890dc8a6 Merge pull request #3749 from Citadel-Station-13/upstream-merge-32288 
[MIRROR] Fixes hand tele adjacent attacks teleporting you
 2017-11-02 23:50:38 -05:00
Jalleo
76bce07100 Refactors the RCD code a tiny bit. One minor balance change (#32328) 
* Refactors the RCD code a tad to remove a variable from all RCD's and instead get the reinf_walls.dm checks to be a compiled check with a istype.

* Reverts back to variables for the reinforced walls check. Still reduced the amount of nessecary lines for it though
 2017-11-02 13:55:46 -05:00
Mercenaryblue
67a91aaf41 Hotel Security spellchecked (#32313) 
* spellcheck

interests

* spellcheck
 2017-11-02 13:29:15 -05:00
XDTM
d04b5cbeef Ghosts can now Health Scan (#31640) 
* Ghosts can now Health Scan

* cyberbossing

* Update observer.dm
 2017-11-02 08:46:42 -05:00
MoreRobustThanYou
4c857e446a You can now use banhammers as a weapon (#32270) 
* You can now use banhammers as a weapon

* Update weaponry.dm
 2017-11-02 04:26:06 -05:00