Commit Graph

6438 Commits

Author SHA1 Message Date
phil235 359a270de6 Merge branch 'master' of https://github.com/tgstation/-tg-station into MechRefactoring
Conflicts:
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/mecha.dm
2015-07-14 01:20:37 +02:00
Remie Richards 6937076afe buffs to changelings:
* Changelings now regenerate chemicals while dead, up to half and ONLY HALF of their maximum storage (taking into account their storage upgrades, if applicable)
* Changelings now repair geneticdamage while dead, with the lowest value they can be taken to being 50, this number is arbitrary but was based on half the value at which fakedeath stops working for too much geneticdamage
* Changeling fakedeath timer is now halved, down from 80 seconds (1 minute 20 seconds) to 40 seconds.
2015-07-14 00:17:40 +01:00
phil235 72547af481 Merge branch 'master' of https://github.com/tgstation/-tg-station into SmokeFoamBuff
Conflicts:
	code/modules/mob/living/carbon/human/species.dm
2015-07-14 01:02:37 +02:00
phil235 b570af6795 Fixed catching banana creampie in mid throw (and similar objs). 3824 10536 (hitting a wall now makes the smashed pie effect appear ON the wall)
Moved last_bumped var from movable to living.
Renamed /obj/machinery/field/proc/bump to bump_field() to avoid confusion with Bump(). Same thing with /obj/effect/mine/Bumped() -> triggermine().
Fixes sprite when hunter leaps into a wall. 10428
Removed some commented code here and there.
Remove allow_spin var, throw_at now uses a spin argument for that.
Throwpass atom var is no longer used to check whether thrown stuff can pass stuff (now using CanPass() proc like everything else), the var is still used for some adjacency click check.
A thrown mob hitting another mob now produces a sound; also thrown mob and target one no longer swap places even on help intent.
A thrown mob now is lightly hurt (and weakened) if he hits a wall/mob/dense object. Nerf the damage when thrown mob hit wall.(20 -> 10)
Thrown obj/mob no longer bounces off wall unless it's no grav. Heavy thrown items now push an unanchored obj/mob target.
Fixes losing all momentum when getting out of a thrown closet. 6569
A lot of work on throw_at, throw_impact, and hitby to make the code more OOP. Thrown items no longer collide with border items on the side. 10479
Fixes the killer crusher. 10507
2015-07-14 00:51:19 +02:00
Swag McYolosteinen c81d361273 Merge pull request #10143 from AnturK/ditto
Adds Morph - non-ling shapeshifter
2015-07-13 18:00:21 +02:00
Chiefwaffles 14fb54ce8d Adds support for common channel announcements; moves over latejoin announcement to announcement system. 2015-07-12 22:56:12 -07:00
Ikarrus c3ae39a7e8 Clothing with bomb armor are less likely to be shredded
Should have been this way from the start.
2015-07-12 14:42:07 -06:00
AnturK 4c3848f279 Changelog 2015-07-12 21:58:01 +02:00
duncathan 71ac607a6b Revert "merge conflicts?"
I fucked this up
2015-07-12 12:52:32 -06:00
Ikarrus 1c43425304 Tested and Tweaked 2015-07-12 09:50:57 -06:00
Ikarrus 3bc29a74e6 Adds a Join Queue if the server exceeds its hard population cap
Players can join a queue that will notify them with a message and sound when a slot becomes available. First come first serve.

Players have approximately 20 seconds to join after the notification. Failure to join in that window removes them from the queue, to remove AFKers.

I haven't tested the code yet but it's basically done.
2015-07-11 22:57:08 -06:00
duncathan 27f4bf3ee0 merge conflicts? 2015-07-11 19:56:54 -06:00
duncathan e074fb7856 makes air flow; fixes EVERYTHING 2015-07-11 18:45:19 -06:00
Cheridan 61d5425c3f Merge pull request #10503 from phil235/RevolverMisfireFix
Fixes for lighter, heart attack, defib, light fixture and other stuff
2015-07-11 19:01:04 -05:00
Cheridan 68c32438bb Merge pull request #10525 from phil235/FixFix1
Some fixes and stuff....
2015-07-11 18:06:29 -05:00
Miauw 03bf88bfba Adds a huge message to sec borgs telling them not to be shitheads. 2015-07-11 13:39:54 +02:00
duncathan 140bbd3972 3rd pass OOP
now we've got lists for parents, nodes, and air mixtures
(they're all broken)
moves tank.dm, cryo.dm, Freezer.dm to components/unary_devices/
2015-07-11 02:47:19 -06:00
phil235 7307079f8b Fixes stripping an item from someone not checking if the item is still there after the delay.
Same fix for pocket picking and removing embedded item.
Adding a warning message when trying to put an item on someone in the wrong slot.
Fixes loyalty implant message upon destruction being sent to wrong/dead people.
Fire on mob will now slowly be consumed (no more forever on fire corpse).
Some work on fire related proc.
Can't lit a mob on fire with a lighter that isn't lit.
Removing duplicate code in species.dm.
You can no longer heal your burns by ingesting clf3 and dousing yourself with water repeatedly.
simplified micro/macro explosive implant's timed explosion code.
2015-07-10 22:29:06 +02:00
Remie Richards f7faf4d730 Merge pull request #10487 from MrStonedOne/attacklogcleanup
Attack logging tweaks/cleanup
2015-07-10 18:42:08 +01:00
phil235 53a7b37a94 Modified detective revolver isn't deleted anymore when it misfires.
Heart attack: Moved heart attack var (and changed related code accordingly) from carbon to human since non humans have no use for it. I also added some feedback message when you recover from a heart attack.
Added a click cooldown on touching a light fixture.
burning yourself with a lighter now burns only the arm holding the lighter.
Fixes incorrect message when defibbing heart attack patient.
2015-07-10 00:18:35 +02:00
AnturK 2e9c4f3211 Fixes teleport-swap 2015-07-09 21:22:17 +02:00
phil235 d4cdd8eaa1 iron foam is now blue steel color just like aluminium foam.
Fixes metal foam from backpack firefighter watertank.
Fixes nanofrost not freezing shut vent scrubbers.
Atmos backpack watertank now starts full of water.
Change foam layer to Objlayer +0.1 so that it is above foammetalstructure so it doesn't hide the dissolving animation and also above tables.
Buff foam and smoke: smoke/foam contains four times the amount of reagents that was inserted in them, for balancing.
Add a little more smoke clouds for tear gas grenade.
Removed the no longer needed max_lifetime smoke var.
Reagent_dispensers (watertank) now show how much reagents they have left upon examination.
Fixed some code formatting in reagent_dispensers.
Fixes nanofrost temperature lowering effect that wasn't working.
Adjusted reagent volume in blob spore smoke because of the buff.
Change to sorium and ldm: effect varies with created volume.
If you are close to a powerful vortex you are thrown, otherwise you are just moved instead.
Vortex blobs now only make you step if you are far from it when reaction hits, otherwise it throws you. The vortex blob range gets +1 to compensate. Also the range and effect depends on the reagent volume which means lower effect for blobspore smoke.
2015-07-09 19:49:06 +02:00
Jordie 4928617c2b Merge pull request #10334 from xxalpha/jetbutt
Added ability for items inside items to have action buttons.
2015-07-09 20:51:29 +10:00
palpatine213 625410748d Adds an examine message to braindead Ais 2015-07-09 01:54:51 -07:00
MrStonedOne a262f9aac7 Attack logging tweaks
Removed the "feature" to have something log in an atom's vv attack log, but not the file attack log. all attack log items will go to the file as well as vv.

Replaced all hard coded src.name/name for attack log's object argument with an actual object (src) except where it made more sense not to.

All attack logging *should* happen AFTER damage is applied now.

Removed the confusing attack entry for when a changeling stings another changeling.

Tweaked how punch attack logs worked
2015-07-08 23:14:37 -07:00
Cheridan 2c3c8d7ae3 Merge pull request #10455 from Ikarrus/cyborgobjectives
Borging Antagonists
2015-07-08 17:40:01 -05:00
Swag McYolosteinen ca88306125 Merge pull request #10440 from MrStonedOne/patch-19
Utterly guts the player privacy poll.
2015-07-08 17:34:25 +02:00
MrStonedOne de7b8c3c30 Removes privacy poll, part7: newplayer.dm
I forgot about this part.
2015-07-08 08:24:06 -07:00
Ikarrus 4c4d1aaae4 Rewording 2015-07-07 20:37:07 -06:00
phil235 9cc577273f added update_action_buttons to mmi life subproc
Fixes seraph smoke not working.
buff energy relay so it's closet to the old effect
Fixes 6812 (mmi in mech cant use equipment) somehow.
Moved check to prevent drilling inventory to mecha/click_action so that it also happens with an AI occupant.
Fixes 9562 (verbs sometimes aren't given to the pilot) by removing the verbs
Upon destroy() we delete cabin_air: Fixes 8110
Changed armor booster availability back to all mechs.
Fixes repair droid overlay not updating when turned off after repair done
Fixes heavy plasma cutter not being attachable to anything.
2015-07-08 02:24:29 +02:00
Ikarrus 3497744234 Makes it really obvious that antags no longer have objectives after being borged
Because people were confused by their memory being shown to them after the operation, which includes their objectives.
This also puts brains on a layer just above human mobs, so they can be seen when they pop out.
2015-07-07 15:11:53 -06:00
phil235 1a0f0469e9 Merge pull request #10376 from Perakp/simpleAnimalEmoteSpam
Fixes hostile animal emote spam
2015-07-07 20:22:31 +02:00
phil235 ea1780ce97 - Mech equipment was using its unique processing method, with specific timing for each equipment, but now it uses obj processing, I
changed the values so the equipment effect stays the same. Remove global_iterator datum.
- fiddled with equip_ready procs of mech tools.
- removed mecha/proc/do_after and /enter_after() procs.
- Renamed mech sleeper occupant var to "patient" to avoid confusion with the occupant of the mech.
- all non instant tool (drill) now show a progbar when drilling etc..
- action cooldown now use do_after_cooldown() (that itself uses do_after) and start_cooldown (for instantaneous actions).
- Removed mecha_equipment's destroy proc, it's now all in Destroy(). No confusion.
- modified mecha_equipment/proc/can_attach() to not check istype(mecha) b/c it can't not be. (so the child only have one istype check.
- Removed diamonddrill/can_attach() , all done at drill level.
- armor booster now only for combat mech, instead of all except honkmech.
- Removed dynhitby, dynbulletdamage, dynattackby, dynusepower(), dyngetcharge(), dynabsorbdamage()
- I split the tools.dm file into smaller ones: work tools, mining tools, other tools.
- I split mecha.dm into mecha.dm, mecha_topic.dm and mecha_defense.dm
- refactored mech weapon ballistic/launcher, new proj_init proc, more OOP.
- Moving consumes energy! Lights consumes energy. Fixes #9425.
- Fixed #7354 xeno not bursting if host is inside a mech.
- Added action buttons to mech. Moved toggle lights, internal tank, eject, view stats from verbs to action buttons, these can now only

be done via these buttons (removed them from the big stats window).
- Removed port connect verbs b/C it's automated now.
- regular hud is no longer hidden when inside a mech (doesn't matter b/c you can't interact with most stuff in it while in a mecha). Fixes issue 10387
- can't walk when shooting projectiles. Makes walking on your projectile a bit harder. Helps against issue 10315 (but doesn't fix it).
- also made into action buttons: the special abilities of certain combat mechs.
- Added thrown alerts for mech charge and integrity.
- Fixes teleporting occupant out not properly removing it from the mech. Fixes issue 10330
- fixes ballistic mech weapons spinning when launched. proc/throw_at() now has a spin argument instead of using var/allow_spin that was added to all atoms just for that.
- added a update_action_buttons() to ai/life() to handle ai mech.
2015-07-07 19:40:32 +02:00
Cheridan c72c44bc18 Merge pull request #10426 from Ikarrus/shredreduction
Removes light blasts shredding clothes
2015-07-07 09:53:40 -05:00
MrStonedOne b56648205f Removes privacy poll, part2: newplayer/login.dm 2015-07-07 07:01:27 -07:00
MrStonedOne a4d3c887be Removes privacy poll, part1: poll.dm 2015-07-07 06:58:46 -07:00
Cheridan 54754c52a9 Merge pull request #10407 from nullstation/hi-extended-patch
Improvements to crew monitoring computer
2015-07-07 07:12:08 -05:00
Ikarrus b1d8d049c1 Renames duplicate random_name() proc 2015-07-06 20:15:47 -06:00
Ikarrus 75578aa69d Removed Shredding for light blasts 2015-07-06 16:45:21 -06:00
Ikarrus 472f973cac Reduces the chance of your clothes getting shredded with light blast damage 2015-07-06 08:27:52 -06:00
Ikarrus 5e50b2b982 Update and Changelog
Lizard names are now "name1-name2"
2015-07-05 22:20:00 -06:00
Ikarrus b0cfaf401f Random Names for Lizards
Lizards now have their own list of names to pull from when randomizing their names.
2015-07-05 18:35:56 -06:00
NullQuery 10109d134f - Fixes sorting on the crew monitoring computer. Items will now sort as they have before, based on the department and job.
- Hovering over a dot on the map will now scroll to the applicable person in the table.
- Patch for interactive mobs (sNPCs) to properly set assignments on their ID's.
2015-07-05 13:15:20 +02:00
Razharas 60a5a83757 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChamFix 2015-07-04 22:31:18 +03:00
Cheridan 798f05e4a6 Merge pull request #10272 from Razharas/DarkClick
Fixes clicks in darkness
2015-07-04 12:17:10 -05:00
Swag McYolosteinen b25767b33f Merge pull request #10335 from Ikarrus/bombcover
Fixes clothes not protecting underlaying clothes.
2015-07-04 17:24:59 +02:00
Swag McYolosteinen b649c11bc6 Merge pull request #10314 from RemieRichards/MoreAttackAnimations
More Attack Animations
2015-07-04 17:22:24 +02:00
Swag McYolosteinen a4b60449f8 Merge pull request #10129 from AnturK/ayy
Abductors fixes and improvements
2015-07-04 16:57:10 +02:00
Perakp d6405a0051 - Reduces emote spam of some hostile simple animals.
- Removes a near-duplicate proc LostTarget (kept LoseTarget).
- Adds punctuation to some simple animal emotes.
2015-07-04 15:37:00 +03:00
Razharas bc2592eb5a Merge pull request #10222 from MMMiracles/freedomsocks
Adds patriotic apparel for upcoming 4th of July (and inferior countries too I guess)
2015-07-04 10:04:46 +03:00