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

12937 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJay a45e8527db Merge pull request #5121 from Citadel-Station-13/upstream-merge-34935 
[MIRROR] OH GOD HOW DID THE MAPS GET SMALLER?
 2018-01-31 03:02:10 -06:00
CitadelStationBot 87df04d3f0 Automatic changelog generation for PR #5212 [ci skip] 2018-01-31 03:00:40 -06:00
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
CitadelStationBot 3d67efdfe9 Automatic changelog generation for PR #5211 [ci skip] 2018-01-31 03:00:27 -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
CitadelStationBot c1db81da0d Automatic changelog generation for PR #5209 [ci skip] 2018-01-31 03:00:11 -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 b75d9cccf3 Merge pull request #5205 from Citadel-Station-13/upstream-merge-35112 
[MIRROR] Adds information regarding porting code/assets from other codebases
 2018-01-31 02:24:42 -06:00
CitadelStationBot 306ec6859a Automatic changelog generation for PR #5200 [ci skip] 2018-01-30 23:17:12 -06:00
LetterJay 0d2b1db67c Merge pull request #5200 from improvedname/loudout-skirt 
Adds security skirts to the loadout
 2018-01-30 23:17:10 -06:00
LetterJay 5b948125ca Merge pull request #5199 from Vivinet/darkinterface 
Dark theme for the general interface
 2018-01-30 23:16:58 -06:00
CitadelStationBot 84cbaecb0f Automatic changelog generation for PR #5195 [ci skip] 2018-01-30 23:16:43 -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
CitadelStationBot bc5e3917a5 Automatic changelog generation for PR #5192 [ci skip] 2018-01-30 23:16:24 -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
CitadelStationBot 8b75c2c605 Heartless humans now display as unsuitable for abductor experiments 2018-01-30 22:44:58 -06:00
vuonojenmustaturska a334c51b20 Heartless humans now display as unsuitable for abductor experiments (#34951) 2018-01-30 22:44:58 -06:00
CitadelStationBot 4148dee418 Cleans up wirer code. 2018-01-30 22:44:49 -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
CitadelStationBot 72c82e5a96 [s] Reverts smoke and foam buffs, disable foam combining 2018-01-30 22:44:30 -06:00
vuonojenmustaturska eafccb8330 Reverts smoke and foam buffs, disable foam combining 2018-01-30 22:44:30 -06:00
CitadelStationBot 7e03ac9948 Removes Tech-Disk Exports 2018-01-30 22:44:22 -06:00
Liam e292b050f8 bye 2018-01-30 22:44:21 -06:00
CitadelStationBot 537f1584a5 [s] Fix bobby tables 2018-01-30 22:44:13 -06:00
vuonojenmustaturska ec182ac486 Merge pull request #35125 from Cyberboss/BlameTheBee 
[s] Fix bobby tables
 2018-01-30 22:44:13 -06:00
CitadelStationBot 9a09d3b83a Adds information regarding porting code/assets from other codebases 2018-01-30 22:43:54 -06:00
FrozenGuy5 b6b774a026 Adds information regarding porting code/assets from other codebases (#35112) 
* we need more license memes in our contributing.md

* adds goon's licensing

* contributing memes

* licenses are too serious for kor
 2018-01-30 22:43:54 -06:00
CitadelStationBot f4c44d004a Automatic changelog generation for PR #5198 [ci skip] 2018-01-30 10:14:26 -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
Improvedname 3db7412fb7 adds loudout stuff... 2018-01-30 15:10:04 +01: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 e5b8057f18 Automatic changelog generation for PR #5183 [ci skip] 2018-01-30 07:30:53 -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 a965828526 Automatic changelog generation for PR #5187 [ci skip] 2018-01-30 07:26:06 -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 4cfcc77bd4 Automatic changelog generation for PR #5190 [ci skip] 2018-01-30 07:24:20 -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 fd97ae832c Automatic changelog generation for PR #5191 [ci skip] 2018-01-30 07:23:49 -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
Vivinet b0c94deff3 Removed interface/skin.dmf from the tgstation.dme.dme. Added a new interface located in modular_citadel/interface/skin.dmf, this should be a one for one clone of the original interface skin.dmf with a darker tone. 2018-01-29 21:26:40 -08:00
CitadelStationBot e5b34c80e2 Fixes blood contract names 2018-01-29 21:57:11 -06:00
Jordan Brown bfd6f8b792 Fixes blood contract names (#35064) 2018-01-29 21:57:11 -06:00
CitadelStationBot 78df41fcf1 adds extendohands 2018-01-29 21:56:44 -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
CitadelStationBot ad9a8b470c Fixes being able to bomb servant blockers 2018-01-29 21:55:38 -06:00