Commit Graph

2293 Commits

Author SHA1 Message Date
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 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
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
Remie Richards fca3c0bdb5 Adds Plasmamen! Adds the ability for species to breathe other gases! 2015-04-28 20:48:14 +01:00
TheVekter edd3daab24 Fixes #9066, removes description on Noslips 2015-04-27 14:03:51 -05:00
Remie Richards 95e325ee7b Merge pull request #9115 from AnturK/abduction_udpate_dos
Abduction Update 2
2015-04-26 15:38:19 +01:00
AnturK f4a7b2dbe1 Abduction Update Two:
-SPRITES SPRITES SPRITES
-Hopefully fixes create_antag and team problems
-Fixes the Inactive Eye on follow list
-Removes redundant and adds needed checks
-Neater adv camera code
-Minor balance tweaks
-Fixes instant first activation of glands
-Adds 3 mostly negative glands
-Adds anti-tracking helmet to agent equipment
-Makes experimental dissection ignore clothes
-Way out for trapped humans : Mash random buttons
-Abductors now virus immune (also golems and skeletons)
-File cleanup
-Teleporter functionality for camera
2015-04-26 01:30:59 +02:00
kingofkosmos a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos 1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03: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
xxalpha 32746ba73a Merge remote-tracking branch 'upstream/master' into fixfixfix 2015-04-22 18:03:35 +01:00
Ikarrus c771d30986 Gang Mode Update 4
**Major Changes**
- Increased win condition to require 66%
- Added a switchblade. A relatively cheap and decently robust melee weapon for gangsters.
- Capped how much influence you can get every income at 50
- Limited gang spraycan use to 15
- Pistol cost increased to 30 Influence
- Promotion cost now scales to how many bosses you already have. The more bosses, the more expensive it will be. It starts off cheap at 20 influence now.

**Minor Changes**
- Tagging a territory now tells you what territory you actually tagged!
- Added an option to silence the verbose territorial updates you get from gangtools
- Capped how much influence you can get every income at 50
- Updated Centcom report on gangs
- Spraycans always show their inhands now, instead of only when uncapped
- Antag panel now shows how much influence each gang has
- Cleaned up gang code in the traitor panel
- Fixed non-gangers getting gang messages when trying to spray on an invalid territory
2015-04-21 23:23:15 -06:00
Ikarrus af7131c7ad Gang Update v3
The coding isn't done yet, but the design is. So comment on the design while I smooth out the code.

tldr; Gang mode rewrite to follow my original vision: Slower and longer rounds with less deathmatching, and a resource both teams have to fight over

NEW OBJECTIVE: CLAIM HALF THE STATION AS TERRITORY
- Gang bosses can spawn special spray cans that can be used to tag areas
- Any gang member can tag areas.
- Gang tags must be removed before another one is placed in the same area
- Game mode no longer automatically ends when the boss dies. It now ends when either the station evacs, or one gang claims more than 50% of the station areas
- Boss can promote gangers into his lieutenants, which basically means adding more bosses
- Lieutenants can do anything bosses can except promote others to lieutenant

NEW RECRUITMENT TOOL: PENS
- Recruitment pens replace flashes
- Looks exactly like a pen. Stab people to recruit them.
- Recruitment is silent but obvious to the perceptive (Causes a brief seizure)
- Cooldown between uses that gets longer as the gang gets larger

NEW TOOL: GANGTOOL
- Replaces the recaller device. Can still recall the shuttle.
- Provides overview information about the gang (membership size, income amount and time)
- Can spawn pistols and ammo
- Can spawn additional recruitment pens
- Can spawn additional gangtools (For personal use, or promoting a single ganger to lieutenant)

NEW CURRENCY SYSTEM: NAME IS WIP
- Gangtools purchase items with new currency with the placeholder name "Supply Points (SP)"
- Supply points are collected every 5 minutes. The more territory a gang has claimed, the more points they get.
- Supply points are accumulated per-gang. Having more gangtools does not intrinsically give you more points to use.
2015-04-19 01:00:17 -06:00
Jordie 4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Swag McYolosteinen 65f0e36eeb Merge pull request #8942 from AnturK/martialfixes
Martial art fixes
2015-04-15 13:02:23 +02:00
phil235 081bae6740 Fixes broken ui action button for toggling chef apron's sleeves and owl's wings.
Fixes surviving suicide
Fixes suicide damage overlays.
Fixes ninja regen "clothes warm" spam message. (moving rad armor check outside of apply_effect)
Fixes ninja smoke bomb count.
Fixes dead shaved corgi
Fixes lipozine still being in code.
Fixes flattening boxes requiring them to have their window opened.
Fixes armor softening message from disarm attack.
Fixes player being forced to play spiders without choosing.
2015-04-14 13:54:36 +02:00
AnturK cad52e1672 - Fixes temporary martial styles becoming permanent 2015-04-14 13:26:12 +02:00
AnturK 9048a5fca1 - Fixes suplex logging 2015-04-14 08:47:02 +02:00
AnturK 9ee88e7c4a - Fixes scroll usage
- Fixes wrestling belt name
2015-04-14 01:14:18 +02:00
Xhuis 7b5760f6d3 Merge remote-tracking branch 'remotes/upstream/master' into shadowling_1 2015-04-13 16:47:00 -04:00
Xhuis 9c752683ef Shadowling update one 2015-04-13 16:46:49 -04:00
Remie Richards 3a7a300081 Merge pull request #8155 from AnturK/abduction
Abduction Gamemode [Ready]
2015-04-13 18:06:55 +01:00
AnturK 6fa8e5f02d Adds Abduction Mode 2015-04-13 18:40:15 +02:00
Cheridan 8123093880 Merge pull request #8918 from MrPerson/ie_modern
Make DS's IE browser use the most modern available instead of IE7
2015-04-13 09:35:03 -05:00
AnturK 6eef1ddf16 Fixes #8941 2015-04-13 15:57:06 +02:00
Jordie cba7fe8a28 Merge pull request #8900 from Ikarrus/ganguplink
Set list of uplink-purchasable items for Gang Mode
2015-04-13 18:24:35 +10:00
Jordie d8ef9ecb44 Merge pull request #8777 from CosmicScientist/SpaceCarpTatorItem
Adds space carp traitor item and carp plushie "attack"
2015-04-13 18:22:53 +10:00
Jordie e6143f6493 Merge pull request #8810 from AnturK/everybodywaskungfufighting
Adds martial art datum and three styles
2015-04-13 18:22:37 +10:00
Jordie becdb6fcc3 Merge pull request #8746 from ACCount12/diseasesfixes
Fixes for DNA spread and transformation diseases
2015-04-13 18:22:21 +10:00
Jordie ae120db87c Merge pull request #8728 from AnturK/action_button
Generic Action\Action Button System
2015-04-13 18:22:08 +10:00
MrPerson d315b64585 Make DS's IE browser use the most modern available instead of IE7
Read this for more info http://www.byond.com/forum/?post=1820325
Assuming the user has a modern version of IE installed, this allows access to supported CSS 3 elements that we currently can't use. Visually everything seems to remain the same.
Tried doing this with nano and it stopped working for me. Since I know jack all about how nano works, it stays as-is for now.
2015-04-12 07:25:28 -07:00
xxalpha 91cdab2b9c Added implants to Nuke uplink. Removed random implant spawner. 2015-04-12 03:18:44 +01:00
CosmicScientist 6f357b1d63 Merge branch 'master' of https://github.com/tgstation/-tg-station into SpaceCarpTatorItem 2015-04-11 22:11:10 +01:00
Ikarrus 71d529a6a5 More adjustments
- added unrestricted-use guns
- excluded fake toy guns
- Unexcluded throwing stars
2015-04-11 14:37:21 -06:00
Ikarrus 6f3a9ab68a Unexcluded surplus crates 2015-04-11 13:04:13 -06:00
Ikarrus 398f75f035 Custom list of uplink-purchasable items for Gang
This excludes certain uplink items that can be purchased during gang mode. Most notably emags (OP with borgs), space suits (No hiding), chameleon projector (No hiding), the singularity beacon and certain spy-like weapons (Not appropriate).
But this also allows gang bosses to purchase items that were formerly only available to nuke ops, such as their weapons.
2015-04-11 12:57:15 -06:00
Xhuis 6375286704 Fixes admin shadowlings not getting Enthrall 2015-04-11 14:57:14 -04:00
Swag McYolosteinen 853009f7e0 Merge pull request #8157 from Xhuis/shadowling_gamemode
Shadowling (MERGE-READY!!)
2015-04-11 17:51:23 +02:00
Xhuis c9338f7212 Shadowling: RELEASE EDITION 2015-04-11 11:42:02 -04:00
AnturK f0bc1cc70c - Adds action buttons for aliens 2015-04-11 17:06:44 +02:00
AnturK e2c869bc77 - Adds generic action and action buttons system 2015-04-11 17:06:43 +02:00
AnturK 260d205598 - Adds Martial Art datum and Three styles 2015-04-11 16:32:20 +02:00
CosmicScientist bfbc7c40a8 Should be up to date now. 2015-04-11 14:39:37 +01:00
CosmicScientist 0e0f8c4720 Fixed code, carp won't attack owner, corrected spelling. 2015-04-11 03:48:08 +01:00
phil235 4ef5aa93dc Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	icons/obj/food.dmi
2015-04-09 17:38:14 +02:00
phil235 ddb5ffe324 Merge pull request #8582 from Xhuis/two_devices
Adds pizza bomb
2015-04-09 12:58:57 +02:00
phil235 e6e0143ec5 Merge branch 'master' of https://github.com/tgstation/-tg-station into FoodRecipes2
Conflicts:
	_maps/map_files/MiniStation/MiniStation.dmm
	_maps/map_files/MiniStation/z2.dmm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
2015-04-08 19:36:49 +02:00
Iamgoofball c06ad7e6b8 moved process() to datum. made /datum/reagents/ process instead of the containers. 2015-04-07 17:13:59 -07:00
ACCount12 3efb1124ee fix for a fix 2015-04-06 15:55:47 +12:00