Commit Graph

3551 Commits

Author SHA1 Message Date
tkdrg 890c6f8ebe Merge pull request #6799 from Xhuis/knife_fix
Makes the butcher cleaver a normal-sized item
2015-01-06 03:26:30 -03:00
tkdrg 1716a82400 Merge pull request #6794 from psykzz/patch-4
Cell() Update
2015-01-06 01:22:30 -03:00
Xhuis 8f42d43b04 Merge remote-tracking branch 'remotes/upstream/master' into knife_fix 2015-01-05 21:35:05 -05:00
Xhuis a5c9a7292f Makes butcher's cleaver a child of kitchen knife 2015-01-05 17:23:03 -05:00
carnie 281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +00:00
carnie a730649167 Fixes breathing (indentation error)
Fixes atmos machinery (old global list snuck back into code)
2015-01-05 19:44:17 +00:00
Ergovisavi 7a83165f2b Merge pull request #6773 from phil235/ShadeBuckleFix
Fixes simple animals not being able to unbuckle themselves.
2015-01-05 10:45:13 -08:00
Matt Smith 249e19b935 Cell() Update
Was being output straight to the user, it looked like that might cause the order to be wrong.
Doing this because it looks like the intended results.
2015-01-04 15:11:52 +00:00
Remie Richards ed1375d454 Fixes Humanize and Monkeyize producing invisible changelings and never deleting their Animation overlay. 2015-01-04 11:03:10 +00:00
Remie Richards 3a10a3b198 Merge pull request #6427 from paprka/janitorbuffholyfuckvalvepleasenerf
Adds dirt overlays for walking on simulated turfs
2015-01-04 02:22:50 +00:00
carnie a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
tkdrg a411154581 Merge pull request #6755 from phil235/SpritesFixes
Three sprite related fixes
2015-01-03 19:20:00 -03:00
TZK13 c0b4ea1092 Reverted removal of jerseys. 2015-01-03 10:33:45 -06:00
phil235 6d6547467a Fixes simple animals not being able to unbuckle themselves.
Fixes pet slime. There's no longer two types of adult pet slimes, simplifying adult pet slime's Die() proc.
Fixing some absolute path in slime/slime.dm
2015-01-03 14:35:14 +01:00
TZK13 bf5bddf0c7 Merge branch 'master' of https://github.com/tgstation/-tg-station into Socks
Conflicts:
	config/admins.txt
2015-01-03 07:07:03 -06:00
phil235 eacdc7e920 Fixes emt cap sprite disappearing.
Fixes bloodyhand overlay appearing in front of shield.
Fixes white pixels on some disposal pipe junctions sprites.
2015-01-02 22:36:07 +01:00
tkdrg 8e8b761ae2 Merge pull request #6716 from psykzz/patch-2
Refactor Ears self healing
2015-01-01 17:18:08 -03:00
tkdrg be85bb6d17 Merge pull request #6707 from phil235/HostileAttackingTargetFix
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
2015-01-01 12:47:27 -03:00
tkdrg 7e48be5be0 Merge pull request #6686 from paprka/lizstutterv2
Removes lizard stuttering
2014-12-31 23:22:38 -03:00
paprka d048dd87bd Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf 2014-12-31 17:14:03 -08:00
Matt Smith a9203dcc66 Updating ear code from humans.
Keeping it together.
2014-12-31 21:57:25 +00:00
Matt Smith 9bdc62fae3 Fixing initial ear_damage
Was missing a 0.
2014-12-31 21:35:23 +00:00
Matt Smith 1f8c748309 Refactor Ears self healing
Aims to fix #291
2014-12-31 21:09:35 +00:00
tkdrg cdb5066502 Merge pull request #6324 from Razharas/GenShit
Added datum mutations
2014-12-31 17:24:15 -03:00
carnie e7519a33c8 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2014-12-31 20:22:32 +00:00
phil235 286a9ce4bc Merge pull request #6657 from Lo6a4evskiy/Eyepatch_HUD_fix
All sec HUDs work properly with examine buttons
2014-12-31 15:45:40 +01:00
phil235 27d8c489ee Fixes carp, mimic and tree nog being able to knockdown their target.
Fixes player controlled hostile simple animal not calling AttackingTarget() for their melee attack.
Fixes player controlled hostile simple animal's ranged attack targeting the target from their previous melee attack instead of the target clicked.
2014-12-31 15:01:23 +01:00
carnie a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
phil235 cfff3cd375 Merge pull request #6539 from Xhuis/pounce_nerf
Nerfs alien hunter pounce
2014-12-31 02:29:15 +01:00
tkdrg ff173b82b1 Merge pull request #6656 from Ergovisavi/mushroom_samba
Fixes mushrooms preying on non mushrooms
2014-12-30 21:35:46 -03:00
Xhuis 1c88fbf615 Adds 3-second cooldown to alien hunter pounce; only triggers if successful 2014-12-30 18:19:35 -05:00
paprka 26fb835323 removes lizard stuttering 2014-12-30 10:04:50 -08:00
Razharas d1f347f584 Fixes conflicts
There werent even any conflicts really, but git for some reason thought
there are
2014-12-30 15:12:09 +03:00
Perakp ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
tkdrg df2271c300 Merge pull request #6640 from Nyvrem/master
Preferred colours for Podpeople
2014-12-29 15:00:01 -03:00
Ergovisavi f286d2602b Fixes mushrooms not being cannibals only 2014-12-29 07:28:30 -08:00
Lo6a4evskiy 9276e43e6e Fixes eyepatch and night vision HUDs not working with examine sec record buttons 2014-12-29 18:23:47 +04:00
Razharas f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg 80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03:00
Thunder12345 d7dd967c34 Simplification
Simplified nuzzling, never knew visible_message wound repeat the first
argument if there weren't any others.
2014-12-29 11:35:48 +00:00
Razharas 10b21b20ab Conflicts resolution
In items weapons melee misc
2014-12-29 11:49:30 +03:00
Razharas 418e3a0613 General cleanup
Fixed the magic text failing in monkey injectors
Removed lots of comments
Didnt fix mysterious list bounds runtime in tourettes
2014-12-29 11:36:01 +03:00
tkdrg ad2fee37be Merge pull request #6625 from phil235/HalluAttackAnimationFix
Fixes hallucinated attackers not doing the attack animation.
2014-12-29 01:56:19 -03:00
tkdrg 67b32194f1 Merge pull request #6612 from paprka/fixesstamdamprojguns
Fixes stamina damage on projectile weapons
2014-12-29 00:57:24 -03:00
Nyvrem 05a1cadac3 Preferred colours for podpeople
Make podpeople use preferrence colours instead of being grey with black eyes.
2014-12-28 18:39:20 +01:00
Razharas 76a21883a8 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/game/mecha/mecha.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/projectiles/gun.dm

Fixes dem conflicts
2014-12-28 11:20:15 +03:00
Razharas 208b59c30e Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03:00
paprka 8535145401 Merge branch 'master' of https://github.com/tgstation/-tg-station into janitorbuffholyfuckvalvepleasenerf
Conflicts:
	code/game/turfs/simulated/floor.dm
2014-12-27 21:54:53 -08:00
tkdrg 60fc73d018 Merge pull request #6587 from phil235/MonkeyBiteMaskFix
Fixes being able to bite as a monkey with your mouth covered by a mask.
2014-12-28 01:01:14 -03:00
phil235 3994ac3f48 Fixes hallucinated attackers not doing the attack animation.
Fixes lack of attack animation, sound and attack cooldown when the human mob attacks the hallucinated attacker.
Removes some commented code and some duplicated checks.
Reorganized the hallucination procs a bit.
2014-12-27 22:41:13 +01:00