cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-25 01:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,549 Commits 74 Branches 23 Tags
2d15506667b51bb5838eb20b25a0fede91ba6ca9
Commit Graph

4429 Commits

Author SHA1 Message Date
Chinsky
beb028d196 Using spawn in proc that deletes self was not so smart... GC outrun me. 2012-11-17 00:17:50 +04:00
Mloc
49a81a62b5 Merge pull request #1964 from AterIgnis/tajdarkee_iconsupd 
Icons Updated & Tajarnan Darksight
 2012-11-16 12:11:00 -08: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
Chinsky
262315d15c Added chance to get hands bloody during operation. 
Or being covered in blood when you nick an artery.
Moved bloodying code in separate procs.
Made possible to force wounds to be internal, made some wounds in failed surgery steps internal.
 2012-11-16 13:49:28 +04:00
Cael_Aislinn
7b7a200155 added nullcheck to ZAS func, fix for severed powernets still being connected 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-16 18:53:03 +10:00
Mloc
aab9c1b946 Merge pull request #1952 from comma/master 
More fixes for the fix throne.
 2012-11-15 12:52:48 -08:00
Chinsky
cda5f5c755 Fixes buckled people being still buckled after teleportation with artifact. 
Issue #1854
 2012-11-16 00:49:49 +04:00
Chinsky
a1ccbfe198 Fixes issue #1889 
Timers, proxy and other trigger =RSD= properly again.
 2012-11-15 23:39:28 +04:00
Mloc
be9ab53289 Merge pull request #1951 from CIB/master 
Fixes
 2012-11-15 10:47:47 -08: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
7af340aa59 Merge pull request #1950 from comma/master 
Fixes, fixes.
 2012-11-15 08:49:09 -08:00
Chinsky
0fe526aa91 Fixed something with artifacts. 
I have no idea what but it was broken and now is fixed.
Possibly runtime, most likely just artifact's effect is not working on any organ.
 2012-11-15 18:04:54 +04:00
Chinsky
3f0eb4836f Ported some crate types frpm pre-merge. 
Moved posters to arts crate and lipstick with cigs to party crate.
Contraband crate now has killer tomato seeds, illegal booze and drugs.
 2012-11-15 17:17:56 +04:00
Cael_Aislinn
addb95137c made autoinjectors visible again, fixed medibot construction, fixed tajaran ears while lying down 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-11-15 21:02:04 +10: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
Hawk-v3
31a40885b5 Merge pull request #1938 from SkyMarshal/bugfixes 
Fixed a compile warning, Possible fix for adminhelp-IRC relay, readded unbolting AI and associated traitor checks, reverted my grenade changes.
 2012-11-14 10:29:21 -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
b4d335e077 Merge github.com:Baystation12/Baystation12 2012-11-14 13:33:01 +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
SkyMarshal
508f94a072 Possible fix for why IRC is not getting adminhelps. 2012-11-13 22:14:10 -07:00
MrYeti
2b56956d67 Added Smash Recipe Custom Item 2012-11-13 19:56:52 -05: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
Chinsky
058aa7a795 Fix for training gun runtime. 2012-11-13 01:42:11 +04:00
Mloc
d659b567a4 Fix for practice lasers. 
Addresses #1924
 2012-11-12 20:21:30 +00:00