PsiOmega
aad28d63ce
Cleans up welder code.
...
Icon and inhand states should now update properly.
2015-05-16 14:13:24 +02:00
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
PsiOmegaDelta
65151ade35
Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate
...
Inflatables now lose deflate verb when it's used
2015-05-16 13:51:16 +02:00
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
0fb27e83b0
Preliminary file for material weapon system.
2015-05-16 20:14:35 +09:30
Zuhayr
f27ddd548f
Restructuring a bunch of files in prep for widespread path changes.
2015-05-16 20:09:28 +09:30
Zuhayr
966d797e07
Converts bat to use the material system.
2015-05-16 19:59:21 +09:30
PsiOmega
5c646e8365
Limits wall processing.
2015-05-16 11:27:19 +02:00
PsiOmega
bc0e87ceaa
Destroying a camera now also cuts wires randomly.
2015-05-16 11:04:32 +02:00
PsiOmega
729a7a3ec9
Gamestart cleanup.
...
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
2015-05-16 10:59:45 +02:00
Kelenius
af14ec1855
Inflatables now lose deflate verb when it's used
2015-05-16 11:43:30 +03:00
PsiOmega
163aab3753
Adds turf processing.
...
Currently only used by walls. Radioactive walls now irradiate nearby mobs.
2015-05-16 10:27:47 +02:00
Zuhayr
edb1d501d6
Fixes #9217
2015-05-16 17:56:28 +09:30
Zuhayr
00855d636f
Fixes #8389
2015-05-16 17:54:21 +09:30
Zuhayr
7e14930209
Merge pull request #9249 from GinjaNinja32/new_tables
...
Table rewrite
2015-05-16 17:32:47 +09:30
Zuhayr
5d51d0e423
Merge pull request #9267 from Hubblenaut/cameras
...
Camera Rebalance
2015-05-16 17:28:29 +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
PsiOmegaDelta
38eb1ad7b9
Merge pull request #9263 from Hubblenaut/dev
...
Cleans up access and map artifacts
2015-05-16 09:33:11 +02:00
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
Hubblenaut
4e3e5581f3
Extends janitor access
2015-05-15 15:36:51 +02:00
Hubblenaut
f9cbf1a1fd
Cleans up access and map artifacts
2015-05-15 15:36:48 +02:00
Zuhayr
624ffcff4c
Fixes #9239
2015-05-15 18:40:32 +09:30
Zuhayr
f3bd251f95
Fixes #9259
2015-05-15 18:29:44 +09:30
Zuhayr
cb73d5b6e9
Fixes #9256
2015-05-15 18:23:00 +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
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
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
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
Hubblenaut
dfd3a679a8
camera rebalance
2015-05-14 20:02:09 +02:00
Mloc
d95701a7b5
fix for "cleaning light"
...
Signed-off-by: Mloc <colmohici@gmail.com >
2015-05-14 18:03:18 +01:00
Ccomp5950
4ec41c73ca
Merge pull request #9195 from atlantiscze/radio-fix
...
Fixes common channel radios not working.
2015-05-14 12:34:43 -04:00
Loganbacca
e3564a5d80
MULE destination update
...
- MULE destination selection is now handled using a list
2015-05-15 00:03:38 +12:00
PsiOmegaDelta
9ed8f69e02
Merge pull request #9240 from Techhead0/internalsBox
...
Moves survival boxes to species datums.
2015-05-14 09:38:24 +02:00
mwerezak
aeb1f5ae68
Updates instances of if(cell.use(...))
2015-05-14 01:52:04 -04:00
GinjaNinja32
fb329fb8e0
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-13 20:46:58 +01:00
GinjaNinja32
a353c90159
Super-small fix.
2015-05-13 20:41:40 +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
Chinsky
2b1271d633
Merge pull request #9242 from PsiOmegaDelta/MechWreck
...
Fixes #9221 .
2015-05-13 18:10:24 +03:00
Chinsky
ef79eb920d
Merge pull request #9224 from PsiOmegaDelta/BrigGarbage
...
Map cleaning.
2015-05-13 18:09:28 +03:00
Chinsky
4108e82b6b
Merge pull request #9208 from atlantiscze/rolling-brownouts
...
Fixes dev power issues
2015-05-13 18:09:16 +03:00
PsiOmega
cb5535a64b
Fixes #9221 .
...
Removes premature loc = null change.
Also fixes an issue occuring when the impact of an ion bullet would wreck a mech before triggering the EMP.
This would cause null runtimes as a now removed object would be accessed.
2015-05-13 12:37:18 +02:00
Techhead0
875a4fd893
Moves equip_survival_gear into job controller, species gear into datums.
2015-05-13 04:07:01 -04:00
