Commit Graph

1626 Commits

Author SHA1 Message Date
Cheridan
5a83f85c83 Merge pull request #804 from Ikarrus/tplog
Traitor Panel Improvements
2013-06-19 21:08:14 -07:00
Giacomand
20a9dd130b Merge pull request #789 from Carn/member_content
Resolves an issue with sanitize_hexcolor where it'd return an incomplete...
2013-06-19 06:45:40 -07:00
Giacomand
c838e2d348 Merge pull request #798 from MrPerson/zone_sel
Redo of zone_sel/Click() to be much simpler.                                                             Zone_sel is the paper doll ...
2013-06-18 17:59:53 -07:00
Ikarrus
26becb3937 Traitor Panel Improvements
-Added logging for admins editing objectives
-Added logging for admins adding new antagonists
-Changed the antag role assignment buttons to something more appropriate for the game modes. Will now tell you if someone is loyal (implanted).
-Added a isloyal() proc to check if a mob is loyalty implanted.
-Made the headrev message more noticeable
2013-06-17 22:39:32 -06:00
Ikarrus
1518d285e7 Standardized spelling of all instances of "Centcom"
Centcomm/CentComm -> Centcom
centcomm -> centcom
2013-06-17 20:49:01 -06:00
Matevž Baloh
6ef1c83338 Merge pull request #774 from Giacomand/pull_click
CTRL+Clicking won't cancel a pull if you try to pull the same object.
2013-06-17 06:42:57 -07:00
MrPerson
4f2f583a5d Redo of zone_sel/Click() to be much simpler. Zone_sel is the paper doll on the screen where you choose what body part to target. Fewer sections under switch statements, plus a check to only update the icon if there's been a change.
tgstation.dme is a fixed version without FILE_DIR set. Gitblame!
2013-06-17 05:06:03 -07:00
carnie
52c48d11aa Resolves an issue with sanitize_hexcolor where it'd return an incomplete string such as ""
Resolves an issue where whitespace in names could cause a saveslot button to wrap to the next line.

Byond members:
can colour their name using the admin ooc-colour feature.
get a icon next to their name in ooc chat.
can choose their icon_state as a ghost.
get 8 saveslots

unlock_content tracks the return of IsByondMember(). This is to allow for easier testing/debug.
2013-06-16 11:08:39 +01:00
Giacomand
27b4a6c443 * CTRL+Clicking won't cancel a pull if you try to pull the same object. 2013-06-15 15:43:28 +01:00
Uristqwerty
f6733d4921 Optimizations in insignificant procs (less than 2% of total self time each (according to the june 7 profile), and the changes probably don't have a huge impact on them.
/turf/simulated/proc/update_air_properties()
 - Changed border lists to use |= rather than -= then +=.

/datum/camerachunk/New()
 - Uses block() rather than range() and a coordinate check

Comment (copied to two places) outlining a potential optimization. (potential as in "needs to be tested whether it actually makes things faster")
2013-06-12 15:30:52 -04:00
Cael Aislinn
925e1b9fa8 Merge pull request #659 from Petethegoat/catch
Added catching.
2013-06-10 05:07:24 -07:00
Cael Aislinn
cc66ec46db Merge pull request #552 from dumpdavidson/monkeyize
Monkey - Human transformation
2013-06-10 02:27:52 -07:00
dumpdavidson
1a338be330 Fixed duration of the transformation. 2013-06-10 10:55:19 +02:00
dumpdavidson
87a28b67e0 Merge remote-tracking branch 'remotes/origin/master' into monkeyize 2013-06-10 10:54:09 +02:00
Cael Aislinn
0c9b1b1cd5 Merge pull request #697 from Malkevin/Improved_eyecheck()
Improved eyecheck()
2013-06-08 18:53:25 -07:00
Giacomand
be550b196e The victim will now get a message if the user empties their pockets and gets interrupted. (Victim moving, user being stunned, etc..) 2013-06-06 18:01:14 +01:00
Giacomand
8fee615d85 * Added a message to the user. 2013-06-06 14:15:19 +01:00
Giacomand
e83fada8c1 Emptying someone's pockets won't display a message anymore. This allows people to pickpocket if their victim stands still long enough. 2013-06-06 08:17:53 +01:00
Malkevin
af3737b4b9 comments for new defines 2013-06-02 17:16:32 +01:00
Malkevin
b9a370f310 Changes the check for blindfolds healing eye damage and making the mob blind to work off tintcheck() 2013-06-02 17:06:06 +01:00
Malkevin
7e610b6677 Improved eyecheck()
Changes flash/welder protection eyecheck() proc from several hard coded  item checks to a /var check for eye covering items, reducing the number of IF statements and allowing greater flexibility as child items can have a different protection level to their parent.

Created a new proc tintcheck()
-Items have a separate tint var to allow for items to protect but not impair, such as space helmets.
-tintcheck() adds these up for eye covering locations
-life.dm uses this new proc when checking to apply the welder overlay instead of hardcoded if statements
2013-06-02 02:04:47 +01: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
Pete Goodfellow
5ffed82431 Fixed all the bugs that Dumpdavidson mentioned. 2013-05-31 18:08:08 +01:00
Cael Aislinn
0d8a9e6809 Merge pull request #665 from Petethegoat/equipfix
Misc fixes- #649 and #663
2013-05-30 21:48:22 -07: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
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
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
828e364363 Merge pull request #589 from Ikarrus/borgnerf
Cyborg Budget Cuts
2013-05-28 13:10:08 -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
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
7215a65f93 Merge branch 'altbranch' of github.com:Cheridan/-tg-station into borgi 2013-05-28 01:35:07 +01:00
Pete Goodfellow
ecd3decab0 Fix for the actual hud button. Clicking it will work now, in addition to hotkeys. 2013-05-27 22:23:31 +01:00
Pete Goodfellow
2af188524b Added catching. Toggle throw intent with an open hand to catch things that are thrown at you. TK users can't catch anything, but that's okay! 2013-05-27 22:08:38 +01: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
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
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
dumpdavidson
6cd1b87782 Merge branch 'master' of https://github.com/dumpdavidson/-tg-station into monkeyize
Conflicts:
	code/game/dna.dm
	code/game/gamemodes/changeling/changeling_powers.dm
2013-05-24 15:40:07 +02: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
dumpdavidson
25b96f1fc2 prevented the issue with the genderblock that was fixed in commit c1b605c627 from reappearing
Signed-off-by: dumpdavidson <gtb.schmidt@gmail.com>
2013-05-21 22:34:03 +02: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
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
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