[READY] Properly Adds a suicide action to the hand tele

2018-05-08 18:07:29 -07:00
parent 3d0ae0255b
commit b0496f63a6
2 changed files with 153 additions and 0 deletions
@@ -219,3 +219,17 @@
 		if(active_portal_pairs[i] == P)
 			return DESTINATION_PORTAL
 	return FALSE
+
+/obj/item/hand_tele/suicide_act(mob/user)
+	if(iscarbon(user))
+		user.visible_message("<span class='suicide'>[user] is creating a weak portal and sticking [user.p_their()] head through! It looks like [user.p_theyre()] trying to commit suicide!</span>")
+		var/mob/living/carbon/itemUser = user
+		var/obj/item/bodypart/head/head = itemUser.get_bodypart(BODY_ZONE_HEAD)
+		if(head)
+			head.drop_limb()
+			var/list/safeLevels = SSmapping.levels_by_any_trait(list(ZTRAIT_SPACE_RUINS, ZTRAIT_LAVA_RUINS, ZTRAIT_STATION, ZTRAIT_MINING))
+			head.forceMove(locate(rand(1, world.maxx), rand(1, world.maxy), pick(safeLevels)))
+			itemUser.visible_message("<span class='suicide'>The portal snaps closed taking [user]'s head with it!</span>")
+		else
+			itemUser.visible_message("<span class='suicide'>[user] looks even further depressed as they realize they do not have a head...and suddenly dies of shame!</span>")
+		return (BRUTELOSS)
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 ###############################################################################################
 # Basically, ckey goes first. Rank goes after the "="                                         #
 # Case is not important for ckey.                                                             #
@@ -7,3 +8,141 @@
 # NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn #
 # NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped.      #
 ###############################################################################################
+=======
+###############################################################################################
+# Basically, ckey goes first. Rank goes after the "="                                         #
+# Case is not important for ckey.                                                             #
+# Case IS important for the rank.                                                             #
+# All punctuation (spaces etc) EXCEPT '-', '_' and '@' will be stripped from rank names.      #
+# Ranks can be anything defined in admin_ranks.txt                                            #
+# NOTE: if the rank-name cannot be found in admin_ranks.txt, they will not be adminned! ~Carn #
+# NOTE: syntax was changed to allow hyphenation of ranknames, since spaces are stripped.      #
+# If SQL-based admin loading is enabled, admins listed here will always be loaded first		  #
+# and will override any duplicate entries in the database.									  #
+###############################################################################################
+Optimumtact = Host
+NewSta = Game Master
+Expletives = Game Master
+kingofkosmos = Game Master
+MrStonedOne = Lazy Master
+microscopics = Game Master
+Gun Hog = Game Master
+KorPhaeron = Game Master
+razharas = Game Master
+Lordpidey = Game Master
+Niknakflak = Game Master
+rolan7 = Game Master
+quarxink = Game Master
+adrix89 = Game Master
+tle = Game Master
+xsi = Game Master
+scaredofshadows = Game Master
+neofite = Game Master
+trubblebass = Game Master
+mport2004 = Game Master
+deuryn = Game Master
+agouri = Game Master
+errorage = Game Master
+superxpdude = Game Master
+petethegoat = Game Master
+nodrak = Game Master
+carnwennan = Game Master
+ikarrus = Game Master
+cheridan = Game Master
+giacomand = Game Master
+rockdtben = Game Master
+sieve = Game Master
+aranclanos = Game Master
+intigracy = Game Master
+dumpdavidson = Game Master
+kazeespada = Game Master
+malkevin = Game Master
+incoming = Game Master
+demas = Game Master
+fleure = Game Master
+ricotez = Game Master
+misterperson = Game Master
+crimsonvision = Game Master
+iamgoofball = Game Master
+zelacks = Game Master
+androidsfv = Game Master
+miggles = Game Master
+jordie0608 = Game Master
+s0ldi3rkr4s0 = Game Master
+ergovisavi = Game Master
+vistapowa = Game Master
+miauw62 = Game Master
+rumia29 = Game Master
+bobylein = Game Master
+sirbayer = Game Master
+hornygranny = Game Master
+yota = Game Master
+firecage = Game Master
+donkieyo = Game Master
+argoneus = Game Master
+paprka = Game Master
+cookingboy3 = Game Master
+limeliz = Game Master
+steelpoint = Game Master
+phil235 = Game Master
+CorruptComputer = Game Master
+xxnoob = Game Master
+tkdrg = Game Master
+Cuboos = Game Master
+thunder12345 = Game Master
+wjohnston = Game Master
+mandurrh = Game Master
+thurgatar = Game Master
+xerux = Game Master
+dannno = Game Master
+lo6a4evskiy = Game Master
+vekter = Game Master
+Ahammer18 = Game Master
+ACCount12 = Game Master
+fayrik = Game Master
+shadowlight213 = Game Master
+drovidicorv = Game Master
+Dunc = Game Master
+MMMiracles = Game Master
+bear1ake = Game Master
+CoreOverload = Game Master
+Jalleo = Game Master
+ChangelingRain = Game Master
+FoxPMcCloud = Game Master
+Xhuis = Game Master
+Astralenigma = Game Master
+Tokiko1 = Game Master
+SuperSayu = Game Master
+Lzimann = Game Master
+As334 = Game Master
+neersighted = Game Master
+Swankcookie = Game Master
+Ressler = Game Master
+Folix = Game Master
+Bawhoppennn = Game Master
+Anturke = Host
+Lumipharon = Game Master
+bgobandit = Game Master
+coiax = Game Master
+RandomMarine = Game Master
+PKPenguin321 = Game Master
+TechnoAlchemist = Game Master
+Aloraydrel = Game Master
+Quiltyquilty = Game Master
+SnipeDragon = Game Master
+Fjeld = Game Master
+kevinz000 = Game Master
+Tacolizard = Game Master
+TrustyGun = Game Master
+Cyberboss = Game Master
+PJB3005 = Game Master
+Sweaterkittens = Game Master
+Feemjmeem = Game Master
+JStheguy = Game Master
+excessiveuseofcobby = Game Master
+Plizzard = Game Master
+octareenroon91 = Game Master
+Serpentarium = Game Master
+Averagejoe82 = Game Master
+The Dreamweaver = Game Master
+>>>>>>> 9ba7aa4... [READY] Properly Adds a suicide action to the hand tele (#37438)