shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,123 Commits 5 Branches 0 Tags
08809072bbdc30d44e38e1555c2bbcd09a36aeb5
Commit Graph

12123 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jordan Brown
08809072bb Merge pull request #34558 from AutomaticFrenzy/patch/pda-logs 
Log PDA messages sent by the message monitor console
 2018-01-18 16:48:25 -06:00
CitadelStationBot
8d19f35d33 Automatic changelog generation for PR #4838 [ci skip] 2018-01-18 15:32:03 -06:00
LetterJay
91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
CitadelStationBot
8cf5770ae0 Automatic changelog generation for PR #4908 [ci skip] 2018-01-18 15:26:11 -06:00
LetterJay
a4282dd904 Merge pull request #4908 from Citadel-Station-13/upstream-merge-34533 
[MIRROR] Fixes integrity value for non-reinforced plasma window
 2018-01-18 15:26:07 -06:00
CitadelStationBot
15e7d28033 Fixes integrity value for non-reinforced plasma window 2018-01-18 06:11:01 -06:00
Leo
0d6d7116ff Merge pull request #34533 from Buggy123/patch-56 
Fixes integrity value for non-reinforced plasma window
 2018-01-18 06:11:01 -06:00
CitadelStationBot
d2cbcae629 Automatic changelog generation for PR #4097 [ci skip] 2018-01-18 00:28:06 -06:00
deathride58
3d0d1bd06a Merge pull request #4097 from deathride58/theprthatbulliesjanitormains 
[READY] Makes walking on tiles slowly make them dirty, similar to Baystation, and adds footstep sounds (Featuring sounds from CEV Eris!)
 2018-01-18 06:28:04 +00:00
CitadelStationBot
0733768437 Automatic changelog generation for PR #4906 [ci skip] 2018-01-18 00:03:37 -06:00
LetterJay
4f058dbf6c Merge pull request #4906 from deathride58/mapseparation2 
Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
 2018-01-18 00:03:32 -06:00
deathride58
e22b022e98 Merge pull request #4902 from Vivinet/Vivinet 
Mining Droid + Borg Tank Tread Movement
 2018-01-18 04:59:24 +00:00
deathride58
9bf498c763 Merge pull request #4903 from Citadel-Station-13/upstream-merge-34291 
[MIRROR] Removes sulpheric acid requirement from most computer boards
 2018-01-18 04:59:08 +00:00
CitadelStationBot
cb35507ca9 Automatic changelog generation for PR #4721 [ci skip] 2018-01-17 22:56:52 -06:00
deathride58
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
deathride58
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
deathride58
35635b3cf0 Merge pull request #4892 from theTiji0/bananaSpider 
Banana spider
 2018-01-18 04:55:15 +00:00
deathride58
9e0f8384e5 ATTEMPT NUMBER 2 AT SEPARATING MODIFIED MAPS FROM TG MAPS 2018-01-17 23:51:54 -05:00
deathride58
7411b25113 trying to fix the bug that causes gear with apostrophes in their name to be unusable 2018-01-17 18:31:42 -05:00
deathride58
80f3c9a6da hrmm 2018-01-17 17:58:42 -05:00
deathride58
5fd8606a3f migrates donor items to loadout system, comments out handle_roundstart_items, plus fixes 2018-01-17 17:19:54 -05:00
CitadelStationBot
a1a06bf83d Removes sulpheric acid requirement from most computer boards 2018-01-17 16:02:57 -06:00
kevinz000
62c8371961 Removes sacid requirement 2018-01-17 16:02:57 -06:00
Vivinet
17eaffed26 Update admin.txt 2018-01-17 13:05:35 -08:00
Vivinet
a4ae8856aa Update admin.txt 2018-01-17 13:04:47 -08:00
Vivinet
87c1f34536 Requested changes and then some 
- Moved all modified sprites to modular_citadel, made overrides for sec-tread and eng-tread, reverted original robots.dmi

- Added open cover states to modular_citadel robots.dmi

- Removed light found on normal engi-borg sprite that was not on the tread version.
 2018-01-17 13:03:57 -08:00
CitadelStationBot
3cc63f486b Automatic changelog generation for PR #4901 [ci skip] 2018-01-17 14:15:40 -06:00
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
deathride58
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
Vivinet
4d05dc1829 Mining Droid + Borg Tank Tread Movement 
- Adds the mining droid sprite to the default mining borg module selection.

- Adds movement states for both security and engineering tank tread sprites.

- Fixed static security tread state sprite.
 2018-01-17 11:52:47 -08: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
deathride58
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
LetterJay
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
LetterJay
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