Commit Graph

304 Commits

Author SHA1 Message Date
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Razharas
f48563f1d1 Fixes some bugs and rutimes tkdrg pointed
Monkeys arent blind anymore
Bad dna mutation runtime fixed
Two handed shit runtime fixed
Carbons unarmed attacks runtime fixed
2015-01-08 22:35:07 +03:00
Steelpoint
ec821c33d2 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	_maps/map_files/generic/z2.dmm
	code/_globalvars/lists/mapping.dm
2015-01-06 12:17:29 +08:00
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08: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
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
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
tkdrg
cc474b2af6 Merge pull request #6591 from phil235/FingerlessSpriteFix
Fix fingerless gloves icon and washing machine changing boxing gloves
2014-12-27 15:46:43 -03:00
tkdrg
f0cc5cce4d Merge pull request #6330 from RemieRichards/MapperFriendlySoundTrigger
Simple sound effect map object
2014-12-26 22:36:55 -03:00
phil235
b6e35278e3 Fixes cutting black gloves to make fingerless gloves not changing the icon to fingerless.
Fixes the washing machine being able to change boxing gloves, ninja gloves and botany gloves to look like simple colored gloves. Creating a /gloves/color category for all gloves whose color can be changed.
Fixing some absolute pathing.
2014-12-26 17:04:09 +01:00
paprka
21df99154d Merge branch 'master' of https://github.com/tgstation/-tg-station into burtsfiya
Conflicts:
	code/modules/projectiles/gun.dm
	code/modules/projectiles/guns/projectile/automatic.dm
	code/modules/projectiles/guns/projectile/shotgun.dm
	icons/obj/gun.dmi
2014-12-25 13:51:43 -08:00
Razharas
92fc9b5d1b And some more little fixes
Return of the prob to foam smashing
Correct laserpointer check
Correct wield behaviour with hulk
2014-12-23 05:22:20 +03:00
Razharas
9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Razharas
f0c8f2eeac Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution
2014-12-16 02:52:08 +03:00
paprka
e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
tkdrg
621d3d936a Fixes disappearing alien weeds overlays
I have no idea why this works.
Fixes #6326
2014-12-12 14:29:32 -03:00
Remie Richards
5307ec5e96 Fixes some backwards logic 2014-12-12 16:48:06 +00:00
Remie Richards
cdbd40f796 Adds a new step_trigger, "sound_effect", acts as a mapper friendly wrapper for playing sound effects
Adds a new step_trigger variable, "mobs_only", like affects_ghosts this is a boolean for allowing/denying atom/movables from triggering step_triggers
playsound_local() is now a /atom proc, all mob specific requirements have been moved to an override
2014-12-12 16:35:16 +00:00
Razharas
11f6c7c401 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-12 04:51:16 +03:00
Razharas
0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03:00
Razharas
f9cf4f233d Merge pull request #6263 from paprka/gunsthegunnening
Guns: the gunnening
2014-12-11 10:46:34 +03:00
hornygranny
7d83830365 Merge pull request #6268 from tkdrg/yum
Changes weed overlay border layer to match weeds
2014-12-10 16:55:13 -08:00
tkdrg
bce24d96c9 Changes weed overlay border layer to match weeds
Fixes #6237
2014-12-08 15:47:59 -03:00
Swag McYolosteinen
b828448645 Merge pull request #6228 from paprka/coatscoats
Adds winter coats and changes labcoat toggling
2014-12-08 11:35:56 +01:00
Swag McYolosteinen
bff2e62a0f Merge pull request #6175 from Razharas/ExActFix
Fixes ex_act() destroying too much shit
2014-12-08 08:03:35 +01:00
Cheridan
4b9f8972cf Merge pull request #6184 from phil235/PosterRippingSpamFix
Fixes being able to rip posters more than once
2014-12-05 15:13:18 -06:00
Razharas
7758a0afed Ok now explosions shall work properly
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
2014-12-05 23:21:48 +03:00
paprka
9e9b8b440d adds winter coats and changes labcoat toggling 2014-12-04 21:29:21 -08:00
paprka
2425903320 intial commit, renames stechkin 2014-12-04 18:13:50 -08:00
Cheridan
f909d59d1a Merge pull request #6130 from phil235/AttackMsgStandardizedFormat
Standardizing attack messages to always show the attacker first
2014-12-04 12:45:31 -06:00
phil235
656a533b1a Fixes being able to rip posters more than once by opening multiple confirmation windows beforehand. 2014-12-02 20:44:28 +01:00
Perakp
48b1ee513e Merge remote-tracking branch 'upstream/master' into wormholeProjector
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2014-11-29 09:37:40 +02:00
phil235
86405fa8c0 Standardizes attack messages to always show the attacker first (when there is an attacker).
Replacing some fo mob in viewers() show_message() with visible message().
Simplifying some message code in a couple places, fixing typos and span classes.
2014-11-24 01:49:34 +01:00
Razharas
ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
tkdrg
608dec814e Removes old/unused code from the tree. Use version control if you need it for some reason. 2014-11-16 16:53:18 -03:00
Razharas
6fba9b3a19 Merge pull request #5688 from Jordie0608/isitpronouncedlockorloch
Fixes #5613 null acid loc
2014-11-16 20:22:08 +03:00
Jordie0608
0fa48252c9 reworked acid's ticks and locationing 2014-11-15 05:15:30 +11:00
Remie Richards
85eaae7b4a Merge pull request #5877 from phil235/SmokeRuntimeFix
Fixes the smoke runtime.
2014-11-14 18:09:19 +00:00
Cheridan
24456bcc22 Merge branch 'PipenetRevamp' of https://github.com/Aranclanos/-tg-station into Aranclanos-PipenetRevamp
Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/portables_connector.dm
2014-11-13 18:55:53 -06:00
phil235
d2d2d162ba Third time's the charm. 2014-11-13 19:39:37 +01:00
phil235
a73d22f2ed Actually fixes the runtime this time. 2014-11-13 19:22:22 +01:00
phil235
a2f23f2cef Fixes the smoke runtime. 2014-11-13 17:11:06 +01:00
Jordie0608
590684e129 Merge branch 'master' of https://github.com/tgstation/-tg-station into beekeepermodewhen
Conflicts:
	icons/mob/animal.dmi
	tgstation.dme
2014-11-09 00:15:12 +11:00
Remie Richards
2054cbda08 Merge branch 'master' of https://github.com/tgstation/-tg-station into DiseaseRework
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/human/human_attackpaw.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
2014-11-08 01:07:29 +00:00
phil235
bc5754b378 adding diagonal attack animation. 2014-11-07 15:42:07 +01:00
Jordie0608
63a8a900dc Removes loc check 2014-11-05 22:48:53 +11:00
phil235
74f8a08522 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackAnimation
Conflicts:
	code/modules/mob/living/living.dm
2014-11-04 18:55:07 +01:00