Commit Graph

1336 Commits

Author SHA1 Message Date
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
MrPerson
e9f6e5d17d Added a changelog entry
Also fixed the chair-diagonal drifting bug somehow
2014-10-28 07:37:31 -07:00
hornygranny
b2b0bec539 Merge pull request #5433 from phil235/WrapperFixes1
Wrapping papers fixes
2014-10-27 10:18:31 -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
phil235
b971a09bcd Wrapping something with package wrapper now gives a message.
Adding a check so clicking an already giftwrapped item doesn't show the wrapping message.
Adding nobludgeon flag to wrapping paper to remove attack messages
Removing w_class line from package wrapper because already in its parent.
Remove the unnecessary message (box is full/packagewrapper doesn't fit in the box) when wrapping box.
Fixes not being able to wrap box with just one single package wrapper left.
Fixing attack_log (fix issue4180) and only adds log when the wrapping succeeds.
Now using wrapping paper actually uses its amount.
when all used, they will drop cardboard tube like intended.
Fixes issue4207
Fixes not being able to re-add wrapping paper and package wrapper to themselves like proper stacks.
New sprite for both paperwrap and cardboard tube. (from Nienhaus)
2014-10-23 19:30:09 +02: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
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
hornygranny
55ff8ab432 Merge pull request #5206 from paprka/usedcuffs
Used zipcuffs name change
2014-10-20 19:28:10 -07:00
Hornygranny
e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07: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
hornygranny
c936f3134d Merge pull request #5268 from paprka/zipeties
fixes zipeties typo
2014-10-17 07:35:07 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits
Adds Construction Permits
2014-10-17 05:24:37 +01:00
paprka
85478315e6 Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties 2014-10-16 09:28:11 -07: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
a5638c7107 Merge pull request #5152 from paprka/medicalbeltsstuff
Hyposprays fit in medibelts now
2014-10-16 08:46:54 -05:00
Cheridan
13b59d2d0e Merge pull request #5165 from paprka/INGLEWOODINGLEINGLEWOOD
Expands medipens & mining
2014-10-16 08:44:36 -05:00
Cheridan
01e7b0af6d Merge pull request #5218 from Perakp/dnaInjectorGarbage
Garbage collect dna injectors
2014-10-16 08:34:50 -05:00
hornygranny
53cb161add Merge pull request #5245 from paprka/removespammessages
Removes a few spammable visible messages
2014-10-15 16:41:09 -07:00
paprka
54b575523a removes zippo changes 2014-10-15 16:32:51 -07:00
paprka
4c7831c4fd Merge branch 'master' of https://github.com/tgstation/-tg-station into zipeties
Conflicts:
	code/game/machinery/bots/secbot.dm
2014-10-15 13:32:24 -07:00
paprka
d244fd6bbd initial commit 2014-10-15 13:29:19 -07:00
Aranclanos
bd2f0692d3 Merge pull request #5222 from phil235/c4GibFix
You can no longer gib mob with c4+signaler
2014-10-15 10:43:20 -03:00
Remie Richards
7bb012127c Merge pull request #5235 from phil235/CollapsibleRollerBed
Collapsible Rollerbed
2014-10-15 11:54:48 +01:00
paprka
dc9d194706 fixes zipeties typo 2014-10-15 00:07:42 -07:00
paprka
40ab91a060 removes a few spammable visible messages 2014-10-14 04:58:42 -07: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
4640999701 Merge pull request #5199 from paprka/telebatonlog
stun logging for telebaton
2014-10-13 11:48:17 +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
paprka
739cc29dbd removes typecasting from zipcuffs cutting 2014-10-12 14:02:04 -07:00
paprka
8986181e44 fixes ziptie bug 2014-10-12 13:39:55 -07:00
phil235
f5eb963720 You can no longer gib mobs by placing a c4 with a signaler on its wire in the hands/pocket/backpack of the mob and sending the signal. 2014-10-12 22:17:37 +02:00
Perakp
562776e2fb - Properly garbage collect dna injectors. Before you could pick them up if you were fast enough. 2014-10-12 20:50:23 +03:00
paprka
c83e0d65a0 used zipcuffs name change 2014-10-11 18:08:52 -07:00
Cheridan
5eb6a82970 Merge branch 'master' of https://github.com/tgstation/-tg-station into permits
Conflicts:
	icons/obj/items.dmi
2014-10-11 17:48:46 -05:00
Cheridan
84e7121903 Adds construction permits 2014-10-11 17:39:27 -05:00
paprka
6235cb3401 stun logging for telebaton 2014-10-11 09:29:44 -07:00
Swag McYolosteinen
cd60db5e18 Merge pull request #5124 from MrPerson/implant_action_button
Give implants an action button
2014-10-11 18:15:44 +02:00
Swag McYolosteinen
db23e13575 Merge pull request #5098 from tkdrg/loadingloading
Wiki books now have a loading screen
2014-10-11 14:29:46 +02:00
MrPerson
863f28f295 On second thought, leave the result as just a path
Fix up IED's so they work correctly when tablecrafted. Also remove their manual crafting.

Merge branch 'master' of https://github.com/tgstation/-tg-station into table_module

Conflicts:
	code/game/objects/structures/tables_racks.dm
2014-10-10 14:30:41 -07:00
Remie Richards
b54ed5b4e5 Merge pull request #5137 from paprka/holosignoff
Adds holographic janitor signs
2014-10-10 17:41:41 +01:00
Remie Richards
b9f4a54c56 Merge pull request #5132 from paprka/tacticool
Changes HUD in syndicate medkit to NV HUD
2014-10-10 17:29:18 +01:00
paprka
b2ca9776fd expands medipens 2014-10-09 18:01:35 -07:00
paprka
fa55262f83 hyposprays fit in medibelts now 2014-10-09 14:40:14 -07:00
hornygranny
30b3294adc Merge pull request #5123 from paprka/zippycuffs
Adds zipties
2014-10-08 21:12:05 -07:00
paprka
149c9a3a76 big update 2014-10-08 20:58:43 -07:00
Remie Richards
23651b54f0 Merge pull request #5093 from paprka/medipens
Replaces a lot of inaprovaline syringes with medipens
2014-10-08 22:15:52 +01:00
paprka
b638daa384 oops 2014-10-08 13:52:21 -07:00