Commit Graph

127 Commits

Author SHA1 Message Date
Peliia 8743cd89a4 Dish Incubator v2
Adheres to pointers laid out by Ginja.
2015-08-27 18:59:16 +02:00
Peliia d9e940c3a6 Dish Incubator Limits
Imposes limits on the Dish Incubator, it shall no longer have values above the meters on the display.
2015-08-26 17:12:30 +02:00
Peliia 89629b686f Dish Incubator
Now the Incubator should stop magically conjuring food whenever there is a beaker without food inside.
2015-08-26 16:18:36 +02:00
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
Chinsky 0056a889de Moved antibodies to the rest of reagents.
Updates them to use new chem processing.
Also axes unused commented out code.
2015-08-14 04:53:46 +03:00
Chinsky 38adf2c5b4 Fixes #10294
Now if virus can infect lesser/greater form of specie, it can infect its counterpart.
Also made viruses affect only joinable species to lessen a chance of spawning a virus that they can't work on (e.g. slime-affecting viruses that can't be injected into monkeys). As a side-effect viro reports are a little less inane listing all the species crewmembers aren't supposed to know about like xenomorphs and Shadows.
2015-08-14 04:20:44 +03:00
PsiOmegaDelta 265802d270 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/controllers/_DynamicAreaLighting_TG.dm
	code/game/objects/effects/chem/chemsmoke.dm
	code/game/objects/explosion.dm
2015-07-10 12:57:46 +02:00
PsiOmegaDelta e0ed7c3e69 Merge pull request #10089 from mwerezak/infection-fix
Fixes a couple more virus oversights/bugs
2015-07-10 11:37:50 +02:00
mwerezak d1b15fc601 Fixes a couple more virus oversights/bugs
Fixes contact viruses spreading through windows, fixes bad copypasta in
infection_spreading_check()
2015-07-10 01:02:16 -04:00
HarpyEagle 5011f9b806 Fixes virus infectionchance oversight
Fixes oversight in minormutate() that would cause viruses to become
extremely infectious after spreading to another person.
2015-07-09 17:26:15 -04:00
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
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
Kelenius b4b635f32d Chemistry commit
I messed something in the git
2015-03-25 19:09:10 +03:00
Zuhayr 97112c8a4c Replaced display_name with name, worked on severing limbs and damage propagation. 2015-03-25 19:07:22 +10:30
Zuhayr e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Zuhayr 1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
PsiOmega 0262ab0de0 Runtime fixes
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
  source file: statistics.dm,87
  usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
  src: null
````

````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
  source file: statistics.dm,52
  usr: null
  src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
  source file: helpers.dm,16
  usr: null
  src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
  source file: nanoui.dm,419
  usr: null
  src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
  source file: mob.dm,862
  usr: null
  src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
mwerezak 6d15809768 Corrects return values for the Topic procs of several computers and some other machines as well. 2015-02-25 21:32:35 -05:00
GinjaNinja32 f0e92023f0 Fixes startup runtime
Fixes #8062
2015-02-06 08:54:28 +00:00
Chinsky 3384f13a31 Merge pull request #8029 from GinjaNinja32/viro
Virology rework
2015-02-06 00:18:13 +03:00
Zulker Nayeen Nahiyan 0a3f523066 Merge remote-tracking branch 'refs/remotes/origin/dev' into dev
Conflicts:
	code/__HELPERS/maths.dm
	code/__HELPERS/type2type.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/spacesuits/captain.dm
	code/modules/clothing/spacesuits/miscellaneous.dm
	code/modules/clothing/spacesuits/rig/rig_pieces.dm
	code/modules/clothing/spacesuits/rig/suits/light.dm
	code/modules/clothing/spacesuits/spacesuits.dm
	code/modules/clothing/suits/armor.dm
	code/modules/clothing/suits/utility.dm
	code/modules/events/event_manager.dm
	code/modules/mob/living/living.dm
	code/setup.dm
2015-02-04 04:44:09 +06:00
GinjaNinja32 7f12c68a4b Remove ethanol from chem synthesis
Done on mobile. Might break.
2015-02-03 19:58:20 +00:00
GinjaNinja32 95ec6a4dfe Changes cure mechanism 2015-02-03 16:41:08 +00:00
GinjaNinja32 c4788ad6f5 Merge remote-tracking branch 'upstream/dev' into viro
Conflicts:
	code/modules/virus2/disease2.dm
2015-02-03 15:33:37 +00:00
Chinsky b995c856a9 Merge pull request #7924 from Kelenius/ofTablesAndPass
Removes FPRINT and TABLEPASS flags
2015-01-30 16:17:41 +03:00
GinjaNinja32 1b08463b7e Antibodies rework. 2015-01-26 05:32:00 +00:00
GinjaNinja32 7e43812408 Virology fixes; nerfs viruses significantly (~33% power), but reactivates broken effects that were multiplying their effects by null 2015-01-25 09:34:53 +00:00
GinjaNinja32 e49c6de525 One symptom of each type per virus 2015-01-25 04:26:34 +00:00
Kelenius 10de826ca3 Removes FPRINT and TABLEPASS flags 2015-01-23 22:27:32 +03:00
unknown 7590bbac99 Infection chance proc improvements
Instead of magic type bits, the infection protection value of clothing is mostly based on it's bio armor value, which is much more flexible. Also gloves and shoes to contribute to protection values, and adjusts surgical mask bio protection.
Hardsuits gain voidsuit level bio protection, when sealed.
Wearing a face mask helps prevent others from catching airborne diseases.
Also fixes #7909
2015-01-22 11:10:57 -05:00
GinjaNinja32 a1e5194c34 Virology rebalance
- Effects can now appear and be spliced in at higher stages than their set stages (e.g. Waiting Syndrome can now occur in any block)
- Gibbingtons changed to not instantly gib infected on activation, instead either dealing massive brute damage or making humanoids' limbs fall off; this avoids three copies of Waiting Syndrome then Gibbingtons going undetected until it instagibs the entire station one after the other.
- New effect: chemical synthesis. Picks one reagent from its list, and keeps infected at 5-7u of that reagent. Infecting others, splicing the gene, etc does not change the reagent, only generating an entirely new chemical synthesis effect does that.
- Admin panel for spawning viruses
- Virus dish examine() now doesn't print 15+ lines to output, instead printing one line and a link to open a window with the rest (and it calls ..() now)
- Lowercased most virology machinery's names
- Renamed/reordered antigens, there are now 16 antigens rather than 11, and they don't use the blood markers' names despite not being affected by blood type at all
- Generating random effects does not rely so much on the GC
2015-01-20 09:57:47 +00:00
Zulker Nayeen Nahiyan 490027405a Merge remote-tracking branch 'origin/dev' into dev
Conflicts:
	code/modules/virus2/helpers.dm
2015-01-19 02:15:38 +06:00
Chinsky 6e7eb38c5d Merge pull request #7850 from Baystation12/master
master -> freeze
2015-01-16 14:23:03 +03:00
Chinsky 47e5e51db3 Fix for the fix. 2015-01-15 17:51:45 +03:00
Chinsky 1c772e9914 Fixes #7821 2015-01-15 16:45:45 +03:00
mwerezak b069bfb658 Adjusts infection chances
After some discussion on IRC this seems like a better starting value.
2015-01-12 00:05:47 -05:00
mwerezak d61c808fef Cleans up infect_virus2() typecheck 2015-01-10 12:29:35 -05:00
mwerezak 8ac0450c01 Sets chance_maxm for several disease effects
Also lengthens the time to get from stage 1 to stage 2
2015-01-10 12:26:12 -05:00
mwerezak 654769016e Fixes virus events failing because of lack of compatible species 2015-01-10 03:18:52 -05:00
mwerezak 1c5ca01dae Restricts Gibbingtons, Suicide, and Monkism syndromes
Restricts Gibbingtons, Suicide, and Monkism syndromes from even greater
diseases. Admins can still generate diseases with these syndromes
through secrets.

Fixes virus events potentially having people share the same virus datum.
2015-01-10 03:08:42 -05:00
mwerezak 9b5eded546 Fixes major virus event generating lesser viruses, makes lesser viruses actually less severe
Makes more of a distinction between lesser and greater viruses by
restricting lesser viruses to only have the "Nil" syndrome for stage 4.
2015-01-10 01:25:19 -05:00
Zulker Nayeen Nahiyan 6e550d7308 Cleanup helper files maths.dm, time.dm, type2type.dm, add macros for bit-manipulation
`maths.dm`:
	Rewrite `Gcd(x)` to remove recursive behaviour.
	Remove `RaiseToPower(x)` and its usage from `event_manager.dm`.
	Rename `Lerp()` to `Interpolate()`.
	Add `Square(x)`, which squares a number.
	Rearrange most of the functions in the file. (trigonometric functions together, etc.)

`type2type.dm`:
	Rewrite `num2hex()` and optimise `hex2num()` for superior clarity and a 100% speed improvement.
	Correct indenting, spaces, make switches more concise.

`time.dm`:
	Remove old, slanderous commented-out function `/proc/time_stamp()`

`lists.dm`:
	Add the macros, `BITTEST(bitfield,index)`, `BITSET(...)`, `BITRESET(...)`
	  and `BITFLIP(...)` for bit-manipulation and use them where 20+ files
	  do it manually, for arguments of reader clarity and standardness.
2015-01-09 21:55:11 +06:00
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr 37cb78eefa Fixes #6613 and #6492 2014-10-08 23:10:12 +10:30
Zuhayr 6c96f3d66b Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into dev 2014-10-02 02:39:37 +09:30
Mloc d43dbaa7b5 resolves #6260
chance was being checked twice, for some reason.

Signed-off-by: Mloc <colmohici@gmail.com>
2014-10-01 10:13:15 +01:00
Zuhayr 9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30