shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,082 Commits 5 Branches 0 Tags
8c743141daea48c8f89b4b99d6033a43044e6eed
Commit Graph
12082 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
deathride58andGitHub 8c743141da Merge pull request #4721 from deathride58/genitalexamine 
Exposed genitals will now add details onto examine text
 2018-01-18 04:56:50 +00:00
CitadelStationBot 766577f19c Automatic changelog generation for PR #4839 [ci skip] 2018-01-17 22:56:20 -06:00
deathride58andGitHub f92f1f0390 Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1 
Shock collars
 2018-01-18 04:56:18 +00:00
CitadelStationBot c7c4d0a86b Automatic changelog generation for PR #4892 [ci skip] 2018-01-17 22:55:17 -06:00
deathride58andGitHub 35635b3cf0 Merge pull request #4892 from theTiji0/bananaSpider 
Banana spider
 2018-01-18 04:55:15 +00:00
CitadelStationBot 3cc63f486b Automatic changelog generation for PR #4901 [ci skip] 2018-01-17 14:15:40 -06:00
deathride58andGitHub 45818d03b3 Merge pull request #4901 from Citadel-Station-13/upstream-merge-33916 
[MIRROR] [READY] Allows the supermatter's radiation collectors to produce research points in short bursts
 2018-01-17 20:15:38 +00:00
deathride58andGitHub cc1babf6c3 Merge pull request #4900 from Citadel-Station-13/upstream-merge-34509 
[MIRROR] Super Surplus Crate
 2018-01-17 20:15:13 +00:00
CitadelStationBot cb89e42edf Automatic changelog generation for PR #4899 [ci skip] 2018-01-17 14:14:57 -06:00
deathride58andGitHub e8e6b3e770 Merge pull request #4899 from Citadel-Station-13/upstream-merge-34500 
[MIRROR] fixes a mass recall runtime error that prevented it from working
 2018-01-17 20:14:55 +00:00
CitadelStationBot 66f94d09ac Automatic changelog generation for PR #4896 [ci skip] 2018-01-17 14:13:53 -06:00
deathride58andGitHub 28aae2cf35 Merge pull request #4896 from Citadel-Station-13/upstream-merge-34507 
[MIRROR] Add JMP buttons to SDQL select results
 2018-01-17 20:13:51 +00:00
deathride58andGitHub d7e2967bc8 Merge pull request #4891 from Citadel-Station-13/upstream-merge-34502 
[MIRROR] Update Space Station 13 decal on RuntimeStation
 2018-01-17 20:13:17 +00:00
CitadelStationBot 285df6f118 Automatic changelog generation for PR #4895 [ci skip] 2018-01-17 14:13:02 -06:00
deathride58andGitHub 656fb45fd2 Merge pull request #4895 from Citadel-Station-13/upstream-merge-34353 
[MIRROR] Ghosts can start CTF on their own
 2018-01-17 20:13:00 +00:00
deathride58andGitHub e14795291d Merge pull request #4889 from Citadel-Station-13/upstream-merge-34319 
[MIRROR] Fails travis on common mapping mistakes
 2018-01-17 20:12:39 +00:00
deathride58andGitHub c7d3dd7e41 Merge pull request #4888 from Citadel-Station-13/upstream-merge-34322 
[MIRROR] Removes ash flora being harvested on roundstart
 2018-01-17 20:11:36 +00:00
CitadelStationBot 80a0c9d90a Automatic changelog generation for PR #4887 [ci skip] 2018-01-17 14:11:14 -06:00
deathride58andGitHub a0319643bd Merge pull request #4887 from Citadel-Station-13/upstream-merge-34378 
[MIRROR] Pirates are now skeletons
 2018-01-17 20:11:12 +00:00
CitadelStationBot f8ed2a93db Automatic changelog generation for PR #4886 [ci skip] 2018-01-17 14:10:47 -06:00
deathride58andGitHub 7b4214b199 Merge pull request #4886 from Citadel-Station-13/upstream-merge-34427 
[MIRROR] Reebe rifts no longer instantly teleport you on collision, and servant blockers also block airflow
 2018-01-17 20:10:45 +00:00
CitadelStationBot da996f994c [READY] Allows the supermatter's radiation collectors to produce research points in short bursts 2018-01-17 11:18:22 -06:00
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
CitadelStationBot 00bff19da6 Super Surplus Crate 2018-01-17 07:29:04 -06:00
Jordan BrownandCitadelStationBot 13a399b8be Merge pull request #34509 from Iamgoofball/patch-365 
Super Surplus Crate
 2018-01-17 07:29:04 -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
CitadelStationBot 1dbf7fea74 fixes a mass recall runtime error that prevented it from working 2018-01-17 07:10:30 -06:00
Jordan BrownandCitadelStationBot b6150e8525 Merge pull request #34500 from Xhuis/recallfix 
fixes a mass recall runtime error that prevented it from working
 2018-01-17 07:10:30 -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
CitadelStationBot 3f45b5e216 Add JMP buttons to SDQL select results 2018-01-16 21:42:12 -06:00
Jordan BrownandCitadelStationBot 4f2716f312 Merge pull request #34507 from AutomaticFrenzy/patch/sdql-jmp 
Add JMP buttons to SDQL select results
 2018-01-16 21:42:12 -06:00
CitadelStationBot 67d95e4840 Ghosts can start CTF on their own 2018-01-16 19:21:33 -06:00
Jack EdgeandCitadelStationBot 87cdaf0932 Ghosts can start CTF on their own 
🆑 coiax
add: If enough people vote to start CTF (by clicking on a CTF controller
as a ghost), then CTF will automatically begin.
/🆑

- CTF will no longer restart 30 seconds after it ends, it requires
people to vote for it.
- Victory messages are coloured with the team's colour.
- Current number of people required to start CTF is 4 people.
 2018-01-16 19:21:33 -06:00