PsiOmegaDelta
a677ec3b83
Merge pull request #9412 from Kelenius/ofChemAndReadme
...
Updates Chemistry-Readme.dm
2015-05-22 06:37:25 +02:00
PsiOmega
7d17f2eeb7
Items again have their loc set just before dropped() is called.
...
Fixes #9299 .
Fixes #9406 .
2015-05-21 17:55:31 +02:00
Daranz
e9d9ff57ba
Remove redundant null argument in a view() call
2015-05-21 10:14:40 -04: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
Daranz
bbc8ad6383
Add extra checks for Say :i
...
Say :i now leaves fingerprints on affected intercoms, and cannot be performed
at all if restrained.
2015-05-21 09:18:02 -04:00
Daranz
b9dbeeb356
Fix a problem with Say :i not working
2015-05-21 08:53:14 -04:00
Atlantis
d8141445e4
Implements suggestions
...
- Hardware examine is now generated by hardware's proc.
- Camera network updating now uses proper procs
- Bugfix: APU Generator no longer prevents you from using NanoUI based devices
- Bugfix: Fixes rare runtime on roundstart.
2015-05-21 13:27:18 +02:00
Atlantis
991546df2a
Span Class in shields code.
2015-05-21 12:19:23 +02:00
Kelenius
360113850a
Updates Chemistry-Readme.dm
...
Also removes one unused variable that I forgot to remove.
2015-05-21 12:43:28 +03:00
Chinsky
ae3e80b85b
Merge pull request #9409 from GinjaNinja32/supply
...
Fixes supply shuttle
2015-05-21 12:30:20 +03: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
Zuhayr
52ae206174
Merge pull request #9391 from comma/ghettoMD
...
Missed one baddie
2015-05-21 18:30:06 +09:30
GinjaNinja32
900fb32aff
Fixes supply shuttle
2015-05-21 06:58:35 +01:00
GinjaNinja32
0aff37a72c
Fixes floor painter 'side/3 corners'->'black' and another state
2015-05-21 06:03:15 +01:00
mwerezak
3c67c46442
Limits the ability of the SM to return to the station zlevel once ejected.
...
Fixes #7900
2015-05-21 01:02:30 -04:00
PsiOmegaDelta
558118f2c8
Merge pull request #9372 from GinjaNinja32/reactions
...
Allows reactions to happen with any level of the required chems
2015-05-21 06:53:51 +02:00
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
Zuhayr
293fb6782c
Merge pull request #9387 from Yoshax/syringespls
...
Fixes a typo/mistake
2015-05-21 12:51:27 +09:30
Chinsky
a1d84ff176
Merge pull request #9385 from GinjaNinja32/structure_climb
...
Fixes structure climbing
2015-05-21 03:58:13 +03:00
Chinsky
cb3dea3682
Merge pull request #9369 from mwerezak/action-icons
...
Ports "Makes update_action_buttons() work on-demand"
2015-05-21 03:35:41 +03:00
Chinsky
91de5b2d9d
Merge pull request #9381 from GinjaNinja32/patch-1
...
Fixes #9380
2015-05-21 03:27:28 +03:00
Chinsky
ecc2b3c437
Merge pull request #9258 from mwerezak/charge
...
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Chinsky
53e3e2f6e6
Merge pull request #9379 from Zuhayr/materials
...
Materials + Morguemeat icon + bat nerf
2015-05-21 03:23:41 +03:00
Chinsky
97b2a63b76
Missed one baddie
...
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
Chinsky
9d14bc41de
Merge pull request #9389 from mwerezak/fire
...
Fire
2015-05-21 03:13:55 +03:00
Yoshax
7cfb921ca0
Fixes a typo/mistake
2015-05-20 20:36:24 +01:00
GinjaNinja32
c345f317ac
Fixes structure climbing
2015-05-20 17:10:18 +01:00
GinjaNinja32
9888a8a70b
Another PoolOrNew(new /type, loc) fix
2015-05-20 16:49: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
Zuhayr
c3f0f42ec2
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into materials
2015-05-21 00:49:14 +09:30
Zuhayr
98def6e247
Updating dev from master.
2015-05-21 00:08:22 +09:30
Atlantis
b0334ac331
isrobot() fix, attempt two
2015-05-20 12:22:33 +02:00
Atlantis
5592534ecc
Revert "isrobot() fix"
...
This reverts commit 61c0eaa4a3
2015-05-20 12:18:23 +02:00
GinjaNinja32
f979d80dde
Allows reactions to happen with any level of the required chems
...
Rather than an arbitrary 1u cutoff below which reactions will not happen, reactions will now happen at whatever level of chems are present.
2015-05-20 10:23:31 +01:00
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
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
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
mwerezak
01e8246e64
Clean up world print
2015-05-20 00:35:26 -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
mwerezak
20b72b9911
Adds attack animation calls
2015-05-20 00:18:32 -04:00
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Chinsky
1089da7fb1
Frankenstein edition:
...
Limbs now store their own dna/species info. This allows transplanted limbs show up as they are, instead of conforming to mob. Vox-cat-monkey hybrids, rainbow skrells, go wild.
Also changed rejection to cause infection instead of straight up organ damage - wouldn't want your newly acquired catpaws fracture out of blue.
As a bonus, attacks are tracked per limb, so for example having kitty claws will give you the corresponding attack
2015-05-20 03:20:09 +03:00
Chinsky
284d1cc1f5
Merge pull request #9360 from Kelenius/ofChemAndCarbon
...
Carbon now clears ingested chemicals
2015-05-20 01:45:13 +03:00
HarpyEagle
10067349b2
Cleans up debug prints
2015-05-19 17:47:51 -04:00
