Commit Graph

2954 Commits

Author SHA1 Message Date
phil235 c8f3ad2dd0 Fix ID show message.
Remove "Read ID card" object verb (because all the information it gave was already in the ID card's name.
Remove some old text( ) stuff.
2014-11-01 15:17:43 +01:00
phil235 af767f2935 Fix being able to apply lipstick through masks and items covering the mouth. 2014-11-01 13:28:32 +01:00
paprka 389e0e1237 research design and origintech update 2014-10-30 19:21:58 -07:00
paprka 0296e7634a lots of debugging, ghost notifications work now 2014-10-30 17:32:19 -07:00
paprka 920739c8ab defibrillators initial commit 2014-10-30 14:53:51 -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
xxalpha 1ae24af71e Added reagents to some cigarette packs 2014-10-30 01:03:51 +00:00
xxalpha 7803f296ba New Cigarette Packs 2014-10-30 00:08:14 +00:00
paprka 1b91ab24ce Improves mining equipment locker and rewards system, and buffs kinetic accelerator 2014-10-28 15:42:55 -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
paprka 635458446a fixes compile errors by assigning proper target for checks 2014-10-28 09:51:36 -07:00
paprka b0be021739 fixes telebaton stunning borgs 2014-10-28 09:03:46 -07: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
paprka 5599d9b2b7 advanced mop cleans twice as fast as the normal mop 2014-10-27 19:04:01 -07:00
paprka 2ee042b587 removes meme 2014-10-27 11:29:39 -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
paprka b136cf653c wet floor signs and advanced janitor research 2014-10-23 13:43:42 -07:00
paprka b925becf67 fixes trash bag capacity 2014-10-23 13:03:41 -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
paprka 7f2feabbd8 soap, lube, and janitor stuff 2014-10-23 01:44:19 -07: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
Menshin 26f70fd9aa * Completed the _strip_html_properly_ proc to also limit the length of the text
* Removed uses of _strip_html_simple_
* Replaced input or redondant trimming/text_copying with the new unified _stripped_input_
2014-10-15 16:00:22 +02: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