Commit Graph

675 Commits

Author SHA1 Message Date
GunHog
3b35e80e4d Merge remote-tracking branch 'remotes/upstream/master' into Botcall_V2
Conflicts:
	code/game/machinery/bots/bots.dm
2015-05-03 17:59:46 -05:00
GunHog
df902d50fc Bots Revamp
- Viciously rips radio code from bots, replacing it with something
better and faster!
- Bot patrol logic redesigned, much faster.
- Gives all bots Robotics access for easy patrol activation.
- Bot navigation beacons are no longer radios. Instead, they are
maintained in a global list.
- Navbeacons can now be accessed by Roboticists, and they use a better
UI.
- PDA bot code rewritten. They no longer use radio objects at all!
- Captain now has all-access! His cartridge now has everything except
Mime and Clown functions.
- There is now one button across all PDAs for accessing bots. Only bots
you have access to control will show on the list.
- Buffed the signaler cartridge! It may now be used to signal on all
valid frequencies.
- The AI's botcall interface now includes the bot's model, so it can
always identify the type of bot it is controlling. PDAs have this as
well.
- Spilled my blood to begin Jordie's dark ritual.
2015-05-03 17:31:10 -05: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
68d4ffaf3f uncommitted files (+5 squashed commit)
Squashed commit:

[971e023] Lets try loosening the restrictions on territory tagging

[c55a30d] Reduced pen cost to 40

[2b83dca] Formatting and changelog

[1fe81a8] Let's make the message slightly less gamey

[3067acc] Changeloggery
2015-04-29 20:28:28 -06:00
Ikarrus
2b83dca4c5 Formatting and changelog 2015-04-29 19:29:15 -06:00
Ikarrus
1fe81a8e39 Let's make the message slightly less gamey 2015-04-29 19:21:39 -06: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
fceaa8f969 Gang Update
- Bosses can now summon their gangsters to a location with the gangtool
- Gangtools cannot recall the shuttle if the station is too damaged (<70% Integrity)
- Fixed SSshuttle.emergencyLastCallLoc not being handled or stored properly. Fukken Carn breaking my shuttle features.
- Fixed a potential injection exploit in gangtool's can_use()
- Jobbanned players cannot be promoted
2015-04-28 22:25:55 -06:00
Jordie
4463bcfec3 Merge pull request #9193 from Ikarrus/gang5.1
Gang Update 5.1
2015-04-28 23:46:27 +10:00
Cheridan
b27f145f81 Merge pull request #9172 from GunHog/NTSL_Fix
Fixes NTSL Artifical Broadcasts
2015-04-26 22:50:53 -05:00
Ikarrus
9e805710ae - Tweaks to instructional text
- Promotion costs reduced to 10, 30, 50 influence each
- changelog
2015-04-26 18:00:35 -06:00
Ikarrus
4746fe34f5 Gang Update 5.1
I'm quite satisfied in the current state of gang and I feel that I no longer have any more significant changes to make. Gang 5.1 includes primarily minor tweaks.
- Goal reduced back down to 50%
- Boss icon made more obvious. They're now red Gs
- Better descriptions for distributing spraycans and victory conditions
- Lieutenants receive objectives now
- Increased spraycan use to 20
- Poseur tags no longer pick gang B's tag
2015-04-26 16:02:32 -06:00
Cheridan
6bce2db70d Merge pull request #9159 from Ikarrus/gang5
Gang Update 5
2015-04-26 14:29:50 -05:00
GunHog
8974fe23fe Fixes NTSL!
Radio transmissions made via NTSL now work again.
Moved the Centcom radio checks from 4 to 5 so it does not override other
things.
2015-04-25 22:31:51 -05:00
Ikarrus
7b02a11dc2 Gang Update 5
###Major Changes###
- Influence income changed to provide weaker gangs a bigger boost, while slowing down stronger gangs to promote opportunity for comebacks
- Gangs only earn influence on territories they have held on to since the previous Status Report (the income calculation every 5 minutes). This places more significance on defending your existing territory.
- Victory conditions are only checked during Status Reports.
- Bosses no longer receive territory updates real-time. They now get them all as a list of new and lost territories in the Status Update.

###Minor Changes###
- Goal is now a coeff var so it can be modified in-game for debugging/playtesting purposes
- Simplified some list checks for gang
- Trying to tag an invalid area will just error out and return, instead of the ganger spraying regular grafiti and confusing people
2015-04-25 01:20:04 -06:00
Boggart
077051626c Ports Nienhaus's guitar, the additional sounds are about ~1mb.
Moves most of the code from violin up to instrument and makes violin a child of it. (Guitar is a child of it as well.)
Fixes violins on Metastation and Box due to the repath, adds the guitar to both.
2015-04-24 19:12:22 -06:00
Boggart
c6a22a98c9 Renames Violin.dm to Instruments.dm in preparation for generalizing the code and to preserve the git history. 2015-04-24 19:12:16 -06:00
kingofkosmos
a7bd5f93e1 "You hear something" set to italics. 2015-04-24 21:06:16 +03:00
kingofkosmos
9ebbdb2fb2 span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
3304ffa45f span fixes 2015-04-24 20:52:01 +03:00
kingofkosmos
e371dd9f35 more spans 2015-04-24 20:52:00 +03:00
kingofkosmos
72749392d8 span classes removed from visible.messages 2015-04-24 20:50:51 +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
Cheridan
30d160b1d2 Merge pull request #9112 from Ikarrus/gang4
Gang Mode Update 4
2015-04-24 12:11:38 -05:00
Ikarrus
d420e3f467 Pistols -> 25 Cost 2015-04-23 09:23:27 -06:00
Ikarrus
1a1b906eec - Switchblade changes hitsounds now if it's not extended.
- Reverted the boss icon back to use a B. I changed it for a different idea I had but I never went through with it but I forgot to change the icon back
- Price tweaks
2015-04-22 20:02:50 -06:00
phil235
f23db26b6a Merge pull request #9085 from kingofkosmos/weldmaskbuckelefix
Welding mask toggling while buckeled fix
2015-04-22 21:37:31 +02:00
Ikarrus
2343579a48 - Increased pen cost to 60, mostly so you can't be buying one every 5 minutes late round
- Increased pen cooldown to (15*Gang size)+45 seconds
- Promotion cost now counts how many times you bought that item instead of how many bosses you have, so you can't stockpile on cheap gangtools before promoting anyone
2015-04-22 08:08:13 -06:00
Ikarrus
120cb22cb4 Added a changelog and additional tweaks 2015-04-22 00:01:57 -06: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
Swag McYolosteinen
dc696c16cc Merge pull request #9028 from Fayrik/CentcomExpansion
Centcom change, Deathsquad buff and Abductors get the new advanced camera console.
2015-04-20 19:03:04 +02:00
kingofkosmos
e878ca4c8c Fixes #9071 2015-04-20 19:12:27 +03:00
Ikarrus
4ff044dc78 Gang v3 has been tested and is now good to go! 2015-04-19 22:26: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
Fayrik
558f46af1e Forgot the encryption key sprite. 2015-04-18 00:41:15 +01:00
Fayrik
84df0192f4 Buffs Deathsquads. 2015-04-18 00:06:17 +01:00
Jordie
4c1a1c8c87 Merge pull request #8967 from phil235/BundleFix1
A big bundle of fixes
2015-04-16 18:18:53 +10:00
Jordie
210eedbb48 Merge pull request #8841 from GunHog/Bot_Radio_And_Newscasters
Bot fixes and PDA upgrades!
2015-04-16 18:18:44 +10: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
Swag McYolosteinen
ffd0db2b7b Merge pull request #8581 from MrPerson/lighting_2015
Object based lighting system
2015-04-12 13:14:32 +02:00
Cheridan
69f1b38479 Merge pull request #8838 from optimumtact/hearmeroar
Fix megaphone having an audible range of one
2015-04-10 01:01:57 -05: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
GunHog
3f762ee6b5 PDA Upgrade and Bot Fixes
-The Captain's PDA can now access multiple bots!
- The Captain and HoP PDAs can now also remotely access Newscasters!
- Bot radio code now no longer uses filters to allow for multi-access
radio control.
- Bots can now patrol while off station.
2015-04-08 20:12:01 -05:00
oranges
8a5696a033 Fix megaphone having an audible range of one 2015-04-09 10:57:30 +12:00
Xhuis
2cb387af90 Adds proximity/stat/etc. check and removes bloat 2015-04-07 19:52:14 -04:00
Xhuis
27625530e3 Kenny Loggins 2015-04-05 19:13:23 -04:00
Orange Borg
a5306ba1e0 Fix can_speak check in megaphone
The original check actually made no sense, but worked because it returned false every time as there was never a message passed through
2015-04-05 20:29:07 +12:00
phil235
6550016ee6 Merge pull request #8723 from kingofkosmos/grammarfixes
Recieve --> Receive
2015-04-04 20:00:21 +02:00
kingofkosmos
2e4a8fcce8 Recieve --> receive grammarfix
Changes all "recieve"s in descriptions around the tgstation to "receive". Also energy katana description high priority fix.

Fixes #8576
Fixes #8504
2015-04-03 19:42:34 +03:00