Commit Graph

741 Commits

Author SHA1 Message Date
xxalpha
c25576ad6a Merge remote-tracking branch 'upstream/master' into catwalkmachines
Conflicts:
	code/game/objects/structures/lattice.dm
2015-03-20 17:02:00 +00:00
Remie Richards
f6e4c1518d A restructure/removal/cleanup of Ninja Code 2015-03-09 20:43:56 +00:00
xxalpha
13e291a4e9 Merge remote-tracking branch 'upstream/master' into catwalkmachines
Conflicts:
	code/game/turfs/turf.dm
	code/modules/power/power.dm
2015-03-06 19:19:09 +00:00
xxalpha
42dd431e6f Removed duplicate code.
Removed more duplicate code.
2015-03-02 17:24:40 +00:00
xxalpha
f9ebb2cff7 Merge remote-tracking branch 'upstream/master' into traymesons
Conflicts:
	code/modules/research/designs.dm
	icons/mob/eyes.dmi
	icons/obj/clothing/glasses.dmi
2015-02-27 21:15:01 +00:00
xxalpha
15dacd50b1 Replaces cancable var with two new procs.
Clean up.
2015-02-21 20:15:03 +00:00
xxalpha
70eda74c81 Merge remote-tracking branch 'origin/catwalkmachines' into catwalkmachines 2015-02-21 00:42:30 +00:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
phil235
f95dd77509 Merge pull request #7740 from Menshin/nano_solars
NanoUIzed Solar Control Computers
2015-02-17 13:53:37 +01:00
xxalpha
ec4bc5665c Allows portable machines to be mounted on any turf that cancable. 2015-02-17 02:27:41 +00:00
Menshin
a264b85cb3 Sneaky scroll bars 2015-02-15 02:57:27 +01:00
Menshin
26213d59aa * Converted solar control computers interfaces to NanoUI
* Removed some now unused code
2015-02-15 02:39:48 +01:00
xxalpha
28d1e9bad2 Several additions and new sprites.
Reverts glasses.dm
2015-02-14 19:24:41 +00:00
phil235
135293bedf Fixes object processing list by replacing "SSobj.processing.Add" by "SSobj.processing |= " to avoid having duplicated objects in the list, meaning the objects would be processed more than once per iteration.
Fixes Alien embryo processing that was processed twice.
2015-02-14 14:18:49 +01:00
xxalpha
a9c181bbcc Repath all non jetpack tank types to tank/internals
Repath all portable tanks to tank/internals, except jetpacks

Update ministation
2015-02-01 18:25:39 +00:00
Razharas
d30872024c And other readibility improvement 2015-01-16 04:31:02 +03:00
Razharas
f393be45b6 Tiny readibility improvement 2015-01-16 04:08:07 +03:00
Razharas
5176efb88b Merge branch 'master' of https://github.com/tgstation/-tg-station into NewShit
Conflicts:
	code/game/machinery/Freezer.dm

Fixing conflicts
2015-01-16 00:24:53 +03:00
phil235
a55e6a70be Fixes malf AI lockdown affecting doors on z levels other than station and mining.
Replaces a lot of z level numbers in code by their respective defines.
Adding a define for the Mining asteroid z level.
2015-01-11 15:39:32 +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
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
34c4c02777 Merge pull request #6646 from RemieRichards/TerminalDecon
Terminal Deconstruction
2014-12-31 21:47:47 -03:00
Remie Richards
341b147088 You can now deconstruct terminals provided the APC or SMES is prepared for this (eg, open panels, exposed wires etc.) 2014-12-31 23:35:07 +00: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
6cf7cd2c0b Merge pull request #6671 from tkdrg/fuckingSuperMatter-i_SwearTo=god'ThisdamnthingaaA
Fixes supermatter division by zero runtime
2014-12-31 15:42:10 +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
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
Perakp
ee3617310e Merge remote-tracking branch 'upstream/master' into droneFix 2014-12-30 13:32:51 +02:00
hornygranny
9ee5d52814 Merge pull request #6601 from paprka/walkthecat
Adds catwalks
2014-12-29 19:05:41 -08:00
tkdrg
bdbde78470 Fixes supermatter division by zero runtime 2014-12-29 21:48:21 -03:00
Razharas
f7e6552e33 Merge branch 'master' of https://github.com/tgstation/-tg-station into GenShit 2014-12-29 17:05:20 +03:00
tkdrg
80cc2d4100 Merge pull request #6622 from Thunder12345/grammarFixes
Fixes for some grammer and formatting issues
2014-12-29 10:20:35 -03: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
Razharas
208b59c30e Fixed stuff tkdrg pointed out
Added comment to dualsaber and hulk checks to explain whats going on
Added defines that converts to mutation names
Fixed grammer again
2014-12-28 10:49:04 +03: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
Thunder12345
744940c8a8 Fixes #6615
All instances of "Your clothes feel warm" have been given a full stop.
Couldn't actually confirm in testing due to never getting the warm
clothes message, but I don't see why it wouldn't work.
2014-12-27 18:32:45 +00:00
phil235
f8b7a2066f Merge pull request #6559 from tkdrg/hal
Adds sanity checks to supermatter Consume()
2014-12-27 18:42:01 +01:00
paprka
0e4903bd83 Merge branch 'master' of https://github.com/tgstation/-tg-station into walkthecat
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2014-12-26 18:35:12 -08:00
paprka
3ca6d769a1 adds catwalks 2014-12-26 17:38:55 -08:00
paprka
3f41ca1a9a further code optimizations in cable.dm 2014-12-26 09:26:56 -08:00
tkdrg
adb8989327 Nerfs the supermatter explosion back to 3, 7, 14
Request by a headcoder and a server host.
2014-12-25 19:47:36 -03:00
paprka
404da4dbdd code optimizations 2014-12-25 13:28:05 -08:00
paprka
a6acdeb3c2 initial commit 2014-12-25 13:07:06 -08:00
tkdrg
8121ac9dba Adds sanity checks to supermatter Consume()
It should only eat /mob/living and non-effect /obj now.
Fixes #6558
Also fixes the division by 0 runtime for real now.
2014-12-25 14:56:36 -03:00
MrPerson
d8b85dda0a Merge pull request #6468 from hornygranny/YoullCowardsDontEvenSnowflake
refactors narsie
2014-12-24 19:48:24 -08:00
phil235
4374e46cdd Fixes being able to smash grille/newscaster/mirror/lights with holo esword. 2014-12-24 23:50:20 +01:00
Razharas
9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
hornygranny
579f297076 Merge pull request #6444 from tkdrg/shardopplsnerf
Tweaks the Supermatter a bit
2014-12-19 14:57:22 -08:00
tkdrg
d7e05d4387 Adds Supermatter logging and tweaks the power gen
Now includes an admin_investigate entry, plus three message_admins():
when first powered, when first reaching critical point, and when a mob
is dusted. Also tweaks the power generation formula a bit.
2014-12-19 18:19:48 -03:00