cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-21 12:02:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,232 Commits 94 Branches 23 Tags
TGSDMAPI
Commit Graph
317 Commits
Author SHA1 Message Date
PsiOmegaDelta e90bfad7de Merge pull request #11935 from comma/wounds 
Limb reattachment heals missing limbs now
 2016-01-11 17:37:25 +01:00
PsiOmegaDelta 2740858cfe Merge pull request #11934 from comma/malpractice 
Can use items on roller/optable people on help intent
 2016-01-11 17:37:15 +01:00
Chinsky 46bcfd96f8 Changes to limb reattachment - now when limb is attached, wound from it not being there is removed. Because you know, it's there now. No more bleeding stumps with limbs already attached. 
Also fixes limbs instahealing when cut / reattached. Wounds used to be Cut() to prevent fantom wounds but, it's not needed anymore because whole limb is removed.
Also moved moving organs inside replaced() since it was called next to it anyway, and not like you can replace  organ without moving it to human. Also forceMove()
 2016-01-07 23:10:02 +03:00
Chinsky 53e1fb016e Failing to find a valid surgery step now doesn't prevent attack() from running. 
It is now possible to inject / bandage / healthanalyze patients on help intent.
 2016-01-07 21:57:26 +03:00
Chinsky e9991c99ae Fixes #11916 2016-01-07 05:47:51 +03:00
Chinsky 7af61b9a6b Fixes #11924 2016-01-07 05:43:40 +03:00
PsiOmegaDelta 185faaeb82 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/game/turfs/turf.dm
	code/modules/mob/living/carbon/human/examine.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/mob_grab_specials.dm
 2015-12-08 08:23:10 +01:00
PsiOmegaDelta 5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
PsiOmegaDelta b89e19e5a5 Merge remote-tracking branch 'upstream/dev-freeze' into dev. 
Conflicts:
	code/datums/datacore.dm
	code/defines/procs/records.dm
	code/game/machinery/camera/camera_assembly.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/mob/language/station.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	code/modules/surgery/organs_internal.dm
	html/changelogs/.all_changelog.yml
 2015-12-06 11:48:20 +01:00
mwerezak 9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
PsiOmegaDelta 89d20b9195 Updates macro/span use. 2015-12-02 09:25:00 +01:00
PsiOmegaDelta 2560c13816 Fixes hemostat surgery. 
Port of https://github.com/PolarisSS13/Polaris/pull/381.
 2015-12-02 08:56:58 +01:00
Zuhayr 5dc6ff5da1 Merge pull request #11230 from PsiOmegaDelta/xenomorphs 
Xenomorph update
 2015-10-13 08:31:27 +10:30
PsiOmegaDelta 070ca0adea Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/tanks/tanks.dm
	code/modules/holodeck/HolodeckControl.dm
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/setup.dm
 2015-10-11 17:17:41 +02:00
HarpyEagle fa86509daf Readds organ damage from failing to mend ribs 2015-10-09 18:57:17 -04:00
Zuhayr 22ef779f65 Cherrypicked xenophage-rewrite mechanics over. 2015-09-21 20:36:45 +09:30
Zuhayr 3c477dfa5e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/jobs/access.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 03:11:53 +09:30
Zuhayr bb82f80885 Added get_bodytype() species proc as groundwork for subspecies. 
Conflicts:
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/organs/organ_icon.dm
 2015-08-22 02:53:16 +09:30
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
 2015-06-26 20:28:47 +02:00
Chinsky 78784a3d9a Fixes #9933 
Also potential same issue with other scalpel subtypes.
 2015-06-25 23:59:12 +03:00
Chinsky 265b1d5b51 Fixes #9913 
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
 2015-06-25 23:51:58 +03:00
Zuhayr c2c8911aed Additional IPC tweaks. 2015-05-31 02:30:57 +09:30
Zuhayr ff5c815d01 Fixes #9487 2015-05-31 01:38:04 +09:30
Zuhayr 7dd86c9147 Readded preview icon for IPC, added language and blurb. 
Added welder/fuel checks to relevant surgery.
 2015-05-25 14:50:00 +09:30
Zuhayr f0006ec6bf Removes redundant surgery for brain and eye repair, now covered by organ repair in general. 
Attempted to limit regular surgery to non-robotic limbs and added surgical steps for robotic limbs.
Readded checks for smoking reagent transfer.
Fixes, oversights, tweaks with IPC.
Added some reagent bypassing for NO_BLOOD and some checks to various affect_touch() calls for NO_SCAN/IPC.
Added prosthetic-scanning functionality to cyborg analyzer.
Added prosthetic analysis to the robot analyzer.
Allowed people with internal cells to charge in robot chargers (IPCs).
 2015-05-25 14:49:57 +09:30
Zuhayr 958494ae75 Removed IS_SYNTHETIC and REGENERATES_LIMBS flags. 
Moved some organ code around, added icons and limbs for IPC, added IPC limb manufacturer.
Reimplementing checks in place of IS_SYNTHETIC.
Rebalancing EMP a bit for IPC.
 2015-05-25 14:49:07 +09:30
Zuhayr 3cae318716 Merge pull request #9370 from comma/frankenstein 
Frankenstein
 2015-05-25 13:56:40 +09:30
Chinsky de1de98f7a Fixed changelog 
Added some info about not quite attached limbs to examination/scanner.
Added rejection info to advanced scanner
Span classes (gotta start somewhere I guess)
Also zombie goast file pls go
 2015-05-20 09:37:54 +03:00
Zuhayr 93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Chinsky 77519d160f Generalized head reattachment to work with all limbs. 
Now you can attach your useless chunks of meat back!
Needs second step to make meat limb usable, use hemostat/cable/mousetrap.

Changes how organs 'die'. Instead of damage they now acquire germs, 2-6 points per tick, twice faster after hitting acute infection stage. Once they reach necrosis stage, they die. All in all it takes ~7 minutes for organ to go bad without a freezer.
As a bonus, you can now attach robogroins and roboheads (no brain included)
Fixes stumps being un-cuttable, which prevented all kinds of fun stuff with replacements.
Removed ORGAN_DESTROYED check from processing, take_damage should be taking care of that now.
 2015-05-19 07:09:00 +03:00
Chinsky f016d51f38 Fixes cavity surgery using old organ names 2015-05-18 06:15:09 +03:00
Zuhayr a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr 150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
Zuhayr a32179a062 Renamed knives. 2015-05-16 20:54:34 +09:30
Zuhayr 8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Kelenius 317abc6b79 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/datums/recipe.dm
	code/game/machinery/bots/farmbot.dm
	code/game/machinery/bots/medbot.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/mop.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/organs/organ_internal.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	maps/exodus-1.dmm
 2015-04-28 10:49:26 +03:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object. 
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
 2015-04-24 09:59:05 +02:00
Zuhayr fa8ee58183 Fixes a monkey runtime and updates head reattachment surgery. 2015-04-04 20:03:54 -07:00
Zuhayr 2ae7c93582 God dammit copypaste before commit. 2015-04-03 18:47:59 -07:00
Zuhayr 29cd70cbdd Fixes robot limbs not spawning subparts. 2015-04-03 06:44:52 -07:00
Zuhayr eeee0dfb9f Numerous runtime/oversight fixes. 2015-04-03 06:12:36 -07:00
Zuhayr 8def76f849 Removing some debugs. 2015-04-01 18:06:46 -07:00
Zuhayr 84b903cf69 Fixes #8702 properly. 2015-04-01 17:57:28 -07:00
Zuhayr 294a1ff1f1 Should fix #8710 2015-04-01 17:27:06 -07:00
Zuhayr c3eb6102b4 Added a few null checks. 2015-04-01 17:15:59 -07:00
mwerezak 01ce8d4a1f Fixes #8696 
Fixes #8696, and updates other usages of drop_item() where appropriate.
 2015-03-31 20:30:06 -04:00
Kelenius 41ff9819bd Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/modules/mob/living/carbon/carbon.dm
	code/modules/organs/organ_internal.dm
	code/modules/organs/organ_objects.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/reagent_containers/syringes.dm
 2015-03-31 17:44:42 +03:00
= 2e728cfd4b Added macros for droplimb flags. 2015-03-31 11:42:45 +10:30
= 601e6fb7ef Merged with dev. 2015-03-31 11:17:13 +10:30
PsiOmega 464d702d4b Mob refactoring. 
Updates Bump() code.
Intents now use constants.
Simple animals can now use languages without overriding say().
There is now a difference between being able to smash normal and reinforced walls.
Reworks simple_animal/attackby so that constructs don't need to override it simply to add damage resistance.
 2015-03-29 10:44:31 +02:00