Commit Graph

5183 Commits

Author SHA1 Message Date
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
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
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
Pete Goodfellow
cee254c286 Instead of showing a negative time, the supply status displays will inform you that the shuttle is late. 2013-05-12 17:49:22 +01:00
Ikarrus
6c3d5c3e4b Removed Roboticist from engineering_positions
Used in assigning department-wide jobbans
2013-05-12 10:18:34 -06:00
Pete Goodfellow
cb0fd4f0a2 Merge pull request #513 from Rolan7/ManifestsPlease
Cargo manifests from CentComm may contain errors...
2013-05-12 08:24:55 -07:00
Pete Goodfellow
309a3cf68d Merge pull request #525 from SuperSayu/mechfab-fix
Mech fabricator fix
2013-05-12 07:45:47 -07:00
Pete Goodfellow
ff6cd843d8 Merge pull request #522 from Ikarrus/acidfix
Acid Damage Fix
2013-05-12 07:41:54 -07:00
Pete Goodfellow
31c4a7559b Merge pull request #537 from Ikarrus/plastic
Facial Reconstruction Surgery
2013-05-12 07:23:06 -07:00
Pete Goodfellow
20a933e00a Merge pull request #545 from Cheridan/radios
RADIO SPRITES UPDATE
2013-05-12 07:19:35 -07:00
Pete Goodfellow
c8baf7748a Reverting accidental changes. 2013-05-12 15:16:04 +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
carnie
c1b605c627 *Resolves an issue where the gender block was being misread, resulting in gender changes.
*Resolves a potential issue with hardsetting dna, where dna could potentially be created for carbon-based mobs that do not currently support it
*updateappearance(mob) now works for any carbon mob (i.e. monkeys)
*all dna setup procs like hardset_dna check_dna_integrity and ready_dna, return the dna in question (or null/0 on failure) (as per Giacom's request)

Modified   code/game/dna.dm
Modified   code/game/gamemodes/changeling/changeling_powers.dm

Signed-off-by: carnie <elly1989@rocketmail.com>
2013-05-12 08:15:44 +01:00
Intigracy
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
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
Malkevin
164ce9a02e Fix for missing in-hand sprites for orange id cards 2013-05-11 23:15:37 +01:00
Ikarrus
46c4d811bc Minor change to hud icon checks 2013-05-11 15:29:09 -06: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
Ikarrus
4b1ccb9ec7 Increased object melt chance from meltprob*2 to meltprob*3 2013-05-11 12:14:51 -05:00
Ikarrus
96b1bd81dd Reduced toolbox force to 10 2013-05-11 11:44:52 -05:00