shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
12,359 Commits 5 Branches 0 Tags
c18ce156e29c1d4823e28cc870fb7c44294f4bba
Commit Graph
4630 Commits
Author SHA1 Message Date
AnturKandCitadelStationBot 3dc89ba058 Antag Panel / Check antagonists Refactor 2018-01-19 08:43:49 -06:00
RobustinandCitadelStationBot 7a16f0a3ef Temperature Refactor and Fixes 2018-01-19 08:41:34 -06:00
AnturKandCitadelStationBot 6354c6eec5 Moves creating tag before intialization (#34512) 
* Moves creating tag before intialization

* Two nukes for price of one.

* coord
 2018-01-19 08:41:24 -06:00
LetterJayandGitHub 9adbe08df8 Merge pull request #4923 from Vivinet/xeno-fix 
Temp. Xeno-Hybrid Eye Fix + Normal Leg Addition
 2018-01-19 03:21:14 -06:00
LetterJayandGitHub caa0d29bc8 Merge pull request #4926 from Citadel-Station-13/upstream-merge-34213 
[MIRROR] [ready] Adds a system to get a stack trace as a list.
 2018-01-19 02:52:29 -06:00
LetterJayandGitHub cd178d9756 Merge pull request #4921 from Citadel-Station-13/upstream-merge-34472 
[MIRROR] Fixes irreparable plating, deprecates broken & burnt vars on maps
 2018-01-19 02:51:51 -06:00
LetterJayandGitHub 6981bcfab2 Merge pull request #4909 from Citadel-Station-13/upstream-merge-34541 
[MIRROR] Adds a Recipe for morphine to medicine
 2018-01-19 02:49:12 -06:00
Jordan BrownandCitadelStationBot 9478478ca1 Merge pull request #34213 from MrStonedOne/gibstacktrace 
[ready] Adds a system to get a stack trace as a list.
 2018-01-18 22:45:39 -06:00
Vivinet 18fa25cc17 Temp. Xeno Eye Fix - Leg Addition 
Added:
-The option to select eye color for xenos so players selecting this species can blend in the eyes with the head. The eyes weren't originally there but due to upstream changed are now rendered as white, souless eyes.
- Using the lizard normal leg sprites, added the option for the xeno species to use normal legs or digi-grade ones.
 2018-01-18 18:20:58 -08:00
ShizCalevandCitadelStationBot f93ca08aa7 Fixes irreparable plating (#34472) 2018-01-18 20:13:25 -06:00
deathride58andGitHub 61ccb255c4 Merge pull request #4915 from Citadel-Station-13/upstream-merge-34438 
[MIRROR] Mass hallucinations now gives the same hallucination to everyone
 2018-01-19 00:32:11 +00:00
Jordan BrownandCitadelStationBot 05d87d54a3 Merge pull request #34438 from XDTM/EqualHallucinations 
Mass hallucinations now gives the same hallucination to everyone
 2018-01-18 16:52:03 -06:00
Jordan BrownandCitadelStationBot 594e8c8e6d Merge pull request #34553 from ShizCalev/abstract-transfertoloc 
Fixes being able to place abstract items in fridges & chem dispensers
 2018-01-18 16:48:32 -06:00
LetterJayandGitHub 91299a6152 Merge pull request #4838 from deathride58/loadoutsystem 
[READY FOR TESTMERGE] Ports Hippie's loadout system
 2018-01-18 15:32:00 -06:00
OrdonisandCitadelStationBot c2f8339135 Adds a Recipe for morphine to medicine (#34541) 
* Adds a Recipe for morphine to medicine

Exactly what it says on the tin.

* Ketrazine

Adds ketrazine, a combat stimulant with severe consequences for use.

* Revert "Ketrazine"

This reverts commit d618fe337cc28f5513c59ff3399894c10dde4a7d.
 2018-01-18 15:07:13 -06:00
deathride58andGitHub 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
LetterJayandGitHub 4f058dbf6c Merge pull request #4906 from deathride58/mapseparation2 
Map syncs + ATTEMPT 2 OF MODIFIED MAP SEPARATION
 2018-01-18 00:03:32 -06:00
deathride58andGitHub 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
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
deathride58andGitHub f92f1f0390 Merge pull request #4839 from Citadel-Station-13/LetterJay-patch-1 
Shock collars
 2018-01-18 04:56:18 +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
kevinz000andCitadelStationBot 62c8371961 Removes sacid requirement 2018-01-17 16:02:57 -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
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 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
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 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
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 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
Jordan BrownandCitadelStationBot 13a399b8be Merge pull request #34509 from Iamgoofball/patch-365 
Super Surplus Crate
 2018-01-17 07:29:04 -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
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
deathride58 b74518a24a adds more loadout equipment, adds working ckey whitelist system, and more 2018-01-16 16:23:22 -05:00
orangesandCitadelStationBot c9afc3e53d Merge pull request #34319 from ShizCalev/travis-maps 
Fails travis on common mapping mistakes
 2018-01-16 14:37:26 -06:00
orangesandCitadelStationBot ebdb8b1e16 Merge pull request #34322 from coiax/no-longer-harvested 
Removes ash flora being harvested on roundstart
 2018-01-16 14:36:13 -06:00
orangesandCitadelStationBot ebfc1c3d9c Cleans up some redundant stripped_input usage 2018-01-16 14:32:25 -06:00
orangesandCitadelStationBot 4a6b246b4c Merge pull request #34473 from kevinz000/techwebs_points 
Nerfs techweb cargo points
 2018-01-16 14:31:12 -06:00
kevinz000andCitadelStationBot ba16e3a100 Fixes lavaboat buckling (#34450) 
* Buckle order

* lavaboats
 2018-01-16 14:31:02 -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
orangesandCitadelStationBot 2dd1f1f799 Merge pull request #34470 from Cyberboss/MoveMotd 
Moves load_motd to config controller
 2018-01-16 14:28:07 -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
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
LetterJayandGitHub 01344aacdf Merge pull request #4868 from Citadel-Station-13/upstream-merge-34171 
[MIRROR] Refactors how flashes get targets and whatnot, so they no longer work from inside containers to outside.
 2018-01-16 13:48:40 -06:00
LetterJayandGitHub ba5d3c8938 Merge pull request #4867 from Citadel-Station-13/upstream-merge-34479 
[MIRROR] newly built air alarms now start unlocked too, this isn't powercreep this is quality of life
 2018-01-16 13:48:26 -06:00
LetterJayandGitHub 8b89832d76 Merge pull request #4864 from Citadel-Station-13/upstream-merge-34463 
[MIRROR] Fixes duplicate reagents in chemistry macros
 2018-01-16 13:47:50 -06:00