Commit Graph

2677 Commits

Author SHA1 Message Date
cib
d6e575c6b8 Fixed a few bugs. 2012-07-05 07:23:12 +02:00
cib
e92669d155 Merge branch 'master' of git@github.com:CIB/Baystation12 2012-07-05 09:01:34 +04:00
cib
b831a64bc2 Added limb selection to preferences. 2012-07-05 07:00:22 +02:00
cib
dd579bd5fd More work on amorphs. 2012-07-04 17:42:21 +02:00
Erthilo
8acd06ddda Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates
Conflicts:
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2012-07-04 09:00:59 +01:00
caelaislinn
cfb1bf3111 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-01 19:44:34 +10:00
Apple_Master
6102489138 Added Jamini and Cubejackal's custom items. I hope.
Signed-off-by: Apple_Master <cheeckan@gmail.com>
2012-06-29 16:44:03 +01:00
caelaislinn
a8c727ba1a Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-30 01:18:33 +10:00
Erthilo
f4b5961add Added notification for non-whitelisted people. Also updated whitelist with Spaceman96 2012-06-29 03:28:26 +01:00
Erthilo
2f6af975de Fixes extra description damage values. 2012-06-29 02:32:32 +01:00
Erthilo
f5b221bb63 Fixes a few places where if statements wouldn't work due to syntax errors. 2012-06-29 02:31:46 +01:00
Erthilo
a6607a0275 De-yellows blubs sligtly. 2012-06-29 02:25:57 +01:00
Erthilo
079f987c5c Fixes moderators getting verbs they can't use. 2012-06-28 22:59:36 +01:00
Erthilo
95bae4da54 Fixes AI holopad speech not being picked up by tape recorders. 2012-06-28 22:33:07 +01:00
Erthilo
83542c9955 Fixes alien language indicators being overriden. 2012-06-28 22:32:25 +01:00
caelaislinn
4a4d3b0614 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-28 22:56:29 +10:00
Erthilo
5b13fbc6a7 Temp/quick/hotfix for evidence bags. 2012-06-27 23:36:55 +01:00
Erthilo
92b7eb534a Fixes sleeping resting message spam. 2012-06-27 22:34:55 +01:00
Erthilo
1e63e35ab4 Fixes double icons in examine, and random " on his head" " on his groin" messages. 2012-06-27 20:29:40 +01:00
Erthilo
4460bc2011 Simple animals can now use the Me verb. 2012-06-27 18:09:32 +01:00
Erthilo
5c87d02731 "Fixes" packages wrapping crates that are too large or too small. 2012-06-26 20:35:04 +01:00
caelaislinn
fd5661de1f Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-27 00:02:01 +10:00
Erthilo
c95a5a512c TG: - The adminhelp sound is now a character setup option for admins of any rank.
Revision: r3784
Author: 	 baloh.matevz
2012-06-26 01:00:06 +01:00
Erthilo
053ffb837e TG: -Wallets now have sprites for holding silver head IDs and red Centcom IDs.
-New spare ID box sprite. New pill-bottle box sprite.
-Added spades for botanists who want to play with dirt.
-A spade can be found in the hydroponics supply area, along with a couple spare
tools useful for the job.
Revision: r3782
Author: 	 d_h2...@yahoo.com
2012-06-26 00:26:41 +01:00
caelaislinn
564390774f fix for "Energy radiating from the /datum/artifact_effect"
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 22:49:47 +10:00
CIB
d8a5824cbc Merge pull request #1392 from Erthilo/master
Medical System Updates + Bug fixes
2012-06-25 02:52:05 -07:00
caelaislinn
c46d2920a6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-25 18:07:47 +10:00
CIB
47aca7ca44 Merge pull request #1393 from CIB/master
Fixed a derp
2012-06-24 19:30:27 -07:00
cib
7f5db7ab68 Fixed BE_CULTIST/BE_PAI derp. 2012-06-25 04:27:19 -07:00
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
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
caelaislinn
021ddbde38 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-24 16:36:47 +10: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
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