shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,646 Commits 5 Branches 0 Tags
048a321f72ee4d4f42d97ead07ee8aac35d53d29
Commit Graph

7728 Commits

Author SHA1 Message Date
deathride58
048a321f72 Merge pull request #4753 from Citadel-Station-13/upstream-merge-34290 
[MIRROR] Fixes configuration not loading
 2018-01-12 00:42:01 +00:00
deathride58
c0f78415a5 Merge pull request #4771 from Citadel-Station-13/upstream-merge-34270 
[MIRROR] Fixes toolarm grammar
 2018-01-12 00:41:32 +00:00
deathride58
850097abbd Merge pull request #4770 from Citadel-Station-13/upstream-merge-34282 
[MIRROR] Fix hitting closets with wrenches
 2018-01-12 00:41:19 +00:00
deathride58
361e53be3f Merge pull request #4769 from Citadel-Station-13/upstream-merge-34329 
[MIRROR] Fixes mind transfers
 2018-01-12 00:40:56 +00:00
deathride58
d9e8f595b8 Merge pull request #4767 from Citadel-Station-13/upstream-merge-34146 
[MIRROR] Fixes vehicle action handling ordering
 2018-01-12 00:40:43 +00:00
Leo
0985450524 Merge pull request #34270 from tgstation/Cyberboss-patch-3 
Fixes toolarm grammar
 2018-01-11 17:12:47 -06:00
Leo
fc8de4df70 Merge pull request #34282 from Cyberboss/ClosetFix22 
Fix hitting closets with wrenches
 2018-01-11 17:11:37 -06:00
deathride58
e17ce47aad Merge pull request #4766 from Citadel-Station-13/upstream-merge-34164 
[MIRROR] Fixes megafauna being able to port through jaunt tunnels due to snowflake code
 2018-01-11 21:33:52 +00:00
deathride58
e052255e91 Merge pull request #4768 from Citadel-Station-13/upstream-merge-34265 
[MIRROR] fixes safety check
 2018-01-11 21:33:35 +00:00
AnturK
7a4eef12b8 Fixes mind transfers (#34329) 
* Fixes mind transfers

* Don't really see how this is better but sure.
 2018-01-11 15:28:41 -06:00
LetterJay
7c2662f1de custom item 2018-01-11 15:25:47 -06:00
LetterJay
fe63605054 Update vehicle_actions.dm 2018-01-11 15:20:13 -06:00
LetterJay
c98be44b33 Merge pull request #4762 from Citadel-Station-13/upstream-merge-33817 
[MIRROR] [READY]Pulling claw 2
 2018-01-11 15:19:11 -06:00
LetterJay
d04260eab2 Merge pull request #4761 from Citadel-Station-13/upstream-merge-34206 
[MIRROR] Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 15:18:55 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
4ac9269cdf Update configuration.dm 2018-01-11 15:15:50 -06:00
LetterJay
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
LetterJay
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
LetterJay
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
LetterJay
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
oranges
cfa8b8bad4 Merge pull request #34265 from tgstation/welostcountofhowmanycookieswerespawnedshutitalldown 
fixes safety check
 2018-01-11 14:13:09 -06:00
kevinz000
583bd42772 Fixes vehicle action handling ordering 2018-01-11 14:11:52 -06:00
kevinz000
6f96c169e1 Fixes megafauna being able to port through jaunt tunnels due to snowflake code (#34164) 
* Fixed megafauna porting through jaunt tunnels

* Update portals.dm
 2018-01-11 14:10:41 -06:00
arsserpentarium
1d91243ae2 [READY]Pulling claw 2 (#33817) 
Pulling claw is integrated circuit,which allows drones to pull things.
 2018-01-11 14:03:52 -06:00
oranges
6dfb1e2351 Merge pull request #34206 from ShizCalev/fireaxe-drop 
Fixes twohanded weapons not unwielding when you lose an arm.
 2018-01-11 14:02:42 -06:00
oranges
d8f232bd07 Merge pull request #34204 from ShizCalev/chem-macro-feedback 
improves chem macro feedback
 2018-01-11 14:02:35 -06:00
Leo
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
Leo
5cb74c909c Merge pull request #34177 from ShizCalev/pet-rename 
Prevents renaming uniquely named pets.
 2018-01-11 07:40:33 -06:00
Leo
bc7b34d369 Merge pull request #34168 from ShizCalev/dna-human-runtime 
Corrects runtime when shooting humans
 2018-01-11 07:40:26 -06:00
Leo
7efa8098fa Merge pull request #34242 from Someguynamedpie/patch-1 
Precision in timekeeping is important, okay.
 2018-01-11 07:40:19 -06:00
ExcessiveUseOfCobblestone
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
Leo
f9309d4716 Fixes configuration not loading 2018-01-11 07:39:59 -06:00
Tad Hardesty
149542ca26 Replace CentComm with CentCom in deadchat message (#34249) 2018-01-11 07:39:52 -06:00
AnturK
d44d3c3f26 Fixes potato cells missing wires (#34253) 2018-01-11 07:39:37 -06:00
Jordan Brown
ab71f0293b Stops the dbadmin warning if SQL_ENABLED isnt set (#34223) 2018-01-11 07:39:29 -06:00
Jordan Brown
d8c3157741 Fixes error if next_map.json is missing (#34222) 2018-01-11 07:39:22 -06:00
AnturK
e381116bbe Fixes beams failing to qdel properly. Maybe. (#34254) 2018-01-11 07:38:55 -06:00
deathride58
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
ff83b6451b Merge pull request #4727 from Citadel-Station-13/upstream-merge-34065 
[MIRROR] Fixes reflections
 2018-01-10 20:21:56 +00:00
deathride58
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
deathride58
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
deathride58
f24bf9f9fd Merge pull request #4739 from Citadel-Station-13/upstream-merge-34139 
[MIRROR] Fixes archdevils creating wall girders when trying to destroy walls.
 2018-01-10 19:58:36 +00:00
deathride58
54c87fdd15 Merge pull request #4738 from Citadel-Station-13/upstream-merge-34111 
[MIRROR] Fixes buckled message spam for ghosts inside talking scythes
 2018-01-10 19:58:18 +00:00
deathride58
400de30b93 Merge pull request #4737 from Citadel-Station-13/upstream-merge-34096 
[MIRROR] Cult will actually report victories now
 2018-01-10 19:57:56 +00:00
deathride58
df199bc940 Merge pull request #4736 from Citadel-Station-13/upstream-merge-34160 
[MIRROR] Fixes non-cultist hulks being able to hold cult bbs
 2018-01-10 19:57:35 +00:00