Commit Graph

2954 Commits

Author SHA1 Message Date
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
Rolan7 c8cbf58b57 Adds WJohnston's rainbow esword and dual-esword sprites. Also corrected a few bugs involving esword sprites, mainly involving the player sprite not updating when they construct dual-eswords. It turns out that player-sprite updating is magnets, so the eventual solution was for the player to drop both swords before they're deleted. Since dual-eswords were already created on the ground, this changes very little.
A dual-esword inherits the emagged state of the esword being attack_by'd.
2013-06-13 15:51:42 -04: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
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
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
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 4d163db55e Merge pull request #683 from KazeEspada/temperature
temperature gun fix
2013-05-30 21:46:14 -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 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
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
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
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
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 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 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
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
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
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
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
Cael Aislinn 474722d425 Merge pull request #447 from Carn/DNArework
Resolves #283
2013-05-02 05:46:44 -07: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
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
Aranclanos a749023328 Same crap, for the fourth time.
Created a new subtype from radios, /obj/item/device/radio/bounced They have no difference except from spawning with their speakers off.

The only reason is to reduce in a 30% the amount of loops in the general channel chat lag.
2013-04-27 09:33:47 +10:00
Tastyfish ba8d379013 Re-enabled bag item count thing 2013-04-27 09:32:51 +10:00
Cael Aislinn c66b2da154 Merge pull request #444 from Cheridan/Coins!
COIN UPDATE
2013-04-26 03:12:43 -07:00
Ikarrus ee19f2fbd7 Medals
-Added a locked box of medals to be placed in the Captain's Office. It contains medals the Captain can award his crew.
-Added pinning medals onto others, provided their jumpsuit is exposed
-Added a message when you try to add an accessory to a jumpsuit that already has one.
-Fixed up emagging lockboxes
2013-04-25 20:08:02 -06:00
carnie 043028db83 Resolves #283
DNA modification uses normally distributed random numbers. Radiation strength dictates the standard deviation of the change in the hex character which is hit (higher output means greater chance for a large change) . Similarly, radiation duration dictates how likely we are to hit the hex-character we clicked on (longer duration means more likely to hit). Irradiation is strength*duration. All balancing is done via multiplier defines so you can rebalance it easily.

DNA blocks and structuring all use defines. Making modification/expansion easier. I'll likely expand this into a datum-based system to allow more interesting features, reduce code further and allow admins to interact with the way dna strings behave.

DNA strings can be spliced together using merge_text().
 e.g. string 1: "Hello World"
 string 2: "Seeya______"
 result: "Seeya World"
 This isn't used except for admin-spawnable SE injectors at the moment.

r_hair, g_hair, b_hair, r_facial, g_facial, b_facial, r_eyes, g_eyes, b_eyes were removed and made into 3 short hex-colors.

Skin tones now support colours other than shades of brown. I've had to restrict it heavily until other stuff is done. Skin tones include Albino Caucasian, Oriental, Mediterranean, etc.

Data disks and DNA injectors were reworked to use associative lists so transferring data is just a matter of doing list.Copy()

var/dna is now defined at /mob/living/carbon level. Only monkeys and humans may have dna currently. Support is there for all carbon-based lifeforms to have dna.

DNA modifier console has almost all controls on one screen.

UIs and UEs can be injected separately (appearance and name, respectively)

dna helper procs like ready_dna() and such were changed to make them more versatile. There is now a hardset_dna() proc as an alternative to ready_dna which can initialize dna with properties passed into it or update an existing dna string (useful for cloning and antag spawning)

Every block of SEs are in randomised positions.

Disabled automatic logging of world.log, as it produced undesirable behaviour.

Mr Muggles and God Emperor of Mankind disks removed.

Floor() removed. (it was completely uneccesary, that is what round() is).

Fixed spelling mistakes in modularchangling.dm (thanks tenebrosity)

Tanning removed from beaches (again)

Experimental: monkeys and humans do not have dna until first attempt to read dna (using check_dna_integrity(mob))
This is mainly due to the way everything is hardcoded into New().

Changelog.html updated
Signed-off-by: carnie <elly1989@rocketmail.com>
2013-04-24 09:37:30 +01:00
Pete Goodfellow 62b848c6ce Removes equip_e - Fixes #423
This updates everything that used equip_e, particularly the strip panel, but also DNA injectors and CPR.

Removed unused mob vars:
 var/obj/effect/organstructure/organStructure
 var/other
 var/proc_holder_list[]

Removed unused alien suit and head slots.
 Removed var/obj/item/weapon/card/id/wear_id from monkeys, and updated ed209s to not use :

Renamed HUMAN_STRIP_DELAY to STRIP_DELAY.

Muddled Topics() around so that mobs are now a bit more OO. Also updated quite a few misc inventory procs to various degrees.

Updated monkey and aliens huds a little bit.

Random movement when confused now happens half the time.

Fixed monkey breathmask onmobs.

Added a .unconscious text style, for that nice bold blue text you get when you're unconscious. Only CPR uses it at the moment.

This has been tested fairly extensively, and everything seems to work fine.

-Merged commits ~carnie
Signed-off-by: carnie <elly1989@rocketmail.com>
2013-04-24 04:07:39 +01:00
Cheridan 46920eeb39 COIN UPDATE
-Removes the unused/dumb access stuff from space cash.
-Fixes a bug where dice would vanish if you used a hand labeller on them.
-Moves space cash/coins/mint sprites into their own file, economy.dmi. Moves mineral sheets into mining.dmi.
-Coins are flippable! Features unique flipping sprites and sound effects, and two-headed coins.

-Oh and better sprites for wooden closets too.
2013-04-23 19:50:05 -05:00
Giacomand d140310251 Changed the default shout. 2013-04-23 10:46:39 +02:00