shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
13,728 Commits 5 Branches 0 Tags
f7cb4791ea44b26433767cc41eb38c2e1eb8ffa2
Commit Graph

13728 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
CitadelStationBot f7cb4791ea Apples now taste like apples 2018-02-15 14:52:26 -06:00
oranges 7fd53748f0 Merge pull request #35606 from coiax/hydroponic-foods-taste 
Apples now taste like apples
 2018-02-15 14:52:26 -06:00
deathride58 1cda9ef2b4 Merge pull request #5491 from Citadel-Station-13/upstream-merge-35692 
[MIRROR] Moves garbage up in the init order
 2018-02-15 17:07:02 +00:00
CitadelStationBot 5f99140d8b Moves garbage up in the init order 2018-02-15 10:38:03 -06:00
vuonojenmustaturska e6487cc5ef Merge pull request #35692 from Cyberboss/GarbagePreInit 
Moves garbage up in the init order
 2018-02-15 10:38:02 -06:00
deathride58 95582c597b Temporarily disables lavaland lighting (#5486) 
* temporarily disables lavaland lighting

* almost forgot the dme changes
 2018-02-15 02:41:18 -08:00
deathride58 ec58b19bf8 Merge pull request #5487 from Citadel-Station-13/upstream-merge-35660 
[MIRROR] [s] Trit no longer makes radiation
 2018-02-15 02:37:05 +00:00
CitadelStationBot fbaaa3e488 [s] Trit no longer makes radiation 2018-02-14 19:14:14 -06:00
Jordie fe63a4527f Merge pull request #35660 from Iamgoofball/patch-397 
[s] Trit no longer makes radiation
 2018-02-14 19:14:14 -06:00
deathride58 a13d41a675 Merge pull request #5483 from Citadel-Station-13/upstream-merge-35579 
[MIRROR] Disables emagging Centcom Ferry
 2018-02-14 17:09:36 +00:00
CitadelStationBot 44d2759921 [MIRROR] Fixes near_camera runtime (#5482) 
* Merge pull request #35624 from ShizCalev/near_camera-runtime-fix

Fixes near_camera runtime

* Fixes near_camera runtime
 2018-02-14 10:56:19 -06:00
CitadelStationBot 283a0418a3 [MIRROR] Makes the kinetic crusher's damage on examine a little more accurate (#5481) 
* Merge pull request #35617 from ChangelingRain/crusherdescfix

Makes the kinetic crusher's damage on examine a little more accurate

* Makes the kinetic crusher's damage on examine a little more accurate
 2018-02-14 10:55:47 -06:00
CitadelStationBot e0ab141341 [MIRROR] Updates die to use the roll() proc + initialize() (#5480) 
* Merge pull request #35564 from praisenarsie/patch-29

Updates die to use the roll() proc + initialize()

* Updates die to use the roll() proc + initialize()
 2018-02-14 10:54:58 -06:00
CitadelStationBot 2f54dee8fe Disables emagging Centcom Ferry 2018-02-14 10:19:50 -06:00
kevinz000 1309f0a22f Disables emagging Centcom Ferry (#35579) 2018-02-14 10:19:50 -06:00
CitadelStationBot 9b4770f855 [MIRROR] Mining tools now use tool system (#5462) 
* Mining tools now use tool system

* Update hydroponics.dm
 2018-02-14 05:36:15 -06:00
CitadelStationBot 5d18ffef44 Automatic changelog generation for PR #5451 [ci skip] 2018-02-13 22:11:48 -06:00
deathride58 4ac2101d1a Merge pull request #5451 from deathride58/GIANTSYNCNUMBER2049623045 
TG Sync #4985279348672983476
 2018-02-14 04:11:44 +00:00
CitadelStationBot e526719a9e Automatic changelog generation for PR #5477 [ci skip] 2018-02-13 22:10:35 -06:00
deathride58 5bf11ca6d5 Merge pull request #5477 from Citadel-Station-13/upstream-merge-35506 
[MIRROR] Assblasts some power creep in circuit labs
 2018-02-14 04:10:32 +00:00
deathride58 e0eb4999fe Merge pull request #5476 from Citadel-Station-13/upstream-merge-35610 
[MIRROR] Cleans up turf underneath fridges
 2018-02-14 03:51:44 +00:00
deathride58 aa3ee6b6e2 Merge pull request #5475 from Citadel-Station-13/upstream-merge-35605 
[MIRROR] Fixes ai transform being picky
 2018-02-14 03:34:13 +00:00
deathride58 d8b3726437 Merge pull request #5474 from Citadel-Station-13/upstream-merge-35618 
[MIRROR] Fixes process_dead diseases not processing at all
 2018-02-14 03:22:34 +00:00
CitadelStationBot 0a4608e81c Automatic changelog generation for PR #5473 [ci skip] 2018-02-13 21:09:54 -06:00
deathride58 04f852af24 Merge pull request #5473 from Citadel-Station-13/upstream-merge-35612 
[MIRROR] Prevents docking ports from being thrown away by chasms
 2018-02-14 03:09:52 +00:00
CitadelStationBot 0c18c28349 Assblasts some power creep in circuit labs 2018-02-13 21:09:35 -06:00
Dax Dupont 98c9e0948f Assblasts some power creep in circuit labs (#35506) 
* Circuit printers no longer start upgraded.

* Replaces roundstart upgraded printer with regular printer

* Replaces roundstart upgraded printer with regular printer w\ key remap
 2018-02-13 21:09:35 -06:00
deathride58 132b8cc816 Merge pull request #5472 from Citadel-Station-13/upstream-merge-35427 
[MIRROR] Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities
 2018-02-14 03:08:23 +00:00
deathride58 6be0f70bf8 Merge pull request #5471 from Citadel-Station-13/upstream-merge-35584 
[MIRROR] Greentext antag datum and OnRoundend hook.
 2018-02-14 03:02:13 +00:00
CitadelStationBot 6a7ae39dfc Cleans up turf underneath fridges 2018-02-13 21:00:14 -06:00
Jordan Brown 38fdf92660 Merge pull request #35610 from ShizCalev/fridge-cleanup 
Cleans up turf underneath fridges
 2018-02-13 21:00:14 -06:00
CitadelStationBot 9bd4479fd8 Fixes ai transform being picky 2018-02-13 21:00:06 -06:00
Jordan Brown 807a2ebaeb Merge pull request #35605 from MrStonedOne/patch-481 
Fixes ai transform being picky
 2018-02-13 21:00:05 -06:00
CitadelStationBot 38b965fb4d Fixes process_dead diseases not processing at all 2018-02-13 20:58:48 -06:00
Jordan Brown da5cc6a8cc Merge pull request #35618 from YPOQ/processdeaddiseasefix 
Fixes process_dead diseases not processing at all
 2018-02-13 20:58:48 -06:00
CitadelStationBot 44b662882e Prevents docking ports from being thrown away by chasms 2018-02-13 20:57:36 -06:00
Jordan Brown 70f90f8252 Merge pull request #35612 from vuonojenmustaturska/vuonojenmustaturska-patch-1 
Prevents docking ports from being thrown away by chasms
 2018-02-13 20:57:35 -06:00
CitadelStationBot ff8f35fc0e Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities 2018-02-13 20:47:14 -06:00
ExcessiveUseOfCobblestone 745ca227c3 Fixes Battlecruiser Turrets and Improves Turret's Faction Capabilities (#35427) 
* Update portable_turret.dm

* Update portable_turret.dm

* Update portable_turret.dm

* f
 2018-02-13 20:47:14 -06:00
CitadelStationBot 01f76f4588 Automatic changelog generation for PR #5440 [ci skip] 2018-02-13 19:56:23 -06:00
deathride58 040c43a531 Merge pull request #5440 from cebutris/analbeads 
Ports prayer beads from Paradise
 2018-02-14 01:56:21 +00:00
CitadelStationBot fc92759584 Automatic changelog generation for PR #5470 [ci skip] 2018-02-13 19:47:44 -06:00
deathride58 568ab46076 Merge pull request #5470 from Citadel-Station-13/upstream-merge-35649 
[MIRROR] Disables clogged vents until it can be reworked
 2018-02-14 01:47:41 +00:00
CitadelStationBot 20694145b8 Greentext antag datum and OnRoundend hook. 2018-02-13 19:43:55 -06:00
AnturK 38145c93c7 Greentext antag datum and OnRoundend hook. (#35584) 
* Greentext antag datum and OnRoundend hook.

* review stuff
 2018-02-13 19:43:54 -06:00
CitadelStationBot 52566c5038 Disables clogged vents until it can be reworked 2018-02-13 18:46:43 -06:00
vuonojenmustaturska 9041b0b264 Disables clogged vents until it can be reworked 2018-02-13 18:46:43 -06:00
CitadelStationBot f857f53524 Automatic changelog generation for PR #5469 [ci skip] 2018-02-13 18:37:51 -06:00
deathride58 668e0ed088 Merge pull request #5469 from Citadel-Station-13/upstream-merge-35607 
[MIRROR] Transference potions rename the mob to just your name
 2018-02-14 00:37:49 +00:00
deathride58 eb72a2fe12 Merge pull request #5468 from Citadel-Station-13/upstream-merge-35647 
[MIRROR] Fix for invisible heartboxes
 2018-02-14 00:37:19 +00:00