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

8390 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
198677b4cf Merge pull request #5211 from Citadel-Station-13/upstream-merge-35116 
[MIRROR] Cleans up wirer code.
 2018-01-31 03:00:24 -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
e6574a34f6 Merge pull request #5208 from Citadel-Station-13/upstream-merge-35069 
[MIRROR] Removes Tech-Disk Exports
 2018-01-31 02:59:37 -06:00
LetterJay
3e7fa2cbdb Merge pull request #5207 from Citadel-Station-13/upstream-merge-35125 
[MIRROR] [s] Fix bobby tables
 2018-01-31 02:25:16 -06:00
LetterJay
d49a578463 Merge pull request #5195 from Citadel-Station-13/upstream-merge-35064 
[MIRROR] Fixes blood contract names
 2018-01-30 23:16:41 -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
Iamgoofball
8e6aaf70c3 Cleans up wirer code. (#35116) 
* Cleans up wirer code.

🆑 Iamgoofball
fix: Minor code cleanup on the wirer
/🆑
 2018-01-30 22:44:49 -06:00
vuonojenmustaturska
eafccb8330 Reverts smoke and foam buffs, disable foam combining 2018-01-30 22:44:30 -06:00
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
vuonojenmustaturska
ec182ac486 Merge pull request #35125 from Cyberboss/BlameTheBee 
[s] Fix bobby tables
 2018-01-30 22:44:13 -06:00
CitadelStationBot
f3c585935f [MIRROR] Typo fix in Bubblegum desc and outdated comment (#5198) 
* Merge pull request #35055 from 81Denton/hecking-typo

Typo fix in Bubblegum desc and outdated comment

* Typo fix in Bubblegum desc and outdated comment
 2018-01-30 10:14:23 -06:00
CitadelStationBot
cb58800683 [MIRROR] The punisher no longer punishes ticker subsystems with delayed fires (#5174) 
* Merge pull request #34964 from MrStonedOne/patch-463

The punisher no longer punishes ticker subsystems with delayed fires

* The punisher no longer punishes ticker subsystems with delayed fires
 2018-01-30 07:32:34 -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
c93df0ae55 [MIRROR] Makes fire colorful and anime (#5187) 
* Makes fire colorful and anime (#34977)

* - Makes fire colorful and anime

* - Updates light color on fires
- Makes fire update color less often (1/7th as often)

* - Changes the transition from blue to purple to be much more gradual, it starts at 40000 and peaks at 120000 Kelvin now
- Changes fusion fire (>4 million Kelvin) to have a slight colorshift to it (It's just the druggy overlay).

* - Moves fire above gas (and everything else)
- Changes fire alpha for low temperature fires to compensate for items no longer rendering on top of fire

* - Makes the new fire layer a define and makes sure it isn't above "Hyperspace Ripples" whatever that is

* - Removes comment

* - FIRE_LAYER is already defined for burning humans.

* Makes fire colorful and anime
 2018-01-30 07:26:04 -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
CitadelStationBot
001dbde0c9 [MIRROR] Sexy Solar Sprites (#5191) 
* replaced solar panel sprites with better ones

* Sexy Solar Sprites
 2018-01-30 07:23:46 -06:00
CitadelStationBot
670bc6a929 [MIRROR] Better Chat Squashing (#5193) 
* Merge pull request #35058 from uraniummeltdown/chatsquash

Better Chat Squashing

* Better Chat Squashing
 2018-01-30 07:23:18 -06:00
Jordan Brown
bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -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
3e2292ac1d Merge pull request #5166 from Cyberboss/patch-1 
Fixes the mapdiffbot issue
 2018-01-29 02:31:15 +00:00
deathride58
9dc6a9dacb Merge pull request #5161 from Citadel-Station-13/upstream-merge-34992 
[MIRROR] Microwave Powercrêpe
 2018-01-29 02:30:49 +00:00
deathride58
1e9e50fa03 Merge pull request #5160 from Citadel-Station-13/upstream-merge-34939 
[MIRROR] Increases Drone Speed
 2018-01-29 02:30:34 +00: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
deathride58
539621a846 Merge pull request #5127 from Citadel-Station-13/upstream-merge-34875 
[MIRROR] Removes overhead and fixes null runtime with NAMEOF
 2018-01-29 02:29:00 +00:00
deathride58
90cd07e798 Merge pull request #5109 from Citadel-Station-13/upstream-merge-34913 
[MIRROR] Fixes not being able to stop tail wagging
 2018-01-29 02:28:31 +00:00
Jordan Brown
8261e15126 Fixes the mapdiffbot issue 2018-01-28 21:18:21 -05:00
uraniummeltdown
f868cb146f alt-click on microwave to cook (#34992) 2018-01-28 18:29:27 -06:00
Anonmare
1eae1971e3 Increases Drone Speed (#34939) 
* Increases Drone Speed

* Update _drone.dm

* I'm not changing it again
 2018-01-28 18:27:14 -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
LetterJay
84be31bb00 Update unsorted.dm 2018-01-28 15:19:22 -06:00
LetterJay
da5d277ddb Merge pull request #5156 from Citadel-Station-13/upstream-merge-34983 
[MIRROR] Removes /New() from landmarks
 2018-01-28 15:18:06 -06:00
LetterJay
b690ac4af1 Merge pull request #5151 from Citadel-Station-13/upstream-merge-35018 
[MIRROR] Rice (pudding) is no longer a salad.
 2018-01-28 15:16:52 -06:00
LetterJay
a05921f657 Merge pull request #5150 from Citadel-Station-13/upstream-merge-34982 
[MIRROR] Makes lighting corner optimization a little more sane
 2018-01-28 15:16:39 -06:00
LetterJay
cc5c6ec9a3 Merge pull request #5149 from Citadel-Station-13/upstream-merge-34996 
[MIRROR] Fixes held_mob release runtime
 2018-01-28 15:16:28 -06:00
LetterJay
044c13f607 Update emote.dm 2018-01-28 15:13:12 -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
vuonojenmustaturska
f005e65ab0 Merge pull request #35018 from DaxDupont/rice-pudding 
Rice (pudding) is no longer a salad.
 2018-01-28 11:34:14 -06:00
Jordan Brown
307e028811 Merge pull request #34982 from vuonojenmustaturska/lightingdeopt 
Makes lighting corner optimization a little more sane
 2018-01-28 10:34:04 -06:00
Leo
13d9ea5a1c Merge pull request #34996 from ShizCalev/held_mob-runtime 
Fixes held_mob release runtime
 2018-01-28 10:22:41 -06:00
vuonojenmustaturska
6c855bfcee fix lizard jobs (#34994) 2018-01-28 08:16:23 -06:00
LetterJay
5964f97877 Merge pull request #5145 from Citadel-Station-13/upstream-merge-34940 
[MIRROR] Syndicate comms agents have Codespeak training
 2018-01-28 04:02:01 -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
LetterJay
335bcfaff1 Merge pull request #5142 from Citadel-Station-13/upstream-merge-35031 
[MIRROR] Stops titlescreen chef spam
 2018-01-28 04:00:03 -06:00