Commit Graph

904 Commits

Author SHA1 Message Date
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
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
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 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 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 828e364363 Merge pull request #589 from Ikarrus/borgnerf
Cyborg Budget Cuts
2013-05-28 13:10:08 -07: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
Tenebrosity 6e873faf1f * Edited encryptionkey.dm: Fixes about nineteen typos
* Edited tools.dm: Fixes "screwwy" typo in screwdriver description
* Edited paper.dm: Updates DJ station instruction sheet in light of the removal of the broadcaster and receiver from the DJ station
* Edited lib_items.dm: Fixes typo in "unwrenched" in a bookshelf deconstruction step
* Edited tgstation.2.1.2.dmm: Adds updated DJ station sheet to DJ station, replaces missing disposal pipe underneath HoP office door.
* Edited utility_closets.dm: Fixed oxygen closet description
* Edited DJ station paper to read better
2013-05-26 18:16:02 +12:00
Ikarrus 6bb2c54b97 Might as well remove some unusable headsets in the process 2013-05-25 10:28:24 -06:00
Ikarrus 0323344c4e Removed HoP's security radio access
<Ikarrus> So we have the problem of some HoPs disregarding their jobs just to act like security/p2w right?
<Ikarrus> I was thinking removing the HoP's sec radio channel would help
<Ikarrus> I feel like sec radio is just a remnant of old code and design
<Ikarrus> and his role has since become more specialized
<Ikarrus> I don't feel he needs it, and it would help distance him from security
2013-05-25 10:16:43 -06:00
Ikarrus 6932c4e32d Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485
Originally merged by @Giacomand
2013-05-23 20:19:04 -06:00
Giacomand 7d0c5f1054 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/587 2013-05-24 00:00:22 +01:00
Giacomand f95bfb92b0 * Added a return to stop a runtime from triggering. 2013-05-23 23:58:52 +01:00
carnie 3a70153d01 Merge branch 'master' of github.com:tgstation/-tg-station into DNAfix
Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
2013-05-20 00:33:42 +01:00
Ikarrus 9850a66cb0 Merge pull request #582 from Cheridan/radios
Phase 2 of my master plan:
2013-05-17 07:46:40 -07:00
supersayu 1945a7cc22 Splits the camera bug into several different prototypes:
* Vanilla - Sees its own bugs only
* Universal - Sees all bugs
* Networked - Sees all cameras
* Sabotage - Sacrifices a bug to EMP a camera
* Tracker - Lets you monitor who is near a camera and what camera a person is near.  Some limitations.
2013-05-16 22:28:14 -04:00
Cheridan 4ca036543c -Updates DJ station infosheet.
-Adds service headsets to barman/botanist closets (chef doesn't get one for now since he doesn't have a closet, all his spare stuff is just placed in a crate)
2013-05-16 15:16:21 -05:00
Ikarrus a234e4a613 Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
Conflicts:
	html/changelog.html
2013-05-16 09:02:06 -06:00
Giacomand 7e4730c1f5 Merge pull request #571 from Petethegoat/chemistry
Replaced most reagent initialisations with the helper proc create_reagents().
2013-05-16 03:41:18 -07:00
Ikarrus b0e8d18e30 -Rewrote unequipping modules for cleaner code
-Cyborg rods now properly regenerate in while charging
-cyborg rods can no longer be used to generate metal
-Removed roman numerals from the icon
2013-05-15 22:23:07 -06:00
Ikarrus faa3fd6c10 Cyborg Budget Cuts
-Cyborg RCD cost increased from unit*30 to unit*160
With a standard 15k power cell, you can still build:
93 floors
31 walls
18 deconstructions
9 airlock operations
-Reduced cyborg health from 300 to 200
-Cyborgs with less than 100 health can not use any modules, but can still move, speak, and wirelessly interact with machines
-Engineering cyborgs can now use metal rods
-Updated changelog
2013-05-14 22:12:15 -06:00
Cheridan 6ae715a6cf -Updates the headset descriptions. 2013-05-14 21:59:26 -05:00
AndroidSFV 14f01b6a83 Changes the way telecomms identifies the job of the sender of a radio message. It now references the crew manifest with the name of the sender for their job, instead of looking at whatever ID they are holding for their job. 2013-05-13 18:48:17 -05:00
Cheridan 0c47147ab1 Phase 2 of my master plan:
-Adds a Service headset channel, given to the botanists, barman, and chef. The HoP also gets the service channel on his headset.

Note: The Service Preset Server will have to be added to Telecomms on the map before the channel is usable. I'll put up the map when/if this gets merged.
2013-05-13 12:20:12 -05:00
Ikarrus cdd678cc77 Merge branch 'toolboxing' of https://github.com/Ikarrus/-tg-station into toolboxing
Conflicts:
	html/changelog.html
2013-05-13 08:35:59 -06:00
Ikarrus 155f0817bf Merge branch 'master' of https://github.com/tgstation/-tg-station into toolboxing
Conflicts:
	html/changelog.html
2013-05-13 08:34:19 -06:00
supersayu e8090ae34c Fixes 'Camera Bug' item and makes it a viable tool.
Camera bug acts as a mini-camera computer with access to all bugged cameras.

Adjusts camera checks to determine who is looking through them; instead of checking their machine, it now checks the client eye.

Adds camera bug to the uplink list with a cost of 2TC.
2013-05-12 17:52:40 -04:00
supersayu 272f667c1c Fixes 'Camera Bug' item and makes it a viable tool.
Camera bug acts as a mini-camera computer with access to all bugged cameras.

Adjusts camera checks to determine who is looking through them; instead of checking their machine, it now checks the client eye.

Adds camera bug to the uplink list with a cost of 2TC.
2013-05-12 17:49:02 -04:00
Pete Goodfellow 20a933e00a Merge pull request #545 from Cheridan/radios
RADIO SPRITES UPDATE
2013-05-12 07:19:35 -07:00
Pete Goodfellow 46b8ba8341 Merge branch 'master' of github.com:tgstation/-tg-station into chemistry
Conflicts:
	code/game/objects/items/weapons/tools.dm
2013-05-12 15:09:21 +01:00
Malkevin 164ce9a02e Fix for missing in-hand sprites for orange id cards 2013-05-11 23:15:37 +01:00
Ikarrus c333680f28 -Added high-visibility orange ID card icon for prisoner IDs
-Fixed the hud icon not showing up for prisoners
2013-05-11 15:22:52 -06:00
Ikarrus 96b1bd81dd Reduced toolbox force to 10 2013-05-11 11:44:52 -05:00