Commit Graph

13165 Commits

Author SHA1 Message Date
deathride58 8bfc56981b Merge pull request #4774 from Citadel-Station-13/upstream-merge-34297
[MIRROR] Clockcult ark now teleports anything people are in to the station instead of just the person on destruction
2018-01-12 17:42:39 +00:00
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
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
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
Leo 429237d06c Merge pull request #34301 from kevinz000/patch-428
Harvesters now normally attack those with NODISMEMBER species
2018-01-12 07:05:49 -06:00
JJRcop ed6ec3d63a Removes some hrefs from logging (#34310)
* Removes key_name_admin calls from logging

* Removes JMP from gibtonite reaction logs
2018-01-12 07:04:39 -06:00
Leo ab76f05a1e Merge pull request #34305 from AutomaticFrenzy/patch/debug-mapping
Add JMP buttons to mapping debug verbs
2018-01-12 07:04:31 -06:00
Leo e11e4b3385 Merge pull request #34312 from AutomaticFrenzy/patch/canister-grammar
Fix description of relabelled canisters
2018-01-12 07:03:20 -06:00
ShizCalev 8bd1f07353 Fixes pet collars not updating icons (#34184) 2018-01-12 06:17:04 -06:00
MoreRobustThanYou de695abb26 Sigils of submission now uncuff upon successful conversion (#34174)
* Sigils of submission now uncuff upon successful conversion

No more retards forgetting to uncuff after conversion

* Update clock_sigils.dm
2018-01-11 21:51:30 -06:00
ExcessiveUseOfCobblestone 8af2ee0fdd Pointing will now properly reflect a lack of arms (and legs!) (#34259)
* Update emote.dm

* Update emote.dm

* Update emote.dm

* toot
2018-01-11 21:38:08 -06:00
Dax Dupont af73323477 Adds an indestructible disco/dance machine for admemes and disco inferno shuttle (#34260)
* Dance machine fix

* I have no ass and i must blast
2018-01-11 21:36:56 -06:00
YPOQ 7e740208f9 Makes bot emagging more consistent (#34274) 2018-01-11 21:34:44 -06:00
AnturK 7f9d721a72 Fixes mobs on lavaland targeting through walls on wakeup (#34280) 2018-01-11 21:33:34 -06:00
PKPenguin321 145cc8a822 Makes cyborg module damage visible to anyone nearby (#34287)
* swaps to_chats with visilbe_messages in damage feedback

* adds an actual alarm sound
2018-01-11 21:32:24 -06:00
Jordan Brown edfa926886 Move a definition to the right file (#34288) 2018-01-11 21:31:13 -06:00
Jordan Brown bea8dae8c4 Add /datum prefix to custom root types (#34294) 2018-01-11 21:28:02 -06:00
Jordan Brown 08da9ea5a0 Fixes brass skewer grammar 2018-01-11 21:26:43 -06:00
kevinz000 08339940c1 Update ark_of_the_clockwork_justicar.dm (#34297) 2018-01-11 21:24:31 -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
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
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
deathride58 15f0b623ba Update cit_objectives.dm 2018-01-11 19:40:19 -05: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 d6fc0f5d26 Update position_point_vector.dm 2018-01-11 15:20:02 -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