shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,033 Commits 5 Branches 0 Tags
a0a323236027df87b978a8620c905afd4eafb2e8
Commit Graph
12033 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andCitadelStationBot a0a3232360 [READY] Allows the supermatter's radiation collectors to produce research points in short bursts (#33916) 
* allows radiation collectors present on the station roundstart to generate research points

* fixes bitcoin production rate, fixes multitool not activating multitool_act properly

* adds sounds, adds hint text, makes all rad collectors created on the station z-level connect to rnd, and fixes multitools acting weird

* nerfs criticism, makes rad collectors simply check for techwebs and z-level each process instead of during initialization

* fixes compiling error, is_station_level
 2018-01-17 11:18:21 -06:00
LetterJayandGitHub bf7a6e4340 Merge pull request #4885 from Citadel-Station-13/upstream-merge-34464 
[MIRROR] Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-17 10:06:17 -06:00
LetterJayandGitHub 59e5a71e78 Merge pull request #4884 from Citadel-Station-13/upstream-merge-34468 
[MIRROR] Cleans up some redundant stripped_input usage
 2018-01-17 09:45:04 -06:00
CitadelStationBot f4bb94f04e Automatic changelog generation for PR #4890 [ci skip] 2018-01-17 09:41:08 -06:00
LetterJayandGitHub dea706ba74 Merge pull request #4890 from Citadel-Station-13/upstream-merge-34520 
[MIRROR] Techwebs Cargo Point Changelog
 2018-01-17 09:41:06 -06:00
LetterJayandGitHub 6bcf918111 Update message.dm 2018-01-17 09:40:34 -06:00
LetterJayandGitHub 0381765c81 Merge pull request #4883 from Citadel-Station-13/upstream-merge-34473 
[MIRROR] Nerfs techweb cargo points
 2018-01-17 09:39:54 -06:00
LetterJayandGitHub ab9fa43088 Merge pull request #4882 from Citadel-Station-13/upstream-merge-34450 
[MIRROR] Fixes lavaboat buckling
 2018-01-17 09:39:39 -06:00
LetterJayandGitHub 78b13e5317 Merge pull request #4865 from Citadel-Station-13/upstream-merge-34323 
[MIRROR] Fixes webhook diff selecting partial match
 2018-01-17 09:39:20 -06:00
LetterJayandGitHub aaee67bee5 Merge pull request #4858 from Citadel-Station-13/upstream-merge-34449 
[MIRROR] Fixes recycler/anything with mat container emagging.
 2018-01-17 09:39:05 -06:00
LetterJayandGitHub 86610b5e0e Merge pull request #4881 from Citadel-Station-13/upstream-merge-34124 
[MIRROR] Makes report issue handle null round IDs and server names
 2018-01-17 09:38:41 -06:00
CitadelStationBot 2821dcff07 Automatic changelog generation for PR #4879 [ci skip] 2018-01-17 09:36:58 -06:00
LetterJayandGitHub 9fbbb018e8 Merge pull request #4879 from Citadel-Station-13/upstream-merge-34457 
[MIRROR] Combine and fix Show Air Status and Air Status in Location
 2018-01-17 09:36:56 -06:00
LetterJayandGitHub 8a04f19e0a Merge pull request #4877 from Citadel-Station-13/upstream-merge-34470 
[MIRROR] Moves load_motd to config controller
 2018-01-17 09:36:43 -06:00
CitadelStationBot 895dbc2ef6 Automatic changelog generation for PR #4876 [ci skip] 2018-01-17 09:36:36 -06:00
LetterJayandGitHub a05b64c7e7 Merge pull request #4876 from Citadel-Station-13/upstream-merge-34429 
[MIRROR] Fix RPD embedding fixtures inside lattices and girders
 2018-01-17 09:36:33 -06:00
LetterJayandGitHub 5329408366 Merge pull request #4880 from Citadel-Station-13/upstream-merge-34477 
[MIRROR] Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-17 09:36:20 -06:00
LetterJayandGitHub 3d045b87e2 Merge pull request #4878 from Citadel-Station-13/upstream-merge-34413 
[MIRROR] Allows C4 on mobs again
 2018-01-17 07:26:38 -06:00
LetterJayandGitHub 78c33f32ba Update github_webhook_processor.php 2018-01-17 02:36:51 -06:00
LetterJayandGitHub 127cf702a6 Update cards_ids.dm 2018-01-17 02:36:39 -06:00
Jordan BrownandCitadelStationBot 71ade788d9 Techwebs Cargo Point Changelog 2018-01-16 14:40:44 -06:00
CitadelStationBot 2c94ddd318 Removed the dumb iscultist() check in runed metal's attack() proc 2018-01-16 14:32:34 -06:00
orangesandCitadelStationBot 25fc0d0161 Merge pull request #34464 from uraniummeltdown/dumbcult 
Removed the dumb iscultist() check in runed metal's attack() proc
 2018-01-16 14:32:33 -06:00
orangesandCitadelStationBot ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
CitadelStationBot ab11a26b0c Nerfs techweb cargo points 2018-01-16 14:31:12 -06:00
orangesandCitadelStationBot 4a6b246b4c Merge pull request #34473 from kevinz000/techwebs_points 
Nerfs techweb cargo points
 2018-01-16 14:31:12 -06:00
CitadelStationBot faaacf533f Fixes lavaboat buckling 2018-01-16 14:31:02 -06:00
kevinz000andCitadelStationBot ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -06:00
CitadelStationBot 02499469d4 Makes report issue handle null round IDs and server names 2018-01-16 14:29:49 -06:00
Jordan BrownandCitadelStationBot 8292194863 Makes report issue handle null round IDs and server names (#34124) 
* Makes report issue handle null round IDs and server names

* What Leo said

* Add missing bracket

* Parenthesis intensify
 2018-01-16 14:29:49 -06:00
CitadelStationBot dafa0f0a7a Adds component incompatible crash to root level so everything doesn't have to do it itself 2018-01-16 14:29:40 -06:00
orangesandCitadelStationBot b128a28cf3 Merge pull request #34477 from tgstation/Cyberboss-patch-2 
Adds component incompatible crash to root level so everything doesn't have to do it itself
 2018-01-16 14:29:40 -06:00
CitadelStationBot 9356dd733e Combine and fix Show Air Status and Air Status in Location 2018-01-16 14:29:29 -06:00
orangesandCitadelStationBot 9dda16954b Merge pull request #34457 from AutomaticFrenzy/patch/air-status 
Combine and fix Show Air Status and Air Status in Location
 2018-01-16 14:29:29 -06:00
CitadelStationBot aaf9250a4a Allows C4 on mobs again 2018-01-16 14:28:17 -06:00
orangesandCitadelStationBot 1f7e25be0a Merge pull request #34413 from kevinz000/patch-430 
Allows C4 on mobs again
 2018-01-16 14:28:17 -06:00
CitadelStationBot 62a8edd6b4 Moves load_motd to config controller 2018-01-16 14:28:07 -06:00
orangesandCitadelStationBot 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -06:00
CitadelStationBot 74d2eb4332 Fix RPD embedding fixtures inside lattices and girders 2018-01-16 14:26:53 -06:00
orangesandCitadelStationBot 9ff1be35cc Merge pull request #34429 from AutomaticFrenzy/patch/rpd-bad-placement 
Fix RPD embedding fixtures inside lattices and girders
 2018-01-16 14:26:53 -06:00
CitadelStationBot d2d1a063a7 Automatic changelog generation for PR #4875 [ci skip] 2018-01-16 13:50:32 -06:00
LetterJayandGitHub 6bcd56a0f3 Merge pull request #4875 from Citadel-Station-13/upstream-merge-34482 
[MIRROR] Drone dispensers no longer trap the drones below them forcing ghosts to altclick
 2018-01-16 13:50:29 -06:00
CitadelStationBot 83226705df Automatic changelog generation for PR #4874 [ci skip] 2018-01-16 13:50:12 -06:00
LetterJayandGitHub 36dd99b376 Merge pull request #4874 from Citadel-Station-13/upstream-merge-34505 
[MIRROR] Fix Camera Failure crashing the server if there are no cameras
 2018-01-16 13:50:10 -06:00
CitadelStationBot 70a9fbaacb Automatic changelog generation for PR #4873 [ci skip] 2018-01-16 13:49:56 -06:00
LetterJayandGitHub df1e76aa5f Merge pull request #4873 from Citadel-Station-13/upstream-merge-34484 
[MIRROR] Ash storms are no longer so LOUD inside buildings.
 2018-01-16 13:49:53 -06:00
CitadelStationBot 1761f69114 Automatic changelog generation for PR #4872 [ci skip] 2018-01-16 13:49:34 -06:00
LetterJayandGitHub 05989168e7 Merge pull request #4872 from Citadel-Station-13/upstream-merge-34401 
[MIRROR] Stray bullets and explosions don't blow up the entire syndi lava base anymore
 2018-01-16 13:49:32 -06:00
CitadelStationBot 920a916161 Automatic changelog generation for PR #4871 [ci skip] 2018-01-16 13:49:21 -06:00
LetterJayandGitHub 7d7042fc60 Merge pull request #4871 from Citadel-Station-13/upstream-merge-34475 
[MIRROR] Makes tanks made of metal
 2018-01-16 13:49:18 -06:00