More delay issues, magboots, knive-boot, marble and ccia (#1586)

- Fixes #1583
- Fixes #1031 
-adds some checks for magboots
-reduces the hardness of marble
-finally adds a delay when attacking common mobs with weapons
-finally adds a delay of cult mobs attacking things, like machines
-fix the flash pistol having no flash rounds
-fully remove custom items gloves from spawning from cargo
-replace all the references of ahdomai and S'randarr with Adhomai and S'rendarr
-import a bay fixe to hud runtimes
-removes christmas pun pun
-replace the old appearance that the ccia used with the newest and most robust one
-do more changes on the ccia code at ccia request, also, removes all the red and blue shit from it
This commit is contained in:
Alberyk
2017-01-18 14:56:06 -02:00
committed by skull132
parent 933aaf386c
commit f253c2c381
16 changed files with 65 additions and 95 deletions

View File

@@ -42,7 +42,7 @@
/datum/language/tajaran
name = LANGUAGE_SIIK_MAAS
desc = "The traditionally employed tongue of Ahdomai, composed of expressive yowls and chirps. Native to the Tajaran."
desc = "The traditionally employed tongue of Adhomai, composed of expressive yowls and chirps. Native to the Tajaran."
speech_verb = "mrowls"
ask_verb = "mrowls"
exclaim_verb = "yowls"

View File

@@ -1387,7 +1387,7 @@
/mob/living/carbon/human/proc/handle_hud_list()
if (BITTEST(hud_updateflag, HEALTH_HUD))
if (BITTEST(hud_updateflag, HEALTH_HUD)&& hud_list[HEALTH_HUD])
var/image/holder = hud_list[HEALTH_HUD]
if(stat == DEAD)
holder.icon_state = "hudhealth-100" // X_X
@@ -1404,7 +1404,7 @@
holder.icon_state = "hud[percentage_health]"
hud_list[HEALTH_HUD] = holder
if (BITTEST(hud_updateflag, LIFE_HUD))
if (BITTEST(hud_updateflag, LIFE_HUD)&& hud_list[LIFE_HUD])
var/image/holder = hud_list[LIFE_HUD]
if(stat == DEAD)
holder.icon_state = "huddead"
@@ -1412,7 +1412,7 @@
holder.icon_state = "hudhealthy"
hud_list[LIFE_HUD] = holder
if (BITTEST(hud_updateflag, STATUS_HUD))
if (BITTEST(hud_updateflag, STATUS_HUD)&& hud_list[STATUS_HUD] && hud_list[STATUS_HUD_OOC])
var/foundVirus = 0
for(var/datum/disease/D in viruses)
if(!D.hidden[SCANNER])
@@ -1453,7 +1453,7 @@
hud_list[STATUS_HUD] = holder
hud_list[STATUS_HUD_OOC] = holder2
if (BITTEST(hud_updateflag, ID_HUD))
if (BITTEST(hud_updateflag, ID_HUD) && hud_list[WANTED_HUD])
var/image/holder = hud_list[ID_HUD]
//The following function is found in code/defines/procs/hud.dm

View File

@@ -10,10 +10,7 @@
spawn(1)
name = "Pun Pun"
real_name = name
if(prob(10))
w_uniform = new /obj/item/clothing/under/nupnup(src)
else
w_uniform = new /obj/item/clothing/under/punpun(src)
w_uniform = new /obj/item/clothing/under/punpun(src)
/obj/item/clothing/under/nupnup
name = "christmas uniform"
@@ -27,4 +24,4 @@
spawn(1)
name = "Winston, the Christmas Monkey"
real_name = name
w_uniform = new /obj/item/clothing/under/nupnup(src)
w_uniform = new /obj/item/clothing/under/nupnup(src)

View File

@@ -124,7 +124,7 @@
sprint_speed_factor = 0.65
sprint_cost_factor = 0.75
blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Ahdomai in the S'randarr \
blurb = "The Tajaran race is a species of feline-like bipeds hailing from the planet of Adhomai in the S'rendarr \
system. They have been brought up into the space age by the Humans and Skrell, who alledgedly influenced their \
eventual revolution that overthrew their ancient monarchies to become totalitarian - and NanoTrasen friendly - \
republics. Adhomai is still enduring a global war in the aftermath of the new world order, and many Tajara are \

View File

@@ -85,6 +85,7 @@
user << msg
/mob/living/simple_animal/construct/UnarmedAttack(var/atom/A, var/proximity)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(istype(A, /obj/effect/rune))
var/obj/effect/rune/R = A
do_attack_animation(R)

View File

@@ -397,6 +397,7 @@ mob/living/simple_animal/bullet_act(var/obj/item/projectile/Proj)
//TODO: refactor mob attackby(), attacked_by(), and friends.
/mob/living/simple_animal/proc/attacked_with_item(var/obj/item/O, var/mob/user)
user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
if(!O.force)
visible_message("<span class='notice'>[user] gently taps [src] with \the [O].</span>")
return 0