Merge remote-tracking branch 'upstream/dev' into faxmachine

2025-12-12 11:13:16 +00:00 · 2014-10-15 21:12:21 -04:00
parent b0cdcc9796 fe677543f4
commit e53bd0e237
95 changed files with 1211 additions and 1040 deletions
--- a/code/WorkInProgress/Cael_Aislinn/sculpture.dm
+++ b/code/WorkInProgress/Cael_Aislinn/sculpture.dm
@@ -26,7 +26,6 @@
 		G.assailant = src
 		G.layer = 20
 		G.affecting = target
-		target.grabbed_by += G
 		G.synch()
 		target.LAssailant = src

--- a/code/WorkInProgress/Cib/amorph/amorph_attack.dm
+++ b/code/WorkInProgress/Cib/amorph/amorph_attack.dm
@@ -95,7 +95,6 @@
 					M.r_hand = G
 				G.layer = 20
 				G.affecting = src
-				grabbed_by += G
 				G.synch()

 				LAssailant = M
@@ -150,7 +149,6 @@
 				M.r_hand = G
 			G.layer = 20
 			G.affecting = src
-			grabbed_by += G
 			G.synch()

 			LAssailant = M