Commit Graph

12467 Commits

Author SHA1 Message Date
Remie Richards 8b2834fadc Made plasma exhale as CO2 instead oxygen. 1: Oxygen is indirectly harmful to plasmamen (they ignite) 2: Burnmix outputs CO2 2015-04-29 23:39:08 +01:00
Firecage ecc1401261 Makes Simple Animal Clowns drop Human Clown corpses. 2015-04-29 23:30:51 +02:00
Firecage 7ad10b1bb1 Small ..() fix. 2015-04-29 21:10:32 +02:00
Firecage ad75060280 Changes how butchering works. 2015-04-29 20:06:20 +02: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
kingofkosmos 8eec4c9199 Mop can now be wetted in the sink. 2015-04-29 20:19:41 +03:00
Remie Richards 2bc42255f1 New fire overlay sprite for ALL Humanoid mobs, Removes hacky plasmaman fire underlay code - Thanks WJohnston! 2015-04-29 18:19:06 +01:00
kingofkosmos 945df91164 Merge branch 'master' of https://github.com/tgstation/-tg-station into mopbucket 2015-04-29 18:56:57 +03:00
Remie Richards 74805f7011 Not having a breathable gas is now equivalent (code+mechanically wise) to not having enough oxygen. Plasmamen now heal brute and burn damage from the plasma reagent. 2015-04-29 16:46:47 +01:00
kingofkosmos 1f5cb56ff7 Bucket's attackby-procs combined. 2015-04-29 18:45:45 +03:00
kingofkosmos c41b90451c Mopping can be done also with a bucket. 2015-04-29 18:41:04 +03:00
Cheridan 64b5f8540c Merge pull request #9164 from Fayrik/TheNanoing
The Nanoing (Part One: Atmospherics)
2015-04-29 09:38:56 -05: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 0fd70f03cc Fixes a minor goof in powernets from fixing merge conflicts 2015-04-29 02:24:07 -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 ba66482613 Adds new gibbering phrases 2015-04-28 17:48:47 -04:00
Xhuis b0dad44943 Oops. 2015-04-28 17:44:29 -04:00
Xhuis 3995ae73cb Makes revvies admin-spawnable again 2015-04-28 17:10:08 -04:00
Firecage a2070d5c4b Fixes the grammar error of the Grenade Launcher. 2015-04-28 22:27:17 +02:00
phil235 9b90645cec Merge pull request #9199 from TheVekter/buggate2015
Buggate 2015 PART 1: Slimes, drinks, and more!
2015-04-28 22:01:13 +02:00
Remie Richards ec239655ea Removes 2 defines from an early attempt (like, an hour ago) at this port. 2015-04-28 20:58:36 +01: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 877e2e8f56 Merge pull request #9176 from JJRcop/TEAenhancement
TED and Chronosuit tweaks
2015-04-28 23:49:40 +10:00
Jordie 0c08ffb95e Merge pull request #9183 from GoonOnMoon/ARG1
ARG Assault Rifle Addition
2015-04-28 23:49:33 +10:00
Jordie d40ff3d8c6 Merge pull request #9189 from Iamgoofball/patch-61
Acid blob is R.I.P IN ACID
2015-04-28 23:49:09 +10:00
Jordie d1308526a3 Merge pull request #9191 from phil235/ShockDoorFix
Electrocution damage adjustments
2015-04-28 23:48:23 +10:00
Jordie 4463bcfec3 Merge pull request #9193 from Ikarrus/gang5.1
Gang Update 5.1
2015-04-28 23:46:27 +10:00
Jordie 641db847cc Merge pull request #9133 from phil235/ClownNamePreferences
Changes clown/mime naming to use preferences.
2015-04-28 23:45:52 +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
TheVekter 6e6aa1d35d Makes Hooch use UE as a catalyst, fixes map issues (I hope) 2015-04-27 23:38:26 -05: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
xxalpha b9b741a6ae Fixed surgery closing step not removing bleeding overlay. 2015-04-27 20:27:53 +01:00
TheVekter edd3daab24 Fixes #9066, removes description on Noslips 2015-04-27 14:03:51 -05: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 520d9f4976 Merge pull request #9182 from phil235/PodPlantFix
Fixes a runtime with pod plants
2015-04-27 10:02:35 -05: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
Cheridan 3f4e7460e0 Merge pull request #9179 from phil235/DeleteFilesAgain
Removes files that were supposed to be deleted already.
2015-04-27 08:29:41 -05:00
Ikarrus 671bee5027 Centcom Response Team Variations
- The button is now labelled "Make Centcom Response Team"
- Added different response teams of varying strength, to give admins more options than balls-to-the-walls all the time
- Code Green: Centcom Official
- Code Blue: Light ERT - No access to lockers or admin weapons
- Code Amber: Full ERT - Access to lockers, but not admin weapons
- Code Red: Elite ERT - What we have now.
- Code Delta: Deathsquad
- Removed Make Deathsquad button as it's all collapsed into this one button now
2015-04-27 01:08:47 -06:00
TheVekter 07afe76f8c Fixes #9098 and #9077. 2015-04-27 01:41:12 -05:00
TheVekter 36a8405056 Fixes #9184 and #9122 2015-04-27 00:54:55 -05:00
phil235 c2151180eb Merge branch 'master' of https://github.com/tgstation/-tg-station into ClownNamePreferences
Conflicts:
	code/modules/mob/transform_procs.dm
2015-04-27 00:11:49 +02:00
phil235 e16a817b55 Adjusts electrocution damage from cells and powernets. Less RNG and never goes above 95 to avoid instacrit.
Fixes item attacks targeting a random limb instead of the one selected.
2015-04-26 23:48:20 +02:00
Iamgoofball b9f5c528c4 Acid blob is R.I.P IN ACID
Also fixes a bug with LDM and Sorium blobs
2015-04-26 13:09:37 -07:00