Commit Graph

642 Commits

Author SHA1 Message Date
Iamgoofball 38070820f3 Merge branch 'master' of https://github.com/tgstation/-tg-station into goonchem_shoehorn_backup 2015-01-16 17:25:50 -08:00
Iamgoofball f3398e58a9 Removes Star Trek chemistry and transfers us to Goon Chemistry. 2015-01-16 17:21:36 -08:00
JJRcop 8fecbe2318 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/projectiles.dmi
2015-01-16 14:09:07 -05:00
JJRcop 31ebd43b18 Fixes issues with the chronosuit and TED.
Removes unneeded vars from TED.
Re-adjusts armor values for chronosuit
2015-01-15 13:32:21 -05:00
JJRcop f34afaa3c9 Merge branch 'master' of https://github.com/tgstation/-tg-station into ChronOPS
Conflicts:
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/projectiles.dmi
2015-01-15 02:30:31 -05:00
JJRcop 4c8f890f88 Adds Timeline Eradication Device 2015-01-15 02:18:04 -05:00
Steelpoint 3f88acb6f6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2
Conflicts:
	icons/mob/head.dmi
2015-01-14 11:25:07 +08:00
tkdrg d10364797a Merge pull request #6981 from dannno/bandanno's
Bandanas/More jumpsuits in mixed fixed
2015-01-13 21:49:47 -03:00
dannno 4bc4d44ab7 action button and headmaskform removes, terrorists win 2015-01-13 17:30:42 -05:00
dannno 555afcfb58 tkdrg's generalization suggestion no more snowflake 2015-01-13 17:16:41 -05:00
dannno 5dc6f1449f when in hat form, bandanas can be added to head slot
fixed the admins.txt nonsense
2015-01-13 15:41:45 -05:00
dannno 3dc5a04038 Merge branch 'master' of https://github.com/tgstation/-tg-station into bandanno's
Conflicts:
	config/admins.txt
2015-01-12 15:55:51 -05:00
dannno f8573ba257 u know what it is 2015-01-11 16:08:21 -05:00
Steelpoint 982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg eb8f791398 Fixes basic med hud regression bug
PR #6516 made by paprika and reviewed by remierichards removed the med
hud sensor update hook, which in turn broke the AI med hud. Nice job.
2015-01-11 01:45:51 -03:00
tkdrg b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
JJRcop eb7eea787c Chronosuit tweaks 2015-01-09 20:34:20 -05:00
JJRcop 539dac7308 Adds the Chronosuit
Sprites by spheretech
The chronosuit allows you to move via teleportation
Adds mob.remote_control var
2015-01-09 16:14:49 -05:00
Steelpoint ccdf83b8af QuickTidyUp 2015-01-09 11:28:55 +08:00
Steelpoint b0fe1d9818 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-01-08 02:09:02 +08:00
paprka 88e124e88c Revert "Adds Nien's HoS formal sprites so they dont look like a Prince suit." 2015-01-07 09:12:39 -08:00
Steelpoint 699439cc31 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2015-01-08 01:12:29 +08:00
Miauw 2a71a8ee12 Merge branch 'master' of https://github.com/tgstation/-tg-station into newhosjumpsuit
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	icons/mob/head.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/uniforms.dmi
2015-01-07 14:59:24 +01:00
Steelpoint 5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08: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
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 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
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
Steelpoint 9b444c4897 ERTHelmetLights+MinorERTAreaFix 2015-01-01 22:04:11 +08:00
Steelpoint 8ce0055f14 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	icons/obj/gun.dmi
2015-01-01 13:35:29 +08:00
Steelpoint f72ced26fd PulseRifleVarients+ArmouryRooms+FixesAndRefinements 2015-01-01 13:33:23 +08:00
tkdrg 371b66a334 Merge pull request #6678 from paprka/nitrile
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
Steelpoint 3c8062b216 SwapToBaysERTSprites+CommanderSuit 2014-12-31 22:41:25 +08: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
Steelpoint dd111a7c54 EmergencyResponseTeam 2014-12-31 17:31:45 +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
tkdrg 2607a456c0 Merge pull request #6634 from paprka/chefuniform
Makes the second cook spawn in short order cook clothes, fixes chef uniform
2014-12-30 03:45:13 -03:00
paprka 13539c5c8e Merge branch 'master' of https://github.com/tgstation/-tg-station into nitrile
Conflicts:
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	code/modules/clothing/gloves/boxing.dm
	code/modules/clothing/gloves/miscellaneous.dm
2014-12-29 20:19:57 -08:00
paprka c26de0f5d3 adds nitrile gloves 2014-12-29 20:14:41 -08:00
Razharas 10b21b20ab Conflicts resolution
In items weapons melee misc
2014-12-29 11:49:30 +03:00
paprka bbc83fed1c Merge branch 'master' of https://github.com/tgstation/-tg-station into policebatonfixy 2014-12-28 18:39:39 -08:00
paprka e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -08:00
paprka d57256cf11 makes the second cook spawn in short order clothes, fixes chef uniform 2014-12-28 01:12:49 -08: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
paprka 87d0cbdb2b Merge branch 'master' of https://github.com/tgstation/-tg-station into fixescargo
Conflicts:
	code/modules/clothing/head/helmet.dm
2014-12-26 22:31:54 -08:00
paprka 5fb8ae35b4 removes tactical helmets 2014-12-26 22:30:24 -08:00
tkdrg fc7c7b520d Merge pull request #6348 from paprka/highspeednodrag1v1mem80quickscopenotaser
Blood-red hardsuit usability feature and syndicate loadout adjustments
2014-12-27 02:59:24 -03:00
Remie Richards 17f1e7f044 Merge pull request #6516 from paprka/suitcensorsv2v2
Tweaks suit sensor menu to be easier to use
2014-12-27 00:37:47 +00:00