Commit Graph

972 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
234e5bd64c Merge pull request #6811 from paprka/spessbuckle
Fixes chair/bed buckle message
2015-01-06 04:38:48 -03: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
carnie
281df385a2 Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems 2015-01-05 19:52:03 +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
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08:00
paprka
39f27a07e2 fixes buckle message 2015-01-04 21:56:50 -08:00
phil235
d79c6fe929 Merge pull request #6617 from Firecage/Statue_Fixes
Statue fixes
2015-01-04 13:53:45 +01: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
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
1153ef4700 Merge pull request #6651 from paprka/tablesandwindowsbaby
Fixes shuttle windows smoothing with normal windows
2015-01-03 00:22:29 +01:00
paprka
ad5872e84f fixes window junction update to use initial icon state 2015-01-02 15:14:36 -08:00
tkdrg
ac57c7007b Merge pull request #6723 from Boggart/airlockconstructionfix
Fixes being unable to build doors over firelocks, blast doors and shutters.
2015-01-02 04:16:17 -03:00
tkdrg
6a0f1be7cd Merge pull request #6584 from phil235/HoloSwordFix
Fixes being able to smash grille/newscaster/mirror/lights with holo esword
2015-01-01 16:39:16 -03: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
Boggart
ff17e083eb Fixes being unable to build doors over firelocks, blast doors and shutters.
As a result, any door with the sub_door variable set to 1 can have an airlock built over it.
Also fixes using a fireaxe to open unpowered poddoors and adds myself to the admins.txt.
2014-12-31 20:47:17 -07:00
tkdrg
371b66a334 Merge pull request #6678 from paprka/nitrile
Adds nitrile gloves
2015-01-01 00:29:04 -03:00
Firecage
b6e1547f0e Final Statues 2015-01-01 01:43:28 +02:00
Firecage
920624a8f1 Statue code cleanup 2015-01-01 00:41:54 +02: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
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat
Adds catwalks
2014-12-29 19:05:41 -08:00
Firecage
71cc4ff94e Statue_code_cleanliness(kinda) 2014-12-29 23:41:13 +02:00
paprka
58b10962dc clicking on the lattice will now construct a catwalk as well 2014-12-29 05:24:48 -08:00
paprka
b52a3915fb Fixes shuttle windows smoothing with normal windows 2014-12-29 04:58:53 -08:00
Razharas
10b21b20ab Conflicts resolution
In items weapons melee misc
2014-12-29 11:49:30 +03:00
tkdrg
91685820f2 Merge pull request #6588 from phil235/WindowEjectionFix
Removed the ability of windows to be unanchored and ejected when low on health
2014-12-28 21:20:02 -03: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
paprka
acd40bdde8 further updates smoothing and icons 2014-12-28 00:17:19 -08:00
paprka
79e2eedacb Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-27 22:26:21 -08:00
Firecage
26e4329a64 Statue_Fixes_3
Signed-off-by: Firecage <Firecage@hotmail.com>
2014-12-27 22:30:26 +02:00
Firecage
ea16486efd Statue fixes 2. 2014-12-27 22:24:06 +02: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
517d17d9e2 Merge pull request #6585 from phil235/SwirlieFix
Fixed being able to spam slam someone onto a toilet during a swirlie.
2014-12-27 10:33:24 -03:00
Firecage
7f1595dd7d Negligence from me. Fixed 2014-12-27 15:02:31 +02:00