Commit Graph

61 Commits

Author SHA1 Message Date
Cheridan
0015d4c120 Merge pull request #8141 from Incoming5643/Subjectivity_is_a_bitch
Skipping mulligan antag based on Time/Subjectivity from admins + tweaks
2015-03-09 00:14:28 -05:00
Cheridan
39cccb82e4 Merge pull request #8123 from Ikarrus/randomspawns
Randomizes Order of Job Spawn Points
2015-03-03 22:57:16 -06: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
Razharas
64d0af336d Merge pull request #8099 from Incoming5643/doublemint_heads
Fixes duplicated heads
2015-03-03 21:32:46 +03:00
Ikarrus
c62d387a1d Randomizes Order of Job Spawn Points
The ticker's setup() will shuffle the list of spawn points, so jobs won't always predictably spawn bottom-up and left-to-right
2015-03-02 20:01:36 -07:00
hornygranny
539d51fb57 Merge pull request #8091 from MrStonedOne/whydidthistakesolong
Adds admin alert when random events fire
2015-03-02 12:02:43 -08:00
MrStonedOne
cd75ad8693 Fixes admin alert for event triggering logic
Forgot to have it check the event's config in the second loop
2015-03-02 07:24:45 -08:00
MrStonedOne
a3076ce0eb Admin event alerts can now be disabled per event.
Disabled for electrical overload and space dust.
2015-03-02 07:20:23 -08:00
Incoming
0037d06cbf Fixes a pair of instances where AssignRole() was being called unsafely and shoved a hot spoonful of sanity in there.
Fixes #8086
2015-03-01 16:47:58 -05:00
MrStonedOne
74bd002183 Adds admin alert when random events fire
Not sure why it took this long for this to happened.
Will only trigger on random event firing, and not when an admin triggers an event to prevent unneeded duplicate messages
Also triggers for events triggered by the wizard summon events
Logs in the game log under the GAME: heading as well
2015-03-01 06:50:51 -08:00
Razharas
1a311c2434 Merge pull request #8047 from optimumtact/patch-1
compile your shit they say
2015-03-01 06:21:11 +03: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
Orange Borg
d56782f645 compile your shit they say
Don't kill me they say
2015-02-28 10:26:38 +13:00
Razharas
a8cedc14ef Merge pull request #7969 from optimumtact/nanouibeginnings
Auto load required nanoui files on client login
2015-02-27 10:36:13 +03:00
paprka
2d1642dd22 fixes another runtime with starlight 2015-02-24 16:48:06 -08:00
oranges
9b7d23776c Auto load required nanoui files on client login
This is still an inprogress so please do not merge
2015-02-25 12:25:21 +13: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
hornygranny
95f9c59475 Merge pull request #7920 from paprka/starlightconifg
Fixes starlight runtime
2015-02-23 13:03:56 -08:00
Swag McYolosteinen
ac5fc9b044 Merge pull request #7544 from Incoming5643/popcapgames
Adds optional population caps
2015-02-23 17:20:02 +01:00
paprka
68d649b6e1 removes unnecessary crap 2015-02-22 21:07:57 -08:00
paprka
eee61482db removes giant loop 2015-02-22 20:07:38 -08:00
paprka
69915d0b1a actually fixes starlight with configs 2015-02-22 16:58:00 -08:00
vista-
3f3a8bf84c Fixes that fucking typo. 2015-02-05 21:48:15 +01:00
Incoming
7903aba6d3 Adds optional population caps for those that want them. These be dark measures, so tread carefully ye who dare enter this place.
There are three "levels" of popcaps, and you can use them in any assortment you like:

The "soft" cap produces a message on join, and takes no action.

The "hard" cap disallows joining whilst too many other people are alive and playing in game, but allows observing.

The "extreme" cap prevents people from joining the server at all while the cap is exceeded. It won't kick out people who failed to qualify during roundstart, but if they leave they won't be able to get back in.

In each case a customizable message config option has been given. Admins are also immune to most population caps (they still are hit by the ones in job shuffling, but can late join as normal afterwards)
2015-02-04 01:58:02 -05:00
Boggart
fad3ff7365 Fix for mobs falling off the mob_list, as suggested by Carn. 2015-01-27 22:56:31 -07:00
Swag McYolosteinen
58648d267e Merge pull request #7271 from Incoming5643/Maybe_it_ran_out_of_gas
Shuttle Stranding
2015-01-27 17:55:26 +01:00
Cheridan
26275f2ae2 Merge pull request #7099 from Firecage/Supply_blacklist
Prevents singularities from being send to centcom via cargo shuttle
2015-01-25 00:42:03 -06:00
Ikarrus
916270321f It also turns out sec/assmaint is already included in additional access so I don't need to include them in the automatic toggle. 2015-01-23 23:33:28 -07:00
Ikarrus
6a4ca17822 Additional Access Re-evaluation
Additional access hasn't been used nor even looked at since errorage first coded it years ago. Departments were moved around, accesses were added, removed, and moved around.

This PR re-evaluates what additional access includes. The original idea was to give jobs most access to other workspaces in their department. For example, a medical doctor would be able to work anywhere in Medbay (Except CMO's office), so I'm going to keep with that direction.
2015-01-23 23:28:03 -07:00
Ikarrus
b63d511d42 Automatic toggle no longer removes sec/assmaint if their options are toggled on in the game options config. It will still grant these accesses if the threshold is not reached. 2015-01-22 23:36:25 -07:00
Incoming
f6380f385e Removed some now obsoleted code
Fixed an edge case
2015-01-21 23:28:48 -05:00
Incoming
d7bca48557 Shuttle stranding:
Removes fake recalls, the shuttle will arrive in rounds that usually would not allow shuttles (rev, malf, blob) but when the time comes for the shuttle to leave, it simply won't.

What this does:
-It gives a bonus ~8 minute delay to antag discovery on shuttle calls
-It punishes crews that call the shuttle at first sign of danger by:
--Rev: having the heads/potential converts huddle in predictable locations
--Blob/Malf: Distracting focus from the antag
-Gives a nice little OH SHIT moment when the shuttle doesn't launch

Essentially this turns shuttle calls into something you wouldn't attempt without confirmation of the round type, which is the opposite of how it functions currently.

Malf AIs also gain the ability to recall the shuttle to avoid the hard tell if they prefer.
2015-01-21 17:35:45 -05:00
Ikarrus
f91b1f59de The join message won't print if MINIMAL_ACCESS_THRESHOLD is not set. 2015-01-20 23:19:48 -07:00
Ikarrus
f4e021fc82 Automatic Round-start Access Scaling
- Added a new config option MINIMAL_ACCESS_THRESHOLD that can be used to automatically give players more access during low-pop rounds.
- If the number of players is below this threshold, expanded access will be used and security and assistants will have maintenance access.
- If the number of players exceeds the threshold, minimal access will be used and security and assistants will not have maintenance access.
- Setting the threshold to 0 will disable this function, and server ops can set the state of round-start access manually
2015-01-20 23:16:51 -07:00
tkdrg
a9160e52dc Merge pull request #7105 from Carn/#6993
Resolves #6993 - Moved pai controller into a subsystem.
2015-01-19 20:17:14 -03:00
Firecage
7f93f113fb Moves blacklist into the Proc. 2015-01-17 21:28:59 +02:00
carnie
a44795a699 Resolves #6993 - Moved pai controller into a subsystem. 2015-01-15 23:50:46 +00:00
Firecage
07f05784a8 list for the blacklist 2015-01-15 23:16:12 +02:00
Firecage
1f42031322 Adds sing and sing gen to cargo blacklist 2015-01-15 21:42:46 +02:00
phil235
3617640a64 Merge pull request #6595 from tkdrg/guncargo
Fixes cargo investigate log spam
2015-01-15 13:06:36 +01:00
tkdrg
a1bf470e10 Fixes a list check and a period in cargo logging 2015-01-14 22:54:50 -03: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
tkdrg
e7172f458d Merge pull request #6998 from optimumtact/patch-3
Reorder error check for manifest length
2015-01-14 03:25:24 -03:00
Swag McYolosteinen
430b613ef4 Merge pull request #6984 from tkdrg/sanitaiz
Replaces a bunch of input() with stripped_input()
2015-01-13 19:32:25 +01:00
tkdrg
6c0ff7457a Merge pull request #6978 from Carn/#6947
Resolves #6947 - fakerecalls now work
2015-01-12 22:49:39 -03:00
Orange Borg
825c8d45a5 Reorder error check for manifest length
Manifests were reporting an incorret size when there were no errors in the manifest.
2015-01-13 10:37:49 +13:00
tkdrg
79582b9cb1 Merge pull request #6957 from Carn/fix_supplyconsole
Fixes supplycomp
2015-01-12 02:43:54 -03:00
tkdrg
b852aa41ea Replaces a bunch of input() with stripped_input()
Some of these were exploitable for XSS, as well.
2015-01-11 19:02:53 -03: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