Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makes blobs opaque, allows them to target cameras. #16935

Merged
merged 1 commit into from Apr 19, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions code/modules/blob/blob.dm
Expand Up @@ -7,7 +7,7 @@
light_color = "#b5ff5b"
desc = "Some blob creature thingy."
density = 1
opacity = 0
opacity = 1
anchored = 1
mouse_opacity = 2

Expand All @@ -19,7 +19,7 @@
var/regen_rate = 5
var/brute_resist = 4
var/fire_resist = 1
var/laser_resist = 5 // Special resist for laser based weapons - Emitters or handheld energy weaponry. Damage is divided by this and THEN by fire_resist.
var/laser_resist = 4 // Special resist for laser based weapons - Emitters or handheld energy weaponry. Damage is divided by this and THEN by fire_resist.
var/expandType = /obj/effect/blob
var/secondary_core_growth_chance = 5 //% chance to grow a secondary blob core instead of whatever was suposed to grown. Secondary cores are considerably weaker, but still nasty.

Expand Down Expand Up @@ -102,6 +102,10 @@
M.visible_message("<span class='danger'>The blob attacks \the [M]!</span>")
M.take_damage(40)
return
var/obj/machinery/camera/CA = locate() in T
if(CA)
CA.take_damage(30)
return

// Above things, we destroy completely and thus can use locate. Mobs are different.
for(var/mob/living/L in T)
Expand All @@ -118,7 +122,7 @@

/obj/effect/blob/proc/pulse(var/forceLeft, var/list/dirs)
regen()
sleep(5)
sleep(4)
var/pushDir = pick(dirs)
var/turf/T = get_step(src, pushDir)
var/obj/effect/blob/B = (locate() in T)
Expand Down Expand Up @@ -163,7 +167,7 @@
maxHealth = 200
brute_resist = 2
fire_resist = 2
laser_resist = 10
laser_resist = 8
regen_rate = 2

layer = BLOB_CORE_LAYER
Expand Down Expand Up @@ -228,8 +232,7 @@
maxHealth = 60
brute_resist = 1
fire_resist = 2
laser_resist = 7

laser_resist = 6
/obj/effect/blob/shield/New()
..()
update_nearby_tiles()
Expand Down
38 changes: 38 additions & 0 deletions html/changelogs/chaoko99-blobbuff.yml
@@ -0,0 +1,38 @@
################################
# Example Changelog File
#
# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
#
# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
# When it is, any changes listed below will disappear.
#
# Valid Prefixes:
# bugfix
# wip (For works in progress)
# tweak
# soundadd
# sounddel
# rscadd (general adding of nice things)
# rscdel (general deleting of nice things)
# imageadd
# imagedel
# maptweak
# spellcheck (typo fixes)
# experiment
#################################

# Your name.
author: Chaoko99

# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
delete-after: True

# Any changes you've made. See valid prefix list above.
# INDENT WITH TWO SPACES. NOT TABS. SPACES.
# SCREW THIS UP AND IT WON'T WORK.
# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
changes:
- tweak: "Buffed blob, it will now attempt to spread about 20% more often. Lowered laser resistance of a blob to compensate."
- tweak: "Blobs are now totally opaque. This can be countered with optical material scanners."
- rscadd: "Blobs can now trip camera alarms. Beware: You won't be able to use cameras to find them, if you are not quick!"