cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-10 17:42:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,707 Commits 26 Branches 2 Tags
4fd1322dcf5c847b62c06edea36a3fff25c3545f
Commit Graph

2246 Commits

Author SHA1 Message Date
Chinsky
21a19d46cb Fixed typo, now slur should properly fade away. 2012-10-20 22:05:57 +04:00
cib
01ba3871ca Fixed the bug where 'Show Own Skills' wouldn't work. 2012-10-18 15:33:46 +02:00
cib
d90944ad50 Several medical related changes. 
- There's now internal wounds
- Appendicitis stage 4 causes internal wounds
- Added back the body scanner
 2012-10-18 12:39:04 +02:00
Chinsky
92276c9887 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/new_player/new_player.dm
	html/changelog.html
 2012-10-18 09:13:24 +04:00
Asanadas
0ba466e881 Removing Soghun stutters, fix for infinite BoH in BoH. 2012-10-17 19:18:17 -04:00
cib
a1aa3ddecf Ported limb selection. 2012-10-17 20:08:34 +02:00
cib
463178213c You can now pick opposite gender hairstyles. 2012-10-17 18:53:00 +02:00
Mloc
351a233f5f Arrivals runtime fix, thanks to Head! 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-10-17 16:07:19 +01:00
Chinsky
44934ef622 Removed my highly informative and professional debug print. 2012-10-17 14:33:53 +04:00
Chinsky
45e40c09c0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-10-17 14:12:41 +04:00
Chinsky
357f42028e Forgot one hairstyle. 2012-10-17 13:50:47 +04:00
Chinsky
f0c4e3e965 Ported some of hairstyles. 2012-10-17 04:50:49 +04:00
Chinsky
0c97d77d77 Fixes issue with slurring never going away. 
Ethylredoxrazine now properly fights alcohol effects.
 2012-10-17 03:28:10 +04:00
Chinsky
fbc26fde61 Fixed Arrivals runtime. Does not fix issue of it not announcing arrival though. 2012-10-17 03:24:39 +04:00
cib
7fccadfc89 Ported AutoTraitor. 2012-10-16 18:44:53 +02:00
DarkTechnomancer
981481ca56 Fixed nutrition-related messages showing up twice in the examine verb and ported pulling damage back in. 2012-10-16 00:10:40 -04:00
headswe
f296f9c3c8 Merge pull request #1761 from caelaislinn/bs12_with_tgport 
misc merge things
 2012-10-15 10:59:58 -07:00
headswe
3e94d7a682 Merge pull request #1768 from CIB/master 
Bleeding fixes
 2012-10-15 10:59:27 -07:00
Chinsky
468752ea6d Ported BS12 slur. 
Sorta. Can't use html in said strings, so it will look a bit different.
 2012-10-15 20:14:34 +04:00
cib
19846abebe Halved bleeding speed. 2012-10-15 15:13:49 +02:00
Cael_Aislinn
d38cf3da27 re-enabled alien player's hair and facial hair 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-15 21:43:40 +10:00
Cael_Aislinn
e00a696a40 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport 2012-10-15 20:57:54 +10:00
Chinsky
8427947bd7 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/datums/organs/organ_external.dm
	code/modules/mob/living/carbon/human/human.dm
 2012-10-14 20:39:26 +04:00
Cael_Aislinn
4e08f61642 made the alien player limit a config option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-14 13:59:50 +10:00
headswe
10f32d1351 Merge pull request #1760 from DarkTechnomancer/master 
Fixed flavor text
 2012-10-13 20:10:18 -07:00
DarkTechnomancer
4bf6833a62 Fixed flavor text 2012-10-13 19:27:43 -04:00
headswe
c04c26fa29 Merge pull request #1759 from headswe/master 
Fixed Organspam (Maybe)
 2012-10-13 15:44:42 -07:00
Head
085d357b4b Hopefully fixed organ spam. 2012-10-14 00:43:23 +02:00
Chinsky
c3b53af100 Commiting for the night, in case KGB steals my laptop. 
Pretty much finished surgery system.
-working appendectomy, bone surgery, eye surgery, face surgery, brain surgery (humans only) and metroid core surgery.

-moved operation stages tracking vars to one op_stage datum. Left brain opstage var alone because way too many things reference it.

-added bone gel and bone setter.

-added check for surgery tools, so new doctors won't beat shit out of patients on optable too often.

-pretty much emptied surgery_tols.dm, it was unneeded by this point.

Still need to test it more, slap sanity checks everyfuckingwhere.
Also more literate messages written with help of trained monkey (faux).
 2012-10-14 02:15:23 +04:00
cib
160328741e Made the human/drip() proc produce larger pools. 2012-10-13 10:08:12 -07:00
cib
31093ce666 More messages for low blood. 2012-10-13 09:59:17 -07:00
cib
e77afd5ab9 Added bleeding and blood transfusion. 2012-10-13 09:45:33 -07:00
cib
4f1d301880 Examine now only reveals you're dead by checking pulse. 2012-10-13 08:57:03 -07:00
Chinsky
341275fa69 Fixes get_organ not working properly for eyes and mouth target zones. 2012-10-13 19:35:16 +04:00
cib
98386354bb Fixed a bug in radio code where it would expect the user to be a human. 2012-10-13 06:37:18 -07:00
cib
9c55f8c8ac Ported BS12 medbots. 2012-10-13 06:33:05 -07:00
cib
8dc75dfa3c Fixed the problem where :h would be holosay even for cyborgs. 2012-10-13 05:46:09 -07:00
Chinsky
9cc4470af8 Fixes lack of children organs. 2012-10-13 16:26:15 +04:00
cib
9ae4bbfdf8 Fixes the say_quote runtime. 2012-10-12 16:15:34 -07:00
cib
c0e0e7d116 Remove the silly examine messages that give away wounds even when under clothing. 2012-10-12 15:47:01 -07:00
cib
c691f76c65 Small bug with engineering cyborg radio channels. 2012-10-12 15:34:40 -07:00
cib
e05b9fa2b6 Fixed a runtime with organ generation. 2012-10-12 15:03:32 -07:00
cib
06d47ea2dd Cyborgs can now use their respective channel. 2012-10-12 14:56:34 -07:00
cib
32e839f683 More and yet more fixes from the piratepad. 
- AI laws now default to Nanotrasen laws
- Removed half the random events
- Milk now in chem dispensers
- Hunger rate decreased by half
 2012-10-12 14:25:54 -07:00
cib
89263fc9f6 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-10-12 13:19:20 -07:00
cib
8c157bff18 Added missing groin. 2012-10-12 12:36:25 -07:00
Mloc
046348db49 Merge pull request #1744 from CIB/branch 
Several changes to organs + bugfix
 2012-10-12 12:15:57 -07:00
cib
99313f5a94 More fixes to wounds. 
- Added more wound descriptions
- Wounds now have "bleeding" and "bandaged" in their examine description
 2012-10-12 12:08:00 -07:00
Mloc
33a3d3cd97 Merge pull request #1738 from CIB/master 
Dismemberment
 2012-10-12 09:42:31 -07:00
Cael_Aislinn
6d4e17ac32 fix for alien species limiter bug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-10-12 23:36:10 +10:00