cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 08:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,968 Commits 29 Branches 2 Tags
cc2aaf1731b8ec438b5cf06ef0aecd7b7e250913
Commit Graph

5228 Commits

Author SHA1 Message Date
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
0021fe1f49 Nerfed changeling absorb objectives to 2-4 2012-08-06 15:24:50 -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
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
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
Albert Iordache
27920a6c59 Merge branch 'mechrevert' of https://github.com/Nerezza/Baystation12 into Nerezza-mechrevert 
Conflicts:
	code/game/mecha/mecha.dm
 2012-08-04 22:48:25 +03: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
321e8e9e21 uncommented some missing supply datums 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-05 02:21:45 +10:00
Albert Iordache
0fd0f5dbf0 Merge pull request #1571 from caelaislinn/master 
compile fixes
 2012-08-04 04:03:01 -07:00
Albert Iordache
e685276c91 Merge pull request #1569 from FireFishie/map3 
Minor map changes and a changelog
 2012-08-04 04:00:04 -07:00
Cael_Aislinn
6d0058a31e fix for contraband >.>, also simple_animals can't buckle themselves in now 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:58:53 +10:00
Cael_Aislinn
8d4f6a8efe admins can change the serial number of a rolled up poster to change the poster decal type when applied. note that you'll need to change the name of the rolled up poster to reflect this if you want to avoid confusion 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 20:00:59 +10:00
CIB
429b04149a Merge pull request #1570 from caelaislinn/master 
various simple_animal tweaks, fixes and improvements
 2012-08-04 02:48:55 -07:00
CIB
e0c67241cf Added cyborg to jobbans for security etc. 2012-08-04 12:41:50 +03: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
2cb704f617 tweaks and fixes to a couple of supply crates 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 16:23:23 +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
0b14f97af0 hardcap for vermin spawning (30, editable via gameticker) 2012-08-04 15:44:02 +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
FireFishie
01765aa13d Changed name of Warden to Warden's Office 
-This resolves issue 1490
 2012-08-03 21:55:22 -04:00
Mloc
35ac90da8f Merge pull request #1568 from SkyMarshal/BugFixes 
Runtime fix
 2012-08-03 14:09:42 -07:00
SkyMarshal
55adee1723 Runtime fix 2012-08-03 14:08:07 -07:00
CIB
9fa25a84ce Merge pull request #1563 from FireFishie/belts 
Added some belt storage options
 2012-08-03 14:06:13 -07:00