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

Fethas Carnival of Horrors part 1.5: Swarmers #2325

Merged
merged 9 commits into from Nov 4, 2015

Conversation

Aurorablade
Copy link
Contributor

Merge conflict EXTREAME FIX. Rmake of #2256
Notifying @Fox-McCloud @tigercat2000

ports swarmers https://github.com/tgstation/-tg-station/pull/11382/files https://github.com/tgstation/-tg-station/pull/11589/files and https://github.com/tgstation/-tg-station/pull/11757/files

Adds "Swarmers", new simple mob

Intended to be used in the middle of a round, and are not a main antagonist
Completely nonlethal. They are incapable of dealing anything but stamina damage to mobs. Their >melee attack deals 15 stamina damage, and they have a disabler beam on a decent cooldown.
Very low amount of health at 40 max, but can self repair.
Cannot pull.
Can ventcrawl
Unlike standard silicons cannot survive in a fire
Speak swarmer language, and do not understand human speech
Disablers go right through em, to allow swarmers to better cover each other
Swarmer abilities (Cannot be used in vents)

Create Trap - Costs 5 resources, puts a small trap on the ground. Mobs that run over it get >electrocuted for 0 damage, but will still stun them just like any other electric shock. Has 10 health.
Create Barricade - Costs 5 resources, creates a barricade that cannot be passed by anything but >swarmers and disabler beams. They have 50 health.
Replicate - Creates a new inactive swarmer at your location after a 10 second delay. Costs 50 >resources. Ghosts can click on an inactive swarmer to take control of it.
Self repair - Repairs to full health after a small delay.
Contact swarmers - Just sends a message to any other active swarmers
Toggle Light - Just toggles some brightness on the swarmer.
Swarmer Ctrl+Click abilities:

Ctrl Click on a item to attempt to cannibalize it for resources. One resource point for one objects, >but sheets are consumed one at a time. Only occurs on items with glass or metal materials in it. >Remember, because you cannot pull or pick up, resources must be acquired on site. Some objects >are banned, such as wiring (Way too much of it on station) and guns (No eating the whole armory).
Ctrl Click on structure or wall to attempt to Disintegrate it to turn it into useable materials (Calls >ex_act(3) on things), notable uses include destroying tables, walls, closets, vending machines, etc. >You are incapable of causing a hull breach or destroying the powernet in this fashion.
Ctrl Click on a mob in melee range to teleport them away. This requires both parties to remain still, >and ~3 seconds. The mob is teleported to random safe-for-humans tile on the station zlevel. If >they're a human, they get ziptied as well.
Ctrl Click on a machine to dismantle the machine (Requires 10 seconds). Some machines are >obviously protected against this. The circuit board for the machine will drop on the floor, and >swarmers can't eat them.
Other stuff

Swarmers jobs are basically to just run around the station eating random objects. A few things are >protected from them, such as atmos canisters, emitters, wiring, etc. They can defend themselves, >but can't ever kill anything, and are easily killed, so it's mostly just a cat and mouse game.

Merge conflict EXTREAME FIX
@Fox-McCloud Fox-McCloud added Feature This PR is a new addition to the game Needs Review Do Not Merge This PR must not be merged or closed labels Oct 8, 2015
@marlyn-x86
Copy link
Member

It looks like the self-repair function only patches up brute damage. Is burn damage meant to stick on these mobs?

@Aurorablade
Copy link
Contributor Author

Well i know they aren't supposed to be fire immune. i didn't really thing about it since that the way it is on TG..however it the burn damage is felt to be a big issue i can certainly add in repairing it.

I realease a swarmer a day on github until this is merged.
@Aurorablade
Copy link
Contributor Author

releases a swamer on get hub

@@ -325,6 +325,15 @@ Class Procs:
/obj/machinery/CouldNotUseTopic(var/mob/user)
usr.unset_machine()

/obj/machinery/proc/dropContents()//putting for swarmers, occupent code commented out, someone can use later.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any particular reason for the occupant code being commented out?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

occupant isn't a machine level var on baycode

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah it was in the TG PR for swarmers, I can remove it utterly.

@TheDZD
Copy link
Contributor

TheDZD commented Oct 14, 2015

Sorry it took so long for a maintainer to actually look at this. That said, I pointed out anything that looked odd or broken that I could find, a few comments are questions because I'm not certain of the functionality.

@Aurorablade
Copy link
Contributor Author

releases another swarmer..evil laugh

@Fox-McCloud
Copy link
Member

Sorry I haven't looked at this, @Aurorablade I've been distracted by performance fixes of late ;w;

@Aurorablade
Copy link
Contributor Author

off topic but hey @tigercat2000 were you still planning on doing that meat spike port?

harm_intent_damage = 5
minbodytemp = 0
maxbodytemp = 500
unsuitable_atmos_damage = 0
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

don't forget to define the atmos damage(s)

@Fox-McCloud
Copy link
Member

Don't forget the 30->40% chance to drop things for the girders ex_act() level 3.

also stool/ex_act() from 50 to70% for level 2---and 5 to 50 for level 3 (and making both spawn a sheet of metal).

May want to check out the projectile fixes for simple animals here: tgstation/tgstation#11589

..()

/obj/item/unactivated_swarmer/Topic(href, href_list)
if(href_list["ghostjoin"])
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The topic parent chain really shouldn't ever be broken.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tigercat2000 suggested fix there?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Include the standard parent chain-

/Topic(href, href_list)
    if(..())
         return 1

will still need to look at using transfer_to and the language key
@Aurorablade
Copy link
Contributor Author

put in fixy fixes to fix the things

@Aurorablade
Copy link
Contributor Author

releases another swarmer

@Aurorablade
Copy link
Contributor Author

Reviewed TG simple animal.dm, made changes based on feedback, mainly in the adjustbruteloss and adjustfireloss.

Attack Threshold main diffrence is i am using a damagetype switch and some suggestions from @tigercat2000

@Fox-McCloud
Copy link
Member

I think once that's addressed, this can probably be merged.

visible_message("<span class='warning'>[src] looks unharmed from the damage.</span>")
else
adjustBruteLoss(damage)
updatehealth())
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

one too many parenthesis.

@Aurorablade
Copy link
Contributor Author

opps...fixed.

@Fox-McCloud
Copy link
Member

Is probably good to go.

Requesting review by @TheDZD

@Fox-McCloud Fox-McCloud removed the Do Not Merge This PR must not be merged or closed label Nov 3, 2015
@TheDZD
Copy link
Contributor

TheDZD commented Nov 4, 2015

Looks good.

TheDZD added a commit that referenced this pull request Nov 4, 2015
Fethas Carnival of Horrors part 1.5: Swarmers
@TheDZD TheDZD merged commit 0604c8d into ParadiseSS13:master Nov 4, 2015
@Aurorablade Aurorablade deleted the ForTheSwarm2 branch March 8, 2016 00:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Feature This PR is a new addition to the game
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants