Cael Aislinn
0e1c367012
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology
...
Conflicts:
icons/obj/hydroponics.dmi
manual merge of conflicted icon file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 10:05:27 +10:00
Zuhayr
9ca88f5a9e
Merge pull request #5292 from mwerezak/special-shuttle-fix
...
Fixes special shuttle consoles being deconstructible
2014-06-19 08:12:26 +09:30
Chinsky
ed9600ce43
Merge pull request #5286 from PsiOmegaDelta/VentScrubCleanup
...
Scrubbers and cameras
2014-06-18 18:31:34 +04:00
mwerezak
2daab86c89
Fixes special shuttle consoles being...
...
...deconstructible
2014-06-18 09:37:30 -04:00
PsiOmega
ba68f9c7ca
Security no longer has a massive 2-3 layer reinforced table in their lobby with a strange stray scubber pipe beneath it.
...
Restores and relocates some more cameras.
Restores virology area and APC changes on dev.
2014-06-17 23:40:13 +02:00
PsiOmega
34642f5aa4
Relocates a small vent in a medbay room that had two, by adding a few more pipes, is now located in a section that was without.
...
Some scrubbers in Security began off, enabling them.
2014-06-17 22:56:41 +02:00
Chinsky
1be8fd948f
Merge pull request #5278 from comma/dev
...
Master -> dev merge
2014-06-17 16:19:31 +04:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
Chinsky
08dd01801e
Merge pull request #5266 from mwerezak/firelock-fix
...
Proposes a fix for #5224
2014-06-17 14:58:33 +04:00
Chinsky
e304d0010d
Merge pull request #5273 from boopcat/happydrones
...
fixes!
2014-06-17 14:43:55 +04:00
Chinsky
dd4a937ca9
Merge pull request #5275 from GinjaNinja32/lighters
...
Fixes cheap lighters burning body parts other than the hands they're being held in
2014-06-17 14:43:24 +04:00
Chinsky
1ca6a54d3a
Merge pull request #5265 from mwerezak/wound-fixes
...
Fixes the wounding system
2014-06-17 14:41:22 +04:00
Chinsky
6823242fa2
Merge pull request #5268 from Loganbacca/trainfix
...
Cargo train tweaks
2014-06-17 14:39:43 +04:00
mwerezak
944394a042
Fixes armour being applied to projectiles twice
2014-06-17 01:20:49 -04:00
mwerezak
72377d160f
Fixes apply_damage ignoring species mods
...
Also adds some adjust*Loss type procs for adjusting the damage on
specific body parts. apply_damage() should be the standard way to deal
damage to a mob, though.
2014-06-17 00:54:20 -04:00
GinjaNinja32
fcdd0198c0
Fix lighter burning random body parts
2014-06-17 04:50:14 +01:00
mwerezak
274b03b083
Adds thrown object sharp and edge flags
2014-06-16 23:21:01 -04:00
unknown
e16658c37f
Adds diona unarmed attack type
2014-06-16 19:23:20 -04:00
Boop
f4fb2e6291
Fixes #5269
2014-06-17 00:21:14 +01:00
Boop
4c2b66a0f8
Fixes #5271
...
moooore pipes
also gets rid of the "Disposals" tag because it's useless and clutter
"Sorting Office" is used for loopbreaking instead
2014-06-17 00:20:33 +01:00
unknown
95e05a894b
Fixes projectile sharp and edge flags being ignored
2014-06-16 19:17:20 -04:00
unknown
c5e09980b9
Fixes bleeding checks not respecting merged wounds
2014-06-16 18:49:20 -04:00
unknown
7b59cbec5c
Fixes large amounts of damage being carried by minor wound types
2014-06-16 18:42:17 -04:00
Boop
07a6ad4897
Fixes #5270
...
Changes simple_animal/Die() to use death from mob/living instead.
2014-06-16 23:30:37 +01:00
mwerezak
9f7e7004a3
Breach detection update
...
Now only triggers for abnormally low pressures.
Allows breach detection to trigger if an alarm was already raised in an
area for a different reason.
2014-06-16 13:47:04 -04:00
mwerezak
6dee9cf65d
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
mwerezak
45c2274b0a
Species claws are now sharp
2014-06-16 12:54:09 -04:00
mwerezak
8461e5b01f
Fixes bruises not having the right damage_type set
2014-06-16 12:15:31 -04:00
mwerezak
e829f8a633
Fixes wound merging
...
Fixes wound merging completely ignoring things like bleed_timers,
bandaged and salved states, etc.
2014-06-16 12:15:11 -04:00
Zuhayr
8dfd7952fc
Merge pull request #5263 from boopcat/happydrones
...
Fixes #5149
2014-06-17 01:01:13 +09:30
Boop
7a4d0f873d
Fixes #5149
...
also fixes clean_map_git.sh (mloooc)
2014-06-16 10:35:54 +01:00
Loganbacca
32af387a25
Cargo train tweaks
...
- Reduce speed to slightly slower than running
- Only knock people over if emagged, otherwise just bump them back
- Temporarily disable latching trailers inline because no directional sprites (may or may not introduce bugs)
2014-06-16 20:54:18 +12:00
Zuhayr
f80a374ebc
Merge pull request #5258 from paprka/tasers
...
Taser sprites
2014-06-16 16:41:39 +09:30
Zuhayr
5ca5e5c170
Merge pull request #5256 from PsiOmegaDelta/Pipes711
...
Pipe fixes.
2014-06-16 16:41:17 +09:30
mwerezak
17aca7e84d
Fixes #5224
2014-06-16 01:43:56 -04:00
mwerezak
832fb31941
Fixes many small wounds protecting against...
...
...internal damage.
Also removed started_healing() proc because it doesn't actually report
whether the wound is healing and isn't really used for anything.
2014-06-16 01:04:30 -04:00
mwerezak
9f594e4755
Bullets are now properly sharp
2014-06-15 20:28:34 -04:00
mwerezak
1b33ca943d
Separates the sharp flag into edge and sharp
...
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.
Also separates is_sharp, has_edge, and can_puncture.
2014-06-15 20:25:39 -04:00
mwerezak
cbec032ae3
Fixes wrong wound types being used
...
This fixes the autoheal bug, which was being caused by wound types such
as tiny bruises from being used even for large amounts of damage.
I imagine that relying on the order of the list returned by typesof() is
always a bad idea.
2014-06-15 19:08:29 -04:00
Mloc
5ccfa0d1d1
Merge pull request #5262 from Walter0o/patch-1
...
fixes vox armalis being a choosable race
2014-06-15 22:49:23 +01:00
Walter0o
85a6d8a32d
fixes vox armalis being a choosable race
...
the IS_WHITELISTED flag will add the species to the whitelisted_species list,
which in turn gets used as the base list of choosable species in the char setup when
the server config has species whitelisting off.
unless you want giant combat spessbirds as crew ( as a security force maybe ? ;) ),
this is a bug.
2014-06-15 20:27:51 +02:00
Ccomp5950
4419a33e61
Merge pull request #5260 from mwerezak/supply-shuttle-fix
...
Fixes #5259
2014-06-15 11:19:51 -05:00
mwerezak
6d07d99885
Fixes old ferry shuttles (e.g. supply) not being able to use move() directly.
...
This shouldn't be necessary once the supply and emergency shuttles are
updated to the new system, however it will keep them working in the meantime.
2014-06-15 11:57:57 -04:00
Chinsky
9892fb4625
Merge pull request #5257 from paprka/aesthetick
...
Adds overeye short and overeye long hairstyles
2014-06-15 14:41:23 +04:00
paprka
3e10484132
new taser sprites
2014-06-14 21:15:50 -07:00
paprka
7a28f5eea0
overeye
2014-06-14 21:04:05 -07:00
Chinsky
df4a8cf706
Merge pull request #5253 from faerindel/squash_tests
...
Adds buildable and upgradeable PSUs (battery racks, not SMES).
2014-06-15 07:15:14 +04:00
Chinsky
a8c1947a52
Merge pull request #5240 from mwerezak/docking-cleanup
...
Docking Port Door Controls: Stage 2
2014-06-15 07:15:07 +04:00
PsiOmega
562f9142f6
Removes a scrubber pipe in science maintenance that was going into SPACE (previously misc.science existed here). Replaces the manifold connected to it with a straight pipe
2014-06-15 01:18:33 +02:00
