979b6adcae
Removes some qdel:s of lists.
...
Primarily done by removing the need for clearing the contents list of bio-lockers in the first place.
2015-06-05 12:05:43 +02:00
63ea8338fb
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/ZAS/Diagnostic.dm
code/game/machinery/computer3/laptop.dm
code/game/machinery/requests_console.dm
code/game/objects/items/stacks/tiles/plasteel.dm
2015-06-05 00:49:13 +01:00
314a28fa75
Merge remote-tracking branch 'upstream/dev' into span_class=notice
...
Conflicts:
code/game/antagonist/station/rogue_ai.dm
code/game/machinery/OpTable.dm
code/game/machinery/floodlight.dm
code/game/machinery/spaceheater.dm
2015-06-02 17:33:20 +01:00
88b80732e7
Generalizes access definitions.
...
Access description, type, and area/region (medical, security, etc.) is now defined in a datum, ensuring the id modification consoles will (should) never be missing entries.
2015-06-02 18:11:46 +02:00
3d49ad3927
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/jobs/job/job.dm
code/game/jobs/job/silicon.dm
code/game/objects/items/weapons/surgery_tools.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/human/species/species.dm
code/modules/mob/living/carbon/human/species/station/station.dm
code/modules/organs/organ_external.dm
icons/obj/objects.dmi
2015-06-01 09:07:03 +02:00
10218eb8c9
Merge pull request #9573 from Zuhayr/chairs
...
Chair update.
2015-05-31 11:33:24 +03:00
201712eb3d
Added MATERIAL_PADDING flag.
2015-05-31 17:19:32 +09:30
ae38961a65
Fixes #9551
2015-05-31 03:36:07 +09:30
f9e99e1ee9
Fixes #9581
2015-05-31 03:34:29 +09:30
d0232732d4
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/machinery/floodlight.dm
code/game/objects/items/devices/suit_cooling.dm
code/modules/organs/subtypes/diona.dm
code/modules/paperwork/pen.dm
code/modules/reagents/reagent_containers/hypospray.dm
html/changelogs/.all_changelog.yml
2015-05-30 16:11:57 +02:00
94e19592cf
objects/effects, objects/structures
2015-05-30 14:37:40 +01:00
deb806c4cb
Fixes #9076
2015-05-30 05:24:44 +09:30
3cf0018fb8
Fixing up bed icons etc.
2015-05-30 01:13:11 +09:30
93aaa48cd8
Fixes #9571 , various other tweaks.
2015-05-30 00:59:39 +09:30
7d7723c19d
Further material tweaks.
2015-05-30 00:45:58 +09:30
e9f2f5cf55
Converted comfy chairs to material system, cleaned up colours/icons.
2015-05-30 00:45:36 +09:30
62185bc0a8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-26 08:35:32 +02:00
d4eb0e82bb
Merge pull request #9293 from RavingManiac/dev
...
Emote, say() and visible_message() refactor, tape recorder upgrade
2015-05-25 20:53:04 +03:00
3fb3a18f05
Supply shuttle and crate fixes
...
- Supply point generation no longer increases over time, leading to a total of around 45000 points generating after 150 minutes
- Supply packs can have access set as either a number or a list; either is transferred to crates' req_access var correctly
- Non-secure reagent cartridge crates no longer use secure crates
- Closet/crate examine now calls ..() in all circumstances, not just when the user is more than one tile away
- Possibly more I can't remember
2015-05-23 16:15:04 +01:00
04293467e8
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-05-22 00:04:37 +10:00
6d54e1c655
Merge branch 'dev' into ofClicksAndCooldowns
...
Conflicts:
code/game/turfs/simulated/walls.dm
code/modules/mob/living/carbon/resist.dm
code/modules/mob/mob_grab.dm
2015-05-21 17:00:50 +03:00
66b8d67637
Merge pull request #9390 from mwerezak/attack-animation
...
Attack animations
2015-05-21 06:52:30 +02:00
c289975498
Adds attack animation calls for a few common machines and structures
...
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
87178d74a6
Adds attack animation calls for attack_generic()
2015-05-20 00:19:39 -04:00
93b014c699
Merge with dev.
2015-05-20 13:39:31 +09:30
ce8188c1a2
Merge pull request #9350 from Hubblenaut/lockers
...
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
ac1f3c3530
Fixes overbloated closets
2015-05-18 18:34:25 +02:00
8ce787ef68
Final tweaks to recipe availability and material inheritance.
2015-05-17 18:22:21 +09:30
ed34aa2466
Rebalancing and adjusting divisors for all weapon damage values.
2015-05-17 16:51:55 +09:30
22cafb9c48
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-05-17 17:01:43 +10:00
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
a540e97e1b
Stool and table tweaks, adjusted tables on the map.
2015-05-17 13:41:22 +09:30
4cd2a5a532
Updating stools/stool padding.
2015-05-17 12:53:23 +09:30
14df1e5fb5
Converts beds, chairs and stools.
2015-05-17 03:43:59 +09:30
ae3ad84634
Updated ashtrays and mineral doors.
2015-05-17 03:02:03 +09:30
358867f3b5
Major sheet and material refactor.
2015-05-17 01:46:53 +09:30
a101855343
Converted over hatchets and scythes.
2015-05-17 00:15:46 +09:30
83570a1a9e
Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev
2015-05-16 23:35:05 +09:30
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
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +09:30
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
966d797e07
Converts bat to use the material system.
2015-05-16 19:59:21 +09:30
af14ec1855
Inflatables now lose deflate verb when it's used
2015-05-16 11:43:30 +03:00
76654321e4
Merge remote-tracking branch 'upstream/dev' into new_tables
...
Conflicts:
code/setup.dm
2015-05-16 08:53:33 +01:00
38eb1ad7b9
Merge pull request #9263 from Hubblenaut/dev
...
Cleans up access and map artifacts
2015-05-16 09:33:11 +02:00
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
f9cbf1a1fd
Cleans up access and map artifacts
2015-05-15 15:36:48 +02:00
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
21394e78c4
Merge remote-tracking branch 'upstream/dev' into new_tables
2015-05-15 00:12:40 +01:00
4b87799072
New tables, code section. Changelog entry soon.
2015-05-13 19:08:39 +01:00
PsiOmegaDelta