Zuhayr
15070d729d
Dev-freeze into dev merge.
2015-05-30 00:31:12 +09:30
Atlantis
7981777c41
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-28 20:16:12 +02:00
PsiOmega
e0177765c6
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
html/changelogs/.all_changelog.yml
2015-05-27 17:52:55 +02:00
Chinsky
3d5b7e5744
Merge pull request #9464 from Kelenius/ofChemAndAnalyze
...
Medical scanners now scan ingested reagents
2015-05-27 06:32:20 +03:00
PsiOmega
62185bc0a8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-26 08:35:32 +02:00
PsiOmegaDelta
ccf5945944
Merge pull request #9362 from Kelenius/ofResearchAndPrototypes
...
Updates to science
2015-05-25 19:55:01 +02:00
Chinsky
d4eb0e82bb
Merge pull request #9293 from RavingManiac/dev
...
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
Kelenius
ea12fc664f
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/modules/mob/living/carbon/brain/posibrain.dm
2015-05-25 20:35:46 +03:00
Kelenius
359e055463
Lets medical scanners scan stomach
2015-05-25 19:11:14 +03:00
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
mwerezak
c08774d96e
Updates bear traps
...
Moves to trap.dm.
Cleans up trap attacking code.
Fixes trap remaining anchored once triggered.
Instead of embedding, traps now buckle their victim into place.
Deaf messages, where appropriate.
Gave beartraps a more setting-friendly name.
Conflicts:
baystation12.dme
2015-05-24 16:33:41 -04:00
Atlantis
1da44dc861
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
...
- Merge resolution: Updates intellicard NanoUI to correctly show separate hardware integrity/backup capacitor percentages.
2015-05-24 20:23:46 +02:00
Chinsky
b01c3a4ba9
Merge pull request #9451 from PsiOmegaDelta/Tmp
...
Fixes #9447 .
2015-05-24 18:16:08 +03:00
PsiOmega
c21a456379
Fixes #9447 .
...
The inteliCard now has a NanoUI interface, allowing it to utilize custom CanUseTopic() checks depending on context, in-hand or in-rig.
2015-05-24 11:33:54 +02:00
GinjaNinja32
3fb3a18f05
Supply shuttle and crate fixes
...
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
Kelenius
5be2bd6a1b
Updates to properly DA materials
2015-05-23 15:21:11 +03:00
Zuhayr
d4e45fbee8
Merge pull request #9327 from Techhead0/chemRenames
...
Replaces gaseous reagents with organic chemistry ones, adjusts flammable chemicals.
2015-05-23 20:52:58 +09:30
Atlantis
97f0470504
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-22 21:01:26 +02:00
Kelenius
3bdb5ff9ea
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/leather.dm
code/game/objects/items/stacks/sheets/mineral.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/kitchen.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/research/circuitprinter.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
2015-05-22 19:26:39 +03:00
PsiOmega
43e0d9ca07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-22 08:39:07 +02:00
PsiOmega
e74c0e65bf
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/weapons/power_cells.dm
2015-05-22 08:26:13 +02:00
RavingManiac
04293467e8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-05-22 00:04:37 +10:00
RavingManiac
839d3b0588
Ability to head blind_message when invisible people do things readded
...
Tape recorder playback uses audible_message instead of visible_message
2015-05-22 00:02:36 +10:00
Zuhayr
3377f8bbf1
Merge pull request #9407 from GinjaNinja32/floorpainter
...
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 18:43:00 +09:30
GinjaNinja32
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
Chinsky
a1d84ff176
Merge pull request #9385 from GinjaNinja32/structure_climb
...
Fixes structure climbing
2015-05-21 03:58:13 +03:00
Chinsky
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
GinjaNinja32
c345f317ac
Fixes structure climbing
2015-05-20 17:10:18 +01:00
GinjaNinja32
aeb8f2a6c2
Fixes #9380
2015-05-20 16:44:47 +01:00
Zuhayr
71da36ec01
Updated force vars on bats.
2015-05-21 00:52:17 +09:30
Kelenius
35a20002c6
Merge branch 'dev' into ofResearchAndPrototypes
...
Conflicts:
baystation12.dme
code/defines/obj/weapon.dm
code/game/mecha/equipment/tools/medical_tools.dm
code/game/mecha/equipment/tools/tools.dm
code/game/mecha/mecha.dm
code/game/mecha/mecha_parts.dm
code/game/objects/items/devices/flash.dm
code/game/objects/items/devices/powersink.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/game/objects/items/stacks/sheets/sheet_types.dm
code/game/objects/items/weapons/RCD.dm
code/game/objects/items/weapons/circuitboards/machinery/biogenerator.dm
code/game/objects/items/weapons/circuitboards/machinery/cloning.dm
code/game/objects/items/weapons/circuitboards/machinery/mining_drill.dm
code/game/objects/items/weapons/circuitboards/machinery/pacman.dm
code/game/objects/items/weapons/circuitboards/machinery/power.dm
code/game/objects/items/weapons/circuitboards/machinery/recharge_station.dm
code/game/objects/items/weapons/circuitboards/machinery/research.dm
code/game/objects/items/weapons/circuitboards/machinery/shieldgen.dm
code/game/objects/items/weapons/circuitboards/machinery/telecomms.dm
code/game/objects/items/weapons/circuitboards/machinery/unary_atmos.dm
code/game/objects/items/weapons/flamethrower.dm
code/game/objects/items/weapons/handcuffs.dm
code/game/objects/items/weapons/kitchen.dm
code/game/objects/items/weapons/shields.dm
code/game/objects/items/weapons/storage/backpack.dm
code/game/objects/items/weapons/surgery_tools.dm
code/game/objects/items/weapons/teleportation.dm
code/game/objects/items/weapons/tools.dm
code/modules/assembly/igniter.dm
code/modules/assembly/infrared.dm
code/modules/assembly/mousetrap.dm
code/modules/assembly/proximity.dm
code/modules/assembly/signaler.dm
code/modules/assembly/timer.dm
code/modules/assembly/voice.dm
code/modules/clothing/glasses/glasses.dm
code/modules/hydroponics/trays/tray_tools.dm
code/modules/mining/drilling/scanner.dm
code/modules/mining/mine_items.dm
code/modules/mining/ore.dm
code/modules/mob/living/silicon/robot/analyzer.dm
code/modules/power/rust/circuits_and_design.dm
code/modules/projectiles/ammunition/boxes.dm
code/modules/projectiles/guns/energy/laser.dm
code/modules/projectiles/guns/energy/special.dm
code/modules/projectiles/guns/energy/stun.dm
code/modules/research/circuitprinter.dm
code/modules/research/designs.dm
code/modules/research/destructive_analyzer.dm
code/modules/research/protolathe.dm
code/modules/research/rdconsole.dm
code/modules/research/research.dm
code/modules/research/server.dm
code/modules/research/xenoarchaeology/genetics/reconstitutor.dm
2015-05-20 11:50:28 +03:00
Chinsky
a7d6cf3545
tyops fiexs
2015-05-20 09:49:10 +03:00
Chinsky
f42f4582c4
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into frankenstein
2015-05-20 08:52:46 +03:00
mwerezak
a1185476f8
Makes update_action_buttons() work on-demand
...
Fixes #9368
2015-05-20 01:28:16 -04:00
Zuhayr
a6f59edc22
Bit of documentation.
2015-05-20 14:00:14 +09:30
mwerezak
c289975498
Adds attack animation calls for a few common machines and structures
...
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
mwerezak
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Techhead0
aa22f7307a
Replaces gaseous reagents with organic chemistry ones.
...
Hydrogen, Oxygen, Nitrogen, Chlorine, and Fluorine have been replaced with Hydrazine, Acetone, Ammonia, and Hydrochloric Acid.
The new chemicals have been given appropriate effects and integrated into hydroponics.
Flammable liquids have higher touch_met so they don't take forever to build fire stacks.
Liquid phoron now contaminates clothing and burns eyes when splashed on mobs.
2015-05-19 09:32:24 -04:00
Chinsky
05975d78b1
Adds a portable organs/lunch freezer
2015-05-19 09:33:26 +03:00
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
mwerezak
defc4c1f94
Adds check_charge(), checked_use()
2015-05-18 20:09:09 -04:00
mwerezak
53855d2398
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge
2015-05-18 18:47:45 -04:00
PsiOmegaDelta
ce8188c1a2
Merge pull request #9350 from Hubblenaut/lockers
...
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
Hubblenaut
ac1f3c3530
Fixes overbloated closets
2015-05-18 18:34:25 +02:00
PsiOmega
e2e0ffc6e5
Compilation fixes.
2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
