Commit Graph

247 Commits

Author SHA1 Message Date
Remie Richards
c1060d95b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into AcidBurns
Conflicts:
	code/game/atoms.dm
	code/game/objects/items.dm
2014-11-03 19:38:58 +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
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
Hornygranny
264c25b892 makes the singularity's pulling OOP with the magic of atom proc 2014-10-27 16:43:35 -07:00
hornygranny
7eec063785 Merge pull request #5479 from Cheridan/rip_scratch
Adds Doc Scratch costume in reverse.
2014-10-27 10:08:47 -07:00
Cheridan
4525ab93cf Adds Doc Scratch costume in reverse.
Since everyone's already mad anyway.
2014-10-26 03:37:56 -05: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
b37b2651d3 Point is now a mob verb to reduce lag 2014-10-25 22:54:17 -03: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
16d299e5c5 Merge pull request #5379 from optimumtact/revertclick
Revert my click cooldown changes
2014-10-21 18:39:21 -07:00
hornygranny
1c9c6d5950 Merge pull request #5249 from phil235/DisplacedGirderFix
Fix for #4602
2014-10-20 20:18:06 -07:00
hornygranny
9e2dc67e86 Merge pull request #5363 from Cheridan/better_noms
Anomaly Event Changes
2014-10-20 19:24:04 -07:00
Hornygranny
e5e6ded884 singularity is now OOP 2014-10-20 16:36:00 -07:00
Francis
adf252df9b Keep the define around as that is a good idea 2014-10-20 22:49:06 +13:00
Francis
b3de61552f Revert "Defines for the define god"
This reverts commit f737f7889c.
2014-10-20 22:22:38 +13:00
Francis
c50c26a48f Revert "Add the click cooldown define to the last special defines"
This reverts commit 5595d57f57.
2014-10-20 22:22:23 +13:00
Cheridan
f52d3e8c69 Anomaly Event Changes
Increases the duration and occurrence rate of Anomaly events.
Anomaly cores now give better research values.
Bluespace anomalies no longer teleport anchored objects because it looks godawful.

If not defused, Pyroclastic Anomalies will create a red or orange slime.
2014-10-19 17:07:07 -05: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
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
Aranclanos
5561e8d9dc Merge pull request #5250 from phil235/SprayPasstableFix
Fix for #5224
2014-10-15 10:48:14 -03:00
phil235
72cc3274df Adding passtable and passgrille to obj/effect/effect and its children so effects aren't blocked by tables and grilles. 2014-10-14 18:34:19 +02:00
Swag McYolosteinen
7d11253f39 Merge pull request #4861 from Lo6a4evskiy/Custom_graffiti
Choosing graffiti instead of drawing random one
2014-10-09 16:31:13 +02:00
Francis Devine
5595d57f57 Add the click cooldown define to the last special defines
This will stop these getting out of sync and let you change
all times with a single define
2014-10-09 14:52:47 +13:00
Francis Devine
f737f7889c Defines for the define god 2014-10-09 14:49:28 +13:00
hornygranny
e611301f0f Merge pull request #5044 from Jordie0608/mapmergersoannoying
Fixes #4788 Resin walls on the abandoned mining station
2014-10-07 19:39:12 -07:00
Cheridan
f96b017149 Merge pull request #5097 from phil235/Msg1Fix
Fixing a lot of messages
2014-10-07 12:09:01 -05:00
Jordie0608
208b136996 Merge branch 'master' of https://github.com/tgstation/-tg-station into mapmergersoannoying
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
2014-10-07 21:56:06 +11:00
Lo6a4evskiy
18ad0292c3 fixed compilation errors 2014-10-07 12:47:53 +04:00
Lo6a4evskiy
41eb04356f Merge remote-tracking branch 'upstream/master' into Custom_graffiti
Conflicts:
	code/game/objects/effects/decals/crayon.dm
2014-10-07 12:43:59 +04:00
Remie Richards
5b8b883cf0 Merge pull request #5050 from Incoming5643/spiders,man
Updates spiders to have full player functionality
2014-10-06 14:24:39 +01:00
phil235
537280b4b9 Removing many instances of the no longer used second argument of message_admins() proc.
Replacing "for(var/mob/M in viewers()) M.show_message()" by "visible_message()" or audible_message()" in many places.
Changing a few span classes.
2014-10-05 01:29:30 +02:00
MrPerson
651c3e6db5 Merge to master - sole conflicting file was ninja.dm FUCK NINJAS 2014-10-04 01:45:39 -07:00
Incoming
8e99152226 Updates spiders to have full player functionality
*All spiders can now web turf (but AI controlled non-nurses won't choose to), only nurse spiders can wrap items and lay eggs.
*Eggs laid by a player controlled nurse spider will eventually grow into player controlled spiders, while AI lain eggs will only result in AI spiders
*Adds non nurse spiders to the staff of change as they pass my rules for inclusion (Leaves a corpse, can do everything as a player the NPC can do, can't dominate a round by reproduction)

I take no responsibility for spidercode, it's a bit iffy but as far as I can tell it all works for players now.
2014-10-01 18:58:07 -04:00
Jordie0608
210e4f12b5 Fixes resin walls icon on map maker + abandoned mining station 2014-10-01 13:41:48 +10:00
Lo6a4evskiy
b5f0753c8f Prevented from using popups away from crayon, popup now updates properly, mime colours are properly shown. 2014-09-28 14:02:08 +04:00
Lo6a4evskiy
396a115043 Merge branch 'master' of https://github.com/tgstation/-tg-station into Custom_graffiti 2014-09-28 12:20:22 +04:00
phil235
3248e23887 Merge branch 'master' of https://github.com/tgstation/-tg-station into AudibleMsgFix
Conflicts:
	code/modules/recycling/disposal.dm
2014-09-25 18:45:53 +02:00
Lo6a4evskiy
8ab6bf0c15 Super Awesome Crayons! 2014-09-24 22:19:12 +04:00
Perakp
3f451f9b1b Warning cones can be worn on your head, with original codersprites. 2014-09-19 22:44:59 +03:00
Lo6a4evskiy
82e1ce9141 Choosing graffiti instead of drawing random one 2014-09-16 20:57:24 +04:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)"
fixing typos and missing emotes in emote lists.
2014-09-14 01:15:15 +02:00
Hornygranny
e36189772a fixes resin runtime, weeds and walls update icons properly on destruction 2014-09-11 14:40:35 -07:00
Cheridan
12a926ae9e Merge pull request #4532 from hornygranny/smoothaliens
alium update
2014-09-09 14:54:43 -05:00
Hornygranny
5f33e3d713 old alien sprites, description updates 2014-09-09 11:21:41 -07:00
KyrahAbattoir
20d9e6c2b2 Because aparently we can't have nice things. 2014-09-08 17:26:28 +02:00
Hornygranny
02e527e938 Merge branch 'smoothaliens'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/modules/mob/living/carbon/alien/alien.dm
2014-09-07 21:33:48 -07:00
Hornygranny
c2827a64a0 lowered weeds layer 2014-09-02 10:53:36 -07:00