06c04edb5e
Merge pull request #9337 from comma/ghettoMD
...
Ghetto MDing
2015-05-19 20:38:50 +09:30
df917e1538
Changes from PR feedback. Moar feedback for inspecting mob.
2015-05-19 07:16:17 +03:00
c26b4e79b9
Fixes #9244 .
...
Re-adds spawn()s for qdels in transform_procs, to prevent early .
2015-05-18 19:15:28 +02:00
814d38ce66
Adds more info to self-examine
2015-05-18 08:25:34 +03:00
c62958fc89
Fixes #9336
2015-05-18 07:58:41 +03:00
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
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
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
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
d4c205e12a
Merge pull request #9200 from mwerezak/tail-swish
...
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
1de493c272
Fixes #9021
2015-05-16 18:45:31 +09:30
36acf64f18
Partial fix for #8825
2015-05-16 18:33:03 +09:30
e1a14e3c41
Removes xenoarch reconstitutors entirely. "Fixes" #5413
2015-05-16 17:40:49 +09:30
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
07cb2aa1ad
Merge pull request #9291 from Techhead0/seeTheInvisible
...
Invisible people can now be heard by visible_message
2015-05-16 08:57:21 +02:00
10a8c56c5d
Merge pull request #9286 from Zuhayr/dev
...
Fixes, clothes stripping refactor.
2015-05-16 00:53:14 -04:00
35e44ab8d9
Invisible people can now be heard by visible_message
...
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
2015-05-15 21:06:16 -04:00
ec37652997
Fixes #7999
2015-05-15 13:34:46 -04:00
f021467f8b
Merges two redundant procs.
2015-05-16 01:55:19 +09:30
890693b839
Allowed accessories to function as custom items using icon_override
2015-05-16 01:37:04 +09:30
8611499e87
Fixes #8842
2015-05-15 23:53:59 +09:30
7535e027b9
Fixes #9192
2015-05-15 23:53:38 +09:30
f65c4e95f6
Fixes #9060
2015-05-15 23:38:01 +09:30
256c057608
Fixes #8376
2015-05-15 23:27:33 +09:30
5b9eefdebf
Merge with dev.
2015-05-15 23:22:48 +09:30
1e1471a601
Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173 .
2015-05-15 23:19:57 +09:30
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
b963e807f6
Merge pull request #9273 from GinjaNinja32/grab_del
...
Fixes grabs runtiming on qdel()
2015-05-15 08:22:52 +02:00
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
7c242b2c8c
Tail animation resets when unconscious, changelog
2015-05-14 19:14:22 -04:00
21394e78c4
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-15 00:12:40 +01:00
363ce0a925
Fixes grabs runtiming on qdel()
2015-05-15 00:07:45 +01:00
4f40e92a95
Merge pull request #9272 from Mloc/nanoui
...
better nanoui caching + fixes
2015-05-14 23:48:15 +02:00
cfb51cf198
better nanoui caching + fixes
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 22:35:50 +01:00
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
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
9ed8f69e02
Merge pull request #9240 from Techhead0/internalsBox
...
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
3c557b9137
Adds tail icon caching, adds frame offset to dmi for looped animations.
2015-05-14 00:14:47 -04:00
fb329fb8e0
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-13 20:46:58 +01:00
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01:00
b95692e484
Fix a problem in human/has_eyes()
2015-05-13 13:58:37 -04:00
875a4fd893
Moves equip_survival_gear into job controller, species gear into datums.
2015-05-13 04:07:01 -04:00
1dfade1a33
master>dev
2015-05-13 17:09:57 +09:30
3c10cc5852
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems
2015-05-13 17:00:10 +09:30
f41300bbe3
Merge remote-tracking branch 'remotes/Baystation12/dev' into internalsBox
...
Conflicts:
maps/exodus-1.dmm
2015-05-13 03:10:36 -04:00
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
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
32b463237f
Final adjustments to icons, adds delay to pinning
2015-05-12 17:21:37 +02:00
c952507f3c
Fixes carp attacking mechs over z-levels
...
Fixes #9198 .
2015-05-12 15:53:28 +01:00
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Zuhayr