Commit Graph

11646 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
CitadelStationBot
c0072cf15f Automatic changelog generation for PR #4771 [ci skip] 2018-01-11 18:41:34 -06: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
CitadelStationBot
5f467ede81 Automatic changelog generation for PR #4770 [ci skip] 2018-01-11 18:41:21 -06: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
CitadelStationBot
dfc312d1af Fixes toolarm grammar 2018-01-11 17:12:47 -06:00
Leo
0985450524 Merge pull request #34270 from tgstation/Cyberboss-patch-3
Fixes toolarm grammar
2018-01-11 17:12:47 -06:00
CitadelStationBot
07baa22810 Fix hitting closets with wrenches 2018-01-11 17:11:37 -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
CitadelStationBot
8fad8bb503 Automatic changelog generation for PR #4763 [ci skip] 2018-01-11 15:33:01 -06:00
deathride58
3e78921e02 Merge pull request #4763 from Citadel-Station-13/upstream-merge-34101
[MIRROR] Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 21:32:59 +00:00
CitadelStationBot
ddedf055f0 Fixes mind transfers 2018-01-11 15:28:41 -06: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
CitadelStationBot
c91f3c18a8 Automatic changelog generation for PR #4762 [ci skip] 2018-01-11 15:19: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
e9e068dc7c Merge pull request #4759 from Citadel-Station-13/upstream-merge-34252
[MIRROR] Fixes secbot sprites
2018-01-11 15:17:33 -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
CitadelStationBot
36def519b2 Automatic changelog generation for PR #4755 [ci skip] 2018-01-11 15:16:07 -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
CitadelStationBot
6a32cf0b22 Automatic changelog generation for PR #4754 [ci skip] 2018-01-11 15:15:56 -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
CitadelStationBot
b046e615c8 Automatic changelog generation for PR #4752 [ci skip] 2018-01-11 15:15:31 -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
CitadelStationBot
97445bb634 Automatic changelog generation for PR #4751 [ci skip] 2018-01-11 15:15:10 -06:00
LetterJay
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
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
LetterJay
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
ec30ad72b1 fixes safety check 2018-01-11 14:13:09 -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
CitadelStationBot
80517e5f1b Fixes megafauna being able to port through jaunt tunnels due to snowflake code 2018-01-11 14:10:41 -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
CitadelStationBot
ef83d5d834 Removes omnizine (traitor) cigarettes from captain's office on Meta 2018-01-11 14:05:06 -06:00
oranges
8b4788a884 Merge pull request #34101 from ShizCalev/got-a-light-
Removes omnizine (traitor) cigarettes from captain's office on Meta
2018-01-11 14:05:06 -06:00
CitadelStationBot
49e1ad5128 [READY]Pulling claw 2 2018-01-11 14:03:53 -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
CitadelStationBot
6511c6bb58 Fixes twohanded weapons not unwielding when you lose an arm. 2018-01-11 14:02:42 -06:00