Commit Graph

2724 Commits

Author SHA1 Message Date
Pete Goodfellow
ffc42099e1 Merge pull request #521 from Rolan7/ClownstampBugfix
Fixes the bug where clown stamps were usable by anyone
2013-05-08 08:33:15 -07:00
Malkevin
086ac268b3 Changed all crit checks from static zeros to config.health_threshold_crit 2013-05-06 18:31:51 +01:00
Rolan7
5bc16a523e Fixes the bug where clown stamps were usable by anyone, they just didn't affect the sprite.
Also made the stamp check for clumsiness instead of mind.assigned_role.
2013-05-05 20:53:15 -04: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
Tastyfish
7b325f9c6e re-arranged cable actions so src wouldn't get deleted before everything was completed 2013-05-05 05:17:31 -04:00
Carnie
4ca7b5079b Merge pull request #503 from Ikarrus/medalicon
Minor fix for medals - makes overlay update when pinning a medal to somebody else.
2013-05-04 17:20:42 -07: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
Ikarrus
7694776d1f Added a update_inv_w_uniform(0) to pinning medals, so it shows up on the mob icon. 2013-05-04 11:19:49 -06:00
Cael Aislinn
827c72fb72 Merge pull request #483 from kyrahabattoir/gui_stamps
[MAP]Graphical stamps on documents.
2013-05-03 22:04:31 -07:00
Cael Aislinn
242fc2813f Merge pull request #449 from TwistedAkai/master
Syringe log: Resolves issue #321
2013-05-03 21:45:09 -07:00
Blaank
dd9d3fce8d Changed a name so the Chemmaster 3000 will close the interface window when the [close] button is pressed. Previously when the [close] button was pressed it would do nothing and the interface window had to be closed via the window controls. 2013-05-02 23:06:42 -05:00
Malkevin
e2b8a45d42 Merge branch 'master' of https://github.com/tgstation/-tg-station into irongrinder
Conflicts:
	html/changelog.html
2013-05-02 15:11:23 +01:00
Cael Aislinn
474722d425 Merge pull request #447 from Carn/DNArework
Resolves #283
2013-05-02 05:46:44 -07:00
Kyrah Abattoir
cf13402d86 Added pictures for all the different stamps in the game to show them on paper.
Changed the way stamps are displayed in html (no <HR> between them, only one at start).
Made the QM and law office stamps unique (and changed them in the maps).
Made the default stamp a "granted" stamp.
Added a "granted" stamp and paper_stamp sprite (green checkmark).

Signed-off-by: Kyrah Abattoir <github@kyrahabattoir.com>
2013-04-30 21:43:00 +02:00
Pete Goodfellow
aa3efe20d6 Here's the proper cable.dm 2013-04-30 16:32:07 +01:00
carnie
ae00173037 Merge branch 'master' of github.com:tgstation/-tg-station into pr/447 2013-04-30 04:07:28 +01:00
Malkevin
e9a5f9df8a Added Plasteel (iron + plasma) and Reinforced Glass (iron + silicon) 2013-04-30 03:16:03 +01:00
Malkevin
a83bbc9404 More grind-able sheets
Metal sheets can now to ground down for iron
Glass sheets can be ground down for silicon
Wood sheets can be ground down for carbon
2013-04-30 02:31:03 +01:00
Pete Goodfellow
9343a93820 Reverting stray changes from my merge of #464 2013-04-30 00:06:30 +01:00
Cheridan
e4bccfc229 Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
Conflicts:
	html/changelog.html
2013-04-29 14:39:25 -05:00
Ikarrus
e7bcf2dbfc Part one is here: #450
This pull request adds the box of medals to the map (Captain's Office), as well as updating the changelog.html

Also includes minor string and sprite fixes.
2013-04-27 18:43:05 -06:00
Ikarrus
b34c18ce3d Select Equipment update
-Renamed 'Strip' to 'Naked'
-Added Assistant
-Re-added Death Commando
-Added job titles to IDs of figures who should have it displayed. Shortened the titles of some of them so it wouldn't make ID and PDA names too long.
2013-04-27 09:37:06 +10:00
Ikarrus
eabfef6933 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-27 09:35:43 +10:00
Pete Goodfellow
c72bb4aac8 Cable coils now update mob inhands correctly when used up. Changed cable coil items to use the existing update_icon() proc, instead of their own updateicon(). 2013-04-27 09:32:50 +10:00
Tastyfish
a77e4a8e9e Fixed the robot sight modules, eg mesons not clearing on death. 2013-04-27 09:31:56 +10:00
Ikarrus
d1044dff99 A fix for a runtime that would occur if you tried to re-brain a monkey. 2013-04-27 09:31:55 +10:00
Ikarrus
0c66899053 Placing a brain back into a human calls update_hair(). They will look bald. 2013-04-27 09:31:45 +10:00
Pete Goodfellow
c87868b274 Moves /obj/effect/alien to /obj/structure/alien. Does not update the map.
Moves /obj/effect/alien/acid to /obj/effect/acid. Adds a new sprite for acid.
Standardises and updates text styling in code/game/objects/effects/aliens.dm.
2013-04-27 09:30:21 +10: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
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
Malkevin
798d537cfe Merge branch 'master' of https://github.com/tgstation/-tg-station into capcarapace 2013-04-25 15:49:42 +01:00
Akai Alonkai
b00c9bbc7f Syringe log
Adds syringes to attack logs. No immediate notices because OH MY GOD
SPAM, but more useful than a subverted AI for investigating medical
grief.
2013-04-25 07:05:45 -04: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
Cheridan
82c0c39836 Hahaha remember that time when I commited code that didn't compile??
-Fixes my typo.
2013-04-24 15:25:26 -05: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
a8fb18f937 Merge pull request #443 from AndroidSFV/Flux2
Energetic Flux event added to secrets panel
2013-04-24 02:28:28 -07: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
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
a3a615b1c0 Merge pull request #428 from Petethegoat/misc_changes
Sprite update and minor fix
2013-04-23 11:45:03 -07:00
AndroidSFV
9063eaf9f4 -Makes the Energetic Flux event admin trigger-able via the secrets panel. 2013-04-23 12:15:26 -05:00
Pete Goodfellow
ed0f46eaec Merge pull request #435 from errorage/master
Library table update.
2013-04-23 09:47:16 -07:00