Commit Graph

1600 Commits

Author SHA1 Message Date
Giacomand be550b196e The victim will now get a message if the user empties their pockets and gets interrupted. (Victim moving, user being stunned, etc..) 2013-06-06 18:01:14 +01:00
Giacomand 8fee615d85 * Added a message to the user. 2013-06-06 14:15:19 +01:00
Giacomand e83fada8c1 Emptying someone's pockets won't display a message anymore. This allows people to pickpocket if their victim stands still long enough. 2013-06-06 08:17:53 +01: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 cd36661610 Merge pull request #644 from Ikarrus/latejoin
Latejoining Antagonists
2013-05-31 23:25:06 -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 0d8a9e6809 Merge pull request #665 from Petethegoat/equipfix
Misc fixes- #649 and #663
2013-05-30 21:48:22 -07:00
Ikarrus 5b0ef21cdf Added an icon for IDs with unrecognized assignments. This is so that you can tell between those without IDs and those with custom assignments.
https://dl.dropboxusercontent.com/u/831776/unknown.png
2013-05-28 20:19:08 -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 8285222255 Fixes #649 equip e causes items to stack
Fixes #663 monkeys can't use pickup verb
2013-05-28 23:17:11 +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 88253ce9cb Merge pull request #625 from Rolan7/Issue566
Fixed a lot of text, mostly in simple_animal.  The word "the" was being ...
2013-05-28 07:20:38 -07:00
Pete Goodfellow b0f538d7a2 Merge pull request #632 from Carn/Issue619
*Fixes #619 - halloss can no longer stop death()
2013-05-28 04:35:24 -07:00
Carnie 2e5232eea3 Merge pull request #648 from Ikarrus/acc_check
Check Contents now checks jumpsuits for accessories
2013-05-27 20:11:46 -07:00
Pete Goodfellow 7215a65f93 Merge branch 'altbranch' of github.com:Cheridan/-tg-station into borgi 2013-05-28 01:35:07 +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
Ikarrus f6c9d5d3ce Check Contents now checks jumpsuits for accessories 2013-05-26 14:11:01 -06:00
Ikarrus 2845065463 Adding lost pulls #590 #528 #574 #563 #529 2013-05-26 13:02:13 -06:00
Ikarrus 2dfb0ac9f0 Latejoiners can no longer be antagonists if:
[Number of antagonists] >= [Number of Players Joined] / [Scaling coefficient] + 1
2013-05-26 00:24:45 -06:00
Ikarrus 07590723d2 Gives latejoiners a chance of becoming a traitor and/or changeling depending on the game mode.
They will have the same chance of becoming an antagonist as round-start characters.

This function can be toggled off via server configuration.
2013-05-25 13:41:25 -06:00
carnie 8ee9a5c00e *Fixes #619 - halloss can no longer stop death()
*halloss removed from all updatehealth() procs. I could see no reason for it to be there. Correct me if I'm wrong.
*Updated all updatehealth() procs to use maxHealth instead of magic numbers.
2013-05-23 17:15:26 +01:00
Rolan7 3523d9b58a Improved a few lines based on Pete and Aranclanos's feedback. Also removed the "capitalize" call, which wasn't working, instead breaking the string up into two parts. BYOND macros are weird, but it works great. 2013-05-22 16:07:01 -04:00
Rolan7 78b4d985e1 Fixed a lot of text, mostly in simple_animal. The word "the" was being duplicated in a lot of cases when referring to objects or mobs. Basically, byond handles "the" for us. Poly was particularly guilty of this, but really it was all simple_mobs.
Also fixed issue 566, where it was possible to weaken corpses.  Dead humans, humanoid aliens, and larvae should no longer be weakenable once they're dead.

Also also, changed the default name for human mobs from unknown to Unknown.  This is makes them consistent with humans whose identity is destroyed by acid or face damage.  They'll no longer show up as "The unknown" in messages, since Byond recognizes Unknown as a proper noun due to capitalization.

Finally, gave Runtime a DNA joke as a description.  Not sure why she didn't have a description.
2013-05-22 05:24:44 -04:00
carnie a9f73bc56a Fixes #615 - mini icon for human-bodies now display correctly when examining humans. 2013-05-21 09:04:31 +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
Cheridan 37068f64db THE BORGI UPDATE
-As requested by errorage, you can now place air/oxygen tanks and fire extinguishers on Ian's back. Additionally, you can also place cardborg suit/helmets on him.

-Cleans up some shoe code and unused sprites from feet/suit .dmis.
2013-05-16 19:02:40 -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
Giacomand eb5e5a975f Merge pull request #539 from SuperSayu/corgi-inventory
Corgi Inventory Update
2013-05-16 03:40:55 -07:00
Ikarrus d4f7655859 Update examine.dm 2013-05-15 23:24:24 -05: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 e54bc1aee0 Replaced borg crit state with a gradual breakdown of its functions.
Moved the self check after the health check for welding tools
2013-05-15 08:25:02 -06:00
Ikarrus ba1277ac1e Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf 2013-05-15 07:49:34 -06:00
Cael Aislinn 65b7b1765f Merge pull request #574 from Carn/Issue559
Fixes #559 - Changelings are no longer so obviously faking when they are...
2013-05-15 02:38:40 -07:00
Ikarrus 0eaba8311d Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
Conflicts:
	html/changelog.html
2013-05-14 22:17:23 -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 18d25a6bf5 -Changes the channel hotkey from Q to V 2013-05-14 15:32:06 -05:00
Cheridan 7c2e7b9f52 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master 2013-05-14 15:11:37 -05:00
Aranclanos cfbd530a2b Merge pull request #563 from Malkevin/prisonercards
Proper Vandykes
2013-05-13 23:29:33 -07:00
Giacomand ecd209a6f6 Merge pull request #529 from KazeEspada/mice
mice become items when they die.
2013-05-13 12:03:23 -07: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
Malkevin 8ce6ed460b PR #560 - Enabled security clearance checks for SecHuds.
Checks can be bypassed via EMPs.

Modified   code/modules/clothing/clothing.dm
Modified   code/modules/clothing/glasses/glasses.dm
Modified   code/modules/clothing/glasses/hud.dm
Modified   code/modules/mob/living/carbon/human/human.dm
Modified   html/changelog.html
2013-05-12 20:48:23 +01:00
carnie 0fe659c43c Fixes #559 - Changelings are no longer so obviously faking when they are faking death. 2013-05-12 20:34:42 +01: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
carnie 7d3236ca1e Resolves an issue with commit https://github.com/tgstation/-tg-station/commit/f3996dfc5e64408ec95f9b43fe05df348af5978c doing the opposite of what it was supposed to.
Mobs can now become bloody again...after 9 months of going unnoticed.

Credits to Mport for this fix <3

Modified   code/modules/mob/living/carbon/human/human_defense.dm

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-05-12 11:07:31 +01:00
Malkevin b3668c8db7 Proper Vandyke
Vandykes are a tash and chin fungus, old sprite was some weird long handle bar thing.

Added some proper vandyke sprites, renamed old ones to fu manchu and added that as another facial hair style
2013-05-12 00:37:40 +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
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
supersayu b92dff68c3 Corgi Inventory Update
* Removing items works again
* Item duplication bug for non-accepted items fixed
* Corgi inventory refreshes correctly
* When a corgi rejects a head or body item, it will drop in their square (You put X on Y, but they shake it off!)
* Descriptive texts improved
* Plastic Explosives can be planted on the corgi through the inventory window
2013-05-08 16:56:52 -04:00