Commit Graph

1793 Commits

Author SHA1 Message Date
Pete Goodfellow aaa70a994b Added slot_flags = SLOT_BELT 2013-06-19 17:11:04 +01:00
Pete Goodfellow 972a5cdc50 Merge branch 'master' of github.com:tgstation/-tg-station into taperecorder
Conflicts:
	icons/obj/device.dmi
	tgstation.dme
2013-06-19 17:05:47 +01:00
Cheridan 7104d14141 Merge pull request #801 from Ikarrus/bomblog
Improved logging of syndicate bombs and grenades
2013-06-18 18:10:18 -07:00
Ikarrus 1518d285e7 Standardized spelling of all instances of "Centcom"
Centcomm/CentComm -> Centcom
centcomm -> centcom
2013-06-17 20:49:01 -06:00
Ikarrus 2f92f67ae6 Improved logging of syndicate bombs and grenades 2013-06-17 20:42:20 -06:00
Pete Goodfellow 3365e92eb0 Removed unintended changes 2013-06-15 19:09:22 +01:00
Pete Goodfellow c7c3bd48de Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun
Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html
2013-06-15 18:58:11 +01:00
Cael Aislinn 56f577dc7c Merge pull request #754 from MrPerson/tablefix
Hulks punching tables now break into table parts, not rack parts. Fixes ...
2013-06-12 04:54:01 -07:00
MrPerson ed1cccdf25 Hulks punching tables now break into table parts, not rack parts. Fixes issue #640 2013-06-11 02:40:20 -07:00
Cael Aislinn cc66ec46db Merge pull request #552 from dumpdavidson/monkeyize
Monkey - Human transformation
2013-06-10 02:27:52 -07:00
dumpdavidson 87a28b67e0 Merge remote-tracking branch 'remotes/origin/master' into monkeyize 2013-06-10 10:54:09 +02:00
Carnie 968ce3bde1 Merge pull request #747 from KazeEspada/grilles
fixes issue #742 - grilles now drop the correct number of rods when destroyed.
2013-06-10 00:44:00 -07:00
KazeEspada 804f509639 fixes issue #742 2013-06-09 19:06:15 -07:00
Cael Aislinn bfe509a345 Merge pull request #734 from Incoming5643/syndibombs
Adds the Syndicate Minibomb and Syndicate Bomb to traitor PDAs
2013-06-09 12:11:16 -07:00
Cheridan b817a79836 You can no longer create batons with functionally infinite charge, by first rigging the cell and then hitting someone to blow it up.
golly
2013-06-08 20:58:07 -05:00
Cael Aislinn 2febaa4da9 Merge pull request #712 from dumpdavidson/EMP_radios
Radios more vulnerable to EMP (Issue #711)
2013-06-08 17:53:34 -07:00
Cael Aislinn 6531edd757 Merge pull request #576 from SuperSayu/camerabug
Fixes 'Camera Bug' item and makes it a viable tool.
2013-06-08 17:43:18 -07:00
incoming 3cfc4c6203 *Fixed a few errors in the sprites and gave the syndicate bomb unique inhands (thanks again to teh_wolf)
*Added isliving and in_range checks to settings() so you couldn't open the dialog boxes, run across the station, then prime the bomb from there
*Default timer setting has been raised to 60 seconds, minimum timer setting has been raised to 30 seconds
2013-06-08 13:47:17 -04:00
incoming f4f743e0a9 Adds the Syndicate Minibomb and Syndicate Bomb to traitor PDAs
The minibomb is based on grenade code with a blast radius of 1,2,4 and is found in syndieminibomb.dm. This is the same power as the default tank transfer bombs spawned on the syndicate shuttle.
It features new sprites by teh_wolf and existing inhands (the default grenade) and is a tiny item.
As a result of introducing an explosive grenade, grenade priming are now logged.
Its crystal cost has tentatively been set at 3.
---
The Syndicate Bomb is all new code contained in explosives.dm with additional wires code at syndicatebomb.dm. It does not make use of any tank transfer valve or grenade code.
The bomb has a blast radius of 2,5,11. This is the same power as the tank transfer bombs in the syndicate shuttle if they are boosted with oxygen.
It features new sprites by teh_wolf and existing inhands (currently using “electronic”) and is a bulky item.
The bomb is set by touching it in your hand or touching it on the ground if it has been wrenched down, allowing first to set a timer (min 10 seconds) and then giving an option to start the countdown. When the bomb is activated it states so to everyone within sight of it, giving a time to detonation in the process.
The bomb can optionally be wrenched to solid ground to foil would be spacers. When the bomb is set to countdown the bolts lock in, and cannot be removed by wrench alone.
The bomb includes a robust wires system for pulse pounding defusal attempts. Once a bomb starts ticking using the wires is the only way to stop it (it is not immune to del of course, but is unacidable).
The wires are as follows:
*Boom: Will detonate the bomb if cut/pulsed while the bomb is live, but will defuse the bomb on cut when it's not timing. Mending this wire is the only way to make a defused bomb potent again.
*Unbolt:  If the bomb has been locked to the floor cutting this will free it. Pulsing will hint at its function
*Delay:  Adds time (+10) to the timer when pulsed (it does not matter if the bomb is live or not). No function on cut.
*Proceed: Lowers the time when pulsed. If the timer is above 60 it will set it to 60, if it’s between 60 and 21 it will reduce the timer by 10, if it’s between 20 and 11 it will set the timer to 10. This will detonate the bomb when cut if it's timing. Note that this makes randomly cutting more dangerous than pulsing as there’s twice the number of wires that will explode.
*Activate: This will activate the timer if pulsed when the bomb is not timing, or will stop and defuse the bomb if it's cut while it IS timing. Pulsing it on an active bomb will hint at its function and add a little time (+5).
All syndicate bomb primings are logged.
Its crystal cost has tentatively been set at 5.
---
Misc
The “screwed” traitor uplink kit has had its tank transfer bombs replaced with one of each of these two bombs.
2013-06-07 21:39:56 -04:00
dumpdavidson 9fffa15f8f - Replaced EMP frequency scrambling with a 20 seconds forced shutoff
- Made headsets have a 'power button' (toggles listening) and disallowed them from broadcasting with listening = 0.
2013-06-07 16:30:03 +02:00
supersayu 5a385a1159 Final? values for camerabug expansion item types
There wasn't much feedback, so I just threw together something acceptable, not being able to think of anything particularly clever.
- Universal bug: atmos analyzer or subspace analyzer
- Sabotage bug: Igniter, infrared tripwire thing, or subspace amplifier
- Network bug: Radio, signaler, or subspace transmitter
- Advanced bug: Detective scanner, pAI card, or scanning module stock part
2013-06-06 20:14:06 -04:00
dumpdavidson 9ed31bf0d9 - If they are turned on, radios inform the person they are on if they overload due to an EMP. 2013-06-06 19:46:16 +02:00
dumpdavidson c5ce541e96 Makes radios more vulnerable to EMP:
Department channels that are turned off now cannot be broadcasted into.
EMPs will now shift the frequency of a radio a bit.

This is supposed to make EMP a viable option for a traitors or nuke agents that are looking to take someone out without the entire station knowing about it.
Signed-off-by: dumpdavidson <gtb.schmidt@gmail.com>
2013-06-04 02:27:29 +02:00
supersayu 0f8b28bf53 Combines the prototypes back into one finished camera bug.
Adds an associative list sorter to the helper procs.  This will sort a list while maintaining the key=value structure.
The tracking functions of the camera bug will now auto-refresh if you keep the window open.  The functionality was there but broken previously.  This allows you to creepily stalk someone or observe a sensitive area.

The camera bug is now extensible.  If you add an extension of certain types, the bug will have additional functionality.  A screwdriver will remove the existing extension.  Additionally, an admin/testing version of the camera bug can be created with the research admin spawnable item.

This is not the final version of this code; sane item types for the extensions must be chosen.  I do not have any that are feasible right now.
2013-06-02 00:54:04 -04:00
Cael Aislinn 1ab959dc4f Merge pull request #562 from Ikarrus/hudicons
Updated Hud Icons with department colors
2013-05-31 23:42:26 -07:00
Cael Aislinn 1a539fd3f4 Merge pull request #643 from Ikarrus/hopradio
Removed HoP's security radio access
2013-05-31 23:25:18 -07:00
Cael Aislinn 871b775100 Merge pull request #655 from Carn/HelpersTidy
*Small tidy-up of various helper procs*
2013-05-31 23:24:38 -07:00
Pete Goodfellow 6d62eade3d Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun
Conflicts:
	html/changelog.html
2013-05-31 18:31:14 +01:00
Pete Goodfellow c83cf04c48 Added grenade disassembly. Use wirecutters to unlock it, and a wrench to remove the contents. 2013-05-31 18:29:34 +01:00
Cael Aislinn 0d8a9e6809 Merge pull request #665 from Petethegoat/equipfix
Misc fixes- #649 and #663
2013-05-30 21:48:22 -07:00
Cael Aislinn 4d163db55e Merge pull request #683 from KazeEspada/temperature
temperature gun fix
2013-05-30 21:46:14 -07:00
Cael Aislinn 0c269798ad Merge pull request #666 from Petethegoat/i_know_what_youre_thinking_did_i_fix_six_bugs_or_only_five
A fistful of fixes
2013-05-30 21:34:53 -07:00
Pete Goodfellow 242554b1b0 Adds checks for the wires being intact to tape recorders, and readds the print transcript function. 2013-05-30 22:38:30 +01:00
Pete Goodfellow 0b3db1da95 Merge pull request #584 from AndroidSFV/Radiochange
Telecomms references manifest for crew's job
2013-05-30 13:00:00 -07:00
KazeEspada 6fddcb4e61 gives temperature guns a high capacity cell. fixes #265
removes a duplicated line in power_cells.dm
2013-05-30 10:20:22 -07:00
Pete Goodfellow 7b690996cd Added wires to the taperecorder for playing and recording.
Fixed some minor taperecorder issues.
Updated the autolathe to make empty taperecorders, and tapes.
2013-05-30 16:56:23 +01:00
Pete Goodfellow fc850cc0f2 Tape recorders update!
New sprites by Cheridan.
Tape recorders now use tapes.
Tape recorders can no longer be emagged (probably temporary)
Tape recorders can no longer print transcripts (may be replaced)
2013-05-30 01:00:54 +01:00
Pete Goodfellow b27b66a344 Fixes #672 Shards cut you when you put them into your bag
Moves the shard define into glass.dm
The "You step in the broken glass!" message only appears if you aren't wearing shoes.
Other misc changes and fixes.
2013-05-29 20:27:57 +01:00
Ikarrus 92ee6bb76a Resolved Conflicts:
html/changelog.html
2013-05-28 19:34:52 -06:00
Ikarrus 46a9d44db9 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudicons 2013-05-28 19:32:43 -06:00
Pete Goodfellow 7ed93cfad1 Fixes #540 cloning welders
Fixes #486 examining jetpacks
Fixes #532 cyborg camera names
Fixes #510 attack windows with rods
Fixes #533 helmet sprites don't update
2013-05-29 00:35:40 +01:00
Pete Goodfellow 8285222255 Fixes #649 equip e causes items to stack
Fixes #663 monkeys can't use pickup verb
2013-05-28 23:17:11 +01:00
Pete Goodfellow 828e364363 Merge pull request #589 from Ikarrus/borgnerf
Cyborg Budget Cuts
2013-05-28 13:10:08 -07:00
Pete Goodfellow 0345f66d37 Merge branch 'master' of github.com:tgstation/-tg-station into assemblyfun
Conflicts:
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	html/changelog.html
2013-05-28 17:34:01 +01:00
Pete Goodfellow f645037dd5 Updated chem grenades. They use assembly holders instead of snowflake code for each assembly.
The build process is much the same, except they require an igniter-X assembly instead of a single assembly item. You can also just use a cable coil to get regular grenade behaviour.

Updated the changelog.
2013-05-28 17:28:50 +01:00
Ikarrus 944fa58570 -CentCom officials radios changed to only have the command channel
-Replaced Captain's Headsets on CentCom roles with a centcom reskin, which was already in the code.
2013-05-28 01:21:06 -06:00
Ikarrus 117f8c153b Added instructions to access the channels on encryption keys. This helps for security officers, who often have channels that are not labelled on their headset. 2013-05-28 00:46:22 -06:00
Ikarrus 69444e0612 Resolved Conflicts:
code/game/objects/items/devices/radio/encryptionkey.dm
2013-05-28 00:37:31 -06:00
Ikarrus b77c9751a0 Merge pull request #645 from Tenebrosity/miscissuefixes
[MAP] ~25 typo fixes, updated DJ station instruction sheet, replaced missing disposal pipe underneath HoP office door
2013-05-27 12:08:53 -07:00
carnie b84d12d949 *Small tidy-up of various helper procs*
-Turns out there was already a Gaussian PRNG proc already, used by mechs and turrets. I've replaced it with my one as mine has almost half the cost. (currently broken! still waiting for fixes to be pulled!)
-replaced between(min, val, max) with Clamp(val, min, max)
-get_turf(thing) now uses var/list/locs to locate its turf, rather than iterating up through loc of its loc of its loc...etc
-sign(num) moved to maths.dm
-InRange(val, min, max) replaced with IsInRange(val, min, max) (they were identical)
-Removed ismultitool() iswrench() iscoil() iswire() iswelder() iscrowbar() etc
-removed modulus(num) as abs() performs the same task! *roll-eyes*
-removed get_mob_with_client_list() as it is no longer needed (we have var/list/player_list now)
-removed get_turf_or_move() as it simply called get_turf
-removed get_turf_loc() as it was identical to get_turf()

*Additions:*
-The "Declare Ready" link in the lobby will automatically become "Join Game" if the round starts before you declare ready, so you don't have to click it twice
2013-05-27 12:21:43 +01:00