shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,886 Commits 5 Branches 0 Tags
6b0bb7268e2eebca95021e1baaf8a770cc7af631
Commit Graph

490 Commits

Author SHA1 Message Date
LetterJay 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
CitadelStationBot 2f74805a46 [MIRROR] Fixes teleporters not actually denying teleports from Centcom (#3598) 
* Merge pull request #32043 from tgstation/Cyberboss-patch-3

Fixes teleporters not actually denying teleports from Centcom

* Fixes teleporters not actually denying teleports from Centcom
 2017-10-25 20:02:36 -05:00
deathride58 70a2c466f3 manual mirror of upstream robotic surgery pr 2017-10-25 14:29:45 -04:00
LetterJay 98fbe6e813 Update shutters.dm 2017-10-24 15:26:28 -05:00
ShizCalev 889d2ba74e Moves opened firedoors underneath opened airlocks 2017-10-24 00:05:43 -05:00
LetterJay 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
LetterJay 6360be2041 Merge pull request #3571 from Citadel-Station-13/upstream-merge-31883 
[MIRROR] Removes duplicate typecaches
 2017-10-23 20:16:51 -04:00
duncathan salt ed12370a73 Atmos construction rework again 2017-10-23 16:29:53 -05:00
LetterJay 3243eaa6b8 Merge pull request #3573 from Citadel-Station-13/upstream-merge-32003 
[MIRROR] fixes AIs being able to teleport the id card console inserted cards to their core
 2017-10-23 16:54:57 -04:00
LetterJay ad3bafcb42 Update motion.dm 2017-10-23 14:16:15 -05:00
LetterJay 9367eb23c5 Update iv_drip.dm 2017-10-23 14:15:20 -05:00
vuonojenmustaturska 636ab7d156 Removes mob references from camera motion tracking 2017-10-23 13:32:32 -05:00
deathride58 c1bd7bc6ba Map syncs 1 - Code syncs 2017-10-23 12:56:26 -04:00
kevinz000 f4e0eab993 fixes AIs being able to teleport the id card console inserted cards to their core (#32003) 
* Update card.dm

* Update card.dm
 2017-10-23 08:59:24 -05:00
Jordan Brown c51edc3bcd Removes duplicate typecaches 2017-10-23 08:25:30 -05:00
LetterJay 095839becf Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969 
[MIRROR] Gets rids of spawns in airlock code
 2017-10-23 04:05:19 -04:00
LetterJay 8b4c183a26 Update lightswitch.dm 2017-10-22 10:55:52 -05:00
MoreRobustThanYou 26d6e9e67b Gets rids of spawns in airlock code (#31969) 
* Gets rids of spawns in airlock code

* Update airlock.dm
 2017-10-22 00:16:54 -05:00
Firecage 25b5bb3e44 Code Consistency: luminosity --> light_range 2017-10-22 00:06:35 -05:00
CitadelStationBot d25cb1ba5d [MIRROR] Grammar fixes to atom descriptions (#3165) 
* Grammar fixes to atom descriptions

* compile errors
 2017-10-21 07:17:03 -05:00
CitadelStationBot 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
CitadelStationBot 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
LetterJay 72c8c8318d Merge pull request #3507 from Citadel-Station-13/upstream-merge-31819 
[MIRROR] Fixes AI visiblity checks
 2017-10-19 09:24:28 -04:00
LetterJay b31d291ede Merge pull request #3486 from Citadel-Station-13/upstream-merge-31753 
[MIRROR] Radiation makes you vomit blood and some more balance changes
 2017-10-19 08:57:18 -04:00
YPOQ d04818e6f9 Fixes AI visiblity checks (#31819) 2017-10-19 05:42:52 -05:00
Poojawa 45eeebd001 Sleeper nerfs (#3478) 2017-10-19 04:01:59 -05:00
Emmett Gaines 04d26d561a Radiation makes you vomit blood and more balance changes (#31753) 2017-10-18 09:25:11 -05:00
CitadelStationBot 7f9d13ab42 [MIRROR] Removes 200mb of wasted memory usage (#3472) 
* Merge pull request #31835 from MrStonedOne/coiax-is-fired---again

Removes 200mb of wasted memory usage

* Removes 200mb of wasted memory usage
 2017-10-17 22:18:19 -05:00
LetterJay db421c0f6b Merge pull request #3451 from Citadel-Station-13/upstream-merge-30972 
[MIRROR] Atmospherics Multilayer Pipes
 2017-10-17 08:58:10 -04:00
kevinz000 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
vuonojenmustaturska af81a902fd Fixes some copypasted airlocks referring to nonexistent overlay sprites (#31741) 2017-10-16 16:48:52 -05:00
kevinz000 ed96224d3a Moves projectile processing to a subsystem 2017-10-15 21:51:24 -05:00
LetterJay 499254761c Merge pull request #3399 from Citadel-Station-13/upstream-merge-31671 
[MIRROR] ID ejecting from computers by alt-clicking
 2017-10-15 10:22:04 -04:00
Jordan Brown 5bb7618aa9 Merge pull request #31671 from kingofkosmos/altclickejectidfromcomputers 
ID ejecting from computers by alt-clicking
 2017-10-14 18:48:13 -05:00
vuonojenmustaturska 1831bc8ea9 Allows mobs to get shocked when they smash things (#31677) 
also fixes an unrelated runtime involving magillitis
 2017-10-14 15:19:37 -05:00
LetterJay 45619b0e1b Merge pull request #3365 from Citadel-Station-13/upstream-merge-31601 
[MIRROR] Fix many instances of "the the"
 2017-10-14 15:37:00 -04:00
LetterJay c442f49cde Merge pull request #3373 from Citadel-Station-13/upstream-merge-31645 
[MIRROR] Cleans up explosives at syndie base
 2017-10-14 10:20:27 -04:00
LetterJay 4b48651380 Merge pull request #3372 from Citadel-Station-13/upstream-merge-31646 
[MIRROR] You can now drag-drop people into open DNA scanners
 2017-10-14 10:20:11 -04:00
LetterJay 5bbf3b9735 Merge pull request #3370 from Citadel-Station-13/upstream-merge-31620 
[MIRROR] Fixes various Nanotrasen capitalizations
 2017-10-14 10:19:15 -04:00
LetterJay d6903bcf3c Merge branch 'master' into upstream-merge-31601 2017-10-14 10:17:16 -04:00
LetterJay 8aebc3b15a Merge pull request #3364 from Citadel-Station-13/upstream-merge-30909 
[MIRROR] Radiation rework and subsystem
 2017-10-13 23:58:04 -04:00
ShizCalev c7afe4f70e Cleans up explosives at syndie base ruin (#31645) 2017-10-13 16:29:36 -05:00
MoreRobustThanYou fdffebb3b8 You can now drag-drop people into open DNA scanners (#31646) 2017-10-13 16:28:24 -05:00
francinum f63adc1931 Fixes various Nanotrasen capitalizations (#31620) 
* Fixes capitalization of Nanotrasen for secsuits

gimme the GBP

* Fixes this one too
 2017-10-13 12:13:26 -05:00
Jordan Brown bd7a0d65b5 Fix many instances of "the the" 2017-10-13 09:41:54 -05:00
Emmett Gaines 55e8f6526c Radiation rework and subsystem 2017-10-13 09:22:23 -05:00
Jordan Brown 1941a8fcfa Merge pull request #31614 from AnturK/zap 
Fixes electrocution animation
 2017-10-13 09:14:45 -05:00
Dax Dupont 856b6ba853 Allows sillicons to use vending machines. (#31541) 
* Allows borgs to use vending machines.

* Allows AI to use vending machines.
 2017-10-12 00:29:43 -05:00
Jordan Brown 7b30be0058 Merge pull request #31494 from MrStonedOne/tick_contention_tug_of_war 
In which the stoner one gets stoned and tries to address tick contention... again
 2017-10-10 13:28:38 -05:00
LetterJay 26800c1d1d Merge pull request #3267 from Citadel-Station-13/upstream-merge-31399 
[MIRROR] Allows you to choose how much to insert into protolathe/exofab/circuitprinter/dronedispenser
 2017-10-10 05:54:08 -04:00