Commit Graph

4880 Commits

Author SHA1 Message Date
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
Giacomand 35f6a979bc * Small fix for closets picking up anchored items.
* Made closets/crates pick up on their turf during initialization.
2013-05-04 05:07:36 +01:00
Aranclanos 74fb61eeee Merge pull request #463 from Ikarrus/reactive
[MAP] Reactive Armor as objective
2013-05-03 19:24:58 -07:00
Malkevin 3d1a96975f reverting last commit.
Wt.remove_fuel is 0 for a reason
2013-05-04 02:07:20 +01:00
Malkevin f8fa1fce09 Welding rods/shards/floortiles now costs welderfuel 2013-05-04 01:44:31 +01:00
Giacomand 77b0fce80f * Fixed a typo. 2013-05-04 01:10:32 +01:00
Giacomand b4229b0b24 * Fixed an accidental commit. 2013-05-03 22:42:12 +01:00
Giacomand 343bfe90b2 This commit was made to help increase the compatibility between MiniStation and /tg/station.
* Restructured closets to be easier to add new features.
 * Added trash bins that you can hide in.
 * New sound effects for the bin, they are royalty free.
 * Personal lockers can now be (un)locked with your PDA/Wallet/Whatever.
2013-05-03 22:32:17 +01:00
Cheridan 5f933e2d3e Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-02 11:53:30 -05:00
Cheridan 725718dd5b -Replaces the holodeck boxing ring that no longer works with a dodgeball arena. Adds dodgeball sprites and defines.
-Fixes the crew monitoring console disappearing when damaged (meant to do this before but the change didn't go through somehow)
-Readds the space piano, removes the useless /device subtype from its path.

-Makes tables use a less hardcoded method to determine iconstate.
2013-05-02 11:52:55 -05:00
Malkevin 5cef64f237 Merge branch 'master' of https://github.com/tgstation/-tg-station into meltablefloortiles
Conflicts:
	html/changelog.html
2013-05-02 15:07:33 +01:00
Cael Aislinn 474722d425 Merge pull request #447 from Carn/DNArework
Resolves #283
2013-05-02 05:46:44 -07:00
Tastyfish e71c96e93a Removed the barely implemented sleeping and resting states of silicons (doesn't make sense anyway and probably wasn't intentionally existent). Also cleaned up powersink code to enforce its mode and all variables affected 2013-04-30 09:22:59 -04:00
Cael Aislinn 29cd502c8b Merge pull request #440 from Giacomand/c4_act
New suicide_act for C4
2013-04-30 04:56:19 -07:00
carnie ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Malkevin a010b11b83 Recyclable floor tiles
Adds the code to weld floor tiles together to make sheets, just like rods except it takes 4 tiles instead of 2 rods.
2013-04-30 02:59:20 +01:00
Ikarrus a3f51ecbeb Adds the RD's reactive armor to possible steal objectives.
Reactive armor now spawns in the RD's locker.
Replaced some tables with racks in the RD's office.
2013-04-27 18:35:12 -06:00
carnie fea2fc3fef Fixes for admin-spawned dnainjectors: repeat_string has been simplified (it wasn't making NULLED_SE and NULLED_UI to the correct size).
Fix for Overpowered mutations (HULK and TELE) not manifesting. A typo was the cause.
Admin-spawnable injectors always succeed. This code already existed (I believe this is how they used to function), but it did not work as the argument was not passed correctly. This also removed snowflake code for the darkbundle telemut injector.

Thanks to Giacom, wouldn't have found these without him.
2013-04-27 06:40:17 +01:00