Commit Graph

202 Commits

Author SHA1 Message Date
phil235 489d076de5 Merge pull request #9126 from Jordie0608/doesrussellsteapotapplytorussellsteapot
Fixes #9035, atmos locker sprite and misc logging bug
2015-05-08 16:24:21 +02:00
Cheridan 95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
Ikarrus 832e19a061 Fixed a bug with admins being told it failed to create a response team if they spawned a centcom official or deathsquad 2015-05-03 14:06:16 -06:00
Remie Richards e5f034fc0d Merge pull request #9147 from GunHog/Rise_Of_The_RR_Androids
[Review Ready] Positronic Brains!
2015-05-03 06:34:02 +01:00
Jordie d5c7ead540 Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant
Temporarily disables revenants
2015-05-02 23:59:36 +10:00
Incoming 7459238065 Merge branch 'master' of https://github.com/tgstation/-tg-station into begone_ye_jellies
Conflicts:
	code/game/machinery/teleporter.dm
2015-04-29 13:37:01 -04:00
Xhuis 3995ae73cb Makes revvies admin-spawnable again 2015-04-28 17:10:08 -04:00
GunHog 00a6762838 Ban panel and preferences changes
- Deathsquad moved from Antagonist to Ghost Roles.
- pAI jobbans split into drone, pAI, and posibrains.
- Posibrains back under pAI preference flag (the byte is full)
- Fixed Posibrain sprite if it fails to get a ghost.
2015-04-28 14:45:59 -05:00
Jordie0608 a6b3deda96 Merge branch 'master' of https://github.com/tgstation/-tg-station into doesrussellsteapotapplytorussellsteapot
Conflicts:
	icons/obj/closet.dmi
2015-04-28 22:31:11 +10:00
GunHog ae1ad22f97 pAI -> Ghost Roles
Changes the BE_PAI and "pAI" flag names to "BE_GHOST_ROLE" and "Ghost
Roles".
Name subject to change.
2015-04-27 11:07:36 -05:00
Xhuis 8c84b0b5bd Comments out revenant ( ;_; ) 2015-04-25 19:38:14 -04:00
Incoming f59c01e721 sets hardset_dna to clear exotic blood on race changes
sets every instance of race changes to use hardset_dna instead of directly replacing the datum (needs more testing to be sure I didn't break shit)
removes the invisible man race (aka the generic) and shadowlings from the new green slime mutation toxin while I'm in the area
2015-04-23 12:35:37 -04:00
Jordie0608 15718c515d fixes opening lockers, atmos locker sprite and misc logging bug 2015-04-23 20:46:40 +10:00
Xhuis 6eec44430a Lots of updates 2015-04-21 20:17:10 -04:00
Cheridan d6741236b5 Merge pull request #8991 from Fayrik/AllTheSmallThings
One-Click-Antag Tweaks: Now with more jobbans!
2015-04-17 09:30:08 -05:00
Fayrik 772b05d56b New Jobbans, and proper messages for when you fail to spawn antags. 2015-04-15 20:27:44 +01:00
MrStonedOne d9a9ae1358 adds a permission check to force event's topic
There existed a href exploit that allowed any admin to force an event.
2015-04-14 10:48:24 -07:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Incoming d1892cffbe Organizes the various continuous_round_x config options into one set of config options continuous. Functionality is only there for the same mode that already had that functionality, everything else is continuous always
Makes another set of config options for which rounds types, if any, use the midround antagonist (mulligan) system. Keep in mind this is by definition a subset of round with continuous set. Again this feature is only present for the roundtypes where I KNOW it works properly, other modes can't use midround antags.

The check antagonist screen will show how the game will behave when all the antagonists die, and it can be changed on the fly by admins, the four possible states are:

End on antagonist death (noncontinuous rounds)
Continue if antagonists die (unsupported continuous by default round)
Continue if antagonists die, creating replacement antagonists (continuous, using midround antags)
Continue if antagonists die, not creating new antagonists (continuous, not using midround antags)

When rounds prepare to mulligan admins will additionally get the option to just keep the round going without any automatically created antags in case they want to run their own shinanagans instead. They can also as before choose to end the round.
2015-04-09 16:03:11 -04:00
Cheridan 9606763e5f Merge pull request #8583 from Fayrik/CentcomExpansion
Centcom Two: It's better now, I swear.
2015-03-30 21:35:19 -05:00
Jordie 98873da060 Merge pull request #8549 from tedward1337/Ohgodthisishard
Adds Bluespace artillery button.
2015-03-30 01:20:45 +11:00
Fayrik 7336e6ecb8 Call Centcom! ERTs got fixed! 2015-03-29 03:54:54 +01:00
tedward1337 83961b85c9 Adds a new button for admins with +fun to push. Sends bluespace artillery to the station at the whim of God. 2015-03-25 22:03:45 -04:00
phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm
2015-03-23 16:51:03 +01:00
phil235 aecb365f84 Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal
Conflicts:
	code/modules/mob/living/carbon/alien/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/silicon/robot/life.dm
	code/modules/mob/living/simple_animal/slime/life.dm
2015-03-20 19:32:16 +01:00
Cheridan 7149f0382d Adds Pet Collars!
Map needs update now
2015-03-18 21:27:21 -05:00
phil235 456a64f8fd slime from carbon to simple animal 2015-03-14 23:40:57 +01:00
phil235 29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
Incoming c28d8ff7d0 Adds the ability for admins to "take the shot" and end rounds at their discretion. This is behind a two confirmation gate with a 20 second reflection period between them. All this is logged.
When mulligan antag is set to kick in, the suggestion for admins to end the round if they feel enough has happened is given. The option can also be found on the check antagonist panel.

The check antagonist panel will show what the muligan roundtype is if it exists.

If absolutely no one wants/can be the midround antags, the round ends there.

The round will end no matter what if the primary antagonist survived over an hour before biting it (unless the shuttle is already past the point of no return, in which case a peaceful ending takes priority)

Adds force_ending to VV editing protection, to avoid admins trying to shinanigans it on.
2015-03-03 16:39:01 -05:00
Remie Richards 88cc21cb6d Merge pull request #7963 from Incoming5643/manage_ass
Updates Manage Job Slots to work with assistant slots
2015-02-28 21:28:44 +00:00
Incoming cbcc52beeb Updates Manage Job Slots to work with assistant slots
Any (non-silicon) job can now be set to be an unlimited slot job from Manage Job Slots

People will be allowed to join as assistant if no other jobs are availible

Removes a redundant sanity check from AssignRole()
2015-02-24 16:06:36 -05:00
Jordie0608 6b815c7801 Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP 2015-02-24 20:02:43 +11:00
phil235 19e3cd5d1e Fixes a window's size and a colored text in another one. 2015-02-21 16:24:13 +01:00
paprka 55bdca20da Merge branch 'master' of https://github.com/tgstation/-tg-station into gunstuff 2015-02-01 18:22:02 -08:00
paprka 453a3db196 etc 2015-01-30 23:18:02 -08:00
Menshin 9af151878d Added a "Send back to Lobby" option in Player Panel. 2015-01-28 18:45:26 +01:00
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
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
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
paprka 84a943d87c adds supply job list 2015-01-03 19:49:26 -08: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
Incoming 0dd71178c4 Magic Mania 1.8: Summon Spells Rework and The Challenge System
Summon Guns and Summon Magic are no longer traditional spells.

When cast by the wizard, he gains a charge for his spell book but no antagonists are created, essentially making his life harder for more power. Both spells can only be cast once like this for a maximum of 2 extra charges.

When cast by very rare chance in summon events, no charages are gained, and there's a 10% chance of someone becoming a survivor, down from 25%. No charges are gained if this happens.

When cast by a badmin they will be given a choice of not creating antags, creating antags at the old chance, or just going in stupid and giving everyone antag.
2014-12-14 22:07:00 -05:00
Cheridan 594fd9d3e2 Merge pull request #5271 from Menshin/html_sanitization
Text input sanitization (take 1)
2014-11-07 13:56:20 -06:00