Commit Graph

5203 Commits

Author SHA1 Message Date
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
1bba155748 Removed an unused list var from syndie shoes.
Merged the swat and jackboot icons. Fixes invisible swat boots.
2013-05-28 01:54:50 +01:00
Pete Goodfellow
7215a65f93 Merge branch 'altbranch' of github.com:Cheridan/-tg-station into borgi 2013-05-28 01:35:07 +01:00
Ikarrus
b77c9751a0 Merge pull request #645 from Tenebrosity/miscissuefixes
[MAP] ~25 typo fixes, updated DJ station instruction sheet, replaced missing disposal pipe underneath HoP office door
2013-05-27 12:08:53 -07:00
Tenebrosity
4934c98bd7 Fixed common channel frequency mistakenly listed as 145.7 on DJ station paper 2013-05-28 06:27:51 +12: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
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
Ikarrus
6932c4e32d Requesting a re-merge of another change that has mysteriously disappeared, https://github.com/tgstation/-tg-station/pull/485
Originally merged by @Giacomand
2013-05-23 20:19:04 -06:00
Giacomand
7d0c5f1054 Merge branch 'master' of https://github.com/tgstation/-tg-station into pr/587 2013-05-24 00:00:22 +01:00
Giacomand
f95bfb92b0 * Added a return to stop a runtime from triggering. 2013-05-23 23:58:52 +01: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
Pete Goodfellow
64ed1f469a Merge pull request #617 from Carn/Issue615
Fixes #615 - mini icon for human-bodies now display correctly when exami...
2013-05-21 15:03:04 -07: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
4c10f5f94b Fixes #609 - decal/point is now unclickable.
Modified   code/game/objects/effects/decals/misc.dm
2013-05-21 08:41:50 +01:00
Ikarrus
268e39d3d0 Requesting a re-merge of changes that were lost (https://github.com/tgstation/-tg-station/pull/507) 2013-05-20 12:52:02 -06:00
Giacomand
35f4fc6c22 Merge pull request #553 from Carn/DNAfix
DNA fixes - Update Icons refinements
2013-05-20 09:19:19 -07:00
Carnie
115fdcaff6 Merge pull request #592 from Yvar/Astarfix
A-star replacement
2013-05-19 20:10:47 -07:00
carnie
018dd22e05 Removed changeling unfat sting.
Modified   code/game/gamemodes/changeling/changeling_powers.dm
Modified   code/game/gamemodes/changeling/modularchangling.dm
2013-05-20 00:47:27 +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
carnie
e6c8e67c3f Minor modifications to Yvar's A* fixes:
-Removed the priorityqueue datum. It is now a list()
-priorityqueue/proc/insert is now a helper /proc/sorted_insert() as it may be helpful in maintaining pre-sorted lists or insertion sorts.
-Replaced priorityqueue/proc/extract_last() calls with calls to pop(), which already existed.
-Removed last few references to "bestF" (from old awful A) in lighting and MC
-Replaced a section were it'd append to the end of the returned path list and then reverse the list. Now it inserts at the start of the list.
2013-05-19 09:54:39 +01:00
Carnie
2b0c723d2b Merge pull request #572 from Ikarrus/robjobban
Removed Roboticist from engineering_positions
2013-05-18 15:31:07 -07:00
Malkevin
7aac619244 Merge branch 'master' of https://github.com/tgstation/-tg-station into bucketlove 2013-05-18 15:37:32 +01:00
Cheridan
c00f97216c Phase 3 & 1/2
Adds chef locker
Serves up the service server to serve your servers.
2013-05-17 19:15:01 -05: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
Cheridan
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
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
Yvar
3443ee2319 A-star fixes
Will obey the maxnodes parameter if it's provided (although perhaps not
in the way that it was originally meant?) The only one that uses it is
disease, and it wasn't an issue there, but at least in future it won't
be a problem.

Also slightly increased the maximum loop count from 1500 to 1800, on the
off-chance that the previous value was pessimistically low. In the
initial station this doesn't go past 1000, but if bots understand doors
their paths might get squiggly.
2013-05-16 20:40:01 +10:00
Giacomand
df7aaece0c Merge pull request #538 from SuperSayu/sandbox-update
Update to Sandbox Panel
2013-05-16 03:26:58 -07:00
supersayu
514ca15100 Missed an exception for a door that does not have a glass doortype 2013-05-15 13:20:16 -04:00
Yvar
1273a75ceb Wholesale A-star replacement
I wish I'd just been able to update the original version, but something
kept going wrong.

This version creates paths of identical lengths (not necessarily the
same paths!) while evaluating, on average, only 35% of the tiles that
the original algorithm would. Seems like a decent improvement.

Also fixes some grammar in the mulebot file.
2013-05-15 21:23:40 +10: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
Cheridan
6ae715a6cf -Updates the headset descriptions. 2013-05-14 21:59:26 -05:00
Tastyfish
a7617f5c8a revert out lazybots commit 2013-05-14 18:23:08 -04: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
Malkevin
951ba1bede changed wetness check from constant to variable reference 2013-05-14 17:42:46 +01:00
Malkevin
cef6bd2786 Better Mop and Cart love
Slight tweak to the behavior of attacking the janicart with a mop.
Changed it so that it stores the mop when it is soaked (or the bucket is empty), as I'm sure most players would prefer their mop to always be fully soaked when they remove it from the cart.

Also changed the examine text from 'water' to 'liquid' as it was misleading. It can actually be filled with any reagent, even welder fuel...or acid... or blood... or dr.gibb...space lube... you get the picture.
2013-05-14 17:02:35 +01: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
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
carnie
4627e5459c *Fix for syringes
*Fix for one icon_state being the wrong shade (apparently)
2013-05-13 01:48:41 +01: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
supersayu
9377f06ad9 Sandbox improvements
Reduced the overwhelming size of items list by removing huge categories into their own separate lists; this affects /obj/item/clothing and /obj/item/weapon/reagent_containers.
Removes a bunch of unsanitary items from the spawn list.
Makes RCD quick spawn button check for spawn disabled flag since it can destroy walls and floors with impunity.
Adds cleanbot to quick spawn list.
Removes the check for the spawn flag from the dialog construction, because it is cached; if the admin turns it on during the round, people who already have a sandbox panel will be unable to use it.
Adds a disclaimer to the sandbox panel vis a vis admin disabling.
2013-05-12 14:49:39 -04:00