tweaks on feedback

This commit is contained in:
Aurorablade
2016-04-30 16:04:56 -04:00
parent 7e405427aa
commit dbc65dc7ec
7 changed files with 33 additions and 6 deletions
+6
View File
@@ -135,6 +135,7 @@ var/list/uplink_items = list()
name = "Feral Cat Delivery Grenade"
desc = "The feral cat delivery grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
item = /obj/item/weapon/grenade/spawnergrenade/feral_cats
reference = "CCLG"
cost = 5
job = list("Psychiatrist")//why? Becuase its funny that a person in charge of your mental wellbeing has a cat granade..
@@ -599,6 +600,7 @@ var/list/uplink_items = list()
name = "Sniper Magazine - .50"
desc = "An additional 6-round .50 magazine for use in the syndicate sniper rifle."
item = /obj/item/ammo_box/magazine/sniper_rounds
reference = "SAMO"
cost = 4 //70dmg rounds are no joke
gamemodes = list(/datum/game_mode/nuclear)
@@ -606,22 +608,26 @@ var/list/uplink_items = list()
name = "Sniper Magazine - Soporific Rounds"
desc = "A 3-round magazine of soporific ammo designed for use in the syndicate sniper rifle, put your enemies to sleep today!"
item = /obj/item/ammo_box/magazine/sniper_rounds/soporific
reference = "SOPA"
cost = 6
/datum/uplink_item/ammo/sniper/haemorrhage
name = "Sniper Magazine - Haemorrhage Rounds"
desc = "A 5-round magazine of haemorrhage ammo designed for use in the syndicate sniper rifle, causes heavy bleeding in the target."
reference = "BLUDA"
item = /obj/item/ammo_box/magazine/sniper_rounds/haemorrhage
/datum/uplink_item/ammo/sniper/penetrator
name = "Sniper Magazine - Penetrator Rounds"
desc = "A 5-round magazine of penetrator ammo designed for use in the syndicate sniper rifle. Can pierce walls and multiple enemies."
reference = "PENAMO"
item = /obj/item/ammo_box/magazine/sniper_rounds/penetrator
cost = 5
/datum/uplink_item/ammo/sniper/accelerator
name = "Sniper Magazine - Accelerator Rounds"
desc = "A 5-round magazine of accelerator ammo designed for use in the syndicate sniper rifle. The shot is weak at close range, but gains more power the farther it flies."
reference = "ACELAMO"
item = /obj/item/ammo_box/magazine/sniper_rounds/accelerator
cost = 4
@@ -46,7 +46,7 @@
name = "feral cat delivery grenade"
desc = "This grenade contains 8 dehydrated feral cats in a similar manner to dehydrated monkeys, which, upon detonation, will be rehydrated by a small reservoir of water contained within the grenade. These cats will then attack anything in sight."
spawner_type = /mob/living/simple_animal/hostile/feral_cat
deliveryamt = 8
deliveryamt = 5
origin_tech = "materials=3;magnets=4;syndicate=4"
/obj/item/weapon/grenade/spawnergrenade/feral_cats/prime() //Own proc for this because the regular one would flash people which was dumb.
@@ -691,6 +691,16 @@
item_state = "atmos_suit"
item_color = "atmos"
/obj/item/clothing/under/contortionist/equipped(mob/living/carbon/human/user, slot)
if(!user.ventcrawler)
user.ventcrawler = 2
..()
/obj/item/clothing/under/contortionist/dropped(mob/living/carbon/human/user)
if(!user.get_int_organ(/obj/item/organ/internal/gland/ventcrawling))
user.ventcrawler = 0
..()
/obj/item/clothing/under/contortionist/proc/check_clothing(mob/user as mob)
//Allowed to wear: glasses, shoes, gloves, pockets, mask, and jumpsuit (obviously)
var/list/slot_must_be_empty = list(slot_back,slot_handcuffed,slot_legcuffed,slot_l_hand,slot_r_hand,slot_belt,slot_head,slot_wear_suit)
+6
View File
@@ -386,6 +386,12 @@ var/list/ventcrawl_machinery = list(/obj/machinery/atmospherics/unary/vent_pump,
if(buckled_mob)
to_chat(src, "You can't vent crawl with [buckled_mob] on you!")
return
if(ishuman(src))
var/mob/living/carbon/human/H = src
if(H.w_uniform && istype(H.w_uniform, /obj/item/clothing/under/contortionist))//IMMA SPCHUL SNOWFLAKE
var/obj/item/clothing/under/contortionist/C = H.w_uniform
if(!C.check_clothing(src))//return values confuse me right now
return
var/obj/machinery/atmospherics/unary/vent_found
@@ -6,8 +6,8 @@
icon_living = "cat2"
icon_dead = "cat2_dead"
gender = MALE
maxHealth = 30
health = 30
maxHealth = 20
health = 20
melee_damage_lower = 10
melee_damage_upper = 5
attacktext = "claws"
+3
View File
@@ -89,17 +89,20 @@
/obj/item/weapon/gun/New()
build_zooming()
..()
/obj/item/weapon/gun/pickup(mob/user)
if(azoom)
azoom.Grant(user)
..()
/obj/item/weapon/gun/dropped(mob/user)
zoom(user,FALSE)
if(azoom)
azoom.Remove(user)
..()
/obj/item/weapon/gun/afterattack(atom/A as mob|obj|turf|area, mob/living/user as mob|obj, flag, params)
if(flag) return //we're placing gun on a table or in backpack
@@ -24,13 +24,13 @@
/obj/item/weapon/gun/projectile/sniper_rifle/syndicate
name = "syndicate sniper rifle"
desc = "Syndicate flavoured sniper rifle, it packs quite a punch, a punch to your face"
origin_tech = "combat=8;illigal=4"
origin_tech = "combat=8;syndicate=4"
//Normal Boolets
/obj/item/ammo_box/magazine/sniper_rounds
name = "sniper rounds (.50)"
icon_state = ".50mag"
origin_tech = "combat=6;illigal=2"
origin_tech = "combat=6;syndicate=2"
ammo_type = /obj/item/ammo_casing/point50
max_ammo = 6
caliber = ".50"
@@ -66,7 +66,7 @@
name = "sniper rounds (Zzzzz)"
desc = "Soporific sniper rounds, designed for happy days and dead quiet nights..."
icon_state = "soporific"
origin_tech = "combat=6;illigal=3"
origin_tech = "combat=6;syndicate=3"
ammo_type = /obj/item/ammo_casing/soporific
max_ammo = 3
caliber = ".50"
@@ -76,6 +76,7 @@
desc = "A .50 bullet casing, specialised in sending the target to sleep, instead of hell."
caliber = ".50"
projectile_type = /obj/item/projectile/bullet/sniper/soporific
icon_state = ".50"
/obj/item/projectile/bullet/sniper/soporific
nodamage = 1
@@ -108,6 +109,7 @@
desc = "A .50 bullet casing, specialised in causing massive bloodloss"
caliber = ".50"
projectile_type = /obj/item/projectile/bullet/sniper/haemorrhage
icon_state = ".50"
/obj/item/projectile/bullet/sniper/haemorrhage
damage = 15