Commit Graph

1280 Commits

Author SHA1 Message Date
phil235
f643769ef4 Fixes some runtimes with bluespace artillery, handcuffs on simple animals, lobby music start, stunbaton attack, kitchen bowl update_icon, particle accelerator admin log message, and plasmaman spec_life(). 2015-05-23 22:34:04 +02:00
Jordie0608
84eaa17ec9 reset ooc color buttons, changes how default color for admins is handled 2015-05-17 22:10:46 +10:00
Jordie
df2433a43f Merge pull request #9451 from Xhuis/whyAreThereFortyShadowlings
Adds a Create Shadowling button
2015-05-13 19:46:12 +10:00
Jordie
c769a45b3c Merge pull request #9449 from Incoming5643/con_troll
Minor Check Antagonist Panel Beautification
2015-05-13 19:45:22 +10:00
Jordie
e1f5ed793d Merge pull request #9356 from Firecage/Kudzulogs
Adds logs for admins to kudzu.
2015-05-11 23:58:38 +10:00
Firecage
c6b0c8b390 Investigate logs for kudzu planting 2015-05-11 15:18:01 +02:00
Xhuis
aa52d59b18 Adds a Create Shadowling button 2015-05-10 22:07:19 -04:00
Incoming
562bff95b4 Slightly widens the check antagonist panel
Makes the "(logged out)" flag on antagonists read "(ghost)" because that's what it's actually tracking

Together these fix #9268

Also sneaks a bit of mulligan functionality in so admins can see what the time and life checks for the mulligan system are, and modify them midround if desired.

Also shows and allows editing of the "on failure" behavior of mulligans, specifically if they default to instant round ending if the mulligan fails or if it just doesn't create antags.
2015-05-10 20:06:00 -04:00
Remie Richards
7e0e50302a Merge pull request #9436 from MrStonedOne/powerfixes
Merges power subsystem into machine subsystem.
2015-05-10 08:23:20 +01:00
MrStonedOne
c6c7237265 Merges power subsystem into machine subsystem.
This is to avoid issues from when they fire out of sync, since powernets assume machine's subsystem will fire directly after power's does.
2015-05-09 23:48:18 -07:00
phil235
1875f3a9c2 Merge pull request #9377 from Jordie0608/thebackpackistherealmagicitemhere
Group of fixes
2015-05-09 16:23:46 +02:00
Jordie
a73ef787a2 Merge pull request #9380 from SconesC/spooky-faces
Replaces Plasmaman Gas Mask w/ Breath Mask
2015-05-09 22:03:34 +10:00
Remie Richards
c77fefc937 Merge pull request #9374 from AnturK/abduction_third
Abduction fixes
2015-05-09 06:25:23 +01:00
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
Jordie0608
e72a4fb580 Drop-Everything deletes NODROP items 2015-05-08 18:40:23 +10:00
Cheridan
95d7af4e48 Merge pull request #9277 from Ikarrus/ertbaton
Batons for Light ERP
2015-05-06 09:03:55 -05:00
SconesC
20181c37b8 Replaces Plasmaman Gas Mask w/ Breath Mask 2015-05-05 17:55:32 -07:00
Cheridan
78e25c3175 Merge pull request #9220 from RemieRichards/PlasmaaaaaaaMeeeeeeen
Ports VG's Plasmamen + Species breathing additions
2015-05-04 00:19:18 -05:00
Ikarrus
040ffc9ace Grammar for special_role 2015-05-03 15:19:43 -06: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
AnturK
63b33f40cf Fixes button created teams not adding to gamemode 2015-05-03 15:15:09 +02: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
Cheridan
bbb1df2654 Merge pull request #9263 from Incoming5643/fightvale_pride
Fixes another instance of FIGHTVALE
2015-05-02 17:46:24 -05:00
Jordie
d5c7ead540 Merge pull request #9165 from Xhuis/REMOVE_REVENANT_remove_revenant
Temporarily disables revenants
2015-05-02 23:59:36 +10:00
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
MrStonedOne
eb7d5fefa5 Merge remote-tracking branch 'upstream/master' into step-aside-aran-im-here-to-touch-your-precious
Conflicts:
	code/controllers/subsystem/ticker.dm
2015-05-02 03:03:29 -07:00
Ikarrus
b331391aa5 Batons for Light ERT
Moved the batons from the lockers to their backpacks so light ERTs can use them
2015-05-01 21:30:34 -06:00
Cheridan
84d2a5a006 Merge pull request #9228 from Ikarrus/pregamedelay
Admins can now adjust pre-game delay time
2015-05-01 15:03:26 -05:00
Cheridan
0d1cfba3b7 Merge pull request #9200 from Ikarrus/ERTcodes
[Z2 MAP] Centcom Response Team Variations
2015-05-01 14:31:22 -05:00
Cheridan
509d940746 Merge pull request #9225 from Incoming5643/Unless_its_wizbiz_bugs_will_usually_follow
Fixes Round End Sound
2015-05-01 14:13:07 -05:00
Incoming
b19a66ba51 Fixes another instance of FIGHTVALE because the replacementmode didn't realize that the lists of antags are kept in the ticker.mode gamemode and not itself.
Clears up some language issues that was making the check antag panel a little harder to read than it needed to be.
2015-05-01 13:34:34 -04:00
MrStonedOne
fe1d3c22d5 Minor rework of lobby admin verbs
Both me and #9228 fixed the same bug, so I reverted mine

Starting the round with the start now verb will now show a tip of the round.
2015-04-30 18:27:58 -07:00
Ikarrus
0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06: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
Cheridan
36df27ad53 Merge pull request #9205 from phil235/SpiderKnifeFixes
Spiders and kitchen tool fixes
2015-04-29 08:23:10 -05:00
MrStonedOne
ccf90332c2 Fixes delay start giving the wrong message 2015-04-29 02:51:10 -07:00
MrStonedOne
bd6d51a0b5 Massive MC and subsystem rewrite
MC:
	No longer tracks a subsystem's cpu usage. This was basically worthless and took up space on the stat panel
	Can calculate wait down to a tenth of a decisecond to make it fps/world.ticklag agnostic
	Now allows subsystems to have a dynamic wait, that is based on a ratio of how long that subsystem has been taking to process(cost). (This system allows for upper and lower bounds, and an changeable cost delta for each subsystem)
	MC can now be told to init a zlevel

All Subsystems:
	Stats panel now allows child subsystems to pass it a message to add to its stats entry. All subsystems have been moved over to this system - This should cut down on subsystems having to copy and paste the stats proc in order to add to it
	All subsystems now properlly handle being given a zlevel in their init proc

Subsystem changes:
	Air:
		Added air to the dynamic wait subsystem. upper bound: 50, lower bound: 5, cost delta: 3 times process cost
		Air now fires 4 times faster when it can do so without lagging things up
		Pipenet has been merged into air
		Atmos machinery now processes with process_atmos(), ticked by air, not machinery.
		Hotspots (the fire object) are now object pooled
	Pipenet:
		Deleted, added to air
	Machinery:
		Moved all atmos calcualtions in all objects's process() to process_atmos().
	Lighting:
		Added Lighting to the dynamic wait subsystem. upper bound: 20, lower bound: 5, cost delta: 3 times process cost
	Ticker:
		Fixed ticker not updating the lobby panel when game start delayed
		Fixed the game start timer updating rapidly from queued fires when game start delay is removed
	Garbage/qdel:
		qdel will now limit its process time to 2ds a fire.
		qdel can now be given hints as a return to Destroy() as to what should be done with the object.
		the options are:
			queue: (default) this is the normal behavior.
			letmelive: old default to non-null/zero. does nothing with the object
			iwillgc: functionally the same as above, mainly to let people working with objects know that the object will not be queued for GC checking
			harddel: this will queue the object to be deleted without storing a soft reference, mainly to save locate() processing time.
			harddel_now: this will del() the object. To allow for a clean removal of every del() not in qdel
		All objects have been updated to the new system, harddel and iwillgc was not added to any new objects.
		Fixed some objects not GCing because they didn't properlly clear references in Destory()
		Fixed some objects getting qdel'ed preventing other objects from getting GCed because they did not null their reference to that object.
2015-04-29 02:00:25 -07:00
Ikarrus
3b96d74955 Admins can now adjust pre-game delay time
Instead of just a simple Pause/Play toggle, it lets admins set a longer (or shorter) time if they want.

Admins can still set -1 for indefinite delays.
2015-04-28 23:00:42 -06:00
Incoming
2f0ebbf810 Fixes a pretty significant bug where sounds set with set round end sound would only actually play for the person who set the sound 2015-04-28 23:15:27 -04:00
Xhuis
3995ae73cb Makes revvies admin-spawnable again 2015-04-28 17:10:08 -04:00
Remie Richards
fca3c0bdb5 Adds Plasmamen! Adds the ability for species to breathe other gases! 2015-04-28 20:48:14 +01: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
Jordie
4463bcfec3 Merge pull request #9193 from Ikarrus/gang5.1
Gang Update 5.1
2015-04-28 23:46:27 +10: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
Ikarrus
4444f30040 Round Integers 2015-04-27 22:29:28 -06:00
Ikarrus
866ad1bc62 - Re-added the centcom ferry shuttle console back on centcom, and added the admin request button to the ferry request console. 2015-04-27 20:01:59 -06:00
phil235
752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02: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
Ikarrus
91c52d7766 - No more searching through world
- Customizable squad size
2015-04-27 09:32:41 -06:00
Cheridan
6938612555 Merge pull request #9149 from Incoming5643/generic_continuous
[new config options][the eternal playtest] Mulligans/Continuous for any roundtype
2015-04-27 08:45:52 -05:00