shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,883 Commits 5 Branches 0 Tags
49fa09d1bdf18ed1d4ec5dc6d4b7218c90246c21
Commit Graph
1033 Commits
Author SHA1 Message Date
LetterJayandGitHub 49fa09d1bd Merge pull request #3578 from Citadel-Station-13/upstream-merge-31944 
[MIRROR] Atmos construction rework again
 2017-10-27 02:00:11 -04:00
LetterJayandGitHub 4cc0cf3ee7 Merge pull request #3606 from Citadel-Station-13/upstream-merge-31972 
[MIRROR] Greyscale cables
 2017-10-26 16:53:08 -04:00
Emmett GainesandCitadelStationBot ae86a75362 Greyscale cables 2017-10-25 21:46:57 -05:00
Kyle Spier-SwensonandCitadelStationBot 927dea03ce Fixes excessive overlay churn (#32065) 
* Fixes excessive overlay chern

Adding an overlay on every cross and uncross of every player (with how bloody the station gets this is called on just about every fucking movement, some times multiple times if there are multiple types of stains (oil, blood, alien, etc) is an excessive as fuck amount of chern in the overlay subsystem.

This is likely the cause of overlays being so high.

* I APOLOGIZE FOR NOTHING!
 2017-10-25 21:45:46 -05:00
kevinz000andCitadelStationBot 0986857f18 Update crayons.dm (#32024) 2017-10-24 08:07:42 -05:00
LetterJayandGitHub 00da8a2ead Merge pull request #3575 from deathride58/mapsyncs1 
Map Syncs - TG-gnawed-on-too-many-cables Edition
 2017-10-23 23:02:23 -04:00
duncathan saltandCitadelStationBot ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
LetterJayandGitHub fc07e15f61 Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992 
[MIRROR] Fixes being unable to merge full stacks
 2017-10-23 14:52:28 -04:00
LetterJayandGitHub c17d1dce40 Merge pull request #3559 from Citadel-Station-13/upstream-merge-31948 
[MIRROR] Fixes champrojector camera bugs
 2017-10-23 14:50:34 -04:00
LetterJayandGitHub ce2f1cc672 Merge pull request #3554 from Citadel-Station-13/upstream-merge-31981 
[MIRROR] Removes mob.lastattacked and replaces lastattacker with a string
 2017-10-23 14:48:10 -04:00
LetterJayandGitHub 23765d9ddd Update stunbaton.dm 2017-10-23 13:17:35 -05:00
deathride58 c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
YPOQandCitadelStationBot 2c251f929f Fixes being unable to merge full stacks (#31992) 2017-10-23 00:09:29 -05:00
MoreRobustThanYouandCitadelStationBot 5504b4c1e2 Fixes champrojector camera bug (#31948) 2017-10-22 17:50:11 -05:00
vuonojenmustaturskaandCitadelStationBot 1794018ae1 Removes mob.lastattacked and replaces lastattacker with a string 2017-10-22 11:29:35 -05:00
FirecageandCitadelStationBot 25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
CitadelStationBotandPoojawa d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBotandPoojawa adc2e46114 [MIRROR] Does some code standardization/consistency. (#3161) 
* Does some code standardization/consistency.

* fixes merge conflict generation

* Missed a few, oops

* Update pierrot_throat.dm
 2017-10-21 06:10:22 -05:00
CitadelStationBotandPoojawa 46a78bc3dd [MIRROR] Reverts bluespace pipes (#3513) 
* Revert bluespace pipes while keeping fixes from the original PR (#31866)

These are absurdely overpowered given that they have no research or
material gate

* Reverts bluespace pipes
 2017-10-20 01:40:15 -05:00
LetterJayandGitHub fe05d8aaaf Merge pull request #3506 from Citadel-Station-13/upstream-merge-31754 
[MIRROR] Stops manned turrets from firing when the user unbuckles themselves from the turret
 2017-10-19 09:24:04 -04:00
LetterJayandGitHub e876293476 Merge pull request #3499 from Citadel-Station-13/upstream-merge-31773 
[MIRROR] Showers clean contamination and make sound
 2017-10-19 09:20:02 -04:00
LetterJayandGitHub 7ca5646119 Merge pull request #3497 from Citadel-Station-13/upstream-merge-31711 
[MIRROR] Removes crewpinpointer from wardens locker
 2017-10-19 09:14:00 -04:00
LetterJayandGitHub 9076721384 Merge pull request #3482 from Citadel-Station-13/upstream-merge-31842 
[MIRROR] GPS renaming fix
 2017-10-19 09:05:18 -04:00
vuonojenmustaturskaandCitadelStationBot 7045809aa2 Stops manned turrets from firing when the user unbuckles themselves from the turret (#31754) 
* The clown is drunk, and the cards of death wait on him

* Update power.dm
 2017-10-19 05:41:41 -05:00
Emmett GainesandCitadelStationBot ee3d18fe58 Showers clean contamination and make sound (#31773) 
* fucking showers

* cleanup
 2017-10-19 03:29:08 -05:00
jughuandCitadelStationBot 25c37ac9bb Removes crewpinpointer from wardens locker (#31711) 
* Update security.dm

* Update security.dm
 2017-10-19 02:02:25 -05:00
LeoandCitadelStationBot 29e20a55de Merge pull request #31842 from GunHog/GPS_Name_Fix 
GPS renaming fix
 2017-10-18 07:23:31 -05:00
LeoandCitadelStationBot 060d43768e Merge pull request #31836 from AnturK/pdalogfix 
Fixes recipient in pda logs
 2017-10-18 07:23:12 -05:00
LetterJayandGitHub 250f55e072 Merge pull request #3477 from Citadel-Station-13/upstream-merge-31630 
[MIRROR] Datum rev & related upgrades to base datum antag
 2017-10-18 07:42:54 -04:00
LetterJayandGitHub 799e52c5b0 Merge pull request #3479 from Citadel-Station-13/upstream-merge-31838 
[MIRROR] Fixes foam layer popping
 2017-10-18 07:42:48 -04:00
LetterJayandGitHub 92fa0ca960 Merge pull request #3473 from Citadel-Station-13/upstream-merge-31809 
[MIRROR] Cleans up some istypes not using helpers
 2017-10-18 07:37:43 -04:00
LetterJayandGitHub b89142a35b Merge pull request #3471 from Citadel-Station-13/upstream-merge-31810 
[MIRROR] Fixes being able to pick up brass chairs
 2017-10-18 07:37:05 -04:00
LeoandCitadelStationBot 3894b463bf Merge pull request #31838 from ShizCalev/foam-layer-fix 
Fixes foam layer popping
 2017-10-18 05:16:52 -05:00
AnturKandCitadelStationBot 2ecb4c216c Datum rev & related upgrades to base datum antag 2017-10-18 02:26:11 -05:00
LeoandCitadelStationBot 28656d3347 Merge pull request #31809 from ShizCalev/helper-cleanup 
Cleans up some istypes not using helpers
 2017-10-17 19:21:14 -05:00
Ashe HiggsandCitadelStationBot 13d8414369 Fixes being able to pick up brass chairs (#31810) 2017-10-17 15:33:23 -05:00
ShizCalevandCitadelStationBot bcb077a526 Fixes slapper inhand (#31793) 2017-10-17 13:36:17 -05:00
LetterJayandGitHub d6daa8b3e9 Merge pull request #3454 from Citadel-Station-13/upstream-merge-31699 
[MIRROR] Increasew the size of the katana from normal to huge
 2017-10-17 08:59:20 -04:00
LetterJayandGitHub e3922656fc Merge pull request #3452 from Citadel-Station-13/upstream-merge-31761 
[MIRROR] obj_break() will always be called before obj_destruction()
 2017-10-17 08:58:20 -04:00
LetterJayandGitHub db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00
LetterJayandGitHub 3f339a9908 Merge pull request #3444 from Citadel-Station-13/upstream-merge-31742 
[MIRROR] Removes a misleading message when handling full stacks of sheets.
 2017-10-17 08:55:33 -04:00
orangesandCitadelStationBot baae0dcd15 Merge pull request #31699 from jughu/Misc 
Increasew the size of the katana from normal to huge
 2017-10-17 03:49:58 -05:00
orangesandCitadelStationBot 8353428c43 Merge pull request #31761 from tgstation/Cyberboss-patch-3 
obj_break() will always be called before obj_destruction()
 2017-10-17 03:44:31 -05:00
kevinz000andCitadelStationBot a41725a955 Atmospherics Multilayer Pipes (#30972) 
* 1

* rpd

* 3

* 4

* 5

* 6

* 7

* 8

* wew

* src. and underlays

* update

* woops

* misspelled params

* reviews

* fixes

* fixes

* better checks and layer crap

* Update RPD.dm

* Update pipe_construction.dm

* 3 layers, fixes

* woops i didn't update defines correctly

* dunc

* Fixes

* Fixes

* fixes

* fixes some more bullshit

* fixes

* fixes

* not needed

* makes attachment sprites prettier or uglier i dunno

* Unary flag

* sprite fix??

* fixes...

* sprite fixes
 2017-10-17 00:49:12 -05:00
vuonojenmustaturskaandCitadelStationBot 6e1ef37f10 stops message spam (#31742) 2017-10-16 16:48:45 -05:00
KorPhaeronandCitadelStationBot 74c6e7e23f Fixes godhand having no inhand sprite (#31744) 
* Fixes godhand having no inhand

* Correct file paths
 2017-10-16 14:34:11 -05:00
LetterJayandGitHub 24631746d4 Merge pull request #3414 from Citadel-Station-13/upstream-merge-31707 
[MIRROR] Restores security bombsuit & white bombsuit
 2017-10-16 14:12:28 -04:00
LetterJayandGitHub 638290e121 Merge pull request #3433 from Citadel-Station-13/upstream-merge-31765 
[MIRROR] Fixed fancy boxes not showing proper content amount.
 2017-10-16 10:40:06 -04:00
LetterJayandGitHub 568ed91f28 Merge pull request #3430 from Citadel-Station-13/upstream-merge-30599 
[MIRROR] Moves projectile processing to a subsystem
 2017-10-16 10:39:41 -04:00
Jordan BrownandCitadelStationBot 98fb887ccc Merge pull request #31765 from DaxDupont/fancythis 
Fixed fancy boxes not showing proper content amount.
 2017-10-16 07:15:04 -05:00