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

4830 Commits

Author SHA1 Message Date
LetterJay 903a89e281 Merge pull request #5213 from Citadel-Station-13/upstream-merge-35045 
[MIRROR] Turrets now check borgs!
 2018-01-31 04:12:11 -06:00
LetterJay 7ac807afa6 Merge pull request #5184 from Citadel-Station-13/upstream-merge-34849 
[MIRROR] Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC
 2018-01-31 04:07:37 -06:00
LetterJay 3dc5dc2974 Merge pull request #5181 from Citadel-Station-13/upstream-merge-35003 
[MIRROR] Makes the asset cache faster
 2018-01-31 04:06:43 -06:00
LetterJay 32256336b3 Merge pull request #5177 from deathride58/mycomputerisapotato 
Moves toggle animal digestion button to object tab
 2018-01-31 04:05:45 -06:00
LetterJay fb5125bd16 Merge pull request #5171 from Citadel-Station-13/upstream-merge-35027 
[MIRROR] Adds cloning data disks to techwebs
 2018-01-31 03:03:15 -06:00
LetterJay 9a24afb8a4 Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950 
[MIRROR] Readds bz canisters to cargo order packs
 2018-01-31 03:02:31 -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 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 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
ExcessiveUseOfCobblestone 31cf679ce9 Turrets now check borgs! (#35045) 
* epic

* epic2

* epic

* 150 hours

* 150^2 hours
 2018-01-30 22:45:10 -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
Liam e292b050f8 bye 2018-01-30 22:44:21 -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 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 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
Ashe Higgs 597b2864eb Adds the reverse bear trap item, available to traitor clowns in the uplink for 5 TC (#34849) 
* Do you want to play a game?

* removes leftover code from earlier dev

* Some things

* optimizations, from the heart, for the soul
 2018-01-29 21:55:27 -06:00
Poojawa 6af1b18712 [MIRROR] Makes the asset cache faster 
https://github.com/tgstation/tgstation/pull/35003

Origional PR
 2018-01-29 13:10:45 -06:00
deathride58 5300ebdeee Moves toggle animal digestion button to object tab 2018-01-28 23:49:32 -05:00
Mark9013100 c7498412ee Adds cloning data disks to techwebs 2018-01-28 22:06:45 -06: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 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
Nick 124f68bf87 Readds bz canisters to cargo order packs (#34950) 
* Update packs.dm

* Update packs.dm
 2018-01-28 18:39:07 -06: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
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
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 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
LetterJay 3f3ef78428 Merge pull request #5139 from Citadel-Station-13/upstream-merge-35034 
[MIRROR] Revert "Power Cell explosions are now log"
 2018-01-28 03:59:21 -06:00
LetterJay 157295d1f6 Merge pull request #5138 from Citadel-Station-13/upstream-merge-34972 
[MIRROR] [Ready] Rebalances Chameleon Kits for lowpop
 2018-01-28 03:59:10 -06:00
LetterJay c86b256eee Merge pull request #5132 from Citadel-Station-13/upstream-merge-34791 
[MIRROR] Mobs start with a random nutrition amount
 2018-01-28 03:58:38 -06:00
Jack Edge b1b9f5cbee Syndicate comms agents have Codespeak training 
🆑 coiax
add: Nanotrasen Security Division has reported that syndicate comms agents,
both on lavaland and in space, have had training in "Codespeak", a top
secret language for stealthy communication.
/🆑

Why? So they can secret talk with traitors that actually buy Codespeak
books.
 2018-01-27 23:22:06 -06:00
oranges 38f0f17fb7 Merge pull request #35031 from KorPhaeron/imthecook 
Stops titlescreen chef spam
 2018-01-27 23:21:39 -06:00
vuonojenmustaturska cbfe2c997b Revert "Power Cell explosions are now log" 2018-01-27 23:21:15 -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
LetterJay f3aaef86eb Merge pull request #5135 from Citadel-Station-13/boring-slug-ban 
Fixes borer banning href oversight
 2018-01-27 14:19:00 -06:00
LetterJay 6a4027766d Merge pull request #5133 from Citadel-Station-13/upstream-merge-34799 
[MIRROR] Makes Chameleon Kits less restricted
 2018-01-27 14:18:30 -06:00
LetterJay d83ac344fa Merge pull request #5126 from Citadel-Station-13/upstream-merge-34945 
[MIRROR] Slows Simple Clowns
 2018-01-27 14:17:42 -06:00