Zuhayr
50dd6aa0bb
Merge with master.
2015-05-23 21:29:40 +09:30
PsiOmega
77099631d1
Updates del usages.
2015-05-22 08:27:12 +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
PsiOmegaDelta
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02: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
df917e1538
Changes from PR feedback. Moar feedback for inspecting mob.
2015-05-19 07:16:17 +03:00
Chinsky
814d38ce66
Adds more info to self-examine
2015-05-18 08:25:34 +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
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
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
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
GinjaNinja32
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
Ccomp5950
10a8c56c5d
Merge pull request #9286 from Zuhayr/dev
...
Fixes, clothes stripping refactor.
2015-05-16 00:53:14 -04:00
Techhead0
ec37652997
Fixes #7999
2015-05-15 13:34:46 -04:00
Zuhayr
f021467f8b
Merges two redundant procs.
2015-05-16 01:55:19 +09:30
Zuhayr
890693b839
Allowed accessories to function as custom items using icon_override
2015-05-16 01:37:04 +09:30
Zuhayr
8611499e87
Fixes #8842
2015-05-15 23:53:59 +09:30
Zuhayr
5b9eefdebf
Merge with dev.
2015-05-15 23:22:48 +09:30
Zuhayr
1e1471a601
Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173 .
2015-05-15 23:19:57 +09:30
Kelenius
10915eae24
Merge branch 'dev' into ofChemistryAndStuff
...
Conflicts:
code/game/objects/effects/chem/chemsmoke.dm
code/modules/customitems/item_defines.dm
code/modules/projectiles/guns/launcher/syringe_gun.dm
code/modules/reagents/Chemistry-Holder.dm
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
code/modules/reagents/reagent_containers/food/drinks.dm
code/modules/reagents/reagent_containers/pill.dm
maps/exodus-1.dmm
2015-05-15 11:28:05 +03:00
GinjaNinja32
354859b889
Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks
2015-05-15 04:47:18 +01:00
mwerezak
7c242b2c8c
Tail animation resets when unconscious, changelog
2015-05-14 19:14:22 -04:00
PsiOmega
f9306431b7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2015-05-14 22:20:58 +02:00
Chinsky
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
mwerezak
3c557b9137
Adds tail icon caching, adds frame offset to dmi for looped animations.
2015-05-14 00:14:47 -04:00
Daranz
b95692e484
Fix a problem in human/has_eyes()
2015-05-13 13:58:37 -04:00
Techhead0
875a4fd893
Moves equip_survival_gear into job controller, species gear into datums.
2015-05-13 04:07:01 -04:00
Zuhayr
3c10cc5852
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems
2015-05-13 17:00:10 +09:30
Techhead0
f41300bbe3
Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox
...
Conflicts:
maps/exodus-1.dmm
2015-05-13 03:10:36 -04:00
Techhead0
e38ef1c7ef
Moves survival boxes to species datums.
...
Surivival gear is now assigned based on species. Most
species get standard gear, but Vox receive a nitrogen
tank instead, and Diona obtain an emergency flare
instead of a survival box.
As a side effect, engineers no longer spawn with larger
emergency tanks.
Fixes #9237
2015-05-13 02:31:17 -04:00
mwerezak
fe46049b17
Adds tail animations
...
Adds a selection of emotes to control tail animations, and animated sprites for tajaran by 'Full of Skittles'
2015-05-13 01:40:08 -04:00
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Hubblenaut
1b3ddb8633
Merge remote-tracking branch 'upstream/dev' into dev
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/modules/mob/mob_grab.dm
2015-05-12 14:39:21 +02:00
Zuhayr
49930fe55d
Debugging!
2015-05-12 21:30:06 +09:30
Chinsky
e9cc39039c
Merge pull request #8946 from Zuhayr/miningstuff
...
Wall refactor/mining changes.
2015-05-12 13:13:31 +03:00
Zuhayr
c8135cf87b
Merge pull request #9205 from mwerezak/masks
...
Snacks, drinks, and pills now check mouth coverage
2015-05-12 18:11:48 +09:30
Zuhayr
3184f157e9
qdel
2015-05-12 13:12:58 +09:30
Zuhayr
495952ff5d
Changed steel material name to a define.
2015-05-12 13:08:41 +09:30
mwerezak
b1bfbf346d
Snacks, drinks, and pills now check mouth coverage
...
Mouth coverage is defined somewhat conservatively so that breath masks
and the like do not prevent eating. In general only things that
completely cover your face or head like gasmasks and space suit helmets
block eating and drinking, or forcing the same on someone.
2015-05-11 22:17:24 -04:00
