cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 03:27:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna

Browse Source 
# Conflicts:
#	code/game/machinery/turrets.dm
This commit is contained in:
Markolie
2017-01-09 22:00:31 +01:00
parent 55278aa0ee 9f40d013f9
commit 0adc370d55
39 changed files with 188 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/alien/alien_defenses.dm
+1 -1
View File
@@ -35,7 +35,7 @@ In all, this is a lot like the monkey code. /N
visible_message("<span class='danger'>[M.name] bites [src]!</span>", \
"<span class='userdanger'>[M.name] bites [src]!</span>")
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
updatehealth()
else
to_chat(M, "<span class='warning'>[name] is too injured for that.</span>")
code/modules/mob/living/carbon/alien/larva/larva.dm
+1 -1
View File
@@ -116,7 +116,7 @@
"<span class='userdanger'>[M] [M.attacktext] [src]!</span>")
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
updatehealth()
code/modules/mob/living/carbon/human/human.dm
+3
View File
@@ -805,10 +805,12 @@
unEquip(pocket_item)
if(thief_mode)
usr.put_in_hands(pocket_item)
add_logs(usr, src, "stripped", addition="of [pocket_item]", print_attack_log = isLivingSSD(src))
else
if(place_item)
usr.unEquip(place_item)
equip_to_slot_if_possible(place_item, pocket_id, 0, 1)
add_logs(usr, src, "equipped", addition="with [pocket_item]", print_attack_log = isLivingSSD(src))
// Update strip window
if(usr.machine == src && in_range(src, usr))
@@ -817,6 +819,7 @@
// Display a warning if the user mocks up if they don't have pickpocket gloves.
if(!thief_mode)
to_chat(src, "<span class='warning'>You feel your [pocket_side] pocket being fumbled with!</span>")
add_logs(usr, src, "attempted to strip", addition="of [pocket_item]", print_attack_log = isLivingSSD(src))
if(href_list["set_sensor"])
if(istype(w_uniform, /obj/item/clothing/under))
code/modules/mob/living/carbon/human/human_defense.dm
+1 -2
View File
@@ -353,8 +353,7 @@ emp_act
if(M)
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has been hit with a [I], thrown by [key_name(M)]</font>")
M.attack_log += text("\[[time_stamp()]\] <font color='red'>Hit [key_name(src)] with a thrown [I]</font>")
if(!istype(src,/mob/living/simple_animal/mouse))
msg_admin_attack("[key_name_admin(src)] was hit by a [I], thrown by [key_name_admin(M)]")
msg_admin_attack("[key_name_admin(src)] was hit by a [I], thrown by [key_name_admin(M)]", print_attack_log = I.throwforce)
//thrown weapon embedded object code.
if(dtype == BRUTE && istype(I))
code/modules/mob/living/carbon/update_status.dm
-2
View File
@@ -12,6 +12,4 @@
KnockOut()
else
if(stat == UNCONSCIOUS)
// updating=FALSE because `WakeUp` will handle canmove up for us
StopResting(updating=FALSE)
WakeUp()
code/modules/mob/living/living.dm
+2 -2
View File
@@ -650,7 +650,7 @@
who.unEquip(what)
if(silent)
put_in_hands(what)
add_logs(src, who, "stripped", addition="of [what]")
add_logs(src, who, "stripped", addition="of [what]", print_attack_log = isLivingSSD(who))
// The src mob is trying to place an item on someone
// Override if a certain mob should be behave differently when placing items (can't, for example)
@@ -669,7 +669,7 @@
if(what && Adjacent(who))
unEquip(what)
who.equip_to_slot_if_possible(what, where, 0, 1)
add_logs(src, who, "equipped", what)
add_logs(src, who, "equipped", what, print_attack_log = isLivingSSD(who))
/mob/living/singularity_act()
code/modules/mob/living/living_defense.dm
+1 -1
View File
@@ -147,7 +147,7 @@
else
step_away(src,M)
add_logs(M.occupant, src, "pushed", object=M, admin=0)
add_logs(M.occupant, src, "pushed", object=M, admin=0, print_attack_log = 0)
M.occupant_message("<span class='warning'>You push [src] out of the way.</span>")
visible_message("<span class='warning'>[M] pushes [src] out of the way.</span>")
return
code/modules/mob/living/silicon/ai/ai.dm
+1 -1
View File
@@ -603,7 +603,7 @@ var/list/ai_verbs_default = list(
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
visible_message("<span class='danger'><B>[M]</B> [M.attacktext] [src]!")
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
adjustBruteLoss(damage)
updatehealth()
code/modules/mob/living/silicon/robot/robot.dm
+2 -2
View File
@@ -920,7 +920,7 @@ var/list/robot_verbs_default = list(
if(M.attack_sound)
playsound(loc, M.attack_sound, 50, 1, 1)
visible_message("<span class='danger'><B>[M]</B> [M.attacktext] [src]!</span>")
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
switch(M.melee_damage_type)
if(BRUTE)
@@ -1467,4 +1467,4 @@ var/list/robot_verbs_default = list(
borked_part.installed = 1
borked_part.wrapped = new borked_part.external_type
borked_part.heal_damage(brute,burn)
borked_part.install()
borked_part.install()
code/modules/mob/living/simple_animal/bot/bot.dm
+2 -2
View File
@@ -254,7 +254,7 @@
return
apply_damage(M.melee_damage_upper, BRUTE)
visible_message("<span class='userdanger'>[M] has [M.attacktext] [src]!</span>")
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
if(prob(10))
new /obj/effect/decal/cleanable/blood/oil(loc)
@@ -1010,4 +1010,4 @@ Pass a positive integer as an argument to override a bot's default speed.
throw_alert("temp", /obj/screen/alert/cold/robot, 2)
/mob/living/simple_animal/bot/is_mechanical()
return 1
return 1
code/modules/mob/living/simple_animal/simple_animal.dm
+1 -1
View File
@@ -297,7 +297,7 @@
playsound(loc, M.attack_sound, 50, 1, 1)
visible_message("<span class='danger'>\The [M] [M.attacktext] [src]!</span>", \
"<span class='userdanger'>\The [M] [M.attacktext] [src]!</span>")
add_logs(M, src, "attacked", admin=0)
add_logs(M, src, "attacked", admin=0, print_attack_log = 0)
var/damage = rand(M.melee_damage_lower, M.melee_damage_upper)
attack_threshold_check(damage,M.melee_damage_type)
code/modules/mob/living/stat_states.dm
+3 -3
View File
@@ -6,7 +6,7 @@
return 0
else if(stat == UNCONSCIOUS)
return 0
add_logs(src, null, "fallen unconscious at [atom_loc_line(get_turf(src))]", admin=0)
add_logs(src, null, "fallen unconscious at [atom_loc_line(get_turf(src))]", admin=0, print_attack_log = 0)
stat = UNCONSCIOUS
if(updating)
// update_blind_effects()
@@ -19,7 +19,7 @@
return 0
else if(stat == CONSCIOUS)
return 0
add_logs(src, null, "woken up at [atom_loc_line(get_turf(src))]", admin=0)
add_logs(src, null, "woken up at [atom_loc_line(get_turf(src))]", admin=0, print_attack_log = 0)
stat = CONSCIOUS
if(updating)
// update_blind_effects()
@@ -40,7 +40,7 @@
return
if(!can_be_revived())
return
add_logs(src, null, "came back to life at [atom_loc_line(get_turf(src))]", admin=0)
add_logs(src, null, "came back to life at [atom_loc_line(get_turf(src))]", admin=0, print_attack_log = 0)
stat = CONSCIOUS
dead_mob_list -= src
living_mob_list += src
code/modules/mob/mob.dm
+1 -2
View File
@@ -946,8 +946,7 @@ var/list/slot_equipment_priority = list( \
add_spell_to_statpanel(S)
if(client && client.holder)
if(is_admin(src))
if(statpanel("DI")) //not looking at that panel
stat("Loc", "([x], [y], [z]) [loc]")
stat("CPU", "[world.cpu]")
code/modules/mob/new_player/sprite_accessories.dm
+24 -1
View File
@@ -2028,7 +2028,7 @@
models_allowed = list("Xion Manufacturing Group alt.")
/datum/sprite_accessory/body_markings/tattoo // Tattoos applied post-round startup with tattoo guns in item_defines.dm
species_allowed = list("Human", "Unathi", "Grey", "Vulpkanin", "Tajaran", "Skrell")
species_allowed = list("Human", "Unathi", "Vulpkanin", "Tajaran", "Skrell")
icon_state = "accessory_none"
/datum/sprite_accessory/body_markings/tattoo/elliot
@@ -2053,6 +2053,25 @@
name = "Nightling Tattoo"
icon_state = "markings_tattoo_nightling"
/datum/sprite_accessory/body_markings/tattoo/grey
species_allowed = list("Grey")
/datum/sprite_accessory/body_markings/tattoo/grey/heart_grey
name = "Grey Heart Tattoo"
icon_state = "markings_tattoo_heart_grey"
/datum/sprite_accessory/body_markings/tattoo/grey/hive_grey
name = "Grey Hive Tattoo"
icon_state = "markings_tattoo_hive_grey"
/datum/sprite_accessory/body_markings/tattoo/grey/nightling_grey
name = "Grey Nightling Tattoo"
icon_state = "markings_tattoo_nightling_grey"
/datum/sprite_accessory/body_markings/tattoo/grey/tiger_body_grey
name = "Grey Tiger-stripe Tattoo"
icon_state = "markings_tattoo_tiger_grey"
/datum/sprite_accessory/body_markings/tattoo/vox
species_allowed = list("Vox")
@@ -2068,6 +2087,10 @@
name = "Vox Nightling Tattoo"
icon_state = "markings_tattoo_nightling_vox"
/datum/sprite_accessory/body_markings/tattoo/vox/tiger_body_vox
name = "Vox Tiger-stripe Tattoo"
icon_state = "markings_tattoo_tiger_vox"
/datum/sprite_accessory/body_markings/tail
species_allowed = list()
icon_state = "accessory_none"