shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,611 Commits 5 Branches 0 Tags
ef1ac1f0f3d25a96e2362b1cab799e4eb2a9138a
Commit Graph
11611 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
LetterJayandGitHub ef1ac1f0f3 Merge pull request #4760 from Citadel-Station-13/upstream-merge-34204 
[MIRROR] improves chem macro feedback
 2018-01-11 15:18:43 -06:00
LetterJayandGitHub e9e068dc7c Merge pull request #4759 from Citadel-Station-13/upstream-merge-34252 
[MIRROR] Fixes secbot sprites
 2018-01-11 15:17:33 -06:00
LetterJayandGitHub fe6fb09ce7 Merge pull request #4758 from Citadel-Station-13/upstream-merge-34189 
[MIRROR] CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 15:17:24 -06:00
LetterJayandGitHub 878b16e41a Merge pull request #4757 from Citadel-Station-13/upstream-merge-34177 
[MIRROR] Prevents renaming uniquely named pets.
 2018-01-11 15:16:38 -06:00
LetterJayandGitHub 76c423e65d Merge pull request #4756 from Citadel-Station-13/upstream-merge-34168 
[MIRROR] Corrects runtime when shooting humans
 2018-01-11 15:16:16 -06:00
CitadelStationBot 36def519b2 Automatic changelog generation for PR #4755 [ci skip] 2018-01-11 15:16:07 -06:00
LetterJayandGitHub 2e6891f0c2 Merge pull request #4755 from Citadel-Station-13/upstream-merge-34242 
[MIRROR] Precision in timekeeping is important, okay.
 2018-01-11 15:16:05 -06:00
CitadelStationBot 6a32cf0b22 Automatic changelog generation for PR #4754 [ci skip] 2018-01-11 15:15:56 -06:00
LetterJayandGitHub 36a5b861f6 Merge pull request #4754 from Citadel-Station-13/upstream-merge-34216 
[MIRROR] Adds Display Name Argument to Techweb Logging
 2018-01-11 15:15:54 -06:00
CitadelStationBot b046e615c8 Automatic changelog generation for PR #4752 [ci skip] 2018-01-11 15:15:31 -06:00
LetterJayandGitHub 9f9550d5ba Merge pull request #4752 from Citadel-Station-13/upstream-merge-34249 
[MIRROR] Replace CentComm with CentCom
 2018-01-11 15:15:28 -06:00
CitadelStationBot 97445bb634 Automatic changelog generation for PR #4751 [ci skip] 2018-01-11 15:15:10 -06:00
LetterJayandGitHub 1948b055a4 Merge pull request #4751 from Citadel-Station-13/upstream-merge-34248 
[MIRROR] removes the "and clear buffer" text on eject button
 2018-01-11 15:15:06 -06:00
LetterJayandGitHub 387f8b973d Merge pull request #4750 from Citadel-Station-13/upstream-merge-34253 
[MIRROR] Fixes potato cells missing wires
 2018-01-11 15:14:48 -06:00
LetterJayandGitHub 25d231fc20 Merge pull request #4749 from Citadel-Station-13/upstream-merge-34223 
[MIRROR] Stops the dbadmin warning if SQL_ENABLED isnt set
 2018-01-11 15:14:32 -06:00
LetterJayandGitHub 92e8f3cefc Merge pull request #4748 from Citadel-Station-13/upstream-merge-34222 
[MIRROR] Fixes error if next_map.json is missing
 2018-01-11 15:14:19 -06:00
LetterJayandGitHub 7c0944560a Merge pull request #4745 from Citadel-Station-13/upstream-merge-34254 
[MIRROR] Fixes beams failing to qdel properly. Maybe.
 2018-01-11 15:12:11 -06:00
CitadelStationBot 50ddb25f5f improves chem macro feedback 2018-01-11 14:02:35 -06:00
orangesandCitadelStationBot d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback 
improves chem macro feedback
 2018-01-11 14:02:35 -06:00
CitadelStationBot 3e87c1f08b Fixes secbot sprites 2018-01-11 09:45:47 -06:00
LeoandCitadelStationBot 47f361e67c Merge pull request #34252 from ShizCalev/beepsky-sprite-fix 
Fixes secbot sprites
 2018-01-11 09:45:47 -06:00
CitadelStationBot 8674c28030 CHECK_TICK & logging for cmd_admin_areatest 2018-01-11 07:40:41 -06:00
LeoandCitadelStationBot 337ed7f0a6 Merge pull request #34189 from ShizCalev/test-area-tick 
CHECK_TICK & logging for cmd_admin_areatest
 2018-01-11 07:40:41 -06:00
CitadelStationBot 585e8aa75c Prevents renaming uniquely named pets. 2018-01-11 07:40:33 -06:00
LeoandCitadelStationBot 5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename 
Prevents renaming uniquely named pets.
 2018-01-11 07:40:33 -06:00
CitadelStationBot 218a823ac3 Corrects runtime when shooting humans 2018-01-11 07:40:26 -06:00
LeoandCitadelStationBot bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00
CitadelStationBot 06f44b1764 Precision in timekeeping is important, okay. 2018-01-11 07:40:19 -06:00
LeoandCitadelStationBot 7efa8098fa Merge pull request #34242 from Someguynamedpie/patch-1 
Precision in timekeeping is important, okay.
 2018-01-11 07:40:19 -06:00
CitadelStationBot 8c73c05fee Adds Display Name Argument to Techweb Logging 2018-01-11 07:40:11 -06:00
ExcessiveUseOfCobblestoneandCitadelStationBot af4f017b93 Adds Display Name Argument to Techweb Logging (#34216) 
* Update _techweb.dm

* Replaces ID with the name of the tech web

* REVERT ON THE WEBBITOR

* Webbitor Blues

* removes "
 2018-01-11 07:40:11 -06:00
CitadelStationBot 3515822f81 Replace CentComm with CentCom 2018-01-11 07:39:52 -06:00
Tad HardestyandCitadelStationBot 149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
yoriiandCitadelStationBot 6a485fa8df removes the "and clear buffer" text on eject button 2018-01-11 07:39:45 -06:00
CitadelStationBot 97eba5fd5d Fixes potato cells missing wires 2018-01-11 07:39:37 -06:00
AnturKandCitadelStationBot d44d3c3f26 Fixes potato cells missing wires (#34253) 2018-01-11 07:39:37 -06:00
CitadelStationBot 534c8e9d8f Stops the dbadmin warning if SQL_ENABLED isnt set 2018-01-11 07:39:29 -06:00
Jordan BrownandCitadelStationBot ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
CitadelStationBot c5730fd79e Fixes error if next_map.json is missing 2018-01-11 07:39:22 -06:00
Jordan BrownandCitadelStationBot d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
CitadelStationBot e3a4bcec4b Fixes beams failing to qdel properly. Maybe. 2018-01-11 07:38:55 -06:00
AnturKandCitadelStationBot e381116bbe Fixes beams failing to qdel properly. Maybe. (#34254) 2018-01-11 07:38:55 -06:00
CitadelStationBot b2021912d7 Automatic changelog generation for PR #4729 [ci skip] 2018-01-10 23:17:02 -06:00
deathride58andGitHub 84cb51be0c Merge pull request #4729 from Citadel-Station-13/upstream-merge-33436 
[MIRROR] [READY]Cargo Update: Nanotrasen Supply Drop Pods!
 2018-01-11 05:16:59 +00:00
deathride58 9a33ac7177 TGUI recompile, fixes map conflicts 2018-01-11 00:05:34 -05:00
CitadelStationBot 96d43c7216 Automatic changelog generation for PR #4727 [ci skip] 2018-01-10 14:21:59 -06:00
deathride58andGitHub ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58andGitHub 74d918c0b2 Merge pull request #4742 from Citadel-Station-13/upstream-merge-34217 
[MIRROR] Fixes FIND_REF_NO_CHECK_TICK not actually disabling world.loop_checks
 2018-01-10 19:59:51 +00:00
deathride58andGitHub 94848372e9 Merge pull request #4741 from Citadel-Station-13/upstream-merge-34214 
[MIRROR]  Retcons spacemen movement lore in sillytips.txt
 2018-01-10 19:59:31 +00:00
deathride58andGitHub 5abe6abad6 Merge pull request #4740 from Citadel-Station-13/upstream-merge-34209 
[MIRROR] Fixes missing defib inhands
 2018-01-10 19:58:57 +00:00