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
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
7535e027b9
Fixes #9192
2015-05-15 23:53:38 +09:30
Zuhayr
f65c4e95f6
Fixes #9060
2015-05-15 23:38:01 +09:30
Zuhayr
325bd42c66
Fixes #9233
2015-05-15 23:37:52 +09:30
Zuhayr
256c057608
Fixes #8376
2015-05-15 23:27:33 +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
Zuhayr
624a6b0bca
Fixes #9250
2015-05-15 18:26:53 +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
PsiOmegaDelta
68d85556d0
Merge pull request #9282 from Zuhayr/dev
...
Fixes
2015-05-15 08:25:04 +02:00
PsiOmegaDelta
b963e807f6
Merge pull request #9273 from GinjaNinja32/grab_del
...
Fixes grabs runtiming on qdel()
2015-05-15 08:22:52 +02:00
Zuhayr
fe3f169959
Fixes #9234
2015-05-15 13:53:01 +09:30
Zuhayr
30cda10bb3
Fixes #9226
2015-05-15 13:43:28 +09:30
Zuhayr
95ea7c110c
Fixes several wall issues.
2015-05-15 13:43:00 +09:30
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
GinjaNinja32
21394e78c4
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-15 00:12:40 +01:00
GinjaNinja32
363ce0a925
Fixes grabs runtiming on qdel()
2015-05-15 00:07:45 +01:00
GinjaNinja32
a3662a9088
Fixes, improvements, suggestions.
2015-05-15 00:06:47 +01:00
PsiOmegaDelta
4f40e92a95
Merge pull request #9272 from Mloc/nanoui
...
better nanoui caching + fixes
2015-05-14 23:48:15 +02:00
Mloc
cfb51cf198
better nanoui caching + fixes
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 22:35:50 +01:00
GinjaNinja32
63f28ee0e0
Fixes
...
- Material comparisons done by name rather than reference equality
- get_material_by_name proc that ensures the material list is initialised, initialising it if neccessary
- holographic materials moved into main material list
- table frames are not a source of infinite metal, and can be deconstructed correctly
- gambling table icons are no longer E-W flipped
2015-05-14 22:26:19 +01: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
Ccomp5950
1e6921f924
Merge pull request #9268 from Mloc/lightwrite
...
fix for "cleaning light"
2015-05-14 15:08:03 -04:00
Chinsky
8d83e8d452
Merge pull request #9202 from Zuhayr/customitems
...
Custom items refactor.
2015-05-14 21:47:04 +03:00
Mloc
d95701a7b5
fix for "cleaning light"
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 18:03:18 +01:00
Mloc
d6f4828f2a
fix an issue with destroying light sources that have 0 light_range
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 10:58:52 +01:00
PsiOmegaDelta
9ed8f69e02
Merge pull request #9240 from Techhead0/internalsBox
...
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
Chinsky
713deb4137
Merge pull request #9253 from PsiOmegaDelta/StealthFixes
...
Adjusts rig stealth module costs.
2015-05-14 04:17:56 +03:00
Chinsky
dd008c7790
Merge pull request #9254 from PsiOmegaDelta/CellDepletion
...
Using more energy than a cell has stored now drains the cell.
2015-05-14 04:17:43 +03:00
PsiOmega
3d1b671703
Asking for more energy than a cell has stored now drains the cell.
...
Fixes #9252 .
2015-05-13 23:38:49 +02:00
GinjaNinja32
428014c372
Layer and throwpass fix.
2015-05-13 22:06:27 +01: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
GinjaNinja32
5820873dab
Makes gambling tables constructable.
2015-05-13 21:34:31 +01:00
GinjaNinja32
fb329fb8e0
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-13 20:46:58 +01:00
GinjaNinja32
5f65565f45
Bugfixes, removing the remnants of table_parts, changelog.
2015-05-13 20:40:00 +01:00
GinjaNinja32
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01: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
1dfade1a33
master>dev
2015-05-13 17:09:57 +09:30
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
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
Chinsky
ad67215b08
Merge pull request #9073 from PsiOmegaDelta/QDels
...
Implementing Destroy():s
2015-05-12 18:26:57 +03:00
Hubblenaut
32b463237f
Final adjustments to icons, adds delay to pinning
2015-05-12 17:21:37 +02:00
