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

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

Browse Source
This commit is contained in:
FalseIncarnate
2015-06-23 04:18:46 -04:00
parent acf1e268f1 4d9baf9936
commit fc6ebc4854
230 changed files with 962 additions and 1032 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/dead/observer/observer.dm
+1 -1
View File
@@ -92,7 +92,7 @@ var/list/image/ghost_darkness_images = list() //this is a list of images for thi
del(ghostimage)
ghostimage = null
updateallghostimages()
..()
return ..()
/mob/dead/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
return 1
code/modules/mob/living/carbon/alien/humanoid/humanoid.dm
-12
View File
@@ -125,18 +125,6 @@
adjustFireLoss(damage)
return
/mob/living/carbon/alien/humanoid/meteorhit(O as obj)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
adjustFireLoss((istype(O, /obj/effect/meteor/small) ? 10 : 25))
adjustFireLoss(30)
updatehealth()
return
/mob/living/carbon/alien/humanoid/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."
code/modules/mob/living/carbon/alien/larva/larva.dm
-11
View File
@@ -129,17 +129,6 @@
/mob/living/carbon/alien/larva/attack_ui(slot_id)
return
/mob/living/carbon/alien/larva/meteorhit(O as obj)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
adjustBruteLoss((istype(O, /obj/effect/meteor/small) ? 10 : 25))
adjustFireLoss(30)
updatehealth()
return
/mob/living/carbon/alien/larva/attack_animal(mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
code/modules/mob/living/carbon/alien/special/alien_embryo.dm
+1 -1
View File
@@ -25,7 +25,7 @@ var/const/ALIEN_AFK_BRACKET = 450 // 45 seconds
affected_mob.status_flags &= ~(XENO_HOST)
spawn(0)
RemoveInfectionImages(affected_mob)
..()
return ..()
/obj/item/alien_embryo/process()
if(!affected_mob) return
code/modules/mob/living/carbon/human/human.dm
-16
View File
@@ -382,22 +382,6 @@
apply_damage(rand(20,30), BRUTE, affecting, run_armor_check(affecting, "melee"))
return
/mob/living/carbon/human/meteorhit(O as obj)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message("\red [src] has been hit by [O]", 1)
if (health > 0)
var/obj/item/organ/external/affecting = get_organ(pick("chest", "chest", "chest", "head"))
if(!affecting) return
if (istype(O, /obj/effect/immovablerod))
if(affecting.take_damage(101, 0))
UpdateDamageIcon()
else
if(affecting.take_damage((istype(O, /obj/effect/meteor/small) ? 10 : 25), 30))
UpdateDamageIcon()
updatehealth()
return
/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
code/modules/mob/living/carbon/metroid/metroid.dm
-11
View File
@@ -239,17 +239,6 @@
/mob/living/carbon/slime/attack_ui(slot)
return
/mob/living/carbon/slime/meteorhit(O as obj)
for(var/mob/M in viewers(src, null))
if ((M.client && !( M.blinded )))
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (health > 0)
adjustBruteLoss((istype(O, /obj/effect/meteor/small) ? 10 : 25))
adjustFireLoss(30)
updatehealth()
return
/mob/living/carbon/slime/attack_slime(mob/living/carbon/slime/M as mob)
if (!ticker)
M << "You cannot attack people before the game has started."
code/modules/mob/living/silicon/ai/ai.dm
+1 -12
View File
@@ -225,7 +225,7 @@ var/list/ai_verbs_default = list(
/mob/living/silicon/ai/Destroy()
ai_list -= src
..()
return ..()
/*
@@ -591,17 +591,6 @@ var/list/ai_verbs_default = list(
return
/mob/living/silicon/ai/meteorhit(obj/O as obj)
for(var/mob/M in viewers(src, null))
M.show_message(text("\red [] has been hit by []", src, O), 1)
//Foreach goto(19)
if (health > 0)
adjustBruteLoss(30)
if ((O.icon_state == "flaming"))
adjustFireLoss(40)
updatehealth()
return
/mob/living/silicon/ai/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
updatehealth()
code/modules/mob/living/silicon/ai/freelook/eye.dm
+1
View File
@@ -29,6 +29,7 @@
del(ghostimage)
ghostimage = null;
updateallghostimages()
return ..()
// Movement code. Returns 0 to stop air movement from moving it.
/mob/aiEye/Move()
code/modules/mob/living/silicon/pai/pai.dm
-10
View File
@@ -203,16 +203,6 @@
// See software.dm for Topic()
/mob/living/silicon/pai/meteorhit(obj/O as obj)
for(var/mob/M in viewers(src, null))
M.show_message(text("\red [] has been hit by []", src, O), 1)
if (src.health > 0)
src.adjustBruteLoss(30)
if ((O.icon_state == "flaming"))
src.adjustFireLoss(40)
src.updatehealth()
return
/mob/living/silicon/pai/attack_animal(mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
code/modules/mob/living/silicon/robot/robot.dm
+2 -14
View File
@@ -179,7 +179,7 @@ var/list/robot_verbs_default = list(
if(T) mmi.loc = T
if(mind) mind.transfer_to(mmi.brainmob)
mmi = null
..()
return ..()
/mob/living/silicon/robot/proc/pick_module()
if(module)
@@ -528,18 +528,6 @@ var/list/robot_verbs_default = list(
return
/mob/living/silicon/robot/meteorhit(obj/O as obj)
for(var/mob/M in viewers(src, null))
M.show_message(text("\red [src] has been hit by [O]"), 1)
//Foreach goto(19)
if (health > 0)
adjustBruteLoss(30)
if ((O.icon_state == "flaming"))
adjustFireLoss(40)
updatehealth()
return
/mob/living/silicon/robot/bullet_act(var/obj/item/projectile/Proj)
..(Proj)
updatehealth()
@@ -1236,7 +1224,7 @@ var/list/robot_verbs_default = list(
if(emagged)
if(mmi)
qdel(mmi)
explosion(src.loc,1,2,4)
explosion(src.loc,1,2,4,flame_range = 2)
else
explosion(src.loc,-1,0,2)
gib()
code/modules/mob/living/simple_animal/bees.dm
+1 -1
View File
@@ -35,7 +35,7 @@
/mob/living/simple_animal/bee/Destroy()
if(parent)
parent.owned_bee_swarms.Remove(src)
..()
return ..()
/mob/living/simple_animal/bee/Life()
..()
code/modules/mob/living/simple_animal/friendly/spiderbot.dm
+1 -1
View File
@@ -193,7 +193,7 @@
/mob/living/simple_animal/spiderbot/Destroy()
eject_brain()
..()
return ..()
/mob/living/simple_animal/spiderbot/New()
code/modules/mob/living/simple_animal/hostile/retaliate/drone.dm
+5 -5
View File
@@ -170,16 +170,16 @@
var/obj/O
//shards
O = getFromPool(/obj/item/weapon/shard, loc)
O = PoolOrNew(/obj/item/weapon/shard, loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(75))
O = getFromPool(/obj/item/weapon/shard, loc)
O = PoolOrNew(/obj/item/weapon/shard, loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(50))
O = getFromPool(/obj/item/weapon/shard, loc)
O = PoolOrNew(/obj/item/weapon/shard, loc)
step_to(O, get_turf(pick(view(7, src))))
if(prob(25))
O = getFromPool(/obj/item/weapon/shard, loc)
O = PoolOrNew(/obj/item/weapon/shard, loc)
step_to(O, get_turf(pick(view(7, src))))
//rods
@@ -270,7 +270,7 @@
C.name = "Corrupted drone morality core"
C.origin_tech = "illegal=[rand(3,6)]"
..()
return ..()
/obj/item/projectile/beam/drone
damage = 15
code/modules/mob/living/simple_animal/hostile/spaceworms.dm
+1 -1
View File
@@ -216,7 +216,7 @@
/mob/living/simple_animal/hostile/spaceWorm/Destroy()
if(previousWorm)
previousWorm.Detach(0)
..()
return ..()
//Move all segments if one piece moves.
code/modules/mob/living/simple_animal/tribbles.dm
+1 -7
View File
@@ -140,7 +140,7 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
if (1)
new /obj/item/weapon/shard( src.loc )
Break()
del(src)
qdel(src)
if (2)
if (prob(50))
src.health -= 15
@@ -165,12 +165,6 @@ var/global/totaltribbles = 0 //global variable so it updates for all tribbles,
del(src)
/obj/structure/tribble_cage/meteorhit(obj/O as obj)
new /obj/item/weapon/shard( src.loc )
Break()
del(src)
/obj/structure/tribble_cage/proc/healthcheck()
if (src.health <= 0)
if (!( src.destroyed ))
code/modules/mob/mob.dm
+1 -1
View File
@@ -3,7 +3,7 @@
dead_mob_list -= src
living_mob_list -= src
ghostize()
..()
return ..()
/mob/New()
mob_list += src
code/modules/mob/mob_grab.dm
+1 -1
View File
@@ -416,7 +416,7 @@
affecting.layer = initial(affecting.layer)
affecting.grabbed_by -= src
del(hud)
..()
return ..()
#undef EAT_TIME_XENO
#undef EAT_TIME_FAT