Commit Graph

4186 Commits

Author SHA1 Message Date
Erthilo
390782f544 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-25 01:20:08 +01:00
Erthilo
bb8f21a431 Possible fix for everyone being referred to as "It". 2012-06-25 01:19:47 +01:00
Erthilo
67c5e8e3a8 Medical System Updates...
* Dragging someone while injured (brute) will have a small chance of injuring them further that increases depending on how damaged they are. This coincides with the blood spatters that are already generated.
* Blood is now actually lost from the person being dragged.

* Added splints that can be applied to broken arms and legs, and will reduce effects of broken limbs. These can be removed the same way as handcuffs. They show up on the mob and on examine.
* Added an autoinjector that can only hold five units, but acts like a hypospray.
* Added an advanced medical kit that Medical Doctors spawn with that has Advanced Trauma Kits, Advanced Burn Kits, autoinjectors, and splints.
* Health Scanners now show unsplinted fractures ONLY in arms or legs.

* People in critical (less than -50 health) from external trauma (100+ damage from brute and/or burn) bleeding, and with unsplinted limbs, will send a message to anyone trying to drag them, to warn them it would be a bad idea trying to move them. They will suffer a lot more damage if dragged while lying down.
* The correct procedure is therefore, A) Bring a roller bed, or B) Splint all limbs, stop all bleeding with gauze, and then drag them.

* Fixed CPR being performed at weird health levels.
2012-06-25 01:18:55 +01:00
caelaislinn
7bd5beeb17 anomlies now have an activated and non-activated sprite
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:26:50 +10:00
caelaislinn
00493873c0 artifacts have a disable message
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:03:39 +10:00
caelaislinn
f131543fb7 fix for never closing bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:55:28 +10:00
caelaislinn
beb863020b more tweaks and fixes
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:50:03 +10:00
caelaislinn
ddda9f2ce3 fixes and tweaks for the harvester
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:35:19 +10:00
caelaislinn
137e15ef62 this should fix the power harvester bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 07:59:08 +10:00
Albert Iordache
156f1349c2 Fixed compilation error and moved acid_act() 2012-06-24 19:13:51 +03:00
caelaislinn
a240dc71ba added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 01:48:55 +10:00
baloh.matevz
159ff955a6 - Fixed the old iconset's equip button fitting a million batons into your suit storage slot.
- Fixed aliens not being able to tell which hand they have selected

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3913 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 14:27:58 +00:00
caelaislinn
2237e3f658 talking crystal can be heard with ghost ears
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 19:58:21 +10:00
elly1989@rocketmail.com
b21a3ed742 Fixes issue 586.
Culprit code:

/obj/item/clothing/gloves/latex/attackby(obj/item/weapon/cable_coil/O as obj, loc)
	if (istype(O) && O.amount==1)
		var/obj/item/latexballon/LB = new
		if (usr.get_inactive_hand()==src)
			usr.before_take_item(src)
			usr.put_in_inactive_hand(LB)
		else
			LB.loc = src.loc
		del(O)
		del(src)
	else
		return ..()

I was going to fix said code but after seeing that BALLOON is spelled incorrectly, that it uses amount == 1, balloons have no in-hand sprite AND don't even have  a desc I decided I shouldn't waste my time when the authorsimply couldn't be bothered. Commented it out.

Runtime fix for:
untime error: Cannot modify null.icon_state.
proc name: insert key pressed (/client/verb/insert_key_pressed)
  source file: mob_movement.dm,84
Cause: AIs don't have intents and stuff.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3911 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 09:54:36 +00:00
elly1989@rocketmail.com
65a84484cf Removed a debug message.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3909 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 09:01:17 +00:00
elly1989@rocketmail.com
4f910f122f Runtime fix for db_click when clicking the mask inventory slot with an empty hand. This proc will get rewritten anyway (when I've gathered enough courage and/or vodka :3)
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3907 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 07:28:42 +00:00
caelaislinn
021ddbde38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-24 16:36:47 +10:00
mport2004@gmail.com
1513e96439 Fixed some engrish in a desc.
Added more AM to the containment_jar
The shielding makes a bigger boom if it blows.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3905 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 05:00:44 +00:00
SkyMarshal
315e027b05 Merge pull request #1385 from SkyMarshal/BugFixes
Sanity for the "give" command, changelog.
2012-06-23 21:39:46 -07:00
SkyMarshal
484c01498d Sanity for the "give" command, changelog. 2012-06-23 21:38:39 -07:00
caelaislinn
37e76d7436 artifact machinery now uses power
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:57:32 +10:00
caelaislinn
639c00fb66 fix for "the floor emits a pulse of energy"
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:45:51 +10:00
Erthilo
a4f3cada24 Compile error fixing. 2012-06-24 02:42:30 +01:00
Erthilo
ce6cd204f2 Accidentaly reverted a file. 2012-06-24 01:57:12 +01:00
mport2004@gmail.com
698c1140eb spelling fix
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3904 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 00:55:34 +00:00
Erthilo
b3285fd716 Updated use of gender proc. 2012-06-24 01:54:48 +01:00
Erthilo
0f8cf93095 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-06-24 01:53:10 +01:00
Erthilo
163c269cc3 Fixes disarm not working due to armour. 2012-06-24 01:52:44 +01:00
Erthilo
f88f097777 Fixes ghost with ghost ears off hearing whispers. 2012-06-24 01:23:43 +01:00
Erthilo
85f75e639c Fixes morph and appearance editing not updating sprites. 2012-06-24 01:12:16 +01:00
Erthilo
a5adf9377f Fixes changing hairstyles if you pick the same species. 2012-06-24 01:11:31 +01:00
SkyMarshal
0737f64d12 Goddammit 2012-06-23 17:07:33 -07:00
mport2004@gmail.com
69753b0190 Worked on blob mode a bit
Readded the AM stuff to the dme
Added another explosion edit from Willox


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3903 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-24 00:03:31 +00:00
SkyMarshal
ea5913fde8 *sigh* Missed some stuff, compile fix. 2012-06-23 17:02:30 -07:00
SkyMarshal
3efa1d4e6b More fixes. 2012-06-23 17:00:28 -07:00
SkyMarshal
25757511d6 Fixed a derp 2012-06-23 16:36:34 -07:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
elly1989@rocketmail.com
48088b79d9 ugh...this was horrible. I'm really sorry if I fucked anything up, I was literally going braindead towards the end.
Replaced every l_hand = and r_hand = and all that if(hand) crap to use standardised procs. This means we can use procs like Dropped() reliably as they will always be called when things are dropped.

Thorough documentation to come. But generally, if you want a mob's icons to update after deleting something in the inventory...use drop_from_inventory(the_thing_you_wanna_drop) just before deleting it. If you wanna put something in a mob's hands use put_in_hands() (or one of the variants). It'll try putting it in active hand first, then inactive, then the floor. They handle layers, overlays, screenlocs calling various procs such as dropped() etc for you. Easy

mob.equipped() is now mob.get_active_hand() because there was another totally unrelated proc named equipped() and stuff was confusing.

Weakening was made instantaneous.

Minor optimisations for human/handle_regular_status_updates(). I'll port these changes over to the other mobs next. Basically it should stop it constantly incrementing every status effect even after death.

umm... bunch of overlays related fixes... I think that's everything. :/

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3900 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 21:24:45 +00:00
Erthilo
00b4a234c4 Merge fixes. 2012-06-23 22:17:59 +01:00
mport2004@gmail.com
a1cef5a079 Added a default to the uplink welcome and uses in game_mode
The Pumpkin head object once again emits light.


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3898 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 21:03:15 +00:00
mport2004@gmail.com
c86c8e1505 Finished moving the clothes in defines over to modules.
Several head objects path changed so they are not helmets, head means can fit on your head, helmet was securities helmets, space helmets currently still helmet.
Cult restricted job list now has the sec force + cap because you can’t convert them as is.
AI removed from protected traitor jobs as malf is currently effectively out of commission.
A Protected list was added to changling.
Removed the furry mob files that were not checked.
Moved two unchecked files to unused


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3896 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 19:25:01 +00:00
Erthilo
3df776b082 TG: - Added a parser to adminhelps. When someone sends an adminhelp it looks through
the words for mob names, keys and ckeys. These are then displayed in bold and
black with a (?) next to them. Clicking the questionmark will display additional
information about the mob.

Screenshot:
http://www.kamletos.si/Adminhelp%20parser%206.PNG
Revision: r3778
Author: 	 baloh.matevz
2012-06-23 17:36:02 +01:00
baloh.matevz
90041eaba4 - Fixed some odd behavior with the spam filter for admin pm-s.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3895 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 16:34:23 +00:00
Erthilo
4f4ebd809d TG: Comitting for Giacom.
Details here: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8960

And, to summarise:
Added a new computer, the message monitor console. It is able to access the logs
on the message server.
Made PDAs dependant on the message server instead of Telecomms. This fixes PDAs
not sending any messages due to no listening_freqs.

When paper is splashed with Ethanol, the contents of the paper or book
disappear.
Added white coloured pens. Allows you to write hidden messages that can be
revealed by highlighting the text.
Revision: r3777
Author: 	 petethegoat
2012-06-23 16:42:37 +01:00
Erthilo
a9bfaf4173 TG: - Added basic heavy-duty cables, they cannot be destroyed with wirecutters,
unfortunately they currently cannot be created either. Not present anywhere on
the map yet.
- Fixed a bug with masks, which did not follow the equipment rules of the
SLOT_MASK flag.
- Fixed a problem where monkeys could not equip a backpack.
Revision: r3774
Author: 	 baloh.matevz

TG: - Added the heavy cable sprites, sprited by Thunder11.
Revision: r3775
Author: 	 baloh.matevz
2012-06-23 16:21:44 +01:00
Erthilo
e7e1b8f9e8 More compile stuff. 2012-06-23 16:14:00 +01:00
baloh.matevz
ffbed502f1 - Added a privacy poll to the startup process (feedback database needs to be set up for it to show up.). The intention of this poll is to get a general playerbase opinion on whether player-specific data should be gathered to help with statistics as well as to allow in-game polls.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3894 316c924e-a436-60f5-8080-3fe189b3f50e
2012-06-23 15:10:18 +00:00
Erthilo
8b4033c410 TG: - Ported cable restraints from Bay12. You make them by using a verb on cable
coils. Takes 15 lengths to make, applied the same way as handcuffs, they have
the same effects as handcuffs, but only take 30s to remove if you resist. They
can also be removed by using wirecutters on a handcuffed mob.
- Added 4 new cable colors. Pink (ported from Bay12), orange, cyan and white.
- Engineer tool belts can now also spawn with orange wire, in addition to yellow
and red.
- Tool closets and electrical toolboxes can now spawn with cables in any of the
8 colors.
- Added cablecuff.ogg from bay12, played when you apply cable cuffs on someone
- Added this stuff to the changelog

So yeah, some stuff is credited to bay12, tho some of it was nearly enough
completely recoded.

Screenshots:
http://www.kamletos.si/wire%20colors.png
http://www.kamletos.si/cuff%20restraints.png
Revision: r3770
Author: 	 baloh.matevz
2012-06-23 16:04:24 +01:00
Erthilo
6cf06cc9ac TG: - Added a cookie food type, which cannot be made ingame
- slightly altered the pray format to include a (SC) link, which stands for
'spawn cookie'. This attempts to spawn a cookie in the hands of the person who
prayed. It's intent is to be a consolation prize when the prayer cannot be
answered, due to it ruining the round. Only humans will get a cookie.

Screenshot:
http://www.kamletos.si/cookie%20spawner.PNG
Revision: r3766
Author: 	 baloh.matevz
2012-06-23 15:49:05 +01:00
Erthilo
f63b61cbda TG: Fixed some lag caused by improper usage of loops. Enjoy.
Revision: r3764
Author: 	 rockdtben
2012-06-23 15:39:43 +01:00