Commit Graph

9169 Commits

Author SHA1 Message Date
Jordie0608
febd9406a0 mobs pushing restrained fix 2015-05-05 00:43:37 +10:00
phil235
ba1f186ba4 Merge pull request #9307 from kingofkosmos/ragspanfix
Fixes span in wiping with rag.
2015-05-04 13:31:48 +02:00
Cheridan
191e011c14 Merge pull request #9272 from phil235/BundleFix7
animal knockdown, nettle soup, defib, extinguisher fixes
2015-05-04 00:26:22 -05: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
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
kingofkosmos
4dfee04698 Fixes span in wiping with rag. 2015-05-03 08:11:31 +03: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
f0c57b916f Merge pull request #9237 from Firecage/Butchering
Changes how butchering works, Changes butchering drops
2015-05-03 00:00:15 +10:00
Jordie
5f4b41c226 Merge pull request #9246 from Wolfie13/9097-borgs-fix
Fixes #9097
2015-05-03 00:00:08 +10:00
Jordie
6008404738 Merge pull request #9185 from AnturK/aliens_stole_my_branch_name
Abduction Update 2.5
2015-05-02 23:59:48 +10: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
3606662c88 Merge pull request #9106 from phil235/BundleFix5
Cyborgs, MMIs, and other fixes
2015-05-02 23:59:22 +10:00
Jordie
562766bdb0 Merge pull request #9129 from Incoming5643/begone_ye_jellies
Some Mutantrace Housekeeping
2015-05-02 23:59:15 +10:00
Jordie
840d858aa1 Merge pull request #9202 from xxalpha/igppigigppigigppigigppig
Fixed surgery closing step not removing bleeding overlay.
2015-05-02 23:59:06 +10:00
Jordie
88faa5f6e9 Merge pull request #9250 from Boggart/BorgsCantIntoDisposalBinDeconstruction
Fixes borg modules other than the trash bag not being able to work on disposal bins.
2015-05-02 23:58:39 +10:00
AnturK
a92b3b24e4 - Adds make abductor buttons on traitor panel
- Fixes clotheless surgery
2015-05-02 12:54:52 +02: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
phil235
be1708483e - Fixed nettle soup recipe says abstract nettle.
- Fixes hostile animals weakening non carbons, and adjusted weakening values 1958.
- fixes being able to drop defib paddle by resting, fix a runtime linked to this.
- can no longer pick card from deck while resting, same for paper bin and bedsheet bin.
- examining extinguisher and atmos watertank nozzle gives you the amount of water remaining.
2015-05-02 01:34:38 +02: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
Cheridan
c947a4bea6 Merge pull request #9221 from Firecage/Grenadelauncherfix
Fixes the grammar error of the Grenade Launcher.
2015-05-01 12:17:09 -05:00
phil235
9f8c47b5f6 Removes my changes to cyborgs. 2015-05-01 16:32:34 +02: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
Boggart
cd734c8eca Fixes borg modules other than the trash bag not being able to work on disposal bins. 2015-04-30 16:42:25 -06:00
Ikarrus
0615b4e09a Merge branch 'master' of https://github.com/tgstation/-tg-station into ERTcodes 2015-04-30 08:56:46 -06:00
Wolfie13
beca82e3c2 Fixes #9097
https://github.com/tgstation/-tg-station/issues/9097
2015-04-30 12:22:12 +01:00
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
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
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
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
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
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