cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-02 21:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,011 Commits 26 Branches 2 Tags
bca7ff054e98ef4cd1a5204c96202df31f5bb4c8
Commit Graph

1493 Commits

Author SHA1 Message Date
headswe
8103abcd9f Merge pull request #1583 from CIB/cib 
Full wound system rewrite - Tested and ready to merge
 2012-08-10 09:18:28 -07: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
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
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
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
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
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
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
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
Cael_Aislinn
52fdda910a mice can crawl through vents and hide under objects 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 21:03:16 +10:00
Cael_Aislinn
bece31d819 fix for mouseception naming bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 20:00:43 +10:00
Cael_Aislinn
eaa28099d3 compile fixes, more tweaks 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:52:17 +10:00
Cael_Aislinn
2b2017126a tweaks to simple_animals, carps no longer freeze / require oxy to live (but rapidly burn up from 25+ degree temp), kobolds no longer require oxy to live 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 03:13:49 +10:00
Cael_Aislinn
93f864083c doubled zas debug sensitivity, some tweaks to mouse/ghost spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 19:23:40 +10:00
Cael_Aislinn
714a9b120f compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:56:18 +10:00
Cael_Aislinn
46a450069e - simple_animals can't open doors by default 
- alien larvae, mice can hide under mobs
- roaches, mice can hide under various objects
- various tweaks, including flavour and existing mechanics
- fix for ghosts not being able to spawn as mice
- added move delay of half a second to simple_animals (about the same as human walkspeed?)
- simple_animals, when talking, can only understand each other (and mobs with universal_speak)

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 15:47:56 +10:00
Cael_Aislinn
c4ba455f35 added var to /mob to allow some mobs to share spaces 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 13:12:17 +10:00
Cael_Aislinn
4a460f24f3 compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 04:07:54 +10:00
Cael_Aislinn
08f47799e1 ghosts/observers can possess mice at will 2012-08-04 03:57:16 +10:00
Cael_Aislinn
7401f53d75 tweaks to vermin spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 03:41:59 +10:00
Cael_Aislinn
6e0046c77d players who died while in control of simple_animals should now have their name display properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 01:42:48 +10:00
Cael_Aislinn
fd7ddfa11a removed all kobold speak messages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 00:28:48 +10:00
Cael_Aislinn
10d40abb25 fix for kobolds doing things while dead 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:30:23 +10:00
Cael_Aislinn
f3180fed6d possible fix for recent crash /shrug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 18:47:14 +10:00
Cael_Aislinn
e9d68bd249 vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:39:00 +10:00
Cael_Aislinn
7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 04:56:48 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters 
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
 2012-08-02 03:22:44 +10:00