Commit Graph

395 Commits

Author SHA1 Message Date
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
tkdrg 931f75b7e8 Merge pull request #6779 from TZK13/Crayon-Body-Outlines
Adds a new body outline graffiti for crayons and gives the detective a white crayon
2015-01-06 04:18:21 -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
TZK13 18e4cec460 Adds a new body outline graffiti for crayons, gives the detective a white crayon, changes the sprite for the mime crayon, and puts a waistcoat in the detective's closet. 2015-01-03 13:44:23 -06:00
Steelpoint eee11feacb ERTCommander+RipleyMech+AdditionEquipment 2015-01-01 18:43:05 +08:00
Steelpoint 087ab6b415 MinorSpriteFix+CentcomHeadset+GunWeightChange 2015-01-01 15:13:06 +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
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
paprka e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -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
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 84649dacd4 Merge pull request #6339 from tkdrg/rip'd
Ports the rapid pipe dispenser (RPD) from /vg/
2014-12-26 23:58:17 +00:00
paprka 5c8a8b5dca Merge branch 'master' of https://github.com/tgstation/-tg-station into highspeednodrag1v1mem80quickscopenotaser
Conflicts:
	icons/mob/head.dmi
	icons/mob/suit.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/suits.dmi
2014-12-26 09:09:24 -08: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
tkdrg a94012b98a Ports the rapid pipe dispenser (RPD) from /vg/
These are pocket devices that dispense unwrenched atmos/disposal pipes.
Despite the admittedly misleading name, these have infinite ammo.
There is no need to reload with matter cartridges or anything like that.

Currently, they spawn in atmos tech lockers, and as an engiborg module.
More can be obtained with the autolathe.
They are also a traitor "steal item" objective.
2014-12-25 22:06:39 -03: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
paprka 7842ff8803 adds advanced tasers as default 2014-12-24 19:41:40 -08:00
paprka 47659dbbf4 Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-21 20:32:34 -08:00
Razharas 9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
paprka f1963ce537 Merge branch 'master' of https://github.com/tgstation/-tg-station into parahats
Conflicts:
	code/modules/clothing/head/soft_caps.dm
	icons/mob/head.dmi
	icons/obj/clothing/hats.dmi
2014-12-19 10:41:27 -08:00
Cheridan 566066a73a Merge pull request #6441 from paprka/corpsecthecorpening
Corporate Security aesthetic update
2014-12-18 02:14:33 -06:00
paprka 9d46ccceac old warden jacket for the lockers 2014-12-17 23:01:10 -08:00
Cheridan 62252f0273 Merge pull request #6420 from phil235/TypoFix2
Fixes a lot of "the the" in messages.
2014-12-17 16:06:35 -06:00
paprka 4075e59e04 corporate security initial commit 2014-12-17 08:14:22 -08:00
paprka f0d80d487d adds EMT caps 2014-12-16 21:04:27 -08:00
phil235 d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Steelpoint fb5eeb4265 HoP/BartenderArmor 2014-12-16 15:35:49 +08: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
Steelpoint 4b9a87a808 MoveBeretsToSecureLocker 2014-12-15 19:46:32 +08:00
Cheridan 024817b0b2 Merge pull request #6154 from phil235/ClosetResistFix
Fixes not being able to get out of a wrapped closet by resisting
2014-12-15 02:53:33 -06:00
paprka 1fd9e6bfda Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	icons/obj/gun.dmi
2014-12-14 21:55:28 -08:00
Cheridan 7491cc38f7 Merge pull request #6346 from TZK13/Chemical-Closet-Sprites
Adds distinct sprites for the chemical closet
2014-12-14 23:21:04 -06:00
paprka e6f88851ac Adds select fire for burst fire weapons 2014-12-14 20:13:09 -08:00
paprka 303564638b Merge branch 'master' of https://github.com/tgstation/-tg-station into deathtoezmode
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
	code/game/jobs/job/security.dm
2014-12-13 22:58:22 -08:00
paprka db6eabfc4e intial commit for syndicate hardsuit feature 2014-12-13 22:26:09 -08:00
Razharas bafef911d4 Merge pull request #6317 from paprka/saltyfuckingcuntm8
Security aesthetic overhaul
2014-12-14 07:57:33 +03:00