shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,937 Commits 5 Branches 0 Tags
a45e8527dbf4dae2e6a8a809fd612ce464d71998
Commit Graph

1561 Commits

Author SHA1 Message Date
LetterJay
48e5a3be80 Merge pull request #5209 from Citadel-Station-13/upstream-merge-35149 
[MIRROR] [s] Reverts smoke and foam buffs, disable foam combining
 2018-01-31 03:00:07 -06:00
LetterJay
58da631638 Merge pull request #5192 from Citadel-Station-13/upstream-merge-34599 
[MIRROR] adds extendohands
 2018-01-30 23:16:22 -06:00
vuonojenmustaturska
eafccb8330 Reverts smoke and foam buffs, disable foam combining 2018-01-30 22:44:30 -06:00
CitadelStationBot
02b3e47fc3 [MIRROR] Cosmic Bedsheet (#5170) 
* adds cosmic space bedsheet

* Cosmic Bedsheet
 2018-01-30 07:31:26 -06:00
CitadelStationBot
eb9bfbcbb0 [MIRROR] Expand Cyborg (#5183) 
* Expand Cyborg (#34958)

* Expand Cyborg

* i ded pls nerf

* Oh sheet

* Expand Cyborg
 2018-01-30 07:30:51 -06:00
CitadelStationBot
0b330482fc [MIRROR] New Coffin Sprite (#5190) 
* coffins have a new sprite (#34995)

* New Coffin Sprite
 2018-01-30 07:24:18 -06:00
PKPenguin321
e4dd53a89f adds extendohands (#34599) 
* adds extendohands

* adds to arcade prizes, crafting menu
also adds an alternate named/desc'd version for arcade prizes

* removes the else

* actual conflict fix instead of accidental revert

* ACME -> acme
 2018-01-29 21:56:44 -06:00
Jordan Brown
b9f575fa11 Merge pull request #34926 from ShizCalev/morguetray-revenant 
Makes revenants spawn on dead bodies & bodycontainers
 2018-01-28 18:03:41 -06:00
Leo
59eac5ca55 Merge pull request #34983 from tgstation/Cyberboss-patch-1 
Removes /New() from landmarks
 2018-01-28 15:08:25 -06:00
81Denton
547a80eb22 [Ready] Rebalances Chameleon Kits for lowpop (#34972) 
* 🆑 Denton, Anonmare, kevinz000
tweak: Removed the player minimum on syndicate chameleon kits.
rscdel: To compensate, regular chameleon kits no longer contain noslip shoes.
tweak: Reduced the chameleon kit price to 2 TC (same total price for kit+noslips).
/🆑

Chameleon kits were given a minimum player limit due to the noslips that come with them.
This PR removes the player limit as well as the noslips, but lowers the TC cost by 2.

That way, lowpop tators can have disguises while highpop has the same total price for the old chameleon+noslips combo.

* Created a shoes/chameleon/noslip subtype and moved the NOSLIP_1 flag to it. Made sure that all other regular noslips refer to the new subtype.
 2018-01-27 23:21:06 -06:00
ShizCalev
e53dbbc2ec Removes landmark tag generation (#34927) 2018-01-26 11:22:22 -06:00
deathride58
acb7d1827b Merge pull request #5119 from Citadel-Station-13/upstream-merge-34884 
[MIRROR] Fixes pneumatic cannon contents deletion
 2018-01-26 15:55:30 +00:00
deathride58
8ee42a5282 Merge pull request #5090 from Citadel-Station-13/upstream-merge-34755 
[MIRROR] All color inputs use current color as default choice
 2018-01-26 15:44:23 +00:00
vuonojenmustaturska
5eb79ec417 Fixes pneumatic cannon contents deletion (#34884) 
* Fix pneumatic cannon contents deletion

* honk

* Update pneumaticCannon.dm
 2018-01-26 04:37:37 -06:00
LetterJay
50c3debdcf Merge pull request #5092 from Citadel-Station-13/upstream-merge-34383 
[MIRROR] You can now defib monkeys
 2018-01-24 21:45:16 -06:00
LetterJay
c2df8bbacc Merge pull request #5087 from Citadel-Station-13/upstream-merge-34848 
[MIRROR] Adds new landmark icons
 2018-01-24 21:42:12 -06:00
LetterJay
793b4be13f Merge pull request #5066 from Citadel-Station-13/upstream-merge-34773 
[MIRROR] Shifts vars off /mob to the correct subtype
 2018-01-24 20:46:46 -06:00
LetterJay
dd31c777a5 Merge pull request #5068 from Citadel-Station-13/upstream-merge-34807 
[MIRROR] Fixes the kitchen spike turning people upside down forever
 2018-01-24 20:46:16 -06:00
MoreRobustThanYou
35be96ed64 You can now defib monkeys (#34383) 
* You can now defib non-human carbons

* WOOPS

* Woops.
 2018-01-24 18:40:05 -06:00
Jordan Brown
51e4d9f9db All color inputs use current color as default choice 2018-01-24 18:14:16 -06:00
ShizCalev
6ed56158e3 Adds new landmark icons (#34848) 
* Adds new landmark icons

* Update

* Blue
 2018-01-24 18:08:33 -06:00
coiax
481f73aba0 Costumes for nuclear operatives 2018-01-24 13:58:35 -06:00
LetterJay
85a7788dd3 Merge branch 'master' into upstream-merge-34773 2018-01-24 13:58:12 -06:00
LetterJay
b898e53be0 Merge pull request #5065 from Citadel-Station-13/upstream-merge-34775 
[MIRROR] Removed named args from visible_message
 2018-01-24 13:54:34 -06:00
LetterJay
ee253a6c54 Merge pull request #5055 from Citadel-Station-13/upstream-merge-34808 
[MIRROR] Abstract landmarks are now indestructible
 2018-01-24 13:52:41 -06:00
LetterJay
8315716380 Merge pull request #5053 from Citadel-Station-13/upstream-merge-34766 
[MIRROR] Xeno nests are no longer held together by bolts.
 2018-01-24 13:51:48 -06:00
KorPhaeron
7267f4a5f3 Fixes the kitchen spike turning people upside down forever (#34807) 2018-01-24 13:02:39 -06:00
ShizCalev
cae2e5e1eb Shifts vars off /mob to the correct subtype 2018-01-24 12:00:05 -06:00
Leo
e71ce4e8cf Merge pull request #34775 from ShizCalev/removed-named-args-from-visible_message 
Removed named args from visible_message
 2018-01-24 11:59:50 -06:00
coiax
d7c317b6d0 Abstract landmarks are now indestructible (#34808) 
In situations where a maxcap has been dropped above the Bridge, which is
generally the Observer-Start landmark's location, it would destroy the
landmark, making observers get a debugging message asking them to ahelp
when they observed.

There should be a better way of making an object indestructible from any
ingame effect without having to make it QDEL_HINT_LETMELIVE...
 2018-01-24 06:12:57 -06:00
kevinz000
f903330b0e Xeno nests are no longer held together by bolts. (#34766) 
* Update bed.dm

* Update alien_nest.dm
 2018-01-24 06:12:37 -06:00
Jordan Brown
070a4bc0c4 Merge pull request #34817 from ninjanomnom/stop-pointing-at-me 
Makes the point effect not trigger movement code
 2018-01-24 06:12:29 -06:00
LetterJay
f26f1b5370 Merge pull request #5037 from Citadel-Station-13/upstream-merge-34522 
[MIRROR] Adds ~70 more suicides
 2018-01-23 10:00:04 -06:00
LetterJay
4c2c14784b Merge pull request #5035 from Citadel-Station-13/upstream-merge-34560 
[MIRROR] Adds the Bluespace Drop Pod upgrade to the cargo express console
 2018-01-23 09:59:41 -06:00
LetterJay
30ae21043f Merge pull request #5045 from Citadel-Station-13/upstream-merge-34476 
[MIRROR] Simple rotation component.
 2018-01-23 08:24:19 -06:00
LetterJay
ccf1f97478 Merge pull request #5033 from Citadel-Station-13/upstream-merge-34810 
[MIRROR] [s]Fixes being able to lower w_class of transfer valves
 2018-01-23 08:18:21 -06:00
AnturK
eb7974df7d Simple rotation component. (#34476) 
I'm going to port other rotations to it when i don't feel lazy.
Closes #34064
 2018-01-23 02:09:16 -06:00
MrDoomBringer
4d206f56e8 Adds ~70 more suicides 2018-01-23 01:39:07 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
oranges
630d823d1a Merge pull request #34810 from tgstation/KorPhaeron-patch-2 
[s]Fixes being able to lower w_class of transfer valves
 2018-01-23 01:12:54 -06:00
Cruix
23e5b7f396 Consolidated t-ray scanner code (#34759) 
* Consolidated t-ray scanner code

* Fixed cables not showing up on t-ray scans
 2018-01-22 15:45:07 -06:00
deathride58
5121a272d2 Merge pull request #5003 from Citadel-Station-13/upstream-merge-34717 
[MIRROR] Longer lasting candles.
 2018-01-22 06:24:35 +00:00
LetterJay
61c245ebef Update candle.dm 2018-01-21 23:07:11 -06:00
Tad Hardesty
4f33c20fba Fix radio jammers affecting other z-levels (#34705) 2018-01-21 21:18:00 -06:00
scrubs2009
fac6caffca Longer lasting candles. 2018-01-21 18:14:13 -06:00
deathride58
625d46fa19 Merge pull request #4998 from Citadel-Station-13/upstream-merge-34606 
[MIRROR] Config dir again except this time it works
 2018-01-21 22:41:13 +00:00
Jordan Brown
8dead1da6a Config dir again except this time it works 2018-01-21 12:32:29 -06:00
ShizCalev
68cfdb617b Fixes rev mindswap (#34567) 2018-01-21 12:29:12 -06:00
LetterJay
d24a9d02d3 Merge pull request #4986 from Citadel-Station-13/upstream-merge-34497 
[MIRROR] Adds holy vision (Some mobs can now see blessed tiles)
 2018-01-21 11:55:52 -06:00
LetterJay
a29c1bee0b Merge pull request #4984 from Citadel-Station-13/upstream-merge-34485 
[MIRROR] Couple of chemistry fixes
 2018-01-21 11:54:16 -06:00