Merge pull request #18 from ZomgPonies/master

Merge from Master
2026-08-23 03:57:13 +01:00 · 2014-10-13 23:38:10 -04:00
parent 441dd3ecb5 21280de66d
commit 37f99cd7b5
21 changed files with 11898 additions and 11852 deletions
@@ -154,12 +154,13 @@ var/list/uplink_items = list()
 	cost = 3
 	job = list("Civilian")

+/*
 /datum/uplink_item/jobspecific/greytide
 	name = "Greytide Implant"
 	desc = "A box containing an implanter filled with a greytide implant when injected into another person makes them loyal to the greytide and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system."
 	item = /obj/item/weapon/storage/box/syndie_kit/greytide
 	cost = 7
-	job = list("Civilian")
+	job = list("Civilian") */
 //Bartender

 /datum/uplink_item/jobspecific/drunkbullets
@@ -257,9 +258,9 @@ var/list/uplink_items = list()

 /datum/uplink_item/stealthy_weapons/para_pen
 	name = "Paralysis Pen"
-	desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target immobile on injection and makes them seem dead to observers. Side effects of the drug include noticeable drooling. The pen holds one dose of paralyzing agent, and cannot be refilled."
+	desc = "A syringe disguised as a functional pen, filled with a neuromuscular-blocking drug that renders a target mute on injection that will eventually cause them to pass out. The pen holds one dose of paralyzing agent,though it can be refilled."
 	item = /obj/item/weapon/pen/paralysis
-	cost = 3
+	cost = 4

 /datum/uplink_item/stealthy_weapons/soap
 	name = "Syndicate Soap"
@@ -317,6 +318,11 @@ var/list/uplink_items = list()
 	item = /obj/item/device/chameleon
 	cost = 4

+/datum/uplink_item/stealthy_tools/mindslave
+	name = "Mindslave Implant"
+	desc = "A box containing an implanter filled with a mindslave implant that when injected into another person makes them loyal to you and your cause, unless of course they're already implanted by someone else. Loyalty ends if the implant is no longer in their system."
+	item = /obj/item/weapon/storage/box/syndie_kit/mindslave
+	cost = 5

 // DEVICE AND TOOLS

@@ -52,10 +52,10 @@
 	fire_sound = 'sound/weapons/Laser.ogg'

 /obj/item/mecha_parts/mecha_equipment/weapon/energy/laser/heavy
-	equip_cooldown = 15
+	equip_cooldown = 10
 	name = "CH-LC \"Solaris\" Laser Cannon"
 	icon_state = "mecha_laser"
-	energy_drain = 50
+	energy_drain = 40
 	projectile = /obj/item/projectile/beam/heavylaser
 	fire_sound = 'sound/weapons/lasercannonfire.ogg'

@@ -424,7 +424,7 @@
 	desc = "Your palm is oozing this stuff!"
 	icon = 'icons/mob/slimes.dmi'
 	icon_state = "red slime extract"
-	throwforce = 30.0
+	throwforce = 5.0
 	throw_speed = 10
 	throw_range = 30
 	w_class = 1
@@ -343,20 +343,20 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		return 1

 /obj/item/weapon/implant/traitor
-	name = "Greytide Implant"
-	desc = "Greytide Station wide"
+	name = "Mindslave Implant"
+	desc = "Divide and Conquer"
 	icon_state = "implant_evil"

 	get_data()
 		var/dat = {"
 <b>Implant Specifications:</b><BR>
-<b>Name:</b> Greytide Mind-Slave Implant<BR>
+<b>Name:</b> Mind-Slave Implant<BR>
 <b>Life:</b> ??? <BR>
-<b>Important Notes:</b> Any humanoid injected with this implant will become loyal to the injector and the greytide, unless of course the host is already loyal to someone else.<BR>
+<b>Important Notes:</b> Any humanoid injected with this implant will become loyal to the injector, unless of course the host is already loyal to someone else.<BR>
 <HR>
 <b>Implant Details:</b><BR>
 <b>Function:</b> Contains a small pod of nanobots that manipulate the host's mental functions.<BR>
-<b>Special Features:</b> Glory to the Greytide!<BR>
+<b>Special Features:</b> Diplomacy was never so easy.<BR>
 <b>Integrity:</b> Implant will last so long as the nanobots are inside the bloodstream."}
 		return dat

@@ -367,9 +367,9 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		if(!M.mind) return 0
 		var/mob/living/carbon/human/H = M
 		if(M == user)
-			user << "<span class='notice'>You feel quite stupid for doing that.</span>"
+			user << "<span class='notice'>Making yourself loyal to yourself was a great idea! Perhaps the best idea, ever! Actually, you just feel like an idiot.</span>"
 			if(isliving(user))
-				user:brainloss += 10
+				user:brainloss += 20
 			return
 		if(locate(/obj/item/weapon/implant/traitor) in H.contents || locate(/obj/item/weapon/implant/traitor) in H.contents)
 			H.visible_message("[H] seems to resist the implant!", "You feel a strange sensation in your head that quickly dissipates.")
@@ -389,7 +389,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		ticker.mode:implanter[ref] = implanters
 		ticker.mode.traitors += H.mind
 		H.mind.special_role = "traitor"
-		H << "<B>\red You've been shown the Greytide by [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost."
+		H << "<B>\red You're now completely loyal to [user.name]!</B> You now must lay down your life to protect them and assist in their goals at any cost."
 		var/datum/objective/protect/p = new
 		p.owner = H.mind
 		p.target = user:mind
@@ -54,8 +54,8 @@


 /obj/item/weapon/implanter/traitor
-	name = "implanter-greytide"
-	desc = "Greytide Stationwide."
+	name = "implanter-mindslave"
+	desc = "Divide and Conquer."

 	New()
 		src.imp = new /obj/item/weapon/implant/traitor(src)
@@ -135,8 +135,8 @@
 	new /obj/item/ammo_box/a357(src)
 	return

-/obj/item/weapon/storage/box/syndie_kit/greytide
-	name = "box (GT)"
+/obj/item/weapon/storage/box/syndie_kit/mindslave
+	name = "box (MS)"

 	New()
 		..()
@@ -1,7 +1,7 @@
 /datum/event/anomaly/anomaly_bluespace
 	startWhen = 3
 	announceWhen = 10
-	endWhen = 55
+	endWhen = 160


 /datum/event/anomaly/anomaly_bluespace/announce()
@@ -3,7 +3,7 @@
 /datum/event/anomaly/anomaly_flux
 	startWhen = 3
 	announceWhen = 20
-	endWhen = 60
+	endWhen = 180


 /datum/event/anomaly/anomaly_flux/announce()
@@ -3,7 +3,7 @@
 /datum/event/anomaly/anomaly_grav
 	startWhen = 3
 	announceWhen = 20
-	endWhen = 50
+	endWhen = 70


 /datum/event/anomaly/anomaly_grav/announce()
@@ -1,7 +1,7 @@


 /datum/event/anomaly/anomaly_vortex
-	startWhen = 10
+	startWhen = 20
 	announceWhen = 3
 	endWhen = 80

@@ -527,6 +527,23 @@
 				else
 					message = "<B>[src]</B> sadly can't find anybody to give daps to, and daps \himself. Shameful."

+		if("slap")
+			m_type = 1
+			if (!src.restrained())
+				var/M = null
+				if (param)
+					for (var/mob/A in view(1, null))
+						if (param == A.name)
+							M = A
+							break
+				if (M)
+					message = "\red <B>[src]</B> slaps [M] across the face. Ouch!"
+					playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+				else
+					message = "\red <B>[src]</B> slaps \himself!"
+					playsound(src.loc, 'sound/effects/snap.ogg', 50, 1)
+					src.adjustFireLoss(4)
+
 		if ("scream")
 			if (miming)
 				message = "<B>[src]</B> acts out a scream!"
@@ -242,11 +242,13 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 					if(3)
 						emote("drool")

+        /*
 		if(species.name == "Tajaran")
 			if(prob(1))
 				if(prob(1))
 					vomit(1) // Hairball

+        */

 		if(stat != 2)
 			var/rn = rand(0, 200)
@@ -290,8 +292,8 @@ var/global/list/brutefireloss_overlays = list("1" = image("icon" = 'icons/mob/sc
 			if(!gene.block)
 				continue
 			if(gene.is_active(src))
-				if (prob(10) && prob(gene.instability))
-					adjustCloneLoss(1)
+			/*	if (prob(10) && prob(gene.instability))
+					adjustCloneLoss(1) */
 				gene.OnMobLife(src)

 		if (radiation)
@@ -457,10 +457,10 @@
 		return 1

 //Antag Creatures!
-	if(ispath(MP, /mob/living/simple_animal/hostile/carp))
+/*	if(ispath(MP, /mob/living/simple_animal/hostile/carp))
 		return 1
 	if(ispath(MP, /mob/living/simple_animal/hostile/giant_spider))
-		return 1
+		return 1 */
 	if(ispath(MP, /mob/living/simple_animal/borer))
 		return 1
 	if(ispath(MP, /mob/living/carbon/alien))
@@ -106,7 +106,21 @@
 	var/datum/reagents/R = new/datum/reagents(50)
 	reagents = R
 	R.my_atom = src
-	R.add_reagent("zombiepowder", 10)
-	R.add_reagent("cryptobiolin", 15)
+	R.add_reagent("stoxin", 30)
+	R.add_reagent("mutetoxin", 15)
 	..()
 	return
+
+/obj/item/weapon/pen/paralysis/attackby(var/obj/item/O as obj, var/mob/user as mob) //courtesy of FalseIncarnate!
+
+	if (O.is_open_container())
+		//Check if container is of the "glass" subtype (includes buckets, beakers, vials)
+		if(istype(O, /obj/item/weapon/reagent_containers/glass))
+			var/obj/item/weapon/reagent_containers/glass/C = O
+			//Check if container is empty
+			if(!C.reagents.total_volume)
+				user << "\red [C] is empty."
+				return
+			//Container not empty, transfer contents to tray
+			var/trans = C.reagents.trans_to(src, C.amount_per_transfer_from_this)
+			user << "\blue You transfer [trans] units of the solution to [src]."
@@ -70,11 +70,11 @@ obj/item/weapon/gun/energy/laser/retro
 	name = "laser cannon"
 	desc = "With the L.A.S.E.R. cannon, the lasing medium is enclosed in a tube lined with uranium-235 and subjected to high neutron flux in a nuclear reactor core. This incredible technology may help YOU achieve high excitation rates with small laser volumes!"
 	icon_state = "lasercannon"
-//	fire_sound = 'sound/weapons/lasercannonfire.ogg'
+	fire_sound = 'sound/weapons/lasercannonfire.ogg'
 	origin_tech = "combat=4;materials=3;powerstorage=3"
 	projectile_type = "/obj/item/projectile/beam/heavylaser"
-	charge_cost = 500 // Half the cost of the regular laser, weaker projectile.
-	fire_delay = 3
+	charge_cost = 1250
+	fire_delay = 10

 	isHandgun()
 		return 0
@@ -304,11 +304,11 @@ var/list/beam_master = list()
 	flag = "laser"
 	eyeblur = 2

-//changing heavy lasers to shoot twice as fast as regular lasers, and do a bit more DPS.
+//Heavy lasers now deal slightly more damage, but have a slower firing rate; overall DPS still identical to lasers.
 /obj/item/projectile/beam/heavylaser
 	name = "heavy laser"
 	icon_state = "heavylaser"
-	damage = 25
+	damage = 50

 /obj/item/projectile/beam/xray
 	name = "xray beam"
@@ -246,7 +246,7 @@
 	ui_title = "Soda Dispens-o-matic"
 	energy = 100
 	max_energy = 100
-	dispensable_reagents = list("water","ice","coffee","tea","icetea","cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice","limejuice","tomatojuice" ,"watermelonjuice","berryjuice")
+	dispensable_reagents = list("water","ice", "milk", "soymilk", "coffee","tea","hot_coco", "cola","spacemountainwind","dr_gibb","space_up","tonic","sodawater","lemon_lime","sugar","orangejuice", "lemonjuice", "limejuice","tomatojuice", "banana", "watermelonjuice", "carrotjuice", "potato", "berryjuice")
 	hack_message = "You change the mode from 'McNano' to 'Pizza King'."
 	unhack_message = "You change the mode from 'Pizza King' to 'McNano'."
 	hacked_reagents = list("thirteenloko")
@@ -258,10 +258,10 @@
 	energy = 100
 	max_energy = 100
 	desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one."
-	dispensable_reagents = list("ice","cream","beer","kahlua","whiskey","wine","vodka","gin","rum","tequila","vermouth","cognac","ale","mead")
+	dispensable_reagents = list("ice","cream","beer","kahlua","whiskey","wine","vodka","gin","rum","tequilla","vermouth","cognac","ale","mead")
 	hack_message = "You disable the 'nanotrasen-are-cheap-bastards' lock, enabling hidden and very expensive boozes."
 	unhack_message = "You re-enable the 'nanotrasen-are-cheap-bastards' lock, disabling hidden and very expensive boozes."
-	hacked_reagents = list("goldschlager","patron", "nothing")
+	hacked_reagents = list("goldschlager","patron", "absinthe", "ethanol", "nothing")

 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -116,6 +116,10 @@
 					icon_state  = "chocolateglass"
 					name = "Glass of chocolate"
 					desc = "Tasty"
+				if("hot_coco")
+					icon_state  = "hot_coco"
+					name = "Glass of hot coco"
+					desc = "Delicious and cozy"
 				if("lemonjuice")
 					icon_state  = "lemonglass"
 					name = "Glass of lemonjuice"
@@ -192,6 +196,10 @@
 					icon_state = "rumglass"
 					name = "Glass of Rum"
 					desc = "Now you want to Pray for a pirate suit, don't you?"
+				if("absinthe")
+					icon_state = "absinthebottle"
+					name = "Glass of Absinthe"
+					desc = "The green fairy is going to get you now!"
 				if("gintonic")
 					icon_state = "gintonicglass"
 					name = "Gin and Tonic"
@@ -356,6 +364,10 @@
 					icon_state = "carrotjuice"
 					name = "Glass of  carrot juice"
 					desc = "It is just like a carrot but without crunching."
+				if("potato")
+					icon_state = "glass_brown"
+					name = "Glass of  potato juice"
+					desc = "Who in the hell requests this? Gross!"
 				if("banana")
 					icon_state = "banana"
 					name = "Glass of banana juice"
@@ -369,7 +369,8 @@

 */

-/datum/disease2/effect/orbweapon
+/*
+/datum/disease2/effect/orbweapon         //peopel are just griefing the shit out of each other with this..and with a constantly regenerating weapon that has a throwforce of 30? I can see why.
 	name = "Biolobulin Effect"
 	stage = 4
 	activate(var/mob/living/carbon/mob,var/multiplier)
@@ -388,7 +389,7 @@
 		if (slot == slot_l_hand)
 			canremove = 1		//curses!
 		..()
-
+*/

 /datum/disease2/effect/plasma
 	name = "Toxin Sublimation"