PsiOmega
2c60619273
Restores the original messages.
2015-05-17 10:25:37 +02:00
Zuhayr
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
RavingManiac
22cafb9c48
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-05-17 17:01:43 +10:00
RavingManiac
f66cf9af05
get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications
...
Transmission of emotes, visible_message() and say() refactored. All three use get_mobs_or_objects_in_view() to find objects and mobs in containers
Storage objects and closets no longer transfer hear_talk(), see_emote() or show_message() to contents, as this is already covered by the above changes
2015-05-17 16:54:18 +10:00
Zuhayr
a540e97e1b
Stool and table tweaks, adjusted tables on the map.
2015-05-17 13:41:22 +09:30
Zuhayr
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
Zuhayr
14df1e5fb5
Converts beds, chairs and stools.
2015-05-17 03:43:59 +09:30
Zuhayr
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
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
b8ca15f541
Tweaks/fixes and greyscale icons.
2015-05-17 00:07:29 +09:30
Zuhayr
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
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
Kelenius
af14ec1855
Inflatables now lose deflate verb when it's used
2015-05-16 11:43:30 +03:00
Zuhayr
edb1d501d6
Fixes #9217
2015-05-16 17:56:28 +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
RavingManiac
c67ed25b85
visible_message() now affects objects. Holopads, pAIs, AI cards people in mecha should hence be able to see them
...
Tape recorders record hearable emotes and action messages
Human and robot emotes now use custom_emote()
2015-05-16 16:01:41 +10: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
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
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
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
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
Ccomp5950
4ec41c73ca
Merge pull request #9195 from atlantiscze/radio-fix
...
Fixes common channel radios not working.
2015-05-14 12:34:43 -04: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
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
4108e82b6b
Merge pull request #9208 from atlantiscze/rolling-brownouts
...
Fixes dev power issues
2015-05-13 18:09:16 +03:00
Zuhayr
38e7cb8774
Minor amendments to mech kits and icons.
2015-05-13 17:04:52 +09:30
Zuhayr
3c10cc5852
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into customitems
2015-05-13 17:00:10 +09:30
Techhead0
93767c589e
Adds beanbag shells to bar backroom.
...
Also, fixes.
2015-05-13 03:30:07 -04:00
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
Atlantiscze
090112c874
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge
2015-05-13 06:17:26 +02:00
