cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 23:21:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,126 Commits 26 Branches 2 Tags
14bbdc91ca7f2a58ca44c31df5cee95219ccb153
Commit Graph

2814 Commits

Author SHA1 Message Date
Christian Bielert
14a96f77ab Merge pull request #2539 from comma/organ 
Organ code restructuring
 2013-03-16 07:10:40 -07:00
Chinsky
8ec33904dc Moved ruptured lung effects into lung processing 2013-03-15 18:28:44 +04:00
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-15 20:37:35 +10:00
Chinsky
13b6b2f61b Moved organ and blood code to module folder. 
Moved most organ and blood procs to that folder.
Refactored handle_organs a little.
Added comments in some places.
 2013-03-14 11:52:53 +04:00
Chinsky
f8ae612991 Open incisions in surgery now bleed until closed or clamped. 2013-03-14 04:23:07 +04:00
Chinsky
7e82d9064c Head blows now can cause brain damage. 2013-03-11 04:59:24 +04:00
Chinsky
52ad4929d1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:43 +04:00
Chinsky
b207349c44 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-11 01:18:10 +04:00
Chinsky
ced88e1569 Ported HUD functionality. 
Sec HUDs showing brief of sec record.
Med HUDs changing status and showing brief of med record.
 2013-03-11 01:11:56 +04:00
Chinsky
611bd1c6e9 Removed ability to use radio while stunned again. 2013-03-11 00:38:16 +04:00
Chinsky
e60bef91bd Added indication for when someone speaks into radio. 2013-03-11 00:27:18 +04:00
Cael_Aislinn
f8f9397636 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	icons/obj/library.dmi
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-10 23:01:33 +10:00
Christian Bielert
10c3beae24 Merge pull request #2514 from comma/master 
Goatee fix.
 2013-03-10 05:01:50 -07:00
Chinsky
cf423fe979 Fixed Goatee and Male Skrell Tentacles. 2013-03-10 15:37:33 +04:00
Chinsky
cce3e8e4e9 Merge pull request #2503 from CIB/feature 
Improved brainloss effects.
 2013-03-09 05:48:19 -08:00
cib
58186ce7e0 Improved brainloss effects. 
- Will drop items/fall down with a lot of brainloss now, headache and blurry vision with small brainloss.
- Removed stupid effects, like random messages and headbutting airlocks.
- Cloning now will leave you at lower health and cause small amounts of brainloss.
 2013-03-09 10:35:20 +01:00
Christian Bielert
c31abc3b05 Merge pull request #2502 from comma/gunmode 
Aiming Mode
 2013-03-09 00:13:19 -08:00
Asanadas
b82070ecd8 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-03-06 18:10:47 -05:00
Chinsky
5a916019de Refactored and moved targeting code around a little. 
Refactored suicide and point blank shooting code to use their projectiles properties instead of huge chain of conditions with arbitrary values.
 2013-03-07 00:44:28 +04:00
Chinsky
55671d7485 Merge branch 'guntest' of https://github.com/Whitellama/Baystation12 into gunmode 
Conflicts:
	code/modules/mob/living/simple_animal/simple_animal.dm
	icons/mob/screen1_old.dmi
 2013-03-06 17:04:45 +04:00
Cael_Aislinn
53793fc2aa Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/storage.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-03-06 19:03:18 +10:00
cib
aa4deb2b89 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 2013-03-04 12:20:38 +01:00
cib
65b8eafe8e Added internal organs. 
They can be hurt by their parent organ getting hurt.

Ruptured lungs are now represented as damage to the lungs internal organ.
 2013-03-04 12:19:12 +01:00
Zuhayr
6c15bb5bfa Forgot to update the emag code so that the bots explode. 2013-03-04 04:14:44 -08:00
Zuhayr
810c9bea70 Added verbs to spiderbot, tweaked access. 2013-03-04 03:26:52 -08:00
Zuhayr
3774b16839 Made spiderbots buildable, animated spiderbot sprites. 2013-03-02 02:15:39 -08:00
Zuhayr
e17038636f Added spiderbots! Adminspawn only currently. They take an occupied MMI or posibrain, can crawl through vents and hide, shock people, and go 'beep'. 2013-03-01 14:28:58 -08:00
Zuhayr
15984f6a14 Fix for posibrains, modification to posibrain brainmob for admin use, updated posibrain sprites, addition of spiderbot sprites for a later project. 2013-03-01 01:38:32 -08:00
Chinsky
97b547d5d3 Merge pull request #2440 from Zuhayr/master 
Robot changes, Set Flavour verb.
 2013-02-25 01:19:08 -08:00
Zuhayr
36038d150c Returned Set Flavour Text to humans, added Set Pose and Set Flavour Text to robots. 2013-02-25 20:05:33 -08:00
Zuhayr
2381aa2dca Rename of cyborgs to robots (in strings), addition of robot spawn name-choosing proc, addition of method for removing robot brain. 2013-02-25 19:48:00 -08:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch 
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 14:27:44 +10:00
Cael_Aislinn
fad9909b78 mice dont wander when asleep, they also snuffle (snore) occasionally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:38 +10:00
Cael_Aislinn
fed198964f fixed ooc runtime, removed random space in adminpms, removed forced disabling of stat tracking >.> 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-25 13:45:13 +10:00
Chinsky
3b95009189 Commented out debug verb just in case. 
Does not really affect anything, but may get a bit resource heavy if spammed.
 2013-02-23 00:45:54 +04:00
Chinsky
2ce64b77a7 Merge branch 'necrosis' into bleeding-edge-freeze 2013-02-22 23:46:54 +04:00
Chinsky
a8fdc16729 Debug verb to check how long it would take for gangrene to kick in. 2013-02-22 23:13:22 +04:00
Chinsky
f50fd49032 Gangrene! 
Now germ level for organ has three thresholds.
LEVEL 1: Occasional (prob(10) every tick) tox damage and germ level raise.
LEVEL 2: In addition to that, tox damage and germ level raise every tick.
LEVEL 3: Limb necrosis. Currently does nothing but icon change. Also at this stage germs start leaking to connected organs, so amputations is necessary.
 2013-02-22 23:12:27 +04:00
Cael_Aislinn
3c3d19ade8 added missing config links, added holder rights check to hearing deadchat 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 01:31:52 +10:00
Cael_Aislinn
43e58aacbb new unathi hair styles 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:46:33 +10:00
Cael_Aislinn
389be7d4cf NPC mice periodically fall asleep 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2013-02-23 00:45:48 +10:00
Christian Bielert
f2b9816810 Merge pull request #2389 from comma/bleeding-edge-freeze 
Guns, medicine and fixes.
 2013-02-20 13:22:57 -08:00
Chinsky
69c32e1e61 Merge branch 'bleeding-edge-freeze' into gun 2013-02-20 10:22:12 +04:00
Zuhayr
d261e3836f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-02-20 12:36:22 -08:00
Zuhayr
cdb3907493 Binary file merge conflict. 2013-02-20 00:28:14 -08:00
Zuhayr
1fe4cbb619 Added a mantle and robe for Unathi to wear, added weldermask vision reduction for Unathi helmets, changed instances of soghun to 'Unathi' where needed. 2013-02-20 00:24:26 -08:00
Chinsky
0eca1bd4e4 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-02-19 18:46:29 +04:00
Chinsky
261577317e Merge pull request #2373 from CIB/master 
Several bugfixes
 2013-02-19 06:44:05 -08:00
RavingManiac
839d4cb6c8 Added var/small to mobs, which currently only handles if they can open airlocks. This replaces the use of ismouse(). 2013-02-19 22:10:27 +08:00