Commit Graph

727 Commits

Author SHA1 Message Date
Ergovisavi 40e093de50 Merge branch 'master' of https://github.com/tgstation/-tg-station into firefighting 2014-11-04 10:52:46 -08:00
Ergovisavi 46a3170b2a Firefighting changes:
-Firesuit level protection will not entirely protect you from being set on fire. You will gain small amounts of heat while on fire.
-Overhauls the Atmos Water Backpack into a more effective firefighting tool
-Adds a secure ATMOS closet containing said atmos water backpack to the code, but is not on the map as the backpack already exists in the ATMOS hardsuit object at this moment
2014-11-03 10:25:12 -08:00
Cheridan a28abaf72a Merge pull request #5544 from MrPerson/jesus_shut_up_aran_god_damn
Make buckled mobs anchored if their chair is anchored
2014-11-02 22:40:20 -06:00
Cheridan 6e29ad75d5 Merge pull request #5492 from tkdrg/nofunallowed
You can no longer put transit tube pods in a station that already has one
2014-11-02 11:56:20 -06:00
MrPerson 05b2146a7d Fix anchored issues with alien nests
Because standardization is poison it seems
Also fix an issue where pixel_y could get permanently set to 6.
2014-11-02 05:46:03 -08:00
phil235 128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
MrPerson d14d5ac6a1 Make buckled mobs anchored if their chair is anchored 2014-10-29 22:56:11 -07:00
MrPerson e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
tkdrg 0a47c8ec4e You can no longer put transit tube pods in a station that already has one. 2014-10-27 11:55:46 -03: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
paprka 51a4bd7be6 drill sergeant hat for HoS instead of police 2014-10-25 13:51:36 -07:00
paprka 9cc31a3b85 adds HoS black police hat, and other changes 2014-10-24 04:19:11 -07:00
hornygranny 3a98979572 Merge pull request #5393 from paprka/cooljackets
Adds bomber and leather jackets + toolbelt improvements
2014-10-22 16:43:42 -07:00
Cheridan a5e3851b99 Merge pull request #5216 from phil235/bodybagfix1
closets can no longer contain a near infinite amount of mobs.
2014-10-21 12:15:30 -05:00
hornygranny e556867a58 Merge pull request #5277 from paprka/newshotguns
Adds improvised shotguns and fixes paths for wrap paper
2014-10-21 09:51:35 -07:00
phil235 c2fcd21499 Adding bluespace bodybags. Adding changelog. 2014-10-21 17:27:40 +02: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
paprka c4668885ec Merge branch 'master' of https://github.com/tgstation/-tg-station into cooljackets
Conflicts:
	icons/mob/suit.dmi
	icons/obj/clothing/suits.dmi
2014-10-20 21:38:39 -07:00
paprka 74dfbeb92c adds bomber and leather jackets 2014-10-20 21:36:40 -07:00
hornygranny 1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
2014-10-20 20:18:06 -07:00
Cheridan 455b526cc1 Merge pull request #5318 from phil235/MsgFix2
More messages fixed
2014-10-19 21:39:06 -05:00
paprka 2a8e772131 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
Conflicts:
	code/modules/projectiles/ammunition/magazines.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/mob/back.dmi
	icons/obj/gun.dmi
2014-10-19 17:30:47 -07:00
Cheridan 4adb8c0c9a Merge pull request #5316 from xxalpha/fix_flasher
Fixes cyborgs being able to add their flashes to things
2014-10-19 17:44:30 -05:00
xxalpha d9dafa9649 Fix cyborg flashes being useable in flashers and cyborg heads. 2014-10-19 04:35:10 +01:00
phil235 9b9481d65c Changes many span classes.
Replaces for(mob in oviewers) show_message()  with visible_message() when possible.

Fixes the absolute pathing in Ninja code.

Fixes facehugger attack messages being bold red for third party (only the first leap message will stay bold red for third party, for better visibility)

Standardizes vomiting message

Fixes mech occupant not receiving any attack messages when the mech is attacked.
2014-10-18 16:00:38 +02:00
Swag McYolosteinen fdde99e3ca Merge pull request #5239 from tkdrg/sanictoobs
Makes transit tubes a lot faster
2014-10-18 09:54:48 +02:00
paprka 8312c52286 Merge branch 'master' of https://github.com/tgstation/-tg-station into removegreyshirt
Conflicts:
	icons/mob/uniform.dmi
2014-10-16 21:29:10 -07:00
Remie Richards e124c29f8d Merge pull request #5201 from Cheridan/permits
Adds Construction Permits
2014-10-17 05:24:37 +01:00
paprka c29cc89864 Merge branch 'master' of https://github.com/tgstation/-tg-station into newshotguns
Conflicts:
	icons/obj/gun.dmi
2014-10-16 09:26:26 -07:00
Cheridan 17c9aaa6dd Merge pull request #5263 from Aranclanos/electropackrevamp
Electropack fixes
2014-10-16 08:08:57 -05:00
paprka d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
phil235 45cfe07f98 Merge branch 'master' of https://github.com/tgstation/-tg-station into DisplacedGirderFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-10-15 18:23:40 +02:00
phil235 dbea503e88 Removing the fourth argument (air_group) of CanPass() everywhere, because it isn't used anywhere.
Fixing one instance of "for(mob in viewers) show_message()" to "visible_message()"
2014-10-15 18:03:06 +02:00
tkdrg 1ed1c6f40b Changed breakout times to use the new constants 2014-10-15 11:40:25 -03:00
tkdrg e9f418d568 Merge branch 'master' into sanictoobs 2014-10-15 11:39:27 -03:00
Aranclanos d2d92dd35f Merge pull request #4873 from optimumtact/clicktyclackety
Adds click cooldown to clicking on mobs Fixes #4812 Take2
2014-10-15 11:03:02 -03:00
Remie Richards 7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
Aranclanos a1d49cfeb4 Changes the path of electropacks from objitemdeviceradioelectropack to objitemdeviceelectropack.
Fixes some runtimes related to electropacks.
Securing electropacks will no longer be required to use a helmet on it, same with dissembling the shockkit with a wrench or placing it in a chair.
Removes the atom var 'moved_recently' that was only used by electropacks (really). Now the electropack will have an inner cooldown instead.
The cooldown of the shock will be 10 seconds, giving the shocked person some small time to move in-between shocks (the shock gives you 5 of weakened).
2014-10-14 21:44:56 -03:00
tkdrg c6ba2b5c22 Shortens stopped tube time and cleans up a bit 2014-10-14 14:14:58 -03:00
phil235 f4f716c3a7 Adding a CanPass() proc to girders. Projectiles can now sometimes pass through them, with varying percentage chance depending on girder subtypes.
Fixing reinforced and disloged girders being called "reinforced" or "disloged" upon examination instead of "disloged girder" and "reinforced girder".
Adding passtable and passgrille to mice for consistency, because chicks already have those flags.
2014-10-14 17:56:48 +02:00
tkdrg c6d5a44269 Makes transit tubes a lot faster 2014-10-13 19:55:30 -03:00
paprka 20d6524945 cleaned up code and added orange jumpsuits 2014-10-13 15:36:50 -07:00
phil235 cd78c2b067 Adding puppies and kittens to the small mob category.
Increasing mob_storage_capacity for closet and bodybag to 4 and 6 respectively.
2014-10-13 19:03:56 +02:00
phil235 cf40b75313 fixing typo 2014-10-13 18:52:13 +02:00
phil235 619a38ad89 Adds the ability to collapse rollerbed (from baystation). Fixes being able to pick up pill bottles and fold bodybags through windows via click drag. 2014-10-13 17:17:53 +02:00
Remie Richards 07b621421c Merge pull request #5196 from phil235/grammarFix1
Small grammar fix.
2014-10-13 11:41:45 +01:00
Remie Richards 399977d882 Merge pull request #5095 from MrPerson/table_module
Move table crafting into the modules folder plus improvements
2014-10-13 10:42:16 +01:00
Remie Richards 20c6f4cbac Merge pull request #5173 from paprka/knocky
Unique sound for knocking on glass with bare hand/TK
2014-10-12 20:50:57 +01:00
phil235 36cbf06ed9 closets and its children can no longer contain a near infinite amount of mobs.
Adding a mob_size var to mob/living . All closets can still contain the same amount of small sized mobs as before(mouse, parrot,pAI, viscerator, lizard, chick), but they can no longer contain large mobs (alien emperess, blobbernaut, juggernaut, hostile tree, goliath), and they can contain a few human sized mobs (three for bodybags, two for closets and other children).
2014-10-12 18:46:56 +02:00