Commit Graph

11664 Commits

Author SHA1 Message Date
deathride58
a7ec44bfcc Merge pull request #4773 from Citadel-Station-13/upstream-merge-34298
[MIRROR] Adds logging and feedback messages to organ manipulations by admins
2018-01-12 17:42:24 +00:00
deathride58
ed3779feff Merge pull request #4772 from Citadel-Station-13/upstream-merge-34336
[MIRROR] Fixes forensics runtimes
2018-01-12 17:42:05 +00:00
CitadelStationBot
e4a3f2fe1a Automatic changelog generation for PR #4765 [ci skip] 2018-01-12 11:41:47 -06:00
deathride58
a2fb8b5304 Merge pull request #4765 from Citadel-Station-13/upstream-merge-34117
[MIRROR] Makes medbots unable to inject you if you are are fully covered with THICKMATERIAL.
2018-01-12 17:41:44 +00:00
CitadelStationBot
5c8f1f7f5b Automatic changelog generation for PR #4764 [ci skip] 2018-01-12 11:41:32 -06:00
deathride58
0c56db4f9b Merge pull request #4764 from Citadel-Station-13/upstream-merge-34090
[MIRROR] Replace hardcoded z-level numbers with a trait system
2018-01-12 17:41:28 +00:00
CitadelStationBot
0f9d7a4d2e Adds logging and feedback messages to organ manipulations by admins 2018-01-11 21:23:21 -06:00
kevinz000
5920ec6996 Adds logging and feedback messages to organ manipulations by admins (#34298)
* logging

* Update manipulate_organs.dm
2018-01-11 21:23:21 -06:00
CitadelStationBot
8ee64c2369 Fixes forensics runtimes 2018-01-11 21:11:59 -06:00
kevinz000
f234c471ee Fixes forensics runtimes (#34336) 2018-01-11 21:11:58 -06:00
LetterJay
2b9b826a95 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2018-01-11 20:38:06 -06:00
LetterJay
946d0243ce donation item fix 2018-01-11 20:37:54 -06:00
deathride58
eedf8eb101 Update cit_objectives.dm 2018-01-11 20:19:09 -05:00
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
deathride58
15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05: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
LetterJay
d6fc0f5d26 Update position_point_vector.dm 2018-01-11 15:20:02 -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