Commit Graph

4116 Commits

Author SHA1 Message Date
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
tkdrg
234e5bd64c Merge pull request #6811 from paprka/spessbuckle
Fixes chair/bed buckle message
2015-01-06 04:38:48 -03:00
Remie Richards
005d79073a Merge pull request #6731 from tkdrg/ntrc_strikes_back
Adds an "unread message count" to the NTRC link
2015-01-06 07:22:45 +00:00
Remie Richards
b798df68ab Merge pull request #6790 from tkdrg/ExhaustedPlumpCamel
Fixes a few RPD painting bugs
2015-01-06 07:20:28 +00: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
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
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
paprka
39f27a07e2 fixes buckle message 2015-01-04 21:56:50 -08:00
tkdrg
4e84fb2eef Changes a missed del() to qdel() 2015-01-04 16:22:27 -03:00
Xhuis
e7a9a0bdfc Makes the butcher cleaver a normal-sized item 2015-01-04 14:21:27 -05:00
phil235
6c156f5218 Merge pull request #6774 from psykzz/patch-2
Fixing desc to show max cap of the RCD
2015-01-04 15:04:45 +01:00
phil235
d79c6fe929 Merge pull request #6617 from Firecage/Statue_Fixes
Statue fixes
2015-01-04 13:53:45 +01:00
tkdrg
2eb366de89 Fixes a few RPD painting bugs
Changes RPD colors to be consistent with pipe painter & default pipes.
Makes the RPD properly update its neighbors on painting.
Offloads the neighbor updating logic from pipe_painter to a pipe proc.
Fixes #6783
2015-01-04 04:35:36 -03: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
Matt Smith
50a7f76f18 derp'd with the names 2015-01-04 00:36:04 +00:00
Matt Smith
fb4e1c56c2 Update RCD.dm 2015-01-04 00:32:37 +00:00
Matt Smith
585971270a moved and renamed variable 2015-01-03 23:49:03 +00:00
Matt Smith
c227ebefe8 Updated base object and fixed missing line. 2015-01-03 23:48:21 +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
Matt Smith
19ad927d4f Fixing desc to show max cap of the RCD
Was hard coded to show 30, moving it to a variable and actually making use of it.
2015-01-03 16:48:43 +00: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
38acdca156 Merge pull request #6713 from phil235/DicerollRuntimeFix
Fixes runtime linked to diceroll proc
2015-01-01 16:58:39 -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
tkdrg
56a1d11162 Adds an "unread message count" to the NTRC link
Fixes #6720
2015-01-01 13:54:52 -03:00
Swag McYolosteinen
17c81726ce Merge pull request #6722 from tkdrg/holytitsmergethis
[HOLY TITS MERGE THIS] Fixes Hulk server crash bug and also a couple typos
2015-01-01 13:41:35 +01: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
tkdrg
908922f24c Fixes Hulk crash bug and typos 2014-12-31 23:28:14 -03:00
tkdrg
9a9f0bc058 Merge pull request #6691 from Menshin/clientless_peeking_runtime_fix
Fixes runtime with moving objects in/out of storage while clientless mobs peeking
2014-12-31 22:19: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
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
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
57cf4bc394 Fixes runtime linked to diceroll proc 2014-12-31 20:47:32 +01:00
phil235
e476074b32 Merge pull request #6673 from GunHog/FixForTatorAIRadioAndRemovesSpice
Fixes #6654
2014-12-31 15:41:17 +01:00
phil235
3ce15f31b0 Merge pull request #6672 from Menshin/flash_emp_runtime_fix
Fixes flashes runtiming on EMP + flash spamming
2014-12-31 15:33:20 +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
Menshin
34cee3f088 Renamed confusing variable 2014-12-31 13:51:39 +01:00
Menshin
4db3268fcb Fixes runtime when moving objects in/out storage while a clientless mob is peeking on the storage panel 2014-12-31 01:54:25 +01:00
tkdrg
829ba09986 Merge pull request #6244 from Ergovisavi/halp_medics_griffon_me
Adds Medical Hologram functionality to Medical Penlight
2014-12-30 20:52:46 -03: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
Razharas
084d193409 Fixed dualsabers and hulks
Fixed dualsabers and hulks
2014-12-30 14:47:07 +03:00