9850a66cb0
Merge pull request #582 from Cheridan/radios
...
Phase 2 of my master plan:
2013-05-17 07:46:40 -07:00
4ca036543c
-Updates DJ station infosheet.
...
-Adds service headsets to barman/botanist closets (chef doesn't get one for now since he doesn't have a closet, all his spare stuff is just placed in a crate)
2013-05-16 15:16:21 -05:00
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
eb5e5a975f
Merge pull request #539 from SuperSayu/corgi-inventory
...
Corgi Inventory Update
2013-05-16 03:40:55 -07:00
18d25a6bf5
-Changes the channel hotkey from Q to V
2013-05-14 15:32:06 -05:00
7c2e7b9f52
Merge branch 'master' of https://github.com/tgstation/-tg-station into Master
2013-05-14 15:11:37 -05:00
cfbd530a2b
Merge pull request #563 from Malkevin/prisonercards
...
Proper Vandykes
2013-05-13 23:29:33 -07:00
ecd209a6f6
Merge pull request #529 from KazeEspada/mice
...
mice become items when they die.
2013-05-13 12:03:23 -07:00
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
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
ff6cd843d8
Merge pull request #522 from Ikarrus/acidfix
...
Acid Damage Fix
2013-05-12 07:41:54 -07:00
31c4a7559b
Merge pull request #537 from Ikarrus/plastic
...
Facial Reconstruction Surgery
2013-05-12 07:23:06 -07:00
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
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
1c1b33bd8d
Pull Request #548 - vareditting ckey, key, icon, icon_state, overlays, underlays have permission alternatives
...
Fixed indentation reauthored and rebased ~Carn
Fixed the things carn pointed out. Thanks. ~Intigracy
ckey editing and icon editing changes, added alternate requirements besides +DEBUG. ~Intigracy
Modified code/modules/admin/verbs/modifyvariables.dm
Signed-off-by: carnie <elly1989@rocketmail.com >
2013-05-12 02:42:52 +01:00
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
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
4b1ccb9ec7
Increased object melt chance from meltprob*2 to meltprob*3
2013-05-11 12:14:51 -05:00
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
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
f9d4926ad7
Facial Reconstruction Surgery
...
Plastic Surgery will restore the face if it is disfigured by acid.
2013-05-08 08:52:38 -06:00
9378c020b8
Increased sacid meltprob from 5 to 10
2013-05-06 20:29:01 -06:00
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
086ac268b3
Changed all crit checks from static zeros to config.health_threshold_crit
2013-05-06 18:31:51 +01:00
0c0231779f
Updated object melt probability I overlooked.
2013-05-05 19:13:29 -06:00
521bd5df60
Acid Damage Fix
...
Redid a portion of how acid damage is applied. People were not being disfigured when sprayed, and contact with acid for some reason had a 15% chance to do ridiculous damage (~30 per spray puff), otherwise it did very little (~6). It should be more consistent now around the ~12 range per spray puff.
Glasses melt too, now.
2013-05-05 19:05:39 -06:00
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
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
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
d20c7a4bd2
Made hulk talking change all periods to exclamation points
2013-05-05 05:32:01 -04:00
7b325f9c6e
re-arranged cable actions so src wouldn't get deleted before everything was completed
2013-05-05 05:17:31 -04:00
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
7111f86a2b
Merge pull request #432 from Rolan7/master
...
Issue 113 mob->closet->wall glitch fix.
2013-05-04 11:18:42 -07:00
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
827c72fb72
Merge pull request #483 from kyrahabattoir/gui_stamps
...
[MAP]Graphical stamps on documents.
2013-05-03 22:04:31 -07:00
242fc2813f
Merge pull request #449 from TwistedAkai/master
...
Syringe log: Resolves issue #321
2013-05-03 21:45:09 -07:00
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
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
474722d425
Merge pull request #447 from Carn/DNArework
...
Resolves #283
2013-05-02 05:46:44 -07:00
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
aa3efe20d6
Here's the proper cable.dm
2013-04-30 16:32:07 +01:00
ae00173037
Merge branch 'master' of github.com:tgstation/-tg-station into pr/447
2013-04-30 04:07:28 +01:00
e9a5f9df8a
Added Plasteel (iron + plasma) and Reinforced Glass (iron + silicon)
2013-04-30 03:16:03 +01:00
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
9343a93820
Reverting stray changes from my merge of #464
2013-04-30 00:06:30 +01:00
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
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
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
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
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
Ikarrus
Cheridan
Giacomand
Aranclanos
Malkevin
Pete Goodfellow
Pete Goodfellow
carnie
Intigracy
supersayu
KazeEspada
Rolan7
Cael Aislinn
Tastyfish
Blaank
Kyrah Abattoir