Commit Graph

541 Commits

Author SHA1 Message Date
KorPhaeron
ccb24e80c1 Merge pull request #17167 from phil235/AbstractFix
You can attack with ABSTRACT items again.
2016-04-27 12:03:23 -05:00
phil235
61c037389e You can attack with ABSTRACT items again. 2016-04-27 17:45:56 +02:00
Joan Lung
ffc87184f0 You can now analyze blobs to check material effects, blob type, and health
* You can now analyze blobs to check material effects, damage resistance, and health.

* beep beep

* slime extinguishes stuff

* I need to check my code

* wew

* buffnerfs

* fuckthemeta

* morebuffs

* no unfriendly fire

* damn my urge for low linecounts

* this makes me want to drink heavily

* if you see something, say nothing, and drink to forget

* waiting for an answer is for scrubs

* if you see something say nothing and drink to forget

* no resist printout

* phiiiiiiiil
2016-04-27 10:24:47 -05:00
phil235
6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-26 21:49:51 +02:00
Cheridan
5485f75bfd Merge pull request #17076 from ChangelingRain/sixtynineblob
Blobbernaut tweaks
2016-04-25 19:28:28 -05:00
phil235
fcf544283d Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction
Conflicts:
	code/game/objects/structures/crates_lockers/closets.dm
2016-04-24 21:22:37 +02:00
phil235
43e98079f1 Removing some comments I had left in. 2016-04-24 21:12:04 +02:00
phil235
b146131a34 Second commits.
This contains the changes to item_attack.dm
Obj/attackby() now follows a similar structure as mob/living/attackby. It calls attack_obj() (like attack() but for obj) which calls attacked_by (just like attack() does)
The use of the NOBLUDGEON flag changes a bit, it is now used to signify the item cannot be used as a melee weapon at all. No attack animation, no attack message. I've given this bitflag to many items that have an afterattack() so as to not both attack and do the special action (among those items: the rcd)

There's also the code changes to attacking machines: attacking any machine now give a proper message and a sound. And with this, I made more machines breakable (using a health var and the very little used BROKEN stat). Most notably, tables can now be attacked when on harm intent and be destroyed.

The newly destroyable machines have a take_damage() proc used by all sorts of attack (weapon, xeno, animal, hulk, mech melee, gun projectile, thrown items).

There's some more stuff in there, see the PR's description and comments.
2016-04-24 20:37:00 +02:00
Nerd Lord
1c1e056515 info correction 2016-04-23 21:45:20 -04:00
Nerd Lord
b88d7d313b Blobbernaut tweaks 2016-04-23 20:33:58 -04:00
KorPhaeron
6d437be6a5 Improvements 2016-04-23 15:35:43 -05:00
KorPhaeron
c771988284 Gatling Autoclick 2016-04-23 13:47:05 -05:00
duncathan
a2a554c48a Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/objects/explosion.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/events/wormholes.dm
	code/modules/mining/mine_items.dm
	code/modules/mob/living/silicon/robot/robot.dm
2016-04-03 18:22:20 -06:00
duncathan salt
3d95d68b2f Merge pull request #16279 from Core0verload/HUDfuckery
Slot icons micro-refactor
2016-03-30 23:30:06 -06:00
c0
fb08d4e30f rm 2016-03-31 08:16:20 +03:00
duncathan
eeb0119acb Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/modules/mob/mob_movement.dm
	code/modules/recycling/conveyor2.dm
2016-03-30 22:55:00 -06:00
c0
24c6d8e876 feature -> refactor 2016-03-30 03:27:28 +03:00
KorPhaeron
76ca35b8a0 Merge pull request #16453 from tgstation/RemieRichards-action-button-reset
Fixes shift clicking action buttons not immediately resetting them.
2016-03-29 17:17:40 -05:00
duncathan
3f1375ba39 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomZLevels/Cabin.dmm
	_maps/RandomZLevels/beach2.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/templates/lavaland_surface_automated_trade_outpost.dmm
	_maps/templates/lavaland_surface_biodome_winter.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	code/controllers/subsystem/air.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/nuclear/nuclearbomb.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/girders.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/mineral_floor.dm
	code/game/turfs/simulated/floor/plating.dm
	code/game/turfs/simulated/river.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/modules/admin/verbs/buildmode.dm
	code/modules/atmospherics/environmental/LINDA_turf_tile.dm
	code/modules/events/spacevine.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/holodeck/turfs.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/interactive.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/simple_animal/bot/floorbot.dm
	code/modules/mob/living/simple_animal/guardian/guardian.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/mob_movement.dm
	code/modules/power/singularity/narsie.dm
	code/modules/reagents/chemistry/reagents/pyrotechnic_reagents.dm
	code/modules/research/server.dm
2016-03-29 14:46:06 -06:00
Nerd Lord
c74b550eb4 fine okay 2016-03-28 19:13:24 -04:00
Remie Richards
a93cb0a01d Fixes shift clicking action buttons not immediately resetting them. 2016-03-28 19:09:11 +01:00
Nerd Lord
1170bf57b6 conflicting with myself 2016-03-27 23:46:00 -04:00
KorPhaeron
3709f57f40 Merge pull request #16381 from ChangelingRain/justthetooltip
Adds alien tooltip style and updates operative tooltip style
2016-03-27 22:41:15 -05:00
Nerd Lord
37b10862d3 Blobbernauts now have an alert when their factory is destroyed 2016-03-27 19:33:18 -04:00
Nerd Lord
0d89760b20 dunc told me to do it 2016-03-26 21:18:43 -04:00
Nerd Lord
8f9f5f152b >>reviewing your own code 2016-03-26 20:03:27 -04:00
Nerd Lord
10e93fe8b1 fold into pr 2016-03-26 15:22:29 -04:00
Nerd Lord
b222f15d52 Adds alien tooltip style
Ghost revival/body alerts now use the ghost's hud style.
2016-03-26 00:13:02 -04:00
Nerd Lord
5dea8ebca1 Adds assassin holoparasites
Assassin holoparasites can go invisible, causing their next attack to do massive damage and ignore armor.
The stealth will be broken by attacking or taking damage.
2016-03-24 12:08:09 -04:00
Nerd Lord
905a72069b Buffs lightning holoparasite to not be total shit
Adds two new, admin-only guardian types
2016-03-22 16:07:37 -04:00
c0
f71ab62e79 HUD item slots no longer show item placeholders when there are actual items inside 2016-03-22 08:00:38 +03:00
Nerd Lord
705e822641 blob tooltips now have a custom blob theme(it's actually pretty plain but it's better than using hud theme) 2016-03-14 18:32:52 -04:00
Nerd Lord
6be232d2fe Blob buttons now have tooltips
Blobs can toggle node requirements off(it defaults to on)
2016-03-13 15:25:27 -04:00
duncathan
12a6205372 Merge branch 'master' of https://github.com/tgstation/-tg-station into turfs
Conflicts:
	_maps/RandomRuins/SpaceRuins/asteroid4.dmm
	_maps/RandomRuins/SpaceRuins/spacebar.dmm
	_maps/RandomZLevels/Academy.dmm
	_maps/RandomZLevels/beach.dmm
	_maps/RandomZLevels/caves.dmm
	_maps/RandomZLevels/research.dmm
	_maps/RandomZLevels/snowdin.dmm
	_maps/RandomZLevels/spacebattle.dmm
	_maps/RandomZLevels/undergroundoutpost45.dmm
	_maps/RandomZLevels/wildwest.dmm
	_maps/map_files/AsteroidStation/AsteroidStation.dmm
	_maps/map_files/BirdStation/BirdStation.dmm
	_maps/map_files/DreamStation/dreamstation04.dmm
	_maps/map_files/DreamStation/z5.dmm
	_maps/map_files/EfficiencyStation/EfficiencyStation.dmm
	_maps/map_files/MetaStation/MetaStation.v41I.dmm
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	_maps/map_files/generic/z4.dmm
	_maps/map_files/generic/z5.dmm
	_maps/map_files/generic/z6.dmm
	_maps/templates/lavaland_surface_prisoner_crash.dmm
	_maps/templates/lavaland_surface_seed_vault.dmm
	_maps/templates/lavaland_surface_ufo_crash.dmm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/machinery/computer/arcade.dm
	code/game/objects/structures/lattice.dm
	code/game/turfs/simulated/floor/fancy_floor.dm
	code/game/turfs/simulated/floor/misc_floor.dm
	code/game/turfs/simulated/floor/plasteel_floor.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/turf.dm
	code/modules/events/spacevine.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mob/living/living.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/mulebot.dm
	code/modules/mob/mob_movement.dm
2016-03-10 23:07:21 -06:00
duncathan
5bf31463da removes simulated turfs; adds space gas mixture for space 2016-03-10 17:27:01 -06:00
Nerd Lord
1ead1acbfc Goon-style blob placement 2016-03-09 20:21:19 -05:00
AnturK
eda3426633 Merge pull request #15839 from ChangelingRain/blobberguards
Blobbernauts now die slowly when not near the blob
2016-03-02 22:13:37 +01:00
Remie Richards
1cb1e7bfa8 Merge pull request #15766 from GunHog/WJohnston's_How_To_Nerf_Your_Xeno
Xenos now suffer when the queen dies.
2016-03-02 17:34:45 +00:00
phil235
4d2c6b8e24 Cyborgs can no longer activate the object in their active module when incapacitated. They also can't change their sensor mode (sechud, etc...) while incapacitated.
Fixes Wizard apprentice not being able to use soulstones.
2016-02-29 23:09:13 +01:00
Nerd Lord
eff82be81a Blobbernauts now die slowly when not near the blob.
Blobbernauts can now see their overmind's core health via their HUD.
Blobbernauts can also see their health from their HUD.
Blobbernauts are somewhat resistant to spacewind.
2016-02-29 16:41:59 -05:00
GunHog
379eb3c04f Queen death vulnerability
- The alien queen's death will now severely weaken the remaining alien
forces.

- Disables Hivemind and Evolving for 4 minutes.

- Confuses and cripples aliens for a short while.

- New screen alert to serve as a reminder! Sprite by WJohn!
2016-02-25 21:13:27 -06:00
c0
6c9be9c82d Adds breathing tube implant, changes how heart works, reworks arm-mounted implants 2016-02-25 12:50:45 +03:00
phil235
57203430fd Merge branch 'master' of https://github.com/tgstation/-tg-station into ActionButtonUpdateRefactor
Conflicts:
	code/modules/clothing/clothing.dm
	code/modules/mob/living/carbon/inventory.dm
	code/modules/mob/living/carbon/life.dm
	icons/mob/actions.dmi
2016-02-23 19:49:38 +01:00
phil235
0ec876d9fe Refactored the item's action system. Items can now hold multiple actions.
The "set internals" button of tank items now turn green when it's used as internals.
Removed research scanner from drones (since cyborgs don't have it, it's more consistent)
Removed the ignore_madkadjust mask var.
The sechailer mask now has an adjust mask action button, so I removed the adjust verb that it was using.
The item's action are now created on item/New() instead of trying to create it every time someone picks the item up.
I split hud/action.dm, the datum/action stuff is now in the datum folder (/datum/action.dm), whereas the code for action buttons is kept in the hud folder under action_button.dm. Also I moved some /datum/action code that was in some files back into datum/action.dm where it belongs.
2016-02-23 19:37:42 +01:00
phil235
91839f5f70 Action buttons will now only update when needed instead of every Life().
The action buttons now update their icon instantly.
Fixes versions of pickup(),equipped() and dropped not calling the parent.
Fixes drone not being able to remove a defib from their storage.
You can now cycle the mime mask by clicking it in your hand.
The action buttons for hardsuit and hooded suits now only appears when you're wearing the suit.
Created two mob helper procs getBeltSlot() and getBackSlot().
Created /datum/species/proc/on_species_loss() to handle stuff when our race change, currently only used by jelly and slime race to remove their exotic blood from our reagents and to remove slime people's action buttons.
2016-02-22 00:34:59 +01:00
AnturK
39d25029d6 Merge pull request #15644 from ChangelingRain/youthoughtitwasdead
Revenants now have an essence HUD
2016-02-21 18:48:40 +01:00
Nerd Lord
4b7438e39f Revenants now have toggleable nightvision.
Revenants now have an essence HUD.
Revenants now retain essence cap from the previous revenant, minus perfect souls.
Restructured revenant code to be less all over the place
Moved Harvesting to revenant_abilities.dm
Defile has slightly more range, but does less damage to windows.
Blight kills shrooms and vines slightly faster.
2016-02-20 13:01:25 -05:00
AnturK
77ee2ded62 Renames click intercept method to avoid collision with ClickOn 2016-02-20 15:39:14 +01:00
Fox-McCloud
3da281caa8 Adjusts Laser Eyes 2016-02-12 15:40:27 -05:00
AnturK
d47b43107d Merge pull request #15405 from phil235/VisionDisposalFix
Fixes vision bug with disposal.
2016-02-11 23:25:44 +01:00