Commit Graph

671 Commits

Author SHA1 Message Date
Cael Aislinn 1120f6475c Merge pull request #918 from Aranclanos/MopWaterCheck
Mop cleaning with fuel fix.
2013-07-13 03:39:15 -07:00
Cheridan 41351f27b0 Merge pull request #947 from Incoming5643/dice
Adds additional new dice
2013-07-12 19:39:08 -07:00
Cheridan 76ecdc817d Merge pull request #892 from Aranclanos/Grenades
Grenades: small standardization and mob sprite updates.
2013-07-12 00:51:03 -07:00
Incoming 67ee2fd661 tweaks to the dice:
*the dice now all have different colors, to make them easy to tell the difference between them at a glance.
*the d2 has been swapped out for a d00, though you can still create a d2 if someone demands it.
*the generic pill bottle full of dice has been replaced with a proper dice bag.
*actually throwing a die will now cause it to roll until the throw ends, at which point it will state the result of the throw. The old method still works as well.
*most new dice have had their sprites edited to be smaller.
*minor grammer corrections.
2013-07-11 17:31:59 -04:00
Giacomand 33e8976274 Removed the nuke code. You cannot nuke the station anymore.
Added a Jump to Node power.
Cleaned up the code.
Changed some more values.
Added a blob_act() to camera.
Removed most "if(gamemode == "blob") checks to stop people from using it to metagame.
Removed cells exploding when being blob_act()'d
2013-07-10 01:49:06 +01:00
Incoming 4fe39dd49b Adds additional dice!
Places where the D6 and D20 spawned (the library and perma) now spawn with a dice bottle. Said dice bottles now contains a D2, D4, D8, D10, and D12 in addition to the preexisting D6 and D20 for a richer meta-roleplaying experience.

This also fixes an obscure bug where dice could be generated invisible because their initial value was set to 0.

Additionally this fixes the grammer of dice descriptions, which were not using the singular "die".
2013-07-09 19:31:01 -04:00
Giacomand 0396077d83 Merge pull request #878 from Ikarrus/kaboom
Syndicate Bomb Tweaks
2013-07-05 06:07:44 -07:00
Giacomand 77357d153e Merge pull request #876 from Aranclanos/LightingCigarsOnPacket
Cigarette packet attack() on mobs fix.
2013-07-05 06:04:22 -07:00
Aranclanos 6294888222 The mop will now check for water to clean the floor. This will stop people from cleaning the floor with fuel, avoiding the slippery floors. 2013-07-04 12:07:02 -03:00
Aranclanos 4fb864ed1b Made a new proc for grenades, update_mob(), it will be called in all the different prime() procs. This will drop the grenade of a mob and update his sprite, using the proper inventory proc. It will be only triggered if the loc is a mob.
Standardized all the grenades files.
2013-07-01 02:08:20 -03:00
Giacomand 54669a8f38 Merge pull request #853 from Aranclanos/EngiborgFlamethrowers
Engiborg flamethrower/welder fix.
2013-06-28 04:43:16 -07:00
ikarrus a28537116c Syndicate Bomb Tweaks
Syndicate bombs are now structures rather than items. This means they cannot be hidden in lockers and disposals anymore. They also can no longer be used as grenades by crafty traitors.

They now audibly beep as their timer counts down, which is a visible display that can be seen when examined.
2013-06-27 22:05:03 -06:00
Aranclanos dae4d37ebe The attack() of cigarette packets is now updated to the storage procs and stuff. It will pick the first object of the contents instead of creating a new cigarette and generating issues. 2013-06-27 23:34:46 -03:00
Aranclanos b09e81276c Fixes engiborgs deleting their own welder by creating a flamethrower.
The attackby() of flamethrowers can lead to flamethrower_screwdriver() and flamethrower_rods(). Two new procs that handle the creation of a flamethrower.
New object /obj/item/weapon/weldingtool/largetank/cyborg. This new object does nothing on the flamethrower creation procs.

I'm not entirely happy about this.
2013-06-24 04:34:49 -03:00
AlexanderUlanH 62110ccc12 Fixes various runtimes
Runtimes created when trying to apply radiation to a mob destroyed by
monkeyizing, trying to add different components to lists of salvage,
attacking non-carbon mobs with lighters, and blending monkies in the
food processor.
2013-06-22 17:35:29 +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 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