Commit Graph

6438 Commits

Author SHA1 Message Date
Hornygranny 955847de74 defines 2014-10-31 19:00:50 -07:00
Remie Richards 24b6e9c601 Merge pull request #5506 from hornygranny/OOPgularity2
makes the singularity's pulling OOP and insanely deadly
2014-10-31 23:13:11 +00:00
Cheridan c8b5f99cf4 Merge pull request #5505 from phil235/AtkMsgFix1
/item/weapon with force 0 can no longer knock humans down
2014-10-31 10:02:19 -05:00
Hornygranny 9c95842adf Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/game/turfs/simulated/floor.dm
2014-10-30 17:26:25 -07:00
MrPerson 00cf1a4f50 Hopefully fixes that runtime where drones could wind up in nullspace. 2014-10-30 15:52:24 -07:00
Incoming d2982a4b8e Adds drones, blobbernauts, magicarp, and chaos magicarp to the staff/wand of change
Makes it so player controlled mobs with a ranged attack can actually use said ranged attack
Fixes #5551 because it's vaguely magic related anyways
2014-10-30 14:29:06 -04:00
Remie Richards dfda08cc63 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/game/machinery/bots/medbot.dm
2014-10-30 06:32:13 +00:00
Remie Richards fa184f5487 Cuts /disease variables from 28 to 23 (includes new ones)
a disease may now have more than one spread type
added "infectivity" variable which replaces a prob(65), defaults to 65
affected_species is now viable_mobtypes, and lists typepaths, this is due to us actually having a species system now so it's confusing
adds defines for a bunch of stuff
2014-10-30 06:21:14 +00:00
tkdrg ab6ca61e2a Lets AIs and pAIs use the chatroom function in their built-in PDAs. 2014-10-29 19:32:23 -03:00
tkdrg a5ab00975b Moves pulled() to /mob/living, lets ghosts point (only other ghosts can see the pointing) 2014-10-29 17:53:41 -03:00
phil235 49921a9bb1 adding CoolDown to welding repair on bot/borg/mecha
Now eye prot needed to repair bot/borg/mecha
fix bug where you're repairing despite weldingtool being off
Fixes the amount of fuel used per repair to 1 for bot/borg/mecha
Adding message when not enough fuel during borg/mecha repair.
Fuel not used when repair attempt on borg/mecha is canceled (no damage or welder off).
For bot/borg/mecha, now using notice span class for all repair messages and visible message instead of << . All cancel messages uses warning span class.
2014-10-29 16:50:13 +01:00
GunHog a216b7024e Merge remote-tracking branch 'remotes/upstream/master' into AI_Radio
Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm
2014-10-28 23:53:26 -05:00
Cheridan 1aef19c835 Merge pull request #4974 from GunHog/Botcall_TG_Edition
Botcall, TG edition!
2014-10-28 22:17:35 -05:00
Remie Richards 2705d0273e Damages /living mobs too. 2014-10-29 00:25:46 +00:00
Hornygranny cc21fd1e70 Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity2
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
2014-10-28 15:27:46 -07:00
Remie Richards 07ff02b7c4 Merge pull request #5477 from MrPerson/space_movement_jam
Space movement rewrite to allow everything to drift
2014-10-28 22:15:05 +00:00
Remie Richards 2da228084b Updates monkey acid_act(), it was actually an older draft (still functional, but message spammy) 2014-10-28 19:15:48 +00:00
GunHog 19ab2c4a2b Logic fix + Tweaks
- Corrects the logic for when the AI can speak on its radio.
- Added a missing "-" to the radio instructions.
- Removed an unneeded feedback line for toggling the AI's radio via
intellicard.
2014-10-28 10:23:56 -05:00
MrPerson e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
Remie Richards 9e2b813fac /acid type reagents now deal damage to limbs individually, stopping if opposed by a piece of clothing.
Pieces of clothing now reduce in protection when surviving an acid attack.
added a potentially useless helper.
2014-10-28 03:55:21 +00:00
tkdrg ceb6de391e Facehuggers no longer violate dead mobs 2014-10-27 22:15:35 -03:00
Hornygranny 264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
phil235 4cc39e3859 item/weapon with force 0 can no longer knock humans down and no longer get bloody when used on humans. 2014-10-27 23:08:33 +01:00
hornygranny d85999f7ee Merge pull request #5438 from xxalpha/clownshoes
Moves shoe actions to human movement because the clown exists
2014-10-27 10:14:45 -07:00
tkdrg b0db18234f Makes pull into a mob verb. 2014-10-27 12:28:06 -03:00
Cheridan 211bb20e53 Merge pull request #5445 from tkdrg/pointandlaugh
Makes point into a mob verb.
2014-10-26 20:33:53 -05:00
MrPerson 6e2efccf59 Fixes slimes and borgs not emote logging 2014-10-26 14:39:39 -07:00
MrPerson 785b6ada07 Fixes and a change 2014-10-26 14:25:07 -07:00
MrPerson 2c8adffac3 Merge branch 'master' of https://github.com/tgstation/-tg-station into space_movement_jam
Conflicts:
	code/modules/mob/living/living.dm
2014-10-25 23:25:27 -07:00
MrPerson ef6204656f Space movement rewrite to allow everything to drift
Removes a version of atom/movable/Move() that was in mob_movement.dm.
New proc called newtonian_move() that's called as a result of things like shooting a gun or spraying a fire extinguisher and as part of atom/movable/Move().
It pushes src if it's not under gravity and gives the object a chance to stop itself.
As a result, inertial_drift() is kill.
Moved Process_Spacemove() out to atom/movable. It does the same thing, it's called whenever a drift is attempted and stops the drift if it returns 1. Default check is to look for nearby lattices to make dragging shit around the station less annoying. Mobs still call it in Client/Move()
The mob version of Process_Spacemove() will shove non-anchored nearby objects out of the way if you try to move like that. For example if you're free-floating in space next to a closet and try to move right, the closet will drift off to the left.
Mechs call their occupant's version of Process_Spacemove() so mining with a mech isn't retarded. The pussy wagon does the same thing and thus no longer works like a jetpack. Will it be making a comeback?!?! (no)
Any move will attempt to keep dragging your pulled object, not just ones initiated by the client. Should make space wind a little less annoying. Was needed to make drifting not break your drags.
Mechs drift correctly without any special snowflake crap.
Spaceslipping is gone because fuck that shit
Space movement is now slow instead of fast. Having a jetpack helps go faster but even that's slower than current. Hopefully means nuke ops can see each other as they move to the station instead of losing sight of each other instantly. Having your hands full makes spacemovement even slower.
You can drift in office chairs and drag mobs in beds or the bed itself. Currently drifting diagonally while in an office chair is bugged and I need help to solve it. It winds up in cardinal movement instead of a diagonal one.
Changes up the jetpacking effects system to cause fewer errant ion trails but it's still awful code. In hindsight I shouldn't have bothered but here we go.
2014-10-25 23:19:46 -07:00
tkdrg c83bf83108 Fixes #2098 2014-10-25 22:54:25 -03:00
tkdrg b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03:00
Miauw62 a0d3a09ef8 Merge branch 'master' of https://github.com/tgstation/-tg-station into thespookisreal
Conflicts:
	code/modules/events/carp_migration.dm
2014-10-25 11:29:07 +00:00
GunHog a5ae16233d AI power quickfix
AI can no longer speak on its radio if depowered.
2014-10-24 21:27:54 -05:00
GunHog 56959506ff Adds AI Integrated Radio
- The AI now has its own built in radio headset!
- The headset receives all department channels, including AI Private.
- AI Private can be accessed using :o, .o, #o, :O, .O, and #O.
- Carding an AI will automatically disable the AI's ability to transmit
on its radio.
*The AI's radio transmission ability can be toggled via the InteliCard's
interface
- Added instructions to newly spawned AIs such that they know how to use
their radio.
2014-10-24 20:33:07 -05:00
xxalpha 936d7bcdab Moved shoe actions to human movement 2014-10-24 00:56:53 +01:00
paprka b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
hornygranny 242621b87c Merge pull request #5422 from xxalpha/flashfix
Finish repathing flashes
2014-10-23 11:22:54 -07:00
GunHog 63b2fc2555 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/ed209bot.dm
2014-10-22 17:49:52 -05:00
Hornygranny 72a8a82c7e Merge remote-tracking branch 'remotes/upstream/master' into OOPgularity
Conflicts:
	code/modules/mob/living/living.dm
2014-10-22 13:26:35 -07:00
xxalpha a5450b0acb Finishes repathing flashes 2014-10-22 19:09:43 +01:00
hornygranny 16d299e5c5 Merge pull request #5379 from optimumtact/revertclick
Revert my click cooldown changes
2014-10-21 18:39:21 -07:00
GunHog 20bd9976b7 Merge remote-tracking branch 'remotes/upstream/master' into Botcall_TG_Edition
Conflicts:
	code/game/machinery/bots/bots.dm
	code/game/machinery/bots/cleanbot.dm
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/floorbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/machinery/bots/mulebot.dm
	code/game/machinery/bots/secbot.dm
	code/game/objects/items/devices/PDA/cart.dm
2014-10-21 18:06:04 -05:00
phil235 56c853f9d6 Merge branch 'master' of https://github.com/tgstation/-tg-station into bodybagfix1
Conflicts:
	code/modules/mob/living/simple_animal/friendly/mouse.dm
2014-10-21 15:58:39 +02:00
hornygranny 1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
2014-10-20 20:18:06 -07:00
hornygranny afe171bb0a Merge pull request #5313 from TZK13/Preferences-Setup-Fixes
Fixes the previews in the character setup screen
2014-10-20 19:32:48 -07:00
hornygranny d74690a7bf Merge pull request #5308 from Menshin/radiation_decreasing_fix
Fixes radiation levels getting stuck
2014-10-20 19:20:19 -07:00
hornygranny 18c669a4fc Merge pull request #5364 from JJRcop/Reactivated-drones-still-in-dead-mob-list
Fixes a bug with reactivated drones not being removed from the dead_mob_list
2014-10-20 19:19:45 -07:00
Hornygranny 3f095fb39f lol forgot to save all 2014-10-20 17:16:39 -07:00
Hornygranny 386972886b fixes 2014-10-20 16:55:02 -07:00