Commit Graph

5300 Commits

Author SHA1 Message Date
Cael_Aislinn
dca3f3bd8a reworked/verbosified some zas debugging, added additional zas debugging, made kill_air available to game_admins as well as game_masters, increased runtime check sensitivity to aid in debugging
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 18:12:59 +10:00
Cael_Aislinn
15fa23331b custom id cards should be able to access atms
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 14:51:59 +10:00
Cael_Aislinn
2abbd8ce6b compile fix, tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 04:53:29 +10:00
Cael_Aislinn
ab0fe32f84 additional debugging tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 04:49:18 +10:00
Cael_Aislinn
9307b00513 tweaks to simple_animal emotes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 04:42:44 +10:00
Cael_Aislinn
34000482c7 additional zas debugging, kill_air output made a bit more informative
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 04:42:26 +10:00
Cael_Aislinn
06f223ec6a ghosts properly retain their human names
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 03:29:20 +10:00
Cael_Aislinn
d817bbb490 more verbose zas debugging, decreased runtime sensitivity by half again, and reset the counter every time a tick is successful
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-09 03:19:50 +10:00
Mloc
0d94175887 Merge pull request #1585 from comma/master
Surgery fixes and tweaks
2012-08-08 06:44:45 -07:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
2012-08-08 13:21:47 +04:00
Cael_Aislinn
e4600a8fa7 tweaks / fixes to carp a bit, removes munchkin from tgstation.dmm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-07 21:23:55 +10:00
cib
6b6d037b51 Fixed a few mistakes with captain's suit storage unit. 2012-08-07 03:01:46 -07:00
cib
8ee4280e73 Moved the captain's space suit to a secure position in EVA. 2012-08-07 02:33:30 -07:00
cib
c6054e06ec Fixed a derp with damage types. 2012-08-07 00:18:53 -07:00
cib
5785c817f8 Added a few hacks to make wound processing happen less often. 2012-08-07 00:01:40 -07:00
cib
2a993ffee4 Adjusted healing speed for the amount of wounds per wound object. 2012-08-06 23:26:26 -07:00
cib
8a2a1b58ca Two fixes to joint wounds. 2012-08-06 23:17:07 -07:00
cib
7bbc98e9da Wounds of the same type are now handled in the same object. 2012-08-06 23:04:47 -07:00
cib
bf82cc0023 Healed wounds now disappear after a while. 2012-08-06 22:55:14 -07:00
CIB
0021fe1f49 Nerfed changeling absorb objectives to 2-4 2012-08-06 15:24:50 -07:00
cib
cc2aaf1731 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/life.dm
2012-08-06 15:18:27 -07:00
cib
5b342bd217 A few last balance fixes to wounds. 2012-08-06 14:52:27 -07:00
cib
02457fc55b Fixed up bloodloss a bit more. 2012-08-06 14:21:34 -07:00
CIB
791e481d6e Removed a lagtastrous item 2012-08-06 14:12:04 -07:00
cib
b4f1c4ed9f Fixed yet another derp with organs 2012-08-06 14:01:36 -07:00
cib
22c627901b Fixed a very silly mistake with wound healing. 2012-08-06 13:23:32 -07:00
cib
45a0eac4e7 Small fix to widening wounds. 2012-08-06 13:19:45 -07:00
cib
279bcc1851 Reduced blood regen significantly. 2012-08-06 13:13:40 -07:00
cib
35d82b3789 Increased the chance of wounds ripping open. 2012-08-06 13:11:48 -07:00
cib
2d751104ae Fixed an issue with wound creation 2012-08-06 13:00:43 -07:00
cib
71e3d50399 Bugfix to healing organs 2012-08-06 15:45:21 -07:00
cib
bdffd60cc9 Balanced out wound healing. 2012-08-06 15:21:03 -07:00
cib
b89e913445 Slowed down healing a little.
Also a minor fix to examine.
2012-08-06 15:08:29 -07:00
cib
76c06283f4 Fixed another derp with organs 2012-08-06 13:58:59 -07:00
cib
1f6231c174 Fixes some more merge issues 2012-08-06 13:48:21 -07:00
cib
9b9d541a25 Fixed response_team.dm indentation. 2012-08-06 13:43:39 -07:00
cib
f13a961a65 Merge branch 'cib' of github.com:CIB/Baystation12
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/living.dm
	code/modules/mob/organ/organ.dm
	code/setup.dm
2012-08-06 13:36:26 -07:00
cib
2be19a15ba Minor bugfix to new organs. 2012-08-06 13:28:02 -07:00
CIB
fafe55632b Merge pull request #1582 from FireFishie/hat2
Captain's cap is now a hat
2012-08-06 12:52:04 -07:00
cib
0c67bc7439 Restructured the organ wound system.
Wounds are now datums rather than pure text, which means wound descriptions in examine will now always be in line with the actual damage of the mob.
2012-08-06 12:51:18 -07:00
comma
fe41c6ea1e Stops processing metroid's life after it's dead.
Fixes issue #1463

Signed-off-by: comma <krauchinsky@gmail.com>
2012-08-06 21:11:58 +04:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore.
Fixes issue #1454
2012-08-06 19:34:59 +04:00
comma
2e6da1ab7a Surgery changes.
Gameplay-wise:
-Made all messages consistent, no more message about 'beginning' to do something when actually it's done. (Addresses Issue #1540)
-Now to attack patient on table with surgery tool you need to have harm intent (Addresses Issue #1540)
-All surgeries now have delays and begin/finish messages on each step, much like bone surgery.

Code-wise:
-All code handling surgery steps was moved in appropriate procs for each tool, to get rid of one HUGE attack proc.
Now attack proc checks for prereqs for surgery (like masks covering face), checks for targeted zone and calls needed proc.
-Deleted all code that handled messages for when user performs surgery on himself, because that's honest to god dead code. You need to be down to get surgery don on you, and you can't use tools while down. So until something is changed, those messages removed to improve readability of code.
-Added interrupt proc, that handles interruptions during surgery for each tool. For now all types of surgery handled the same, may be implemented differently later.

Signed-off-by: comma <krauchinsky@gmail.com>
2012-08-06 19:07:48 +04:00
Cael_Aislinn
f52eb099f7 tweaks, fixes and additions to carp and simple_animals
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-07 00:03:56 +10:00
cib
7be97d0d9f Updated response team fluff 2012-08-06 13:42:31 +02:00
FireFishie
9b4cdb357e Captain's cap is now a hat
-Traded the Captain's cap back for the hat, as the cap is actually not all that sensible
2012-08-06 06:50:31 -04:00
Cael_Aislinn
bc58cbe6a3 fix for announcement bug
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 17:21:46 +10:00
Cael_Aislinn
3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 05:13:02 +10:00
Cael_Aislinn
136b8e44e3 oops
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 00:17:05 +10:00
Cael_Aislinn
d7bd58b8f3 roach remains have a bit more substance now
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-05 21:47:03 +10:00