Commit Graph

1055 Commits

Author SHA1 Message Date
Cheridan
63e09d0928 Merge pull request #6966 from Steelpoint/ERTv2
[FEATURE] Emergency Response Team V2
2015-01-15 23:41:20 -06:00
tkdrg
674b3b65c0 Merge pull request #6968 from phil235/LockdownMalfFix
Fixes malf AI lockdown affecting doors on away missions
2015-01-14 14:58:10 -03: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
paprka
3ce1bf233f fixes some compile errors with my previous PR 2015-01-13 00:45:58 -08:00
Cheridan
1c090e02b7 Merge pull request #6787 from paprka/serviceandsupply
Separates supply from civilian (service) jobs
2015-01-13 02:19:30 -06:00
Steelpoint
64ba51c0b2 Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTv2 2015-01-13 12:52:24 +08:00
carnie
a9bd2739c8 Resolves #6947 - misuse of rand() meant that the multiplier for fake recalls was sometimes getting set to 0, meaning shuttle was never recalled. 2015-01-11 20:55:00 +00: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
Steelpoint
982c54c2f3 EmergencyResponseTeamV2 2015-01-11 19:21:38 +08:00
tkdrg
b0635993a4 Revert "[FEATURE] Emergency Response Team" 2015-01-10 19:55:30 -03:00
Swag McYolosteinen
404cd883f7 Merge pull request #6705 from Steelpoint/EmergencyResponseTeam
[FEATURE] Emergency Response Team
2015-01-10 10:10:59 +01:00
tkdrg
179003b57c Merge pull request #6808 from Boggart/readminbugfix
Re-admin bugfixes.
2015-01-10 01:29:01 -03:00
Steelpoint
ccdf83b8af QuickTidyUp 2015-01-09 11:28:55 +08:00
Steelpoint
34589f52bf Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam
Conflicts:
	code/modules/projectiles/guns/energy/nuclear.dm
	icons/obj/gun.dmi
2015-01-09 11:02:50 +08:00
hornygranny
56bad0f7ce Merge pull request #6747 from paprka/gunchangesv2baby
Further changes to the ranged stun system
2015-01-08 16:09:37 -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
carnie
4bcc5ec791 Resolves #6864 - Sets ticker can_fire=1 inside the start_now verb. 2015-01-07 17:13:23 +00:00
Steelpoint
5f77b95b23 Merge branch 'master' of https://github.com/tgstation/-tg-station into EmergencyResponseTeam 2015-01-07 01:38:38 +08:00
Remie Richards
f918815bea Merge pull request #6741 from tkdrg/atmoslog
Adds atmos investigate_log
2015-01-06 07:56:17 +00:00
Remie Richards
76897893bd Merge pull request #6642 from tkdrg/toupper
Improves Permission Panel security, take 2
2015-01-06 07:24:03 +00: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
paprka
f0712db606 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby
Conflicts:
	code/modules/projectiles/guns/energy/stun.dm
2015-01-05 18:43:46 -08:00
Steelpoint
082f62bf3d NameTweaking+VisibleLoyaltyImplant+MovingSecOfficersSecHUDToObviousLocation 2015-01-06 02:57:05 +08:00
Steelpoint
3e37a8e562 MissedANumber 2015-01-05 20:23:05 +08:00
Steelpoint
49ea9b0543 EmergencyResponseTeam-AntagSelectionForAdmins 2015-01-05 20:20:11 +08:00
Boggart
5f42bac272 Fixes deadmins from being unable to re-admin after disconnecting. 2015-01-05 00:50:49 -07:00
Boggart
57f69f17e4 Moves the removal of the re-admin verb to the admin holder's associate proc to prevent reload_admins and any other method of re-adminning someone from leaving them with the re-admin verb. 2015-01-04 19:30:20 -07:00
paprka
84a943d87c adds supply job list 2015-01-03 19:49:26 -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
paprka
8527f23d85 Merge branch 'master' of https://github.com/tgstation/-tg-station into gunchangesv2baby 2015-01-03 17:05:27 -08:00
Boggart
bb6125a5f1 Fixes feedback on failure due to null rank or disconnected DB. Sanitizes ckey in DB query. 2015-01-02 13:24:49 -07:00
paprka
46ee047404 further changes to the ranged stun system 2015-01-01 22:22:03 -08:00
Boggart
aed9d6b0e2 Fixes some tabs being spaces. 2015-01-01 23:05:32 -07:00
Boggart
2b0932047a Improves feedback to the user of the re-admin verb. 2015-01-01 23:02:18 -07:00
Boggart
0ceda7939c Adds the ability for admins to re-admin themselves once they de-admin. 2015-01-01 20:42:53 -07:00
tkdrg
e52ace562c Adds atmos investigate_log
Sort of ported from the /vg/ atmos logging by N3X15
Right now includes opening/closing pumps and opening/closing canisters.
Also adds a message_admins() when a plasma canister is opened.
2015-01-01 21:37:32 -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
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
tkdrg
176f1a2964 Improves Permission Panel security, take 2
Admins can no longer add permissions that they don't have.
Admins can now edit their own permissions.
Fixes #4559
2014-12-28 18:10:07 -03:00
paprka
e8738e8dd5 Changes some clothing and chef gear 2014-12-28 02:13:28 -08:00
Ergovisavi
ff68a2d55b Merge pull request #6490 from tkdrg/nomoreadmingrudges
Adds cfg option to let players see their own notes
2014-12-27 19:25:43 -08: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
45904bb8a2 Merge pull request #6425 from JJRcop/OOCemoji
Adds emoji to OOC chat [Now with in-house sprites!]
2014-12-27 03:01:36 -03:00
Cheridan
71385308de Merge pull request #6387 from Incoming5643/goodbye_my_children
Magic Mania 1.8: Summon Spells Rework and The Challenge System
2014-12-26 16:29:36 -06: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
9d7567f46d Adds cfg option to let players see their own notes
This lets players see the admin notes that have been added to their
ckey, by using a verb in the OOC tab.
This is a config option and is off by default.
2014-12-19 22:42:18 -03: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
JJRcop
fa18eaa164 Renames game_options.txt OOC_EMOJIS to EMOJIS
Moves config check into emoji_parse proc, so the config affects all emoji use
2014-12-17 12:48:41 -05:00
JJRcop
4755198a75 Made emoji parsing much cheaper
AdminPM now follows OOC_EMOJIS rule
2014-12-17 11:14:37 -05:00
JJRcop
1f064e5312 Adds emoji to adminPMs
as requested by supreme overlord scaredofshadows
2014-12-17 00:41:18 -05:00