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

3229 Commits

Author SHA1 Message Date
LetterJay
b450d5bce1 Merge pull request #5212 from Citadel-Station-13/upstream-merge-34951 
[MIRROR] Heartless humans now display as unsuitable for abductor experiments
 2018-01-31 03:00:38 -06:00
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
LetterJay
ce8114b291 Merge pull request #5185 from Citadel-Station-13/upstream-merge-35047 
[MIRROR] Fixes being able to bomb servant blockers
 2018-01-30 23:15:52 -06:00
vuonojenmustaturska
a334c51b20 Heartless humans now display as unsuitable for abductor experiments (#34951) 2018-01-30 22:44:58 -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
vuonojenmustaturska
5541395022 Merge pull request #35047 from ShizCalev/servant_blocker-bomb 
Fixes being able to bomb servant blockers
 2018-01-29 21:55:38 -06:00
deathride58
34b93a8d42 Merge pull request #5159 from Citadel-Station-13/upstream-merge-34926 
[MIRROR] Makes revenants spawn on dead bodies & bodycontainers
 2018-01-29 02:30:17 +00:00
deathride58
7673583ce1 Merge pull request #5157 from Citadel-Station-13/upstream-merge-35025 
[MIRROR] Warp whistle now respects notransform
 2018-01-29 02:29:18 +00: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
b543882c64 Merge pull request #35025 from vuonojenmustaturska/toot 
Warp whistle now respects notransform
 2018-01-28 15:08:33 -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
LetterJay
2d4065e15c Merge pull request #5143 from Citadel-Station-13/upstream-merge-34866 
[MIRROR] Fixes the eminence getting spammed by blessed tiles.
 2018-01-28 04:01:20 -06:00
Dax Dupont
643e58714e Fixes the eminence getting spammed by blessed tiles. (#34866) 
* Fixes the eminence getting spammed by blessed tiles.

* Forgot to commit this

* world time meme
 2018-01-27 23:21:48 -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
0dcb98f754 Merge pull request #5115 from Citadel-Station-13/upstream-merge-34918 
[MIRROR] Correct spelling of armament
 2018-01-26 15:54:46 +00:00
deathride58
3c017a55ec Merge pull request #5108 from Citadel-Station-13/upstream-merge-34891 
[MIRROR] Fixes airlocks playing closing sound while already closed
 2018-01-26 15:50:57 +00:00
deathride58
90611e16ed Merge pull request #5101 from Citadel-Station-13/upstream-merge-34873 
[MIRROR] Fixes Infinite Airlock Materials
 2018-01-26 15:47:29 +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
Jordan Brown
721f628f60 Merge pull request #34918 from AutomaticFrenzy/patch/armament 
Correct spelling of armament
 2018-01-26 03:01:01 -06:00
Jordan Brown
fc5cf12523 Merge pull request #34891 from YPOQ/closesoundfix 
Fixes airlocks playing closing sound while already closed
 2018-01-26 03:00:00 -06:00
uraniummeltdown
cb8e239bd7 fixes not being able to weld mineral plating off of a mineral airlock turned into mineral airlock assembly 2018-01-26 02:58:43 -06:00
LetterJay
0c86312618 Merge pull request #5100 from Citadel-Station-13/upstream-merge-34860 
[MIRROR] Fixes double camera assemblies when deconstructing cameras
 2018-01-25 14:15:29 -06:00
LetterJay
13c3c7b4e7 Merge pull request #5038 from Citadel-Station-13/upstream-merge-34466 
[MIRROR] Fake nuclear disks are even more convincing
 2018-01-25 13:41:02 -06:00
Leo
90bcf0ef84 Merge pull request #34860 from YPOQ/camerafix 
Fixes double camera assemblies when deconstructing cameras
 2018-01-25 05:11:07 -06:00
LetterJay
9234d01b76 Merge pull request #5069 from Citadel-Station-13/upstream-merge-33773 
[MIRROR] [Ready]Minor Slime Update: slimepeople get the slime language, slimes speak slime instead of common
 2018-01-25 00:51:00 -06:00
LetterJay
d73cd1d35f Merge pull request #5095 from Citadel-Station-13/upstream-merge-34752 
[MIRROR] Clown traitors can buy clown bombs now
 2018-01-24 21:45:51 -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
1dffa54809 Merge pull request #5091 from Citadel-Station-13/upstream-merge-34623 
[MIRROR] Makes templates able to use PlaceOnTop
 2018-01-24 21:44:21 -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
imsxz
e9cdf72439 less than 100 2018-01-24 21:23:37 -06:00
LetterJay
b89007ade5 Merge pull request #5080 from Citadel-Station-13/upstream-merge-34746 
[MIRROR] Makes the autolathe repeat it's animation while it's still printing.
 2018-01-24 20:48:03 -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
LetterJay
f0b83ee23d Merge pull request #5074 from Citadel-Station-13/upstream-merge-34611 
[MIRROR] One can no longer use cogscarab as a form of Eminence priority.
 2018-01-24 20:45:16 -06:00
LetterJay
d573e67ff6 Merge pull request #5072 from Citadel-Station-13/upstream-merge-34487 
[MIRROR] Costumes for nuclear operatives
 2018-01-24 20:44:43 -06:00
LetterJay
cbaca56dbf Merge pull request #5071 from Citadel-Station-13/upstream-merge-34458 
[MIRROR] Refactors and nerfs Fleshmend
 2018-01-24 20:44:30 -06:00
LetterJay
ad50662c94 Merge pull request #5070 from Citadel-Station-13/upstream-merge-34285 
[MIRROR] Gives clockwork marauders a reasonable cost/cooldown
 2018-01-24 20:44:15 -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
829cf4d180 Merge pull request #34623 from ninjanomnom/template-placeontop 
Makes templates able to use PlaceOnTop
 2018-01-24 18:18:31 -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
LetterJay
072056f919 Update fleshmend.dm 2018-01-24 15:40:05 -06:00