cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-01-23 15:33:34 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,218 Commits 8 Branches 26 Tags
8947dc7a0e976b5903c2efe354f2ef9f41bd151f
Commit Graph

2390 Commits

Author SHA1 Message Date
cib
8947dc7a0e Lung damage now occurs pressure-based, not oxyloss-based. 2012-11-18 15:48:38 +01:00
Chinsky
ea4f34d53c Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/ZAS/FEA_system.dm
 2012-11-17 00:20:23 +04:00
Chinsky
beb028d196 Using spawn in proc that deletes self was not so smart... GC outrun me. 2012-11-17 00:17:50 +04:00
Chinsky
f520a79384 Added logging for what I believe to be cause of CPR failing. 
Apparently SOMEHOW it goes into shake proc where it quietly returns meeting check for health being above zero.
I ahve no idea why it is not stopped bu check right before the shake proc call, that's what logging is for, maybe health was computed incorrectly, or threshold for crit is wrong.
 2012-11-16 21:12:55 +04:00
Chinsky
650dc3dab8 Changed way CPR lock works, no dependancy on world time.stored time now. 
When someone starts doing CPR, it locks. After 3 ticks after CPR is done it unlocks. No other mobs can do CPR on same mob while it is locked.
((also it's one of places that can make CPR not start so I wanted ot replace timer with more simple semaphore))
 2012-11-16 20:11:28 +04:00
Ater Ignis
8c5b8f8d50 final pass of merging with my branch 
I hope I have not forgot anything
Still, it compiled for me at least, and passes test cases i did
 2012-11-16 18:54:43 +04:00
Ater Ignis
4ed9b40cb9 tajarans see_in_dark -> 8, disembodied organs rendering correction 2012-11-16 18:41:26 +04:00
Ater Ignis
7f55f25ead comments, and better hulk color 2012-11-16 17:06:47 +04:00
Ater Ignis
cc79346c3b forgot one row 2012-11-16 16:02:36 +04:00
Ater Ignis
c140e3b7d0 update to remote view 2012-11-16 15:55:41 +04:00
Ater Ignis
46bd2ce7e6 human icon generation update, tajarnan darkseeing 
*lying icon generated from standing one
*sprites for dismembering major races (tajarnan,skrell,soghun)
*tajarnans can see in darkness better than others
 2012-11-16 15:19:20 +04:00
cib
b6f16cb62a Fix for the emote fix. 2012-11-15 19:07:45 +01:00
cib
866a113494 Fixes for issue #1872 2012-11-15 18:40:24 +01:00
cib
1213a50298 Removed alien player limit. 
I don't want to know what will happen now, considering medbay *already* was more than 50% non-humans most of the time.
 2012-11-15 18:09:33 +01:00
Mloc
9ca5caa419 Fixed the fix of the movement fix thing. Or something. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-11-14 21:39:49 +00:00
Mloc
7cd054e09a Merge pull request #1941 from CIB/master 
Ported autopsy
 2012-11-14 13:29:20 -08:00
cib
19d2e9d390 Made the autopsy report for projectiles a bit clearer. 2012-11-14 21:33:09 +01:00
cib
2b5d3cac39 Fixed a few organ getter bugs. 2012-11-14 20:59:38 +01:00
cib
7ae7099098 Ported autopsy. 2012-11-14 20:31:31 +01:00
Hawk-v3
317e40795a Merge pull request #1939 from CIB/master 
Misc stuff
 2012-11-14 10:29:57 -08:00
cib
09cbf1f684 Fixed a compile error. 2012-11-14 16:45:22 +01:00
cib
450248864b Added lung rupturing and lung surgery. 2012-11-14 16:20:47 +01:00
cib
e5b62c98c6 Restructured alien removal surgery. 
This way it later can be used for lung surgery.
 2012-11-14 13:54:18 +01:00
CIB
274d422cd4 Nerfed suffocation speed. 2012-11-14 11:26:56 +01:00
SkyMarshal
2fece529af Fixed a compile warning, reverted my grenade changes as requested by mangled, readded unsecuring-of-the-AI-with-a-wrench and the associated traitor objective checks, tweaked my previous commit re:adminhelps. 2012-11-13 22:46:43 -07:00
cib
422ec63bfc Merge branch 'master' of github.com:Baystation12/Baystation12 
Conflicts:
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/human.dm
 2012-11-13 19:01:03 +01:00
cib
78ed2e54eb Added alien surgery. 2012-11-13 18:22:48 +01:00
cib
3dc4a56554 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-11-13 15:39:38 +01:00
Chinsky
e5706a55d3 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-13 10:12:45 +04:00
Ispil
8814647be5 Fix to AIs and Cyborgs being able to "fall asleep" when they log off, but not being able to wake up when they return. They should no longer fall asleep. 2012-11-12 21:15:26 -07:00
Ispil
0a4d79e54f Fix to Tajaran/Skrell/Soghun not mrowling/warbling/hissing, respectively. 2012-11-12 20:39:42 -07:00
Chinsky
8e60315b11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2012-11-13 04:02:26 +04:00
Chinsky
94b54d1cef Fix for laughing gas leaks in surgery. 
Humans breath out same gas mix datum they breathed in.
Works fine because in processing oxygen and CO2 levels in mix are adjusted.
But trace gases remained untouched.
So sedated patient just breathed out N20 at surgeon.
 2012-11-13 03:42:40 +04:00
Chinsky
0caf4673ce Fix for sleep runtime. 
Fix for internals setting message.
 2012-11-13 02:05:13 +04:00
Mloc
daac550822 Revert movement speed changer glide thing I DONT KNOW THE NAME AAAH. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-11-12 21:54:16 +00:00
cib
95181d96a8 Several fixes to germs. 2012-11-12 13:17:11 +01:00
cib
e92cecdefe Added basic germ code. 
This will only trigger in surgery for now - That is when you cut someone open in surgery, you'd better wash your hands before, or otherwise you'll get infected wounds.
 2012-11-12 12:51:28 +01:00
Mloc
ba3a9d37b2 Merge pull request #1916 from Kreastr/master 
Setting proper gliding_size for mobs and objects.
 2012-11-11 14:01:46 -08:00
SkyMarshal
ecdb9ab118 Fixed the sillies marked with "skytodo". Removed ONESIZEFITSALL flag as we removed fatness, replaced it with PLASMAGUARD flag as that is what we were using the value as previously. Firedoors should no longer be derpy. The remaining "skytodo"s are places where I have no idea what the fuck you wanted or no idea what the fuck needed done with it. 2012-11-11 14:33:33 -07:00
Kreastr
9ddc1d02d9 Merge branch 'master' of git://github.com/Baystation12/Baystation12 
Conflicts:
	code/modules/mob/mob_defines.dm
 2012-11-11 16:43:28 +02:00
Kreastr
0fe02fcd27 More clean up 2012-11-11 14:39:22 +02:00
Ravensdale
8cc22cbb15 Adjusts AI code to bring back custom cores and makes it easier to add in more. 2012-11-10 21:42:30 -08:00
Mloc
35132b3036 Merge pull request #1901 from AterIgnis/hud_intent_better 
all-intents-intent-button
 2012-11-10 08:58:39 -08:00
Ater Ignis
20bdba6c67 all-intents-intent-button 
shows all possible intents on intent button and allows choosing needed one directly, without scrolling them all
 2012-11-10 14:19:02 +04:00
Ater Ignis
8b71b7d106 updated DNA code to have more mutations 2012-11-10 14:12:25 +04:00
SkyMarshal
1eb2ceb643 Removed the /TG/ "feature" which has explosions insta-gib dead people. THIS IS WHY I HATE THE MERGE. 2012-11-09 22:30:38 -07:00
Ater Ignis
af0593e07b Chemistry on child reagents and in mobs 
Ethanol childs (most drinks in general) are treated as ethanol in reactions
Reactions are going inside mobs, but not make bubbling effect
 2012-11-09 20:53:20 +04:00
Chinsky
f45855078b Admin revive now fixes beheaded peps. 2012-11-09 20:29:03 +04:00
Chinsky
73ebc5c248 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-11-09 20:13:09 +04:00
Chinsky
7a8899cf42 Updated admin revive to work with organs and bloodloss 2012-11-09 18:03:57 +04:00