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

5858 Commits

Author SHA1 Message Date
ShizCalev
88e7e8d2cb Fixes turf_decal layering 2017-11-07 21:38:53 -06:00
LetterJay
787994ca3c Merge pull request #3840 from Citadel-Station-13/upstream-merge-32437 
[MIRROR] Adds an organ storage bag to the syndicate medborg
 2017-11-07 04:46:44 -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
96134f876c Merge pull request #3834 from Citadel-Station-13/upstream-merge-32431 
[MIRROR] Monkeys can no longer transmit diseases through hardsuits
 2017-11-07 04:45:29 -06:00
LetterJay
c3ecdfaade Merge pull request #3831 from Citadel-Station-13/upstream-merge-32425 
[MIRROR] Adds admin away gateway.
 2017-11-07 04:44:58 -06:00
LetterJay
a5adcace3a Merge pull request #3830 from Citadel-Station-13/upstream-merge-32421 
[MIRROR] Revert "Adds 'round' chat command"
 2017-11-07 04:44:46 -06:00
LetterJay
1f2af245c8 Merge pull request #3829 from Citadel-Station-13/upstream-merge-32424 
[MIRROR] Mining zlevel has a bomb cap of three times the configured cap
 2017-11-07 04:44:31 -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
ce790ce437 Merge pull request #3825 from Citadel-Station-13/upstream-merge-32418 
[MIRROR] Updates cape descriptions
 2017-11-07 04:42:30 -06:00
LetterJay
2d07daca49 Merge pull request #3824 from Citadel-Station-13/upstream-merge-32417 
[MIRROR] Fixes EMP wire pulsing
 2017-11-07 04:41:55 -06:00
LetterJay
48dfeb5f7a Merge pull request #3821 from Citadel-Station-13/upstream-merge-32406 
[MIRROR] Refactors and improvements to xenobio slime processor
 2017-11-07 04:41:23 -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
78f8c4650c Merge pull request #3817 from Citadel-Station-13/upstream-merge-32402 
[MIRROR] Increased gas filter UI size
 2017-11-07 04:39:50 -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
1489019399 Merge pull request #3784 from Citadel-Station-13/upstream-merge-32260 
[MIRROR] Shapeshift tweaks.
 2017-11-07 03:50:05 -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
LetterJay
6a1c0f6683 Update screen_objects.dm 2017-11-07 03:24:40 -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
Anonmare
9c12ee48e1 Adds an organ storage bag to the syndicate medborg (#32437) 
* Adds an organ storage bag to the syndicate medborg

* Adds the drill and extinguisher
 2017-11-06 15:15:10 -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
1b1411f41f Monkeys can no longer transmit diseases through hardsuits (#32431) 2017-11-05 20:45:34 -06:00
AnturK
495632eac2 Adds admin away gateway. (#32425) 
* Adds admin gateway away

* I choose third option.
 2017-11-05 17:35:20 -06:00
Jordan Brown
0bb150ff98 Revert "Adds 'round' chat command" (#32421) 2017-11-05 15:37:50 -06:00
oranges
aa79fdd492 Merge pull request #32424 from lzimann/zlevelcapmultiplier 
Mining zlevel has a bomb cap of three times the configured cap
 2017-11-05 15:13:11 -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
Jordan Brown
d905c9500d Merge pull request #32418 from KorPhaeron/cloak 
Updates cape descriptions
 2017-11-05 12:03:50 -06:00
Jordan Brown
bd69a59bad Merge pull request #32417 from YPOQ/empwirefix 
Fixes EMP wire pulsing
 2017-11-05 12:03:42 -06:00
vuonojenmustaturska
cc438ea9b4 Refactors and improvements to xenobio slime processor (#32406) 
* Do not let your memes be dreams

* static lists for great justice

* Local man forgets to capitalize a word

* Slime processor no longer runtimes when processing food
 2017-11-05 04:32:07 -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
ab7e8a96a3 Increased gas filter UI size (#32402) 2017-11-05 02:08:43 -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
c9a160ccc0 Merge pull request #3812 from Citadel-Station-13/upstream-merge-32377 
[MIRROR] Fixes energy katana dash toggle
 2017-11-04 22:54:44 -05:00
LetterJay
f1d3fb0334 Merge pull request #3811 from Citadel-Station-13/upstream-merge-32396 
[MIRROR] Hide already-downloaded programs from NTNet downloader
 2017-11-04 22:54:35 -05: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
098806129e Merge pull request #3802 from Citadel-Station-13/upstream-merge-32380 
[MIRROR] Makes the shuttle beacon refuse to be placed over the map edge
 2017-11-04 22:53:40 -05:00
LetterJay
23c5e043e7 Merge pull request #3804 from Citadel-Station-13/upstream-merge-32341 
[MIRROR] Fixes a bug in single tank bomb assembly
 2017-11-04 22:52:59 -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
cd9bab3052 Merge pull request #3799 from deathride58/furtherboxedits 
Boxstation Edits: Legless Warden edition
 2017-11-04 22:50:58 -05:00