shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,958 Commits 5 Branches 0 Tags
b13d4dd72185b80d02ce5fb84d6bd38b43b3d35c
Commit Graph
10958 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub b13d4dd721 Merge pull request #4572 from Citadel-Station-13/upstream-merge-33807 
[MIRROR] Made atoms not smooth with shuttles
 2017-12-29 06:23:12 -06:00
LetterJayandGitHub 93914f2a31 Merge pull request #4571 from Citadel-Station-13/upstream-merge-33902 
[MIRROR] Fixes admin fingerprintslast
 2017-12-29 06:23:01 -06:00
LetterJayandGitHub f093bb8fec Merge pull request #4570 from Citadel-Station-13/upstream-merge-33856 
[MIRROR] Fixes AI eyes getting nullspaced when jumping to deleted cameras
 2017-12-29 06:22:35 -06:00
CitadelStationBot 9320c7493f Automatic changelog generation for PR #4569 [ci skip] 2017-12-29 06:22:28 -06:00
LetterJayandGitHub 3c204c0125 Merge pull request #4569 from Citadel-Station-13/upstream-merge-33867 
[MIRROR] Fixes ethanol + book reaction message
 2017-12-29 06:22:26 -06:00
LetterJayandGitHub bbaee9f3d7 Merge pull request #4568 from Citadel-Station-13/upstream-merge-33880 
[MIRROR] Fixes wall CanPass
 2017-12-29 06:22:13 -06:00
LetterJayandGitHub 69766d8a32 Merge pull request #4567 from Citadel-Station-13/upstream-merge-33869 
[MIRROR] Add a new and improved mapmerge
 2017-12-29 06:21:58 -06:00
deathride58andGitHub 96543b5e63 Merge pull request #4566 from Citadel-Station-13/upstream-merge-33881 
[MIRROR] Makes reset_perspective handle turf as eye
 2017-12-29 06:48:10 +00:00
CitadelStationBot fa8b710fde Automatic changelog generation for PR #4556 [ci skip] 2017-12-29 00:47:19 -06:00
deathride58andGitHub b03a8a70db Merge pull request #4556 from Citadel-Station-13/upstream-merge-33442 
[MIRROR] [READY]Adds picking up corgis and pAIs!
 2017-12-29 06:47:17 +00:00
deathride58andGitHub bc6df43cd0 Merge pull request #4565 from Citadel-Station-13/upstream-merge-33879 
[MIRROR] Removes typepath from random event admin message
 2017-12-29 06:45:22 +00:00
deathride58andGitHub 55db5a5a8c Merge pull request #4564 from Citadel-Station-13/upstream-merge-33861 
[MIRROR] Christmas event changes
 2017-12-29 06:44:44 +00:00
CitadelStationBot cc2a18680d Made atoms not smooth with shuttles 2017-12-29 00:29:04 -06:00
CruixandCitadelStationBot ab408d3e97 Made atoms not smooth with shuttles (#33807) 
* Made atoms not smooth with shuttles

* Shuttle area canSmoothWithAreas is automatically assigned to the area's type if it is null

* Moved pirate shuttle areas into the multi-area shuttles section
 2017-12-29 00:29:04 -06:00
orangesandCitadelStationBot 4e1770a21f Fixes admin fingerprintslast 2017-12-29 00:28:55 -06:00
CitadelStationBot f7bcdb6f6b Fixes AI eyes getting nullspaced when jumping to deleted cameras 2017-12-29 00:28:47 -06:00
YPOQandCitadelStationBot 6fac704a4f Fixes AI eyes getting nullspaced when jumping to deleted cameras (#33856) 2017-12-29 00:28:47 -06:00
CitadelStationBot f456e78783 Fixes ethanol + book reaction message 2017-12-29 00:28:40 -06:00
RobustinandCitadelStationBot 4157c30fd8 Fixes ethanol + book reaction message (#33867) 2017-12-29 00:28:40 -06:00
CitadelStationBot 6712938b17 Fixes wall CanPass 2017-12-29 00:28:33 -06:00
AnturKandCitadelStationBot fbdf24ddd4 Fixes wall CanPass (#33880) 2017-12-29 00:28:32 -06:00
CitadelStationBot 0eb47b3e7e Add a new and improved mapmerge 2017-12-29 00:28:25 -06:00
Tad HardestyandCitadelStationBot 61f00cbfb0 Add a new and improved mapmerge (#33869) 
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
 2017-12-29 00:28:25 -06:00
CitadelStationBot c018aa1f9f Makes reset_perspective handle turf as eye 2017-12-29 00:28:18 -06:00
LeoandCitadelStationBot 868fbec32d Merge pull request #33881 from AnturK/walls-have-eyes 
Makes reset_perspective handle turf as eye
 2017-12-29 00:28:18 -06:00
CitadelStationBot c425511111 Removes typepath from random event admin message 2017-12-29 00:28:10 -06:00
Jordan BrownandCitadelStationBot 067680155f Removes typepath from random event admin message 2017-12-29 00:28:10 -06:00
CitadelStationBot c621f669e8 Christmas event changes 2017-12-29 00:28:02 -06:00
coiaxandCitadelStationBot dc6b4e2b61 Christmas event changes (#33861) 
* A christmas tree with presents is now a subtype

Admins can now spawn `/obj/structure/flora/tree/pine/xmas/presents`
directly, instead of spawning regular christmas trees and then
triggering the event.

Also, the event now just deletes and replaces the xmas tree with a
present tree; saves on duplication of icon states and vars and all that.

* Code review I

* Gaia's Landing: The PR
 2017-12-29 00:28:02 -06:00
LetterJayandGitHub b3793ee6d4 Update living.dm 2017-12-28 23:58:07 -06:00
CitadelStationBot 0d79434b72 Automatic changelog generation for PR #4554 [ci skip] 2017-12-28 23:57:42 -06:00
LetterJayandGitHub 2ac9d9a171 Merge pull request #4554 from Citadel-Station-13/upstream-merge-33858 
[MIRROR] Adds open/close sound to blastdoors and shutters
 2017-12-28 23:57:40 -06:00
CitadelStationBot 6a84048518 Automatic changelog generation for PR #4563 [ci skip] 2017-12-28 23:50:03 -06:00
LetterJayandGitHub 40859e3c0a Merge pull request #4563 from deathride58/anthromedibots 
[READY] Adds a new alternate sprite for mediborgs from Paradise (with modifications from Vivi) and more!
 2017-12-28 23:50:00 -06:00
LetterJayandGitHub 98e8e4bbbf Merge pull request #4562 from Citadel-Station-13/upstream-merge-33868 
[MIRROR] Fixes EMP runtime
 2017-12-28 23:49:45 -06:00
LetterJayandGitHub bfd0c7edfa Merge pull request #4561 from Citadel-Station-13/upstream-merge-33853 
[MIRROR] If the world is launched with the "no-init" param. Master.Initialize isn't called
 2017-12-28 23:49:28 -06:00
deathride58 3df98e631b Fixes compiling errors 2017-12-28 16:13:30 -05:00
deathride58 2fdb9e598f Modularizes dogborgs, adds new alternate skins for some modules, and more! 2017-12-28 15:50:33 -05:00
CitadelStationBot 311888361b Fixes EMP runtime 2017-12-28 04:09:06 -06:00
orangesandCitadelStationBot 0223fed7a3 Merge pull request #33868 from Robustin/EMPruntime 
Fixes EMP runtime
 2017-12-28 04:09:06 -06:00
CitadelStationBot 19df2df07b If the world is launched with the "no-init" param. Master.Initialize isn't called 2017-12-27 23:59:21 -06:00
orangesandCitadelStationBot 0147b4a7e1 Merge pull request #33853 from tgstation/Cyberboss-patch-2 
If the world is launched with the "no-init" param. Master.Initialize isn't called
 2017-12-27 23:59:21 -06:00
deathride58andGitHub 90582d2e1a Merge pull request #4557 from Citadel-Station-13/upstream-merge-33831 
[MIRROR] adds handholding
 2017-12-28 02:59:56 +00:00
deathride58andGitHub df14e129f4 Merge pull request #4528 from Citadel-Station-13/upstream-merge-33708 
[MIRROR] Adds random seed feedback
 2017-12-28 02:59:01 +00:00
deathride58andGitHub b8dc623ebc Update poddoor.dm 2017-12-27 21:57:51 -05:00
deathride58andGitHub aa83dbf500 Merge pull request #4532 from Citadel-Station-13/upstream-merge-33759 
[MIRROR] Modified the starting locations of advanced camera console eyes
 2017-12-28 02:54:18 +00:00
CitadelStationBot f55cb8f9b3 Automatic changelog generation for PR #4531 [ci skip] 2017-12-27 20:53:49 -06:00
deathride58andGitHub a8154d102a Merge pull request #4531 from Citadel-Station-13/upstream-merge-33777 
[MIRROR] Arena shuttle teleport fix
 2017-12-28 02:53:47 +00:00
deathride58andGitHub b258879423 Merge pull request #4537 from Citadel-Station-13/upstream-merge-33828 
[MIRROR] Revert "Vending TGUI"
 2017-12-28 02:53:22 +00:00
deathride58andGitHub 754d3d9b28 Merge pull request #4539 from Citadel-Station-13/upstream-merge-33840 
[MIRROR] Logs traumas in the feedback database
 2017-12-28 02:53:01 +00:00