GinjaNinja32
4bad50e875
Gives AI/borg previews back their cardborg hats
2015-05-23 20:42:51 +01:00
Zuhayr
5b8bf58d0d
Merge pull request #9439 from Baystation12/dev-freeze
...
Dev-freeze into dev.
2015-05-23 21:40:26 +09:30
Zuhayr
50dd6aa0bb
Merge with master.
2015-05-23 21:29:40 +09:30
PsiOmega
15756f031b
Fixes pulse-check text.
2015-05-22 14:00:42 +02:00
Chinsky
be24803309
Merge pull request #9363 from PsiOmegaDelta/PulseCheck
...
Pulse check
2015-05-22 14:35:49 +03:00
PsiOmega
43e0d9ca07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-22 08:39:07 +02:00
PsiOmega
77099631d1
Updates del usages.
2015-05-22 08:27:12 +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
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
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
Zuhayr
52ae206174
Merge pull request #9391 from comma/ghettoMD
...
Missed one baddie
2015-05-21 18:30:06 +09:30
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02: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
ecc2b3c437
Merge pull request #9258 from mwerezak/charge
...
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Chinsky
97b2a63b76
Missed one baddie
...
Pretty sure that limb rotting alive is unhealthy yeah
2015-05-21 03:22:20 +03:00
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
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
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
Neerti
6c16923d11
Fixes issue with removing dead plants from hydro treys as a borg.
2015-05-19 15:28:38 -04:00
PsiOmega
b08302f7b1
Pulse measuring tweaks.
...
Now both the pulse checker and target must remain still for the duration of the check.
Previously it may have been possible for dead humans to check the pulse of self and others.
2015-05-19 21:15:59 +02:00
Zuhayr
06c04edb5e
Merge pull request #9337 from comma/ghettoMD
...
Ghetto MDing
2015-05-19 20:38:50 +09:30
Chinsky
df917e1538
Changes from PR feedback. Moar feedback for inspecting mob.
2015-05-19 07:16:17 +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
PsiOmega
c26b4e79b9
Fixes #9244 .
...
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +02:00
ccomp5950
53e52a6f92
Goat Buffs.
...
Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
2015-05-18 04:35:19 -04:00
Chinsky
814d38ce66
Adds more info to self-examine
2015-05-18 08:25:34 +03:00
Chinsky
c62958fc89
Fixes #9336
2015-05-18 07:58:41 +03:00
Chinsky
ef0f21bd1a
Ghetto MD part 2
...
Examining people with grab-exmaine move now can tell you if they have toxins in blood, or are short of breath.
Stethoscopes now actually give real info about severe oxyloss/internal organs damage.
2015-05-18 07:45:29 +03:00
Chinsky
26e5630e23
Ghetto diagnostics!
...
Grab + click with help intent to inspect the bodypart. You'll learn what injuries there are without stripping the guy. After delay, you also learn if there's a fracture here.
Also surgical incisions are now visible on examine because goddamnit.
2015-05-18 06:37:51 +03:00
Chinsky
57a7c307b9
Fixes dislocation not being set properly on an actual targeted limb.
...
Fixes being unable to pop back joints of other people. (it was making victim pick the limb)
2015-05-18 03:50:47 +03:00
Zuhayr
2714e458b3
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-17 12:58:09 +09:30
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
Zuhayr
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
mwerezak
9ae57e95e1
Moves mob animations to a new source file, adds attack animation
2015-05-16 12:44:49 -04:00
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
PsiOmegaDelta
d4c205e12a
Merge pull request #9200 from mwerezak/tail-swish
...
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
Zuhayr
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
Zuhayr
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +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
Zuhayr
1de493c272
Fixes #9021
2015-05-16 18:45:31 +09:30
Zuhayr
36acf64f18
Partial fix for #8825
2015-05-16 18:33:03 +09:30
