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

769 Commits

Author SHA1 Message Date
arsserpentarium
d8847ea167 [READY]integrated circuitry port+upgrade. 2017-11-14 05:00:48 -06:00
LetterJay
0a21e6e83b Merge pull request #3904 from Citadel-Station-13/upstream-merge-32642 
[MIRROR] Makes clown box consistent with the rest of the boxes
 2017-11-13 11:45:13 -06:00
LetterJay
9ff35c5b2c Merge branch 'master' into upstream-merge-32435 2017-11-13 11:30:06 -06:00
LetterJay
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
LetterJay
aa020ea9e8 Update electropack.dm 2017-11-12 16:00:15 -06:00
tortellinitony
89b23905b5 Makes clown box consistent with the rest of the boxes 2017-11-12 15:57:01 -06:00
LetterJay
de8e064e45 Update electropack.dm 2017-11-12 15:42:44 -06:00
LetterJay
1c8d9b3a4e Update electropack.dm 2017-11-12 10:38:30 -06:00
LetterJay
77d261aa8a Update camera_bug.dm 2017-11-12 10:02:32 -06:00
LetterJay
298ddc8fa9 Update scrolls.dm 2017-11-12 08:56:30 -06:00
LetterJay
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
LetterJay
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
LetterJay
c2d3ad9c3f Update RPD.dm 2017-11-12 08:15:18 -06:00
ACCount
500307b034 Disposal pipes and pipe dispensers refactor 2017-11-12 00:31:00 -06:00
LetterJay
6286f4d4c2 Merge branch 'master' into upstream-merge-32161 2017-11-11 23:02:13 -06:00
Leo
73cb2ead88 Items no longer need to check for tools in attackby 2017-11-11 14:31:12 -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
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
as334
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
duncathan salt
3c8eef9243 removes pipe construction cache (#32516) 2017-11-09 11:14:43 -06:00
swindly
3fa561c3b1 fixes spelling and stuff (#32531) 2017-11-09 11:04:50 -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
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
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
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
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
YPOQ
b5cdfe5070 Fixes using RPDs on catwalks and allows using on lattices (#32378) 2017-11-04 10:10:00 -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
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
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
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
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
kevinz000
82e1d1ac35 fixes inducers working from inside things (#32290) 2017-11-02 04:15:29 -05:00
Leo
cf6ee8d4c2 Merge pull request #32288 from kevinz000/patch-369 
Fixes hand tele adjacent attacks teleporting you
 2017-11-01 21:38:21 -05:00
LetterJay
84c2be8e2f Merge pull request #3734 from Citadel-Station-13/upstream-merge-32251 
[MIRROR] Nerfs peaceborg chain bucklestun
 2017-11-01 01:44:55 -04:00
LetterJay
5d46fbb8d3 Merge pull request #3730 from Citadel-Station-13/upstream-merge-32250 
[MIRROR] Makes greyscaled cables' color viewable in map editing
 2017-11-01 01:44:05 -04:00
AnturK
d792624dd8 Nerfs peaceborg chain bucklestun (#32251) 
The definition of a trap option is that you don't know its a trap option until you use it. Obviously anyone who has tried it before realizes that they're a stunted joke but that doesn't make it any worse of a addition to the game.
 2017-10-31 17:40:03 -05:00