Commit Graph

2813 Commits

Author SHA1 Message Date
Cheridan
df681bed40 Food update -
-Removes all the dumb weapon/syntiflesh recipes. Remove syntikebab. Cleans up commented-out stuff that'll never be readded.
-Deletes jar.dm, which I tried to delete months ago but somehow messed up.

-'Imitation' carp meat can now be made with 5 units of carpotoxin and some tofu.
-Some recipes changed slightly.
-Adds berry muffins and booberry muffins.

Cleaned up the carton-based sprites in drinks.dmi to look better.
New sprites for muffins, donut boxes, brain burgers, super big bite burgers, enchiladas, monkey delight, baguettes, fried eggs, wing fang chu, clown's tears, and mystery soup.

I also completely reorganized the food.dmi
(and made my bed and mopped the floors)
2013-06-04 14:45:40 -05:00
Cael Aislinn
1ab959dc4f Merge pull request #562 from Ikarrus/hudicons
Updated Hud Icons with department colors
2013-05-31 23:42:26 -07:00
Cael Aislinn
cd36661610 Merge pull request #644 from Ikarrus/latejoin
Latejoining Antagonists
2013-05-31 23:25:06 -07:00
Cael Aislinn
871b775100 Merge pull request #655 from Carn/HelpersTidy
*Small tidy-up of various helper procs*
2013-05-31 23:24:38 -07:00
Cael Aislinn
c765bb9d47 Merge pull request #675 from d3athrow/oneclickantagfix
Fixes the Create Antagonist: one click antag Nuke Team. Requires atleast...
2013-05-31 23:23:35 -07:00
Cael Aislinn
41364fc293 Merge pull request #662 from Petethegoat/hang
Nooses and table fix
2013-05-31 05:00:20 -07:00
Cael Aislinn
0d8a9e6809 Merge pull request #665 from Petethegoat/equipfix
Misc fixes- #649 and #663
2013-05-30 21:48:22 -07:00
Cael Aislinn
4d163db55e Merge pull request #683 from KazeEspada/temperature
temperature gun fix
2013-05-30 21:46:14 -07:00
Cael Aislinn
0c269798ad Merge pull request #666 from Petethegoat/i_know_what_youre_thinking_did_i_fix_six_bugs_or_only_five
A fistful of fixes
2013-05-30 21:34:53 -07:00
d3athrow
8f8ab8ebf0 Added a break to the nested loop after the candidate was chosen, without it every candidate would get chosen regardless. 2013-05-30 23:32:05 -05:00
KazeEspada
6fddcb4e61 gives temperature guns a high capacity cell. fixes #265
removes a duplicated line in power_cells.dm
2013-05-30 10:20:22 -07:00
d3athrow
a2999b86a0 Fixes the Create Antagonist: one click antag Nuke Team. Requires atleast 3 people to click yes with a maximum of 5 agents possible. 2013-05-29 16:26:25 -05:00
Cheridan
ecee72e76d The Carp Update
Carpotoxin can now be made into a beneficial chemical: Rezadone, which can heal cloneloss without the use of a cryo tube, but requires careful dosage.

New sprites for soybeans; growing/harvested/seeds. Minor tweaks to many seed sprites.
Soybeans can now be mutated into Koibeans, which contain carpotoxin.
2013-05-29 11:44:36 -05:00
Ikarrus
5b0ef21cdf Added an icon for IDs with unrecognized assignments. This is so that you can tell between those without IDs and those with custom assignments.
https://dl.dropboxusercontent.com/u/831776/unknown.png
2013-05-28 20:19:08 -06:00
Ikarrus
46a9d44db9 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudicons 2013-05-28 19:32:43 -06:00
Pete Goodfellow
7ed93cfad1 Fixes #540 cloning welders
Fixes #486 examining jetpacks
Fixes #532 cyborg camera names
Fixes #510 attack windows with rods
Fixes #533 helmet sprites don't update
2013-05-29 00:35:40 +01:00
Pete Goodfellow
eec378585f Merge pull request #607 from Carn/AdminOOCfix
Resolves an issue with sanitize_hexcolor - It now has an optional defaul...
2013-05-28 16:18:40 -07:00
Pete Goodfellow
8285222255 Fixes #649 equip e causes items to stack
Fixes #663 monkeys can't use pickup verb
2013-05-28 23:17:11 +01:00
Pete Goodfellow
dcf7c34990 Changed the suicide text for cable coils if you're standing on a stool bed or chair.
Fixed some table icon_states that Cheri missed.
2013-05-28 21:31:28 +01:00
Pete Goodfellow
828e364363 Merge pull request #589 from Ikarrus/borgnerf
Cyborg Budget Cuts
2013-05-28 13:10:08 -07:00
Pete Goodfellow
36e2d0e30e Merge pull request #650 from Carn/Issue630
Fixes #630 - The null-sound used to stop currently playing music was bei...
2013-05-28 11:31:04 -07:00
Pete Goodfellow
88253ce9cb Merge pull request #625 from Rolan7/Issue566
Fixed a lot of text, mostly in simple_animal.  The word "the" was being ...
2013-05-28 07:20:38 -07:00
Pete Goodfellow
67b8eab129 Merge pull request #651 from Carn/Issue610
Fixes #610 - You could only edit folder names when they were on your per...
2013-05-28 04:44:23 -07:00
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
Ikarrus
944fa58570 -CentCom officials radios changed to only have the command channel
-Replaced Captain's Headsets on CentCom roles with a centcom reskin, which was already in the code.
2013-05-28 01:21:06 -06:00
Ikarrus
1f74a84608 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudicons 2013-05-28 00:49:12 -06: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
carnie
b84d12d949 *Small tidy-up of various helper procs*
-Turns out there was already a Gaussian PRNG proc already, used by mechs and turrets. I've replaced it with my one as mine has almost half the cost. (currently broken! still waiting for fixes to be pulled!)
-replaced between(min, val, max) with Clamp(val, min, max)
-get_turf(thing) now uses var/list/locs to locate its turf, rather than iterating up through loc of its loc of its loc...etc
-sign(num) moved to maths.dm
-InRange(val, min, max) replaced with IsInRange(val, min, max) (they were identical)
-Removed ismultitool() iswrench() iscoil() iswire() iswelder() iscrowbar() etc
-removed modulus(num) as abs() performs the same task! *roll-eyes*
-removed get_mob_with_client_list() as it is no longer needed (we have var/list/player_list now)
-removed get_turf_or_move() as it simply called get_turf
-removed get_turf_loc() as it was identical to get_turf()

*Additions:*
-The "Declare Ready" link in the lobby will automatically become "Join Game" if the round starts before you declare ready, so you don't have to click it twice
2013-05-27 12:21:43 +01:00
carnie
ac63e39c44 Fixes #610 - You could only edit folder names when they were on your person, unlike most other items. It now uses in_range() instead. 2013-05-27 09:44:29 +01:00
carnie
a140fb671c Fixes #630 - The null-sound used to stop currently playing music was being used when turning sounds *on* rather than *off*. Sounds can now be stopped properly without triple-clicking the verb.
Modified   code/modules/client/preferences_toggles.dm
2013-05-27 08:35:57 +01: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
Ikarrus
2dfb0ac9f0 Latejoiners can no longer be antagonists if:
[Number of antagonists] >= [Number of Players Joined] / [Scaling coefficient] + 1
2013-05-26 00:24:45 -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
07590723d2 Gives latejoiners a chance of becoming a traitor and/or changeling depending on the game mode.
They will have the same chance of becoming an antagonist as round-start characters.

This function can be toggled off via server configuration.
2013-05-25 13:41:25 -06: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
Rolan7
3523d9b58a Improved a few lines based on Pete and Aranclanos's feedback. Also removed the "capitalize" call, which wasn't working, instead breaking the string up into two parts. BYOND macros are weird, but it works great. 2013-05-22 16:07:01 -04:00
Rolan7
78b4d985e1 Fixed a lot of text, mostly in simple_animal. The word "the" was being duplicated in a lot of cases when referring to objects or mobs. Basically, byond handles "the" for us. Poly was particularly guilty of this, but really it was all simple_mobs.
Also fixed issue 566, where it was possible to weaken corpses.  Dead humans, humanoid aliens, and larvae should no longer be weakenable once they're dead.

Also also, changed the default name for human mobs from unknown to Unknown.  This is makes them consistent with humans whose identity is destroyed by acid or face damage.  They'll no longer show up as "The unknown" in messages, since Byond recognizes Unknown as a proper noun due to capitalization.

Finally, gave Runtime a DNA joke as a description.  Not sure why she didn't have a description.
2013-05-22 05:24:44 -04: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
c8428e3872 Resolves an issue with sanitize_hexcolor - It now has an optional default return value again.
Fixes some bad arguments in a call to sanitize_hexcolor which was causing admin ooccolor to be set to "000" on load.
2013-05-20 04:24:49 +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
Ikarrus
096ce220c2 Merge branch 'master' of https://github.com/tgstation/-tg-station into hudicons 2013-05-18 17:58:22 -06: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
Ikarrus
a234e4a613 Merge branch 'master' of https://github.com/tgstation/-tg-station into borgnerf
Conflicts:
	html/changelog.html
2013-05-16 09:02:06 -06:00