Commit Graph

1847 Commits

Author SHA1 Message Date
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
dumpdavidson 4e6d84d8a7 Prevents implant from dropping to the floor when drop_from_inventory is called. Resolves an issue where implants might have dropped to the floor during transformation when using adminverbs.
Signed-off-by: dumpdavidson <gtb.schmidt@gmail.com>
2013-05-24 16:00:29 +02: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 4c10f5f94b Fixes #609 - decal/point is now unclickable.
Modified   code/game/objects/effects/decals/misc.dm
2013-05-21 08:41:50 +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
Malkevin 7aac619244 Merge branch 'master' of https://github.com/tgstation/-tg-station into bucketlove 2013-05-18 15:37:32 +01:00
Cheridan c00f97216c Phase 3 & 1/2
Adds chef locker
Serves up the service server to serve your servers.
2013-05-17 19:15:01 -05: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
Malkevin 951ba1bede changed wetness check from constant to variable reference 2013-05-14 17:42:46 +01:00
Malkevin cef6bd2786 Better Mop and Cart love
Slight tweak to the behavior of attacking the janicart with a mop.
Changed it so that it stores the mop when it is soaked (or the bucket is empty), as I'm sure most players would prefer their mop to always be fully soaked when they remove it from the cart.

Also changed the examine text from 'water' to 'liquid' as it was misleading. It can actually be filled with any reagent, even welder fuel...or acid... or blood... or dr.gibb...space lube... you get the picture.
2013-05-14 17:02:35 +01: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
Malkevin 8e32c007ed Made the new prisoner ID box a parent of /box instead of /box/ids, 2013-05-11 17:32:11 +01:00
Malkevin 26cf12cf1a Merge branch 'master' of https://github.com/tgstation/-tg-station into prisonercards
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-11 17:18:34 +01:00
carnie 5e7cffcf5c update_icons.dm changes for humans. This ties in with the dna changes and the changes to skin_tone and hair colours
>update_mutantrace() is no more, it is now part of update_body()
>Moved a lot of stuff into update_base_icon_state(), this will allow making mutantraces modular.
Almost all icon operations are now removed from human overlays (obviously some are still required for recolouring hair and eyes). Any remaining dynamically generated overlay icons are applied individually. This will allow byond to cache them better. This will also eliminate the bug where humans are initially invisible/unclickable when you first encounter them (due to network latency where the icons are being downloaded).
>UpdateDamageIcons() renamed to update_damage_overlays(), so it has the same sort of name as the other procs
>update_icons=true or false arguments removed from human overaly-update procs, no longer required. (i.e. the update_body() update_inv_whatever etc procs do not call update_icons() - see documentation for details)
>mutantrace icon_states moved into human.dmi
>skeletons are now a mutantrace, not a mutation.
>update_icons system should now be even more efficient (thanks partly to aranclanos)
>documentation rewritten
>copypasted code moved into helper procs - super tidy code :3

Other:
>Removed compile error where the core code was reliant on compiling away mission code. >:[
>s_tone renamed to skin_tone

Modified   code/modules/mob/living/carbon/human/update_icons.dm
Modified   code/__DEFINES.dm
Modified   code/datums/datumvars.dm
Modified   code/datums/limbs.dm
Modified   code/game/dna.dm
Modified   code/game/gamemodes/changeling/changeling_powers.dm
Modified   code/game/gamemodes/cult/cult_items.dm
Modified   code/game/gamemodes/cult/runes.dm
Modified   code/game/machinery/doors/airlock.dm
Modified   code/game/machinery/portable_turret.dm
Modified   code/game/machinery/teleporter.dm
Modified   code/game/mecha/combat/combat.dm
Modified   code/game/objects/items.dm
Modified   code/game/objects/items/stacks/medical.dm
Modified   code/game/objects/items/stacks/sheets/glass.dm
Modified   code/game/objects/items/weapons/storage/bible.dm
Modified   code/modules/assembly/mousetrap.dm
Modified   code/modules/hydroponics/hydroitemcode.dm
Modified   code/modules/mob/living/carbon/carbon.dm
Modified   code/modules/mob/living/carbon/human/death.dm
Modified   code/modules/mob/living/carbon/human/human.dm
Modified   code/modules/mob/living/carbon/human/human_damage.dm
Modified   code/modules/mob/living/carbon/human/human_defines.dm
Modified   code/modules/mob/living/living.dm
Modified   code/modules/mob/living/simple_animal/friendly/slime.dm
Modified   code/modules/mob/mob_grab.dm
Modified   code/modules/power/lighting.dm
Modified   code/modules/reagents/Chemistry-Reagents.dm
Modified   code/unused/_debug.dm
Modified   icons/effects/genetics.dmi
Modified   icons/mob/human.dmi
Modified   maps/RandomZLevels/wildwest.dm
Modified   tgstation.dme

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-05-10 18:41:08 +01:00
Ikarrus 2f2b2abb63 Reduced toolbox force to 11 2013-05-09 17:27:33 -06:00
Cheridan 4fa62c6151 -Radio update addendum: Made encryption keys tiny items.
-Fixes an issue with table sprites.
2013-05-09 16:31:24 -05:00
Cheridan 3ce06dea8a RADIO SPRITES UPDATE
-New sprites for about half of the headsets:
-Cargo headset now tan instead of white, science now has a unique headset instead of using the command headset sprite (wtf?), medical headset center changed to green from blue. New sprite for medsci headsets.
-Command, centcomm, & basic headsets tweaked a bit, with better shading.

-Made descriptions for command headsets less bad.
2013-05-09 15:25:56 -05:00
carnie cff9ed5f71 >Resolves some dna runtimes. - check_dna_integrity() was not being used properly.
>Removed a for(obj/item in world) loop triggered by bloodying items. It now uses a caching system.
>New skin_tones - they are now sprite-based. This is to prepare for expansion of the mutantrace system. Thanks validsalid x
>Removed fat icons from the game - when you are obese you will now just look like a regular human. You will not be immune to being pushed. You will not be immune to choking. You will still overheat and run slower and appear fat upon "examine" verb use.

Modified   code/__HELPERS/mobs.dm
Modified   code/game/atoms.dm
Modified   code/game/dna.dm
Modified   code/game/machinery/computer/hologram.dm
Modified   code/game/objects/items.dm
Modified   code/modules/client/preferences.dm
Modified   code/modules/client/preferences_savefile.dm
Modified   code/modules/flufftext/Hallucination.dm
Modified   code/modules/mob/living/carbon/alien/larva/larva.dm
Modified   code/modules/mob/living/carbon/human/human.dm
Modified   code/modules/mob/living/carbon/human/human_defines.dm
Modified   code/modules/mob/living/carbon/human/life.dm
Modified   code/modules/mob/living/carbon/human/update_icons.dm
Modified   code/modules/mob/living/carbon/monkey/monkey.dm
Modified   code/modules/mob/living/silicon/robot/robot.dm
Modified   code/modules/mob/living/simple_animal/constructs.dm
Modified   code/modules/mob/living/simple_animal/friendly/corgi.dm
Modified   code/modules/mob/living/simple_animal/friendly/farm_animals.dm
Modified   code/modules/mob/new_player/preferences_setup.dm
Modified   icons/effects/genetics.dmi
Modified   icons/mob/human.dmi

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-05-08 08:20:15 +01:00
Ikarrus 0ee89e9cd2 Increased toolbox force to 12 2013-05-07 21:13:13 -06:00
Ikarrus 861798c270 Removed extinguisher change 2013-05-07 21:12:01 -06:00
Malkevin f53202e158 Added a box of prisoner ID cards to the perma wing
Aside from further dehumanizing criminal scum this also serves as a way of correcting the annoying behavior of suit sensors and crew monitoring computers, and chemical implants: if someone isn't wearing an ID card (which prisoners will likely have taken from them) they show up as an Unknown.

Also included a sec hud icon for the prisoner 'job'
2013-05-08 01:09:32 +01:00
Ikarrus 0e0622dc12 Raised toolbox force to 10
Reduced extinguisher force to 5
2013-05-06 22:12:28 -06:00
Cheridan a6c3f4a78d Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	maps/tgstation.2.1.2.dmm
2013-05-04 13:04:47 -05:00
Cael Aislinn f0a51af7f4 Merge pull request #499 from Giacomand/ministation_merging1
Closet Cleanup and Bins.
2013-05-03 21:57:53 -07:00
Cael Aislinn 2f57c45e76 Merge pull request #478 from Malkevin/meltablefloortiles
Recyclable floor tiles
2013-05-03 21:16:10 -07:00