Commit Graph

1566 Commits

Author SHA1 Message Date
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
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
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
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 f3996dfc5e 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
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
KazeEspada
27c6028dbf mice become items when they die.
mousetraps now make the SNAP sound based on their location rather then the targets.
2013-05-06 19:25:00 -07:00
Malkevin
086ac268b3 Changed all crit checks from static zeros to config.health_threshold_crit 2013-05-06 18:31:51 +01:00
Malkevin
b91889ba29 Changed the health check for crit in life.dm for humans, monkeys, and aliens from < 0 to <= 0.
Fixes that weird issue where people can take 5 laser hits to the face and still run around at 0 health until someone sneezes on them or they stub their toe.
2013-05-05 17:38:30 +01:00
Cael Aislinn
1fa40ccd22 Merge pull request #514 from Tastyfish/cablez
Addressed hulk speach inconsistant punctuation and cable coil problem
2013-05-05 02:43:23 -07:00
Tastyfish
d20c7a4bd2 Made hulk talking change all periods to exclamation points 2013-05-05 05:32:01 -04:00
Pete Goodfellow
7111f86a2b Merge pull request #432 from Rolan7/master
Issue 113 mob->closet->wall glitch fix.
2013-05-04 11:18:42 -07:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework
Resolves #283
2013-05-02 05:46:44 -07:00
carnie
ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Pete Goodfellow
9343a93820 Reverting stray changes from my merge of #464 2013-04-30 00:06:30 +01:00
Cael Aislinn
8e86150216 Merge pull request #380 from Petethegoat/effects
[MAP] Effects update
2013-04-26 05:01:41 -07:00
Cael Aislinn
ff14a8e295 Merge pull request #383 from Tastyfish/master
Machine frames, pinpointers, borgs, etc
2013-04-26 03:35:20 -07:00
Cael Aislinn
1c2328ed7c Merge pull request #401 from Aranclanos/HUDiconsRevamp
Small revamp of medHUDs and secHUDs. Fixes del() lag (this time 5real).
2013-04-26 03:20:04 -07:00
Carnie
7417b82546 Merge pull request #392 from Ikarrus/debrain
Debraining humans visually change their appearance.
2013-04-24 22:31:36 -07:00
Ikarrus
cc3bf1f655 Changed stand_icon to face_standing so update_body won't have to be used to clear it.
Used update_hair(0) instead of update_hair()
2013-04-24 19:23:04 -06:00
Pete Goodfellow
0b0056d740 Merge branch 'master' of github.com:tgstation/-tg-station into effects 2013-04-24 16:41:02 +01:00
Ikarrus
70818c3b09 Moved the getbrain(src) to be used with the h_style code. 2013-04-24 08:43:44 -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
carnie
4d2c791a33 Modification to Pete's commit.
var/list/type/subtype/L -> var/list/L
2013-04-24 04:07:41 +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
Giacomand
a3a615b1c0 Merge pull request #428 from Petethegoat/misc_changes
Sprite update and minor fix
2013-04-23 11:45:03 -07:00
Cheridan
1317ea6462 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-21 18:58:26 -05:00
Rolan7
6cff2eac2a Improved a sanity check in the Bump proc of several mobs to fix issue 113 (formerly 1130) from Nov 2012: bumpable mobs can be bumped into a wall if a closet (including bodybags) is closed over them while pushing. https://github.com/tgstation/-tg-station/issues/113 2013-04-21 05:58:52 -04:00
Tastyfish
208255be6b Merge branch 'master' of https://github.com/tgstation/-tg-station
Conflicts:
	code/modules/power/cable.dm
2013-04-21 00:42:18 -04:00
Pete Goodfellow
e0de2d9bd2 Fixed the legcuff update icon. It was adding both the lying and standing overlay whenever it was called. 2013-04-21 04:28:21 +01:00
Giacomand
6669148bb7 Merge pull request #399 from AndroidSFV/master
'State Laws' verb for Cyborgs
2013-04-20 06:10:49 -07:00
Giacomand
df245eec30 Merge pull request #352 from Aranclanos/ShuttleCall
Automatic shuttle calls 2 the electric boogaloo
2013-04-20 05:34:40 -07:00
AndroidSFV
2cb0f54312 Recommended changes to silicon State Laws 2013-04-19 12:09:39 -05:00
AndroidSFV
7afcc7e8b9 Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-19 11:29:44 -05:00
Tastyfish
c98abbf6cf Merge branch 'master' of https://github.com/tgstation/-tg-station 2013-04-19 00:44:26 -04:00
Ikarrus
7895ad590e Fix for runtime when debraining a mutantrace human. 2013-04-18 20:53:58 -06:00
Cael Aislinn
1639756136 Merge pull request #386 from Incoming5643/buzz
Gives fly people a buzz lisp (lengthens "z"s)
2013-04-18 16:49:18 -07:00
Cael Aislinn
968bafbd32 Merge pull request #393 from Petethegoat/nullscreenrun
Adds client checks to update_inv procs, before trying to reference client.screen.
2013-04-18 16:47:58 -07:00
Cael Aislinn
976f3faebe Merge pull request #394 from Petethegoat/typofixes2
Fixed a typo in human_defense.dm and updated an outdated message in cyborg examine.dm.
2013-04-18 16:40:18 -07:00