PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
Zuhayr
7d710f2019
Fixes #8471
2015-06-20 21:54:22 +09:30
GinjaNinja32
54b531c36e
Merge pull request #9743 from Techhead0/voidsuitTweaks
...
Minor tweaks to voidsuits.
2015-06-09 02:51:24 +01:00
Techhead0
f2f34b9a38
Minor tweaks to voidsuits.
...
Component removal uses a dialogue box instead of removing items in a set order.
Renames "Eject Tank" to avoid duplicate verb names.
Changes order of components when equipping voidsuits.
Two user message changes.
2015-06-08 05:30:11 -04:00
zonthori
98ca5466e2
Straight base_state
2015-06-07 13:56:11 -06:00
zonthori
ccb01cd4ed
Fixes https://github.com/Baystation12/Baystation12/issues/9728
...
Fixes custom welding helmet sprites to break when toggled.
https://github.com/Baystation12/Baystation12/issues/9728
2015-06-07 13:38:44 -06:00
PsiOmega
5e84bfa57c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
Zuhayr
6564fd6663
Messed this up.
2015-05-30 04:06:23 +09:30
Zuhayr
ac822de309
Fixes #9524
2015-05-30 02:33:41 +09:30
Raptor1628
62ef32a725
Rig Icon Fixes
...
Fixes some incorrect names that were resulting in broken icons.
2015-05-27 23:32:27 -04:00
mwerezak
d65ec62dcb
Fixes #9493
2015-05-26 22:49:16 -04: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
mwerezak
b4c88c6186
Adds engineering workboots
...
Sprites credit ChessPiece.
2015-05-23 23:00:26 -04: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
Zuhayr
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
Zuhayr
06c04edb5e
Merge pull request #9337 from comma/ghettoMD
...
Ghetto MDing
2015-05-19 20:38:50 +09:30
mwerezak
e23f5e7e06
Fixes hardsuit shocking
2015-05-18 20:09:31 -04: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
Kelenius
cd9aa7c9af
Fixes mankini typo
2015-05-18 12:34:03 +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
Zuhayr
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
Zuhayr
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
Ccomp5950
10a8c56c5d
Merge pull request #9286 from Zuhayr/dev
...
Fixes, clothes stripping refactor.
2015-05-16 00:53:14 -04:00
Zuhayr
890693b839
Allowed accessories to function as custom items using icon_override
2015-05-16 01:37:04 +09:30
Zuhayr
325bd42c66
Fixes #9233
2015-05-15 23:37:52 +09:30
Zuhayr
624a6b0bca
Fixes #9250
2015-05-15 18:26:53 +09:30
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
PsiOmega
91f67e5dc5
Adjusts rig stealth module costs.
...
Activation and active power costs were previously a tenth of the same costs for a mere energy blade.
Now costs matches that of an energy blade.
2015-05-13 22:38:52 +02:00
Zuhayr
a9f936fe42
Added exosuit customisation kits to cargo.
2015-05-13 11:20:54 +09:30
Zuhayr
eef2f589ce
Housekeeping.
2015-05-13 10:32:26 +09:30
Zuhayr
4e85c5f387
Dev merge.
2015-05-12 23:33:29 +09:30
Zuhayr
9896bb4a9c
Cleanup of custom item icons.
2015-05-12 23:21:23 +09:30
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
c06323ef7a
Merge pull request #9199 from Techhead0/voidmachine-englishlists
...
Changes machine frames and voidsuits to use proc/english_list() and removes frame_desc
2015-05-12 14:20:37 +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
Zuhayr
4cf296a6c9
First pass on custom item cleanup/refactor.
2015-05-12 10:53:16 +09:30
Techhead0
f6977dd8ed
Changes machine frames and voidsuits to use proc/english_list()
...
Also includes formatting changes to voidsuit examine.
2015-05-11 20:29:35 -04:00
Zuhayr
e28acd5045
Dev merge.
2015-05-11 18:45:14 +09:30
Zuhayr
bc50ba5166
Merge resolution.
2015-05-11 11:47:24 +09:30
Zuhayr
2adc8df1fa
Merge pull request #8903 from Mloc/lightwrite
...
Lighting rewrite
2015-05-11 09:26:04 +09:30
Chinsky
ea28e4aadf
Merge pull request #9126 from Techhead0/magbootsOverShoesTwo
...
Magboots can be worn over shoes
2015-05-11 02:48:45 +03:00
Mloc
16d50c645d
new object-based lighting system
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-10 20:54:25 +01:00
PsiOmega
5de22ace82
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/clothing/gloves/miscellaneous.dm
2015-05-10 10:43:46 +02:00
Zuhayr
90fd4d584e
Merge pull request #9164 from comma/sterile
...
Made sterile gloves actually start sterile
2015-05-10 15:11:29 +09:30
